From patchwork Thu Dec 13 15:21:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 13537 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 7A90F23E2A for ; Thu, 13 Dec 2012 15:21:59 +0000 (UTC) Received: from mail-ie0-f176.google.com (mail-ie0-f176.google.com [209.85.223.176]) by fiordland.canonical.com (Postfix) with ESMTP id 15FA6A185E5 for ; Thu, 13 Dec 2012 15:21:58 +0000 (UTC) Received: by mail-ie0-f176.google.com with SMTP id 13so4058065iea.21 for ; Thu, 13 Dec 2012 07:21:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=QIZtDcwuUhE9wjBhuG+pLmKlo0VMMs+7DY5ivnVM2M0=; b=WcUC3iwKnGYrF/Q/SCYQM1mTKflbhKiLipNYmicSSAuEGulDKxGjePCbs1L3cHnpe5 +288PDv3kgFSeF/D49ae4y86TE0DNzZJL+61XqsAC7rCbMl7r5MyWhNH0YXXkjD7Ji4B byF8AMACrHFMbABdYX1Caw+hz7uxL+cuF/Hd/KCBK9H4GpkxhJmJ1ScLLGz+tze1AOve VQfNT4U2Pfg2er9ECT1prez2v5It0N0iQDkEWTooImRurqS8/INC8BW52J9FQOR+wUiB KbUJYOy5TUg+1BOGDzJefVZKnZtp6S0VEDsNJsajT2D9uw8o0sFNy+AOCOTHf+BH14a1 y+iQ== Received: by 10.50.91.195 with SMTP id cg3mr17103977igb.57.1355412118484; Thu, 13 Dec 2012 07:21:58 -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.50.67.148 with SMTP id n20csp16241igt; Thu, 13 Dec 2012 07:21:57 -0800 (PST) Received: by 10.180.80.201 with SMTP id t9mr4056326wix.0.1355412116599; Thu, 13 Dec 2012 07:21:56 -0800 (PST) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id y1si12607093wje.37.2012.12.13.07.21.56 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 13 Dec 2012 07:21:56 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.178 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-we0-f178.google.com with SMTP id x43so1014132wey.37 for ; Thu, 13 Dec 2012 07:21:56 -0800 (PST) Received: by 10.180.101.104 with SMTP id ff8mr3058789wib.11.1355412116097; Thu, 13 Dec 2012 07:21:56 -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 i6sm8200894wix.5.2012.12.13.07.21.54 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 13 Dec 2012 07:21:55 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org Cc: cbou@mail.ru, Paer-Olof Haakansson , Lee Jones , Robert Marklund Subject: [PATCH 01/18] power: ab8500_charger: Rename the power_loss function Date: Thu, 13 Dec 2012 15:21:24 +0000 Message-Id: <1355412102-14265-2-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1355412102-14265-1-git-send-email-lee.jones@linaro.org> References: <1355412102-14265-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQmggrIz5BAxSeY01o/AAIM7aUt1GxE57MQ+g9qDZSqskO0SMQt7Dn2woZhMCBXhx1VPi1mt 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);