From: Quentin Schulz <quentin.schulz@bootlin.com>
To: sre@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com,
wens@csie.org, linux@armlinux.org.uk, maxime.ripard@bootlin.com,
jic23@kernel.org
Cc: knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net,
lee.jones@linaro.org, linux-pm@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-iio@vger.kernel.org,
thomas.petazzoni@bootlin.com, linux-sunxi@googlegroups.com,
Quentin Schulz <quentin.schulz@bootlin.com>
Subject: [PATCH v4 08/13] power: supply: axp20x_battery: add support for AXP813
Date: Mon, 19 Feb 2018 13:47:31 +0100 [thread overview]
Message-ID: <2a735c19cdb3ba1050172c7f025ead0d27583e10.1519044068.git-series.quentin.schulz@bootlin.com> (raw)
In-Reply-To: <cover.6545459c99a33874413abf619136986f53d2c2a2.1519044068.git-series.quentin.schulz@bootlin.com>
In-Reply-To: <cover.6545459c99a33874413abf619136986f53d2c2a2.1519044068.git-series.quentin.schulz@bootlin.com>
The X-Powers AXP813 PMIC has got some slight differences from
AXP20X/AXP22X PMICs:
- the maximum voltage supplied by the PMIC is 4.35 instead of 4.36/4.24
for AXP20X/AXP22X,
- the constant charge current formula is different,
It also has a bit to tell whether the battery percentage returned by the
PMIC is valid.
Signed-off-by: Quentin Schulz <quentin.schulz@bootlin.com>
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
---
drivers/power/supply/axp20x_battery.c | 42 ++++++++++++++++++++++++++++-
1 file changed, 42 insertions(+)
diff --git a/drivers/power/supply/axp20x_battery.c b/drivers/power/supply/axp20x_battery.c
index 099e785..b1a4c41 100644
--- a/drivers/power/supply/axp20x_battery.c
+++ b/drivers/power/supply/axp20x_battery.c
@@ -49,6 +49,8 @@
#define AXP22X_CHRG_CTRL1_TGT_4_22V (1 << 5)
#define AXP22X_CHRG_CTRL1_TGT_4_24V (3 << 5)
+#define AXP813_CHRG_CTRL1_TGT_4_35V (3 << 5)
+
#define AXP20X_CHRG_CTRL1_TGT_CURR GENMASK(3, 0)
#define AXP20X_V_OFF_MASK GENMASK(2, 0)
@@ -133,6 +135,35 @@ static int axp22x_battery_get_max_voltage(struct axp20x_batt_ps *axp20x_batt,
return 0;
}
+static int axp813_battery_get_max_voltage(struct axp20x_batt_ps *axp20x_batt,
+ int *val)
+{
+ int ret, reg;
+
+ ret = regmap_read(axp20x_batt->regmap, AXP20X_CHRG_CTRL1, ®);
+ if (ret)
+ return ret;
+
+ switch (reg & AXP20X_CHRG_CTRL1_TGT_VOLT) {
+ case AXP20X_CHRG_CTRL1_TGT_4_1V:
+ *val = 4100000;
+ break;
+ case AXP20X_CHRG_CTRL1_TGT_4_15V:
+ *val = 4150000;
+ break;
+ case AXP20X_CHRG_CTRL1_TGT_4_2V:
+ *val = 4200000;
+ break;
+ case AXP813_CHRG_CTRL1_TGT_4_35V:
+ *val = 4350000;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
static int axp20x_get_constant_charge_current(struct axp20x_batt_ps *axp,
int *val)
{
@@ -491,6 +522,14 @@ const struct axp_data axp221_data = {
.set_max_voltage = axp22x_battery_set_max_voltage,
};
+const struct axp_data axp813_data = {
+ .ccc_scale = 200000,
+ .ccc_offset = 200000,
+ .has_fg_valid = true,
+ .get_max_voltage = axp813_battery_get_max_voltage,
+ .set_max_voltage = axp20x_battery_set_max_voltage,
+};
+
static const struct of_device_id axp20x_battery_ps_id[] = {
{
.compatible = "x-powers,axp209-battery-power-supply",
@@ -498,6 +537,9 @@ static const struct of_device_id axp20x_battery_ps_id[] = {
}, {
.compatible = "x-powers,axp221-battery-power-supply",
.data = (void *)&axp221_data,
+ }, {
+ .compatible = "x-powers,axp813-battery-power-supply",
+ .data = (void *)&axp813_data,
}, { /* sentinel */ },
};
MODULE_DEVICE_TABLE(of, axp20x_battery_ps_id);
--
git-series 0.9.1
next prev parent reply other threads:[~2018-02-19 12:50 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-19 12:47 [PATCH v4 00/13] add support for AXP813 ADC and battery power supply Quentin Schulz
2018-02-19 12:47 ` [PATCH v4 01/13] ARM: dtsi: axp209: add node for ADC Quentin Schulz
2018-02-19 12:47 ` [PATCH v4 02/13] ARM: dtsi: axp22x: " Quentin Schulz
2018-02-19 12:47 ` [PATCH v4 03/13] mfd: axp20x: make AXP209/22x cells probe their ADC via DT Quentin Schulz
2018-02-19 12:47 ` [PATCH v4 04/13] ARM: dtsi: axp81x: add node for ADC Quentin Schulz
2018-02-19 12:47 ` [PATCH v4 05/13] mfd: axp20x: probe axp20x_adc driver for AXP813 Quentin Schulz
2018-02-19 12:47 ` [PATCH v4 06/13] power: supply: axp20x_battery: use data struct for variant specific code Quentin Schulz
2018-02-20 9:12 ` kbuild test robot
2018-02-20 9:12 ` [RFC PATCH] power: supply: axp20x_battery: axp209_data can be static kbuild test robot
2018-02-19 12:47 ` [PATCH v4 07/13] dt-bindings: power: supply: axp20x: add AXP813 battery DT binding Quentin Schulz
2018-02-19 12:47 ` Quentin Schulz [this message]
2018-02-19 12:47 ` [PATCH v4 09/13] mfd: axp20x: add battery power supply cell for AXP813 Quentin Schulz
2018-02-19 12:47 ` [PATCH v4 10/13] ARM: dtsi: axp81x: add battery power supply subnode Quentin Schulz
2018-02-19 12:47 ` [PATCH v4 11/13] ARM: dtsi: sun8i: a711: enable " Quentin Schulz
2018-02-19 12:47 ` [PATCH v4 12/13] ARM: dtsi: axp81x: remove IP name from DT node name Quentin Schulz
2018-02-19 12:47 ` [PATCH v4 13/13] iio: adc: axp20x_adc: remove !! in favor of ternary condition Quentin Schulz
2018-02-24 12:20 ` Jonathan Cameron
2018-02-21 9:51 ` [PATCH v4 00/13] add support for AXP813 ADC and battery power supply Maxime Ripard
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=2a735c19cdb3ba1050172c7f025ead0d27583e10.1519044068.git-series.quentin.schulz@bootlin.com \
--to=quentin.schulz@bootlin.com \
--cc=devicetree@vger.kernel.org \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=linux@armlinux.org.uk \
--cc=mark.rutland@arm.com \
--cc=maxime.ripard@bootlin.com \
--cc=pmeerw@pmeerw.net \
--cc=robh+dt@kernel.org \
--cc=sre@kernel.org \
--cc=thomas.petazzoni@bootlin.com \
--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).