From patchwork Fri Jan 11 13:12:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 13974 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 59FCB23E27 for ; Fri, 11 Jan 2013 13:13:26 +0000 (UTC) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by fiordland.canonical.com (Postfix) with ESMTP id D6AE9A18C70 for ; Fri, 11 Jan 2013 13:13:25 +0000 (UTC) Received: by mail-vc0-f182.google.com with SMTP id fy27so1410700vcb.13 for ; Fri, 11 Jan 2013 05:13:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=QIZtDcwuUhE9wjBhuG+pLmKlo0VMMs+7DY5ivnVM2M0=; b=HyZctipIT3Yu380b8jaJzJleKm6KndiRsVFLene6ZmdCM/UuzfgPWVjD9XQFS9FEX3 9o2+8Jct/CCrUCnE/YPJJrpsZHPEVhezTZPxYf9OR3KmE8pE1izMjlEvPkufoM2G0OLD KLpwUO+C9A4BuLQdHOl7DDYClcnWbo5MRJQ+5wFLFe+lH8mhq+DH0gtrQKjtTdfTbsA9 aM0QLe/qsXc+rXOkpaxOQvwWMcO8LqTmj6mJ1fVwhc7nfLb618sH7145i/HQ8Mg31qzh 9NJZv+3S1+RWA2jVouromkjy/AUT8gSBXdZX32gOC9XhEksiEYmTFCceKBDxRiv6cVWj ERfQ== X-Received: by 10.58.74.196 with SMTP id w4mr2115479vev.7.1357910005385; Fri, 11 Jan 2013 05:13:25 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.145.101 with SMTP id st5csp111221veb; Fri, 11 Jan 2013 05:13:24 -0800 (PST) X-Received: by 10.180.99.129 with SMTP id eq1mr15204359wib.30.1357910004074; Fri, 11 Jan 2013 05:13:24 -0800 (PST) Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com [74.125.82.51]) by mx.google.com with ESMTPS id ex6si8677053wib.22.2013.01.11.05.13.23 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Jan 2013 05:13:24 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.51 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.51; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.51 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-wg0-f51.google.com with SMTP id gg4so831367wgb.30 for ; Fri, 11 Jan 2013 05:13:23 -0800 (PST) X-Received: by 10.180.14.2 with SMTP id l2mr15362955wic.2.1357910003681; Fri, 11 Jan 2013 05:13:23 -0800 (PST) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id p2sm7204515wic.7.2013.01.11.05.13.21 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Jan 2013 05:13:22 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, cbouatmailru@gmail.com, Paer-Olof Haakansson , Lee Jones , Robert Marklund Subject: [PATCH 01/18] power: ab8500_charger: Rename the power_loss function Date: Fri, 11 Jan 2013 13:12:49 +0000 Message-Id: <1357909986-9262-2-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1357909986-9262-1-git-send-email-lee.jones@linaro.org> References: <1357909986-9262-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQnieBvHfQiabOvAT/wDKCa2mVNzYGx9YhHAceL/p9Zl3MxUsrtc+yTtWiN31dtx6XZwk+jp From: Paer-Olof Haakansson Rename the ab8500_power_loss_handling function to a more descriptive name ab8500_enable_disable_sw_fallback Signed-off-by: Lee Jones Signed-off-by: Robert Marklund Reviewed-by: Par-Olof HAKANSSON Reviewed-by: Karl KOMIEROWSKI Tested-by: Par-Olof HAKANSSON --- drivers/power/ab8500_charger.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c index 2ddface..d6e1792 100644 --- a/drivers/power/ab8500_charger.c +++ b/drivers/power/ab8500_charger.c @@ -270,20 +270,19 @@ static enum power_supply_property ab8500_charger_usb_props[] = { POWER_SUPPLY_PROP_CURRENT_NOW, }; -/** - * ab8500_power_loss_handling - set how we handle powerloss. - * @di: pointer to the ab8500_charger structure - * - * Magic nummbers are from STE HW department. +/* + * Function for enabling and disabling sw fallback mode + * should always be disabled when no charger is connected. */ -static void ab8500_power_loss_handling(struct ab8500_charger *di) +static void ab8500_enable_disable_sw_fallback(struct ab8500_charger *di, + bool fallback) { u8 reg; int ret; - dev_dbg(di->dev, "Autopower : %d\n", di->autopower); + dev_dbg(di->dev, "SW Fallback: %d\n", fallback); - /* read the autopower register */ + /* read the register containing fallback bit */ ret = abx500_get_register_interruptible(di->dev, 0x15, 0x00, ®); if (ret) { dev_err(di->dev, "%d write failed\n", __LINE__); @@ -297,12 +296,12 @@ static void ab8500_power_loss_handling(struct ab8500_charger *di) return; } - if (di->autopower) + if (fallback) reg |= 0x8; else reg &= ~0x8; - /* write back the changed value to autopower reg */ + /* write back the changed fallback bit value to register */ ret = abx500_set_register_interruptible(di->dev, 0x15, 0x00, reg); if (ret) { dev_err(di->dev, "%d write failed\n", __LINE__); @@ -332,12 +331,12 @@ static void ab8500_power_supply_changed(struct ab8500_charger *di, !di->ac.charger_connected && di->autopower) { di->autopower = false; - ab8500_power_loss_handling(di); + ab8500_enable_disable_sw_fallback(di, false); } else if (!di->autopower && (di->ac.charger_connected || di->usb.charger_connected)) { di->autopower = true; - ab8500_power_loss_handling(di); + ab8500_enable_disable_sw_fallback(di, true); } } power_supply_changed(psy);