From patchwork Thu Aug 25 07:19:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenyou Yang X-Patchwork-Id: 9298863 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4D86C607F0 for ; Thu, 25 Aug 2016 07:32:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F67B291FC for ; Thu, 25 Aug 2016 07:32:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3219729201; Thu, 25 Aug 2016 07:32:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A0603291FC for ; Thu, 25 Aug 2016 07:32:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bcp7t-0004H5-CH; Thu, 25 Aug 2016 07:31:01 +0000 Received: from eusmtp01.atmel.com ([212.144.249.243]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bcp3h-0007fl-Vu for linux-arm-kernel@lists.infradead.org; Thu, 25 Aug 2016 07:26:47 +0000 Received: from apsmtp01.atmel.com (10.168.254.31) by eusmtp01.atmel.com (10.145.145.31) with Microsoft SMTP Server id 14.3.235.1; Thu, 25 Aug 2016 09:26:09 +0200 Received: from shaarm01.corp.atmel.com (10.168.254.13) by apsmtp01.atmel.com (10.168.254.31) with Microsoft SMTP Server id 14.3.235.1; Thu, 25 Aug 2016 15:32:14 +0800 From: Wenyou Yang To: Sebastian Reichel , Dmitry Eremin-Solenikov , David Woodhouse , Rob Herring , Pawel Moll , Mark Brown , Ian Campbell , "Kumar Gala" , Lee Jones , Nicolas Ferre , Alexandre Belloni Subject: [PATCH v8 08/11] power: act8945a_charger: Add max current property Date: Thu, 25 Aug 2016 15:19:56 +0800 Message-ID: <1472109599-21915-9-git-send-email-wenyou.yang@atmel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1472109599-21915-1-git-send-email-wenyou.yang@atmel.com> References: <1472109599-21915-1-git-send-email-wenyou.yang@atmel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160825_002642_747762_804A8D40 X-CRM114-Status: GOOD ( 16.63 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Wenyou Yang , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add the power supply's current max property, POWER_SUPPLY_PROP_CURRENT_MAX. Signed-off-by: Wenyou Yang --- Changes in v8: - As the act8945a_charger is regarded as a sub-device, all properties can be achieved from its own device node, use devm_gpiod_get() properly as well to get "chglev-gpios". - Add missing return -EPROBE_DEFER for "chglev-gpios". Changes in v7: - For "chglev-gpios", use gpiod_get() to fix devm_gpiod_get() wrong use with parent device as *dev argument. - Add the handle -EPROBE_DEFER returned from gpiod_get "chglev-gpio". - Remove unneeded semicolon. Changes in v6: - For "chglev-gpios", use gpiod API instead of old gpio API to handle. Changes in v5: None Changes in v4: - Fix wrong gpio assignment for chglev_pin. Changes in v3: None Changes in v2: None drivers/power/supply/act8945a_charger.c | 90 +++++++++++++++++++++++++++++---- 1 file changed, 81 insertions(+), 9 deletions(-) diff --git a/drivers/power/supply/act8945a_charger.c b/drivers/power/supply/act8945a_charger.c index b66b023..d6263e9 100644 --- a/drivers/power/supply/act8945a_charger.c +++ b/drivers/power/supply/act8945a_charger.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include @@ -85,6 +84,7 @@ struct act8945a_charger { bool init_done; struct gpio_desc *lbo_gpio; + struct gpio_desc *chglev_gpio; }; static int act8945a_get_charger_state(struct regmap *regmap, int *val) @@ -265,12 +265,80 @@ static int act8945a_get_capacity_level(struct act8945a_charger *charger, return 0; } +#define MAX_CURRENT_USB_HIGH 450000 +#define MAX_CURRENT_USB_LOW 90000 +#define MAX_CURRENT_USB_PRE 45000 +/* + * Riset(K) = 2336 * (1V/Ichg(mA)) - 0.205 + * Riset = 2.43K + */ +#define MAX_CURRENT_AC_HIGH 886527 +#define MAX_CURRENT_AC_LOW 117305 +#define MAX_CURRENT_AC_HIGH_PRE 88653 +#define MAX_CURRENT_AC_LOW_PRE 11731 + +static int act8945a_get_current_max(struct act8945a_charger *charger, + struct regmap *regmap, int *val) +{ + int ret; + unsigned int status, state; + unsigned int acin_state; + int chgin_level = gpiod_get_value(charger->chglev_gpio); + + ret = regmap_read(regmap, ACT8945A_APCH_STATUS, &status); + if (ret < 0) + return ret; + + ret = regmap_read(regmap, ACT8945A_APCH_STATE, &state); + if (ret < 0) + return ret; + + acin_state = (state & APCH_STATE_ACINSTAT) >> 1; + + state &= APCH_STATE_CSTATE; + state >>= APCH_STATE_CSTATE_SHIFT; + + switch (state) { + case APCH_STATE_CSTATE_PRE: + if (acin_state) { + if (chgin_level) + *val = MAX_CURRENT_AC_HIGH_PRE; + else + *val = MAX_CURRENT_AC_LOW_PRE; + } else { + *val = MAX_CURRENT_USB_PRE; + } + break; + case APCH_STATE_CSTATE_FAST: + if (acin_state) { + if (chgin_level) + *val = MAX_CURRENT_AC_HIGH; + else + *val = MAX_CURRENT_AC_LOW; + } else { + if (chgin_level) + *val = MAX_CURRENT_USB_HIGH; + else + *val = MAX_CURRENT_USB_LOW; + } + break; + case APCH_STATE_CSTATE_EOC: + case APCH_STATE_CSTATE_DISABLED: + default: + *val = 0; + break; + } + + return 0; +} + static enum power_supply_property act8945a_charger_props[] = { POWER_SUPPLY_PROP_STATUS, POWER_SUPPLY_PROP_CHARGE_TYPE, POWER_SUPPLY_PROP_TECHNOLOGY, POWER_SUPPLY_PROP_HEALTH, POWER_SUPPLY_PROP_CAPACITY_LEVEL, + POWER_SUPPLY_PROP_CURRENT_MAX, POWER_SUPPLY_PROP_MODEL_NAME, POWER_SUPPLY_PROP_MANUFACTURER }; @@ -300,6 +368,10 @@ static int act8945a_charger_get_property(struct power_supply *psy, ret = act8945a_get_capacity_level(charger, regmap, &val->intval); break; + case POWER_SUPPLY_PROP_CURRENT_MAX: + ret = act8945a_get_current_max(charger, + regmap, &val->intval); + break; case POWER_SUPPLY_PROP_MODEL_NAME: val->strval = act8945a_charger_model; break; @@ -390,13 +462,11 @@ static int act8945a_charger_config(struct device *dev, struct act8945a_charger *charger) { struct device_node *np = dev->of_node; - enum of_gpio_flags flags; struct regmap *regmap = charger->regmap; u32 total_time_out; u32 pre_time_out; u32 input_voltage_threshold; - int chglev_pin; int ret; unsigned int tmp; @@ -432,12 +502,14 @@ static int act8945a_charger_config(struct device *dev, if (ret) dev_info(dev, "failed to request gpio \"lbo\" IRQ\n"); - chglev_pin = of_get_named_gpio_flags(np, - "active-semi,chglev-gpios", 0, &flags); - - if (gpio_is_valid(chglev_pin)) { - gpio_set_value(chglev_pin, - ((flags == OF_GPIO_ACTIVE_LOW) ? 0 : 1)); + charger->chglev_gpio = devm_gpiod_get(dev, + "active-semi,chglev", GPIOD_IN); + if (PTR_ERR(charger->chglev_gpio) == -EPROBE_DEFER) { + dev_info(dev, "probe retry requested for gpio \"chglev\"\n"); + return -EPROBE_DEFER; + } else if (IS_ERR(charger->chglev_gpio)) { + dev_err(dev, "unable to claim gpio \"chglev\"\n"); + charger->chglev_gpio = NULL; } if (of_property_read_u32(np,