From patchwork Tue Jan 15 10:32:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 155653 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4717749jaa; Tue, 15 Jan 2019 02:33:26 -0800 (PST) X-Google-Smtp-Source: ALg8bN4GbCJM7nP1VwkQBjoRkSN2sApRGo/qUJoCBIbRJqALrVEG/HL++MrMwT2/N86CtX4suRcx X-Received: by 2002:a63:4566:: with SMTP id u38mr3242500pgk.4.1547548406297; Tue, 15 Jan 2019 02:33:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547548406; cv=none; d=google.com; s=arc-20160816; b=pDzBgMEpxe1DzchAT3ioPnPmg2VKaQEjeU9KeY/t+pgCybFriJsY7ntCi3f5mAE4hN 566VdibTfKH2RaZi23luuRLFB9GuaT+cL5FP/x3oG5jlj3H/S4eJNg9tmusZMGrLnp3c O7ENWikr141KoirHF7Eu4yRMpz3hGU6Ht5Ce9vNN4NZnmwiZXtNkJh5n8GwjYNC9/kUK 9wals4CVRmAmOE19B+9ihVJvFmBYQWcOuY8if3EoX5WtxDPCyY4uy5Jr0fCxsH2tk/a/ svZQc+90laz8yzZlqRtPI6cdKTD0TrBNJkGpCCxeDWE99fL+DS0uiWAya/m2yIg5ll7V I25w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=z+FEdKv7SOmZhEaX0R5BmbcCjlQ5jY9He3y4lwTJ11k=; b=08SXuc8O21j5YhumRsxC86O+6BUGbHkpbWL8nDp5BDy5OJQjUhOotRhqcR50cG7YZQ G9LjOcEBuosmmckwu41Myne8RYVIczW8NTGwB6x3tZ4SrfXjwEw291prxY/os1K6shox UQlN3+SPUqUyWQ+465XhG7LzXHaqwFC7mM71I0UAP+PJa6ZNkHT7KLMZNqvW4sEMkXoV DE4Rz2LKWbB0UwRKRJ/ZI4rU0ZzDqK/g9d0bWy+p1CDCPTM/YZwfrTVf61kjQlVlQjqX VIy0Ea6wI5/Cw6xRYQQd0nNLDThezJutQTDurZQxLZDDE0hbbeK8FBkXM1uJI3Z+2HPL h/EQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="fbSRwjQ/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l36si2924786plb.433.2019.01.15.02.33.25; Tue, 15 Jan 2019 02:33:26 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="fbSRwjQ/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728890AbfAOKdZ (ORCPT + 31 others); Tue, 15 Jan 2019 05:33:25 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:42412 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728437AbfAOKdX (ORCPT ); Tue, 15 Jan 2019 05:33:23 -0500 Received: by mail-pg1-f196.google.com with SMTP id d72so1068034pga.9 for ; Tue, 15 Jan 2019 02:33:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=z+FEdKv7SOmZhEaX0R5BmbcCjlQ5jY9He3y4lwTJ11k=; b=fbSRwjQ/EGE0uRRDVnqryJ62/1KLUb9050Vx0WaPWP2IPPZzpgcicvYwGhus6ms83/ vqYWn8nBZ+gzWOuID2hqv5KFzW4Y1f+twpifDBtDoNro7yv/Zq4ZL+SLk9eqsfDghryP b5VC9jSegvUeY5dgh731OrZL/5KfF1Lt7NzyQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=z+FEdKv7SOmZhEaX0R5BmbcCjlQ5jY9He3y4lwTJ11k=; b=m55tsN9pxLzupQ5221KGd65jVYzs6/UfJBjyudOiNEg0kNn7NDTTBDsi/KtfybF5u+ 0CCHVR0FGrDb0sa9pBNdtjBd+2qEus3MGPuaXIp6dzPE8hglbHDelv4H0dXT3lEGI911 oLCEIWhF4lxlJg6i2wjbkAl9dHlKG/tP/yNdpmwfwuRjf2g+wS0UQFzlfJlrrIaFgb61 uSJWIyY3hIOHxHD5qPkGk1Fu1gaCztTMXsieY1p7W6cZCRGnFapUU/N3FS+ubdc/Zo9K U0iIZx0zaNe7jS7t+zsXjjmnD36gIa3ceDMHedsj+C9RAaIQ409OrDy3UvyUZaU5aWsr xdhA== X-Gm-Message-State: AJcUukeNZEZNlkdGYco6gh82PGXASqewnH0tnmJzNKAjwdCN5ugP07tC XhZw/8ccXdXPYPZwAxv/uq1r4r0sfyjbZg== X-Received: by 2002:a62:7e13:: with SMTP id z19mr3316400pfc.94.1547548402337; Tue, 15 Jan 2019 02:33:22 -0800 (PST) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.102]) by smtp.gmail.com with ESMTPSA id d13sm5073957pfd.58.2019.01.15.02.33.19 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 15 Jan 2019 02:33:21 -0800 (PST) From: Baolin Wang To: sre@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com Cc: linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, yuanjiang.yu@unisoc.com, baolin.wang@linaro.org, broonie@kernel.org, zhang.lyra@gmail.com, orsonzhai@gmail.com Subject: [PATCH 2/4] power: supply: sc27xx: Add one property to read charge voltage Date: Tue, 15 Jan 2019 18:32:35 +0800 Message-Id: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <76a12fe5d0cc670266100b0587b047714c9a8a83.1547544142.git.baolin.wang@linaro.org> References: <76a12fe5d0cc670266100b0587b047714c9a8a83.1547544142.git.baolin.wang@linaro.org> In-Reply-To: <76a12fe5d0cc670266100b0587b047714c9a8a83.1547544142.git.baolin.wang@linaro.org> References: <76a12fe5d0cc670266100b0587b047714c9a8a83.1547544142.git.baolin.wang@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE property to get charge voltage sampling by ADC controller, which is used to validate if the charge voltage is in normal range or not in charger manager. Signed-off-by: Baolin Wang --- drivers/power/supply/sc27xx_fuel_gauge.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) -- 1.7.9.5 diff --git a/drivers/power/supply/sc27xx_fuel_gauge.c b/drivers/power/supply/sc27xx_fuel_gauge.c index 76da189..4926b8a 100644 --- a/drivers/power/supply/sc27xx_fuel_gauge.c +++ b/drivers/power/supply/sc27xx_fuel_gauge.c @@ -72,6 +72,7 @@ * @lock: protect the structure * @gpiod: GPIO for battery detection * @channel: IIO channel to get battery temperature + * @charge_chan: IIO channel to get charge voltage * @internal_resist: the battery internal resistance in mOhm * @total_cap: the total capacity of the battery in mAh * @init_cap: the initial capacity of the battery in mAh @@ -92,6 +93,7 @@ struct sc27xx_fgu_data { struct mutex lock; struct gpio_desc *gpiod; struct iio_channel *channel; + struct iio_channel *charge_chan; bool bat_present; int internal_resist; int total_cap; @@ -391,6 +393,18 @@ static int sc27xx_fgu_get_vbat_ocv(struct sc27xx_fgu_data *data, int *val) return 0; } +static int sc27xx_fgu_get_charge_vol(struct sc27xx_fgu_data *data, int *val) +{ + int ret, vol; + + ret = iio_read_channel_processed(data->charge_chan, &vol); + if (ret < 0) + return ret; + + *val = vol * 1000; + return 0; +} + static int sc27xx_fgu_get_temp(struct sc27xx_fgu_data *data, int *temp) { return iio_read_channel_processed(data->channel, temp); @@ -502,6 +516,14 @@ static int sc27xx_fgu_get_property(struct power_supply *psy, val->intval = value; break; + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE: + ret = sc27xx_fgu_get_charge_vol(data, &value); + if (ret) + goto error; + + val->intval = value; + break; + case POWER_SUPPLY_PROP_CURRENT_NOW: case POWER_SUPPLY_PROP_CURRENT_AVG: ret = sc27xx_fgu_get_current(data, &value); @@ -567,6 +589,7 @@ static int sc27xx_fgu_property_is_writeable(struct power_supply *psy, POWER_SUPPLY_PROP_VOLTAGE_OCV, POWER_SUPPLY_PROP_CURRENT_NOW, POWER_SUPPLY_PROP_CURRENT_AVG, + POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE, }; static const struct power_supply_desc sc27xx_fgu_desc = { @@ -907,6 +930,12 @@ static int sc27xx_fgu_probe(struct platform_device *pdev) return PTR_ERR(data->channel); } + data->charge_chan = devm_iio_channel_get(&pdev->dev, "charge-vol"); + if (IS_ERR(data->charge_chan)) { + dev_err(&pdev->dev, "failed to get charge IIO channel\n"); + return PTR_ERR(data->charge_chan); + } + data->gpiod = devm_gpiod_get(&pdev->dev, "bat-detect", GPIOD_IN); if (IS_ERR(data->gpiod)) { dev_err(&pdev->dev, "failed to get battery detection GPIO\n"); From patchwork Tue Jan 15 10:32:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 155655 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4717918jaa; Tue, 15 Jan 2019 02:33:35 -0800 (PST) X-Google-Smtp-Source: ALg8bN4/BDIdN+Lpm2QzoCawnWcGDXGtSuJKLYt5zHNYX9fql9yGoKpQXmD0rRRNs93hnJfgEjKv X-Received: by 2002:a17:902:5a4d:: with SMTP id f13mr3455134plm.49.1547548415712; Tue, 15 Jan 2019 02:33:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547548415; cv=none; d=google.com; s=arc-20160816; b=T5W00BpYvMeZX84eh15aroPl0pna4TpYEjhgjDC9SICoa+og6sqIDaJN8/U2dGk5IM dYsJyTbr0jupjJk6PSEcNMZBuEZf7BvoOwCw6yC/SyiJnnhD9NWpYv77Rp7hTH4hbuMl TVMY4wzegwsQiT9mOvVj3jHjwGcaKjK/FRUZdIKQBBQ4aLYN/TUPh3T1Hs4JzH7yIDYL TTp7hA3Nu0hiEwK2t49wUST5m+pX42ZbO/c0JYd19fgzMjEM4TRaEQzqEht9tg+VdusP j8p7NHnNQ0A9Z4jI/EFGseMDr/qSTg/ls8ZoEluzoEeKRIpZys8a66V4ob5W3Tu37RtC N2dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=gfsjcoK5+n5u8rdyVSCIiowp3BqnWBKCmYbY+r0pFqo=; b=vjKzlamStvsfqpmBH+koADjPSn2C8MHrRO31FCBfyHH9QfBrIPUSf/CMczjiYmX/cB cV4d5m7hKpn1dusF+uQiLvVpBErr8sy4mURem1dXf0/S9m4kLpwsrA6k6UhBt36iCC8k 3GDvJb67EJCGInkabuFziGWFSKkaprxLaZ0VBVXZWtvph8CsReqILKqBbrRTP8cstKrh STy9x5pg6R34zhugJh5b5Abrw1tVElZxU8jTDeqnKtVwm+m7qh++OeU4smAYIpwNz+Du BxxPIkyTqK385g/oqyWWG1J7+/fPMdu9cnrCuu3EEPWobeExYFkkXZr9GmiuPYcMhI0N kYXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Njalyeho; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w185si1974543pgb.588.2019.01.15.02.33.35; Tue, 15 Jan 2019 02:33:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Njalyeho; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728972AbfAOKdf (ORCPT + 31 others); Tue, 15 Jan 2019 05:33:35 -0500 Received: from mail-pl1-f195.google.com ([209.85.214.195]:46299 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728926AbfAOKdc (ORCPT ); Tue, 15 Jan 2019 05:33:32 -0500 Received: by mail-pl1-f195.google.com with SMTP id t13so1080275ply.13 for ; Tue, 15 Jan 2019 02:33:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=gfsjcoK5+n5u8rdyVSCIiowp3BqnWBKCmYbY+r0pFqo=; b=NjalyehonmSD9f1XkR4NT52PJKvEiK+haOiYekDryzxm6wrHaHgYPGssUgy5RnbI+c 7E2jxPO/HlDbaNi8KYCw6/fEqL8aI7xmSFTo2CuSv0zZEg/RnPuiTfhPB05xN2TzxVwI 2+8U/2UEm/wbrBLy/cAYfcY9EC/97mPdi/ibU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=gfsjcoK5+n5u8rdyVSCIiowp3BqnWBKCmYbY+r0pFqo=; b=Y2FqEW3hCZcvxJX9tXUCLu1Svya5dgR0o/4PGseOTbNB5r45LXRUHa/SYpYPQ5Fd0G UkNfkGp9Ti1wV7Wn5AL3zATqgIqR3IAyFVtB6uSRTAyGRdHTtG2OtuoA+jlD3Mu+BUWB P8vNWA0sFduln/Wm4NRPpVfYMXxjPISz0V1/azYJI2Nt7UGAlL3h0rMpwUeRn3b4+/KJ pjI2uOZzatD0jyNeItXHffGQOq8NtS+0clpzO2pM/jEzPUKa6yD3b2xon8FpOwhSynlU H5qzXk/5iTqIwzB03vRx68Rwah16fpNtQgyYwrVRUw+BdqhPxtrnzWSI6ztKuIwj3jv8 lqzg== X-Gm-Message-State: AJcUukfrDvxVKSiAUxv4wlKWqgDba2Fp9gkXlZxpohz5q7I0hJeOspAb 1OpUX+/BRhrEuCsydz8Vh3z0gQ== X-Received: by 2002:a17:902:bd46:: with SMTP id b6mr3323046plx.231.1547548411565; Tue, 15 Jan 2019 02:33:31 -0800 (PST) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.102]) by smtp.gmail.com with ESMTPSA id d13sm5073957pfd.58.2019.01.15.02.33.26 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 15 Jan 2019 02:33:30 -0800 (PST) From: Baolin Wang To: sre@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com Cc: linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, yuanjiang.yu@unisoc.com, baolin.wang@linaro.org, broonie@kernel.org, zhang.lyra@gmail.com, orsonzhai@gmail.com Subject: [PATCH 4/4] power: supply: sc27xx: Fix capacity saving function Date: Tue, 15 Jan 2019 18:32:37 +0800 Message-Id: <30327406bfd6aa0559e48b766c87c6845fe059af.1547544142.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <76a12fe5d0cc670266100b0587b047714c9a8a83.1547544142.git.baolin.wang@linaro.org> References: <76a12fe5d0cc670266100b0587b047714c9a8a83.1547544142.git.baolin.wang@linaro.org> In-Reply-To: <76a12fe5d0cc670266100b0587b047714c9a8a83.1547544142.git.baolin.wang@linaro.org> References: <76a12fe5d0cc670266100b0587b047714c9a8a83.1547544142.git.baolin.wang@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yuanjiang Yu We found sometimes we can not get the saving capacity to initialize the battery capacity, the reason is the user area registers are put on power always-on region, so we need delay some time to wait until values are updated successfully. Moreover we also should clear the USER_AREA_CLEAR register after setting the USER_AREA_SET register, otherwise we can not save the values in the USER_AREA_SET register. Signed-off-by: Yuanjiang Yu Signed-off-by: Baolin Wang --- drivers/power/supply/sc27xx_fuel_gauge.c | 64 +++++++++++++++++++++++++++--- 1 file changed, 59 insertions(+), 5 deletions(-) -- 1.7.9.5 diff --git a/drivers/power/supply/sc27xx_fuel_gauge.c b/drivers/power/supply/sc27xx_fuel_gauge.c index ea1349f..24895cc 100644 --- a/drivers/power/supply/sc27xx_fuel_gauge.c +++ b/drivers/power/supply/sc27xx_fuel_gauge.c @@ -171,10 +171,37 @@ static int sc27xx_fgu_save_boot_mode(struct sc27xx_fgu_data *data, if (ret) return ret; + /* + * Since the user area registers are put on power always-on region, + * then these registers changing time will be a little long. Thus + * here we should delay 200us to wait until values are updated + * successfully according to the datasheet. + */ + udelay(200); + + ret = regmap_update_bits(data->regmap, + data->base + SC27XX_FGU_USER_AREA_SET, + SC27XX_FGU_MODE_AREA_MASK, + boot_mode << SC27XX_FGU_MODE_AREA_SHIFT); + if (ret) + return ret; + + /* + * Since the user area registers are put on power always-on region, + * then these registers changing time will be a little long. Thus + * here we should delay 200us to wait until values are updated + * successfully according to the datasheet. + */ + udelay(200); + + /* + * According to the datasheet, we should set the USER_AREA_CLEAR to 0 to + * make the user area data available, otherwise we can not save the user + * area data. + */ return regmap_update_bits(data->regmap, - data->base + SC27XX_FGU_USER_AREA_SET, - SC27XX_FGU_MODE_AREA_MASK, - boot_mode << SC27XX_FGU_MODE_AREA_SHIFT); + data->base + SC27XX_FGU_USER_AREA_CLEAR, + SC27XX_FGU_MODE_AREA_MASK, 0); } static int sc27xx_fgu_save_last_cap(struct sc27xx_fgu_data *data, int cap) @@ -188,9 +215,36 @@ static int sc27xx_fgu_save_last_cap(struct sc27xx_fgu_data *data, int cap) if (ret) return ret; + /* + * Since the user area registers are put on power always-on region, + * then these registers changing time will be a little long. Thus + * here we should delay 200us to wait until values are updated + * successfully according to the datasheet. + */ + udelay(200); + + ret = regmap_update_bits(data->regmap, + data->base + SC27XX_FGU_USER_AREA_SET, + SC27XX_FGU_CAP_AREA_MASK, cap); + if (ret) + return ret; + + /* + * Since the user area registers are put on power always-on region, + * then these registers changing time will be a little long. Thus + * here we should delay 200us to wait until values are updated + * successfully according to the datasheet. + */ + udelay(200); + + /* + * According to the datasheet, we should set the USER_AREA_CLEAR to 0 to + * make the user area data available, otherwise we can not save the user + * area data. + */ return regmap_update_bits(data->regmap, - data->base + SC27XX_FGU_USER_AREA_SET, - SC27XX_FGU_CAP_AREA_MASK, cap); + data->base + SC27XX_FGU_USER_AREA_CLEAR, + SC27XX_FGU_CAP_AREA_MASK, 0); } static int sc27xx_fgu_read_last_cap(struct sc27xx_fgu_data *data, int *cap)