From: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
To: jic23@kernel.org, robh+dt@kernel.org,
krzysztof.kozlowski+dt@linaro.org, wens@csie.org,
lee.jones@linaro.org, sre@kernel.org, lgirdwood@gmail.com,
broonie@kernel.org
Cc: lars@metafoo.de, andy.shevchenko@gmail.com,
linus.walleij@linaro.org, brgl@bgdev.pl, michael@walle.cc,
samuel@sholland.org, linux-iio@vger.kernel.org,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
linux-pm@vger.kernel.org,
Sebastian Reichel <sebastian.reichel@collabora.com>
Subject: [PATCH v5 12/13] power: axp20x_battery: Support battery status without fuel gauge
Date: Wed, 6 Jul 2022 11:19:01 +0100 [thread overview]
Message-ID: <20220706101902.4984-13-aidanmacdonald.0x0@gmail.com> (raw)
In-Reply-To: <20220706101902.4984-1-aidanmacdonald.0x0@gmail.com>
Add a "has_fg" flag to indicate that the chip has a fuel gauge.
Report battery full status on chips with no fuel gauge using the
battery voltage.
Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
---
drivers/power/supply/axp20x_battery.c | 34 ++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/drivers/power/supply/axp20x_battery.c b/drivers/power/supply/axp20x_battery.c
index 401779d84d2b..574c1d001556 100644
--- a/drivers/power/supply/axp20x_battery.c
+++ b/drivers/power/supply/axp20x_battery.c
@@ -69,6 +69,7 @@ struct axp_data {
* must have AXP20X_CHRG_CTRL1_TGT_CURR+1 elements.
*/
const int *ccc_table;
+ bool has_fg;
bool has_fg_valid;
int (*get_max_voltage)(struct axp20x_batt_ps *batt, int *val);
int (*set_max_voltage)(struct axp20x_batt_ps *batt, int val);
@@ -197,7 +198,7 @@ static int axp20x_battery_get_prop(struct power_supply *psy,
union power_supply_propval *val)
{
struct axp20x_batt_ps *axp20x_batt = power_supply_get_drvdata(psy);
- int ret = 0, reg, val1;
+ int ret = 0, reg, val1, val2;
switch (psp) {
case POWER_SUPPLY_PROP_PRESENT:
@@ -231,6 +232,34 @@ static int axp20x_battery_get_prop(struct power_supply *psy,
return 0;
}
+ /*
+ * If the chip does not have a fuel gauge, we check battery full status
+ * using voltage instead.
+ */
+ if (!axp20x_batt->data->has_fg) {
+ ret = axp20x_batt->data->get_max_voltage(axp20x_batt, &val1);
+ if (ret)
+ return ret;
+
+ ret = iio_read_channel_processed(axp20x_batt->batt_v, &val2);
+ if (ret)
+ return ret;
+
+ /* IIO subsystem reports voltage in mV but we need uV */
+ val2 *= 1000;
+
+ /*
+ * According to the AXP192 datasheet, charging will restart if
+ * the battery voltage drops below V_rch = V_tgt - 0.1 V, so we
+ * report the battery is full if its voltage is at least V_rch.
+ */
+ if (val2 >= val1 - 100000)
+ val->intval = POWER_SUPPLY_STATUS_FULL;
+ else
+ val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
+ break;
+ }
+
ret = regmap_read(axp20x_batt->regmap, AXP20X_FG_RES, &val1);
if (ret)
return ret;
@@ -552,6 +581,7 @@ static const struct power_supply_desc axp20x_batt_ps_desc = {
static const struct axp_data axp209_data = {
.ccc_scale = 100000,
.ccc_offset = 300000,
+ .has_fg = true,
.get_max_voltage = axp20x_battery_get_max_voltage,
.set_max_voltage = axp20x_battery_set_max_voltage,
};
@@ -559,6 +589,7 @@ static const struct axp_data axp209_data = {
static const struct axp_data axp221_data = {
.ccc_scale = 150000,
.ccc_offset = 300000,
+ .has_fg = true,
.has_fg_valid = true,
.get_max_voltage = axp22x_battery_get_max_voltage,
.set_max_voltage = axp22x_battery_set_max_voltage,
@@ -567,6 +598,7 @@ static const struct axp_data axp221_data = {
static const struct axp_data axp813_data = {
.ccc_scale = 200000,
.ccc_offset = 200000,
+ .has_fg = true,
.has_fg_valid = true,
.get_max_voltage = axp813_battery_get_max_voltage,
.set_max_voltage = axp20x_battery_set_max_voltage,
--
2.35.1
next prev parent reply other threads:[~2022-07-06 10:19 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-06 10:18 [PATCH v5 00/13] Add support for AXP192 PMIC Aidan MacDonald
2022-07-06 10:18 ` [PATCH v5 01/13] dt-bindings: mfd: add bindings for AXP192 MFD device Aidan MacDonald
2022-07-06 10:18 ` [PATCH v5 02/13] dt-bindings: iio: adc: axp209: Add AXP192 compatible Aidan MacDonald
2022-07-06 10:18 ` [PATCH v5 03/13] dt-bindings: power: supply: axp20x: " Aidan MacDonald
2022-07-06 10:18 ` [PATCH v5 04/13] dt-bindings: power: axp20x-battery: " Aidan MacDonald
2022-07-06 10:18 ` [PATCH v5 05/13] mfd: axp20x: Add support for AXP192 Aidan MacDonald
2022-07-06 10:18 ` [PATCH v5 06/13] regulator: " Aidan MacDonald
2022-07-06 10:18 ` [PATCH v5 07/13] iio: adc: axp20x_adc: Minor code cleanups Aidan MacDonald
2022-07-06 10:18 ` [PATCH v5 08/13] iio: adc: axp20x_adc: Replace adc_en2 flag with adc_en2_mask field Aidan MacDonald
2022-07-06 10:18 ` [PATCH v5 09/13] iio: adc: axp20x_adc: Add support for AXP192 Aidan MacDonald
2022-07-06 10:18 ` [PATCH v5 10/13] power: supply: axp20x_usb_power: " Aidan MacDonald
2022-07-06 10:19 ` [PATCH v5 11/13] power: axp20x_battery: Add constant charge current table Aidan MacDonald
2022-07-16 22:39 ` Sebastian Reichel
2022-07-06 10:19 ` Aidan MacDonald [this message]
2022-07-06 10:19 ` [PATCH v5 13/13] power: axp20x_battery: Add support for AXP192 Aidan MacDonald
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220706101902.4984-13-aidanmacdonald.0x0@gmail.com \
--to=aidanmacdonald.0x0@gmail.com \
--cc=andy.shevchenko@gmail.com \
--cc=brgl@bgdev.pl \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=jic23@kernel.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=lars@metafoo.de \
--cc=lee.jones@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=michael@walle.cc \
--cc=robh+dt@kernel.org \
--cc=samuel@sholland.org \
--cc=sebastian.reichel@collabora.com \
--cc=sre@kernel.org \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).