From: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>
To: Quentin Schulz
<quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
Cc: Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Hartmut Knaack <knaack.h-Mmb7MZpHnFY@public.gmane.org>,
Lars-Peter Clausen <lars-Qo5EllUWu/uELgA04lAiVw@public.gmane.org>,
Peter Meerwald-Stadler
<pmeerw-jW+XmwGofnusTnJN9+BGXg@public.gmane.org>,
Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>,
Sebastian Reichel <sre-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Russell King <linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org>,
Maxime Ripard
<maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>,
Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
"open list:THERMAL"
<linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
linux-kernel
<linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
linux-arm-kernel
<linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>,
Thomas Petazzoni
<thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>,
linux-sunxi <linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org>,
Julian Calaby
<julian.calaby-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Subject: Re: [PATCH v3 10/16] power: supply: axp20x_battery: use data structure instead of ID for
Date: Tue, 23 Jan 2018 23:39:06 +0800 [thread overview]
Message-ID: <CAGb2v66ge85a+UR6DYXVWS6g3wkA_MRxeV-QShhm52VL5nb9NQ@mail.gmail.com> (raw)
In-Reply-To: <c4129842e1254289ebb3ad1755879a3722bac1cf.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
On Mon, Jan 15, 2018 at 6:33 PM, Quentin Schulz
<quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> wrote:
> variant specific code
Your subject somehow got wrapped incorrectly.
>
> We used to use IDs to select a function or a feature depending on the
> variant. It's easier to maintain the code by adding data structure
> storing the few differences between variants so that we don't add a pile
> of if conditions.
>
> Let's use this data structure and update the code to use it.
>
> Signed-off-by: Quentin Schulz <quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
> ---
> drivers/power/supply/axp20x_battery.c | 100 +++++++++++++++++----------
> 1 file changed, 66 insertions(+), 34 deletions(-)
>
> diff --git a/drivers/power/supply/axp20x_battery.c b/drivers/power/supply/axp20x_battery.c
> index 7494f0f..d73c78f 100644
> --- a/drivers/power/supply/axp20x_battery.c
> +++ b/drivers/power/supply/axp20x_battery.c
> @@ -53,6 +53,16 @@
>
> #define AXP20X_V_OFF_MASK GENMASK(2, 0)
>
> +struct axp20x_batt_ps;
> +
> +struct axp_data {
> + int ccc_scale;
> + int ccc_offset;
> + 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);
> +};
> +
> struct axp20x_batt_ps {
> struct regmap *regmap;
> struct power_supply *batt;
> @@ -62,7 +72,7 @@ struct axp20x_batt_ps {
> struct iio_channel *batt_v;
> /* Maximum constant charge current */
> unsigned int max_ccc;
> - u8 axp_id;
> + struct axp_data *data;
const.
> };
>
> static int axp20x_battery_get_max_voltage(struct axp20x_batt_ps *axp20x_batt,
> @@ -123,22 +133,6 @@ static int axp22x_battery_get_max_voltage(struct axp20x_batt_ps *axp20x_batt,
> return 0;
> }
>
> -static void raw_to_constant_charge_current(struct axp20x_batt_ps *axp, int *val)
> -{
> - if (axp->axp_id == AXP209_ID)
> - *val = *val * 100000 + 300000;
> - else
> - *val = *val * 150000 + 300000;
> -}
> -
> -static void constant_charge_current_to_raw(struct axp20x_batt_ps *axp, int *val)
> -{
> - if (axp->axp_id == AXP209_ID)
> - *val = (*val - 300000) / 100000;
> - else
> - *val = (*val - 300000) / 150000;
> -}
> -
> static int axp20x_get_constant_charge_current(struct axp20x_batt_ps *axp,
> int *val)
> {
> @@ -150,7 +144,7 @@ static int axp20x_get_constant_charge_current(struct axp20x_batt_ps *axp,
>
> *val &= AXP20X_CHRG_CTRL1_TGT_CURR;
>
> - raw_to_constant_charge_current(axp, val);
> + *val = *val * axp->data->ccc_scale + axp->data->ccc_offset;
>
> return 0;
> }
> @@ -269,8 +263,7 @@ static int axp20x_battery_get_prop(struct power_supply *psy,
> if (ret)
> return ret;
>
> - if (axp20x_batt->axp_id == AXP221_ID &&
> - !(reg & AXP22X_FG_VALID))
> + if (axp20x_batt->data->has_fg_valid && !(reg & AXP22X_FG_VALID))
> return -EINVAL;
>
> /*
> @@ -281,11 +274,8 @@ static int axp20x_battery_get_prop(struct power_supply *psy,
> break;
>
> case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:
> - if (axp20x_batt->axp_id == AXP209_ID)
> - return axp20x_battery_get_max_voltage(axp20x_batt,
> - &val->intval);
> - return axp22x_battery_get_max_voltage(axp20x_batt,
> - &val->intval);
> + return axp20x_batt->data->get_max_voltage(axp20x_batt,
> + &val->intval);
>
> case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
> ret = regmap_read(axp20x_batt->regmap, AXP20X_V_OFF, ®);
> @@ -312,6 +302,32 @@ static int axp20x_battery_get_prop(struct power_supply *psy,
> return 0;
> }
>
> +static int axp22x_battery_set_max_voltage(struct axp20x_batt_ps *axp20x_batt,
> + int val)
> +{
> + switch (val) {
> + case 4100000:
> + val = AXP20X_CHRG_CTRL1_TGT_4_1V;
> + break;
> +
> + case 4200000:
> + val = AXP20X_CHRG_CTRL1_TGT_4_2V;
> + break;
> +
> + default:
> + /*
> + * AXP20x max voltage can be set to 4.36V and AXP22X max voltage
> + * can be set to 4.22V and 4.24V, but these voltages are too
> + * high for Lithium based batteries (AXP PMICs are supposed to
> + * be used with these kinds of battery).
> + */
> + return -EINVAL;
> + }
> +
> + return regmap_update_bits(axp20x_batt->regmap, AXP20X_CHRG_CTRL1,
> + AXP20X_CHRG_CTRL1_TGT_VOLT, val);
> +}
> +
> static int axp20x_battery_set_max_voltage(struct axp20x_batt_ps *axp20x_batt,
> int val)
> {
> @@ -321,9 +337,6 @@ static int axp20x_battery_set_max_voltage(struct axp20x_batt_ps *axp20x_batt,
> break;
>
> case 4150000:
> - if (axp20x_batt->axp_id == AXP221_ID)
> - return -EINVAL;
> -
> val = AXP20X_CHRG_CTRL1_TGT_4_15V;
> break;
>
> @@ -351,7 +364,8 @@ static int axp20x_set_constant_charge_current(struct axp20x_batt_ps *axp_batt,
> if (charge_current > axp_batt->max_ccc)
> return -EINVAL;
>
> - constant_charge_current_to_raw(axp_batt, &charge_current);
> + charge_current = (charge_current - axp_batt->data->ccc_offset) /
> + axp_batt->data->ccc_scale;
>
> if (charge_current > AXP20X_CHRG_CTRL1_TGT_CURR || charge_current < 0)
> return -EINVAL;
> @@ -365,12 +379,14 @@ static int axp20x_set_max_constant_charge_current(struct axp20x_batt_ps *axp,
> {
> bool lower_max = false;
>
> - constant_charge_current_to_raw(axp, &charge_current);
> + charge_current = (charge_current - axp->data->ccc_offset) /
> + axp->data->ccc_scale;
>
> if (charge_current > AXP20X_CHRG_CTRL1_TGT_CURR || charge_current < 0)
> return -EINVAL;
>
> - raw_to_constant_charge_current(axp, &charge_current);
> + charge_current = charge_current * axp->data->ccc_scale +
> + axp->data->ccc_offset;
>
> if (charge_current > axp->max_ccc)
> dev_warn(axp->dev,
> @@ -460,13 +476,28 @@ static const struct power_supply_desc axp20x_batt_ps_desc = {
> .set_property = axp20x_battery_set_prop,
> };
>
> +struct axp_data axp209_data = {
const.
> + .ccc_scale = 100000,
> + .ccc_offset = 300000,
> + .get_max_voltage = axp20x_battery_get_max_voltage,
> + .set_max_voltage = axp20x_battery_set_max_voltage,
> +};
> +
> +struct axp_data axp221_data = {
const.
> + .ccc_scale = 150000,
> + .ccc_offset = 300000,
> + .has_fg_valid = true,
> + .get_max_voltage = axp22x_battery_get_max_voltage,
> + .set_max_voltage = axp22x_battery_set_max_voltage,
> +};
> +
> static const struct of_device_id axp20x_battery_ps_id[] = {
> {
> .compatible = "x-powers,axp209-battery-power-supply",
> - .data = (void *)AXP209_ID,
> + .data = (void *)&axp209_data,
> }, {
> .compatible = "x-powers,axp221-battery-power-supply",
> - .data = (void *)AXP221_ID,
> + .data = (void *)&axp221_data,
> }, { /* sentinel */ },
> };
> MODULE_DEVICE_TABLE(of, axp20x_battery_ps_id);
> @@ -476,6 +507,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;
> + struct device *dev = &pdev->dev;
>
> if (!of_device_is_available(pdev->dev.of_node))
> return -ENODEV;
> @@ -516,7 +548,7 @@ static int axp20x_power_probe(struct platform_device *pdev)
> psy_cfg.drv_data = axp20x_batt;
> psy_cfg.of_node = pdev->dev.of_node;
>
> - axp20x_batt->axp_id = (uintptr_t)of_device_get_match_data(&pdev->dev);
> + axp20x_batt->data = (struct axp_data *)of_device_get_match_data(dev);
const in the cast.
Otherwise,
Reviewed-by: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>
>
> axp20x_batt->batt = devm_power_supply_register(&pdev->dev,
> &axp20x_batt_ps_desc,
> --
> git-series 0.9.1
next prev parent reply other threads:[~2018-01-23 15:39 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-15 10:33 [PATCH v3 00/16] add support for AXP813 ADC and battery power supply Quentin Schulz
[not found] ` <cover.2e5329bf5475a5160e613a4eb1e1377c662ce56e.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-15 10:33 ` [PATCH v3 01/16] iio: adc: axp20x_adc: put ADC rate setting in a per-variant function Quentin Schulz
[not found] ` <9488159b43c4cc8418afa9d1562d972c4631cb02.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-21 12:13 ` Jonathan Cameron
2018-01-15 10:33 ` [PATCH v3 02/16] dt-bindings: iio: adc: add binding for X-Powers AXP PMICs ADC Quentin Schulz
2018-01-21 12:18 ` Jonathan Cameron
2018-01-15 10:33 ` [PATCH v3 03/16] iio: adc: axp20x_adc: make it possible to probe from DT Quentin Schulz
2018-01-21 12:22 ` Jonathan Cameron
2018-01-15 10:33 ` [PATCH v3 04/16] ARM: dtsi: axp209: add node for ADC Quentin Schulz
[not found] ` <ea299dca30bb3d0413d35717522643b5a00e731c.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-23 15:33 ` Chen-Yu Tsai
2018-01-15 10:33 ` [PATCH v3 05/16] ARM: dtsi: axp22x: " Quentin Schulz
[not found] ` <c73ef705e9feacde577de66355a2033b419ca004.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-23 15:33 ` Chen-Yu Tsai
2018-01-15 10:33 ` [PATCH v3 06/16] mfd: axp20x: make AXP209/22x cells probe their ADC via DT Quentin Schulz
[not found] ` <8901f920fb8d84f8bf0cb2832f560c78bffc0392.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-23 9:54 ` Lee Jones
2018-01-23 15:32 ` Chen-Yu Tsai
2018-01-15 10:33 ` [PATCH v3 07/16] iio: adc: axp20x_adc: add support for AXP813 ADC Quentin Schulz
2018-01-21 12:26 ` Jonathan Cameron
2018-01-22 8:22 ` Quentin Schulz
2018-01-28 8:12 ` Jonathan Cameron
2018-01-15 10:33 ` [PATCH v3 08/16] ARM: dtsi: axp81x: add node for ADC Quentin Schulz
[not found] ` <eb8f23f57dc9d7d7c87c5eea2f85e90470e27c83.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-23 15:33 ` Chen-Yu Tsai
2018-01-15 10:33 ` [PATCH v3 09/16] mfd: axp20x: probe axp20x_adc driver for AXP813 Quentin Schulz
[not found] ` <d5792ed6e1e989dde3c9ecdd018286109dfc101d.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-23 9:53 ` Lee Jones
2018-01-23 15:32 ` Chen-Yu Tsai
2018-01-15 10:33 ` [PATCH v3 10/16] power: supply: axp20x_battery: use data structure instead of ID for Quentin Schulz
[not found] ` <c4129842e1254289ebb3ad1755879a3722bac1cf.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-23 15:39 ` Chen-Yu Tsai [this message]
2018-01-15 10:33 ` [PATCH v3 11/16] dt-bindings: power: supply: axp20x: add AXP813 battery DT binding Quentin Schulz
[not found] ` <7b53727c33207f4b7ae36218c99abfb86876e716.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-23 15:43 ` Chen-Yu Tsai
2018-01-15 10:33 ` [PATCH v3 12/16] power: supply: axp20x_battery: add support for AXP813 Quentin Schulz
[not found] ` <42b2e555083abbab43e48362175dc9c2eeeedf3c.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-23 15:47 ` Chen-Yu Tsai
2018-01-15 10:33 ` [PATCH v3 13/16] mfd: axp20x: add battery power supply cell " Quentin Schulz
[not found] ` <76855b0d3b9eb75e00eb6a058db5b4a33b0558c6.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-23 15:50 ` Chen-Yu Tsai
2018-01-15 10:33 ` [PATCH v3 14/16] ARM: dtsi: axp81x: add battery power supply subnode Quentin Schulz
[not found] ` <9c045de8dcee9a71803978855762e272efdc41d3.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-23 15:50 ` Chen-Yu Tsai
2018-01-15 10:33 ` [PATCH v3 15/16] ARM: dtsi: sun8i: a711: enable " Quentin Schulz
2018-01-23 15:51 ` [linux-sunxi] " Chen-Yu Tsai
2018-01-15 10:33 ` [PATCH v3 16/16] ARM: dtsi: axp81x: remove IP name from DT node name Quentin Schulz
[not found] ` <6e881951c43b8829cd509c3db06fa5520f71e779.1516012352.git-series.quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2018-01-23 15:51 ` Chen-Yu Tsai
2018-01-23 15:55 ` [PATCH v3 00/16] add support for AXP813 ADC and battery power supply Chen-Yu Tsai
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=CAGb2v66ge85a+UR6DYXVWS6g3wkA_MRxeV-QShhm52VL5nb9NQ@mail.gmail.com \
--to=wens-jday2fn1rrm@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=julian.calaby-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=knaack.h-Mmb7MZpHnFY@public.gmane.org \
--cc=lars-Qo5EllUWu/uELgA04lAiVw@public.gmane.org \
--cc=lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org \
--cc=mark.rutland-5wv7dgnIgG8@public.gmane.org \
--cc=maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \
--cc=pmeerw-jW+XmwGofnusTnJN9+BGXg@public.gmane.org \
--cc=quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \
--cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=sre-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.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).