linux-gpio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
To: linus.walleij@linaro.org, brgl@bgdev.pl, robh+dt@kernel.org,
	krzysztof.kozlowski+dt@linaro.org, wens@csie.org,
	jic23@kernel.org, lee.jones@linaro.org, sre@kernel.org,
	broonie@kernel.org, gregkh@linuxfoundation.org,
	lgirdwood@gmail.com
Cc: lars@metafoo.de, rafael@kernel.org, quic_gurus@quicinc.com,
	sebastian.reichel@collabora.com, andy.shevchenko@gmail.com,
	michael@walle.cc, linux-gpio@vger.kernel.org,
	devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-iio@vger.kernel.org, linux-pm@vger.kernel.org
Subject: [PATCH v3 16/16] power: axp20x_battery: Add support for AXP192
Date: Sat, 18 Jun 2022 22:40:09 +0100	[thread overview]
Message-ID: <20220618214009.2178567-17-aidanmacdonald.0x0@gmail.com> (raw)
In-Reply-To: <20220618214009.2178567-1-aidanmacdonald.0x0@gmail.com>

The AXP192 has a battery charger similar to other X-Powers PMICs,
but unlike the other supported devices, it does not have a fuel
gauge and can't report battery capacity directly.

Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
---
 drivers/power/supply/axp20x_battery.c | 49 +++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/drivers/power/supply/axp20x_battery.c b/drivers/power/supply/axp20x_battery.c
index f2c57fd1329b..cd5d6905b2d2 100644
--- a/drivers/power/supply/axp20x_battery.c
+++ b/drivers/power/supply/axp20x_battery.c
@@ -545,6 +545,19 @@ static int axp20x_battery_set_prop(struct power_supply *psy,
 	}
 }
 
+static enum power_supply_property axp192_battery_props[] = {
+	POWER_SUPPLY_PROP_PRESENT,
+	POWER_SUPPLY_PROP_ONLINE,
+	POWER_SUPPLY_PROP_STATUS,
+	POWER_SUPPLY_PROP_VOLTAGE_NOW,
+	POWER_SUPPLY_PROP_CURRENT_NOW,
+	POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT,
+	POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX,
+	POWER_SUPPLY_PROP_HEALTH,
+	POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN,
+	POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
+};
+
 static enum power_supply_property axp20x_battery_props[] = {
 	POWER_SUPPLY_PROP_PRESENT,
 	POWER_SUPPLY_PROP_ONLINE,
@@ -569,6 +582,16 @@ static int axp20x_battery_prop_writeable(struct power_supply *psy,
 	       psp == POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX;
 }
 
+static const struct power_supply_desc axp192_batt_ps_desc = {
+	.name = "axp192-battery",
+	.type = POWER_SUPPLY_TYPE_BATTERY,
+	.properties = axp192_battery_props,
+	.num_properties = ARRAY_SIZE(axp192_battery_props),
+	.property_is_writeable = axp20x_battery_prop_writeable,
+	.get_property = axp20x_battery_get_prop,
+	.set_property = axp20x_battery_set_prop,
+};
+
 static const struct power_supply_desc axp20x_batt_ps_desc = {
 	.name = "axp20x-battery",
 	.type = POWER_SUPPLY_TYPE_BATTERY,
@@ -579,6 +602,19 @@ static const struct power_supply_desc axp20x_batt_ps_desc = {
 	.set_property = axp20x_battery_set_prop,
 };
 
+static const int axp192_ccc_table[AXP20X_CHRG_CTRL1_TGT_CURR+1] = {
+	100000,  190000,  280000,  360000,
+	450000,  550000,  630000,  700000,
+	780000,  880000,  960000,  1000000,
+	1080000, 1160000, 1240000, 1320000,
+};
+
+static const struct axp_data axp192_data = {
+	.ccc_table = axp192_ccc_table,
+	.get_max_voltage = axp20x_battery_get_max_voltage,
+	.set_max_voltage = axp20x_battery_set_max_voltage,
+};
+
 static const struct axp_data axp209_data = {
 	.ccc_scale = 100000,
 	.ccc_offset = 300000,
@@ -607,6 +643,9 @@ static const struct axp_data axp813_data = {
 
 static const struct of_device_id axp20x_battery_ps_id[] = {
 	{
+		.compatible = "x-powers,axp192-battery-power-supply",
+		.data = (void *)&axp192_data,
+	}, {
 		.compatible = "x-powers,axp209-battery-power-supply",
 		.data = (void *)&axp209_data,
 	}, {
@@ -624,6 +663,7 @@ static int axp20x_power_probe(struct platform_device *pdev)
 	struct axp20x_batt_ps *axp20x_batt;
 	struct power_supply_config psy_cfg = {};
 	struct power_supply_battery_info *info;
+	const struct power_supply_desc *ps_desc;
 	struct device *dev = &pdev->dev;
 
 	if (!of_device_is_available(pdev->dev.of_node))
@@ -667,9 +707,12 @@ static int axp20x_power_probe(struct platform_device *pdev)
 
 	axp20x_batt->data = (struct axp_data *)of_device_get_match_data(dev);
 
-	axp20x_batt->batt = devm_power_supply_register(&pdev->dev,
-						       &axp20x_batt_ps_desc,
-						       &psy_cfg);
+	if (!axp20x_batt->data->has_fg)
+		ps_desc = &axp192_batt_ps_desc;
+	else
+		ps_desc = &axp20x_batt_ps_desc;
+
+	axp20x_batt->batt = devm_power_supply_register(&pdev->dev, ps_desc, &psy_cfg);
 	if (IS_ERR(axp20x_batt->batt)) {
 		dev_err(&pdev->dev, "failed to register power supply: %ld\n",
 			PTR_ERR(axp20x_batt->batt));
-- 
2.35.1


  parent reply	other threads:[~2022-06-18 21:41 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-18 21:39 [PATCH v3 00/16] Add support for AXP192 PMIC Aidan MacDonald
2022-06-18 21:39 ` [PATCH v3 01/16] regmap-irq: Use sub_irq_reg() to calculate unmask register address Aidan MacDonald
2022-06-18 21:39 ` [PATCH v3 02/16] regmap-irq: Add get_irq_reg to support unusual register layouts Aidan MacDonald
2022-06-18 21:39 ` [PATCH v3 03/16] dt-bindings: mfd: add bindings for AXP192 MFD device Aidan MacDonald
2022-06-19  3:21   ` Chen-Yu Tsai
2022-06-18 21:39 ` [PATCH v3 04/16] dt-bindings: iio: adc: axp209: Add AXP192 compatible Aidan MacDonald
2022-06-19  3:26   ` Chen-Yu Tsai
2022-06-18 21:39 ` [PATCH v3 05/16] dt-bindings: power: supply: axp20x: " Aidan MacDonald
2022-06-19  3:34   ` Chen-Yu Tsai
2022-06-18 21:39 ` [PATCH v3 06/16] dt-bindings: gpio: Add AXP192 GPIO bindings Aidan MacDonald
2022-06-19 11:12   ` Krzysztof Kozlowski
2022-06-19 17:20   ` Rob Herring
2022-06-18 21:40 ` [PATCH v3 07/16] dt-bindings: power: axp20x-battery: Add AXP192 compatible Aidan MacDonald
2022-06-18 21:40 ` [PATCH v3 08/16] mfd: axp20x: Add support for AXP192 Aidan MacDonald
2022-06-19 10:44   ` Andy Shevchenko
2022-06-18 21:40 ` [PATCH v3 09/16] regulator: " Aidan MacDonald
2022-06-19 10:46   ` Andy Shevchenko
2022-06-18 21:40 ` [PATCH v3 10/16] iio: adc: axp20x_adc: Minor code cleanups Aidan MacDonald
2022-06-19  3:56   ` Chen-Yu Tsai
2022-06-19 11:01     ` Jonathan Cameron
2022-06-19 10:51   ` Andy Shevchenko
2022-06-18 21:40 ` [PATCH v3 11/16] iio: adc: axp20x_adc: Add support for AXP192 Aidan MacDonald
2022-06-19 10:55   ` Andy Shevchenko
2022-06-19 11:13   ` Jonathan Cameron
2022-06-19 15:11     ` Aidan MacDonald
2022-06-18 21:40 ` [PATCH v3 12/16] power: supply: axp20x_usb_power: " Aidan MacDonald
2022-06-19  3:34   ` Chen-Yu Tsai
2022-06-19 11:02   ` Andy Shevchenko
2022-06-18 21:40 ` [PATCH v3 13/16] pinctrl: Add AXP192 pin control driver Aidan MacDonald
2022-06-18 21:59   ` Randy Dunlap
2022-06-19 11:20   ` Andy Shevchenko
2022-06-19 11:25     ` Andy Shevchenko
2022-06-27  8:10   ` Michael Walle
2022-06-27 13:12     ` Aidan MacDonald
2022-06-30  7:26       ` Michael Walle
2022-07-01 15:51         ` Aidan MacDonald
2022-06-18 21:40 ` [PATCH v3 14/16] power: axp20x_battery: Add constant charge current table Aidan MacDonald
2022-06-19 11:29   ` Andy Shevchenko
2022-06-18 21:40 ` [PATCH v3 15/16] power: axp20x_battery: Support battery status without fuel gauge Aidan MacDonald
2022-06-18 21:40 ` Aidan MacDonald [this message]
     [not found] ` <CAHp75VfrzQFq4u0vMtPM7LRYNcQQC-padQ1yyFijbpWx8_LwBQ@mail.gmail.com>
2022-06-19 11:17   ` [PATCH v3 00/16] Add support for AXP192 PMIC Jonathan Cameron
2022-06-19 11:12     ` Andy Shevchenko
2022-06-19 14:54       ` 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=20220618214009.2178567-17-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=gregkh@linuxfoundation.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-gpio@vger.kernel.org \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=michael@walle.cc \
    --cc=quic_gurus@quicinc.com \
    --cc=rafael@kernel.org \
    --cc=robh+dt@kernel.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).