From: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
To: Sebastian Reichel <sebastian.reichel@collabora.com>
Cc: 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, broonie@kernel.org,
gregkh@linuxfoundation.org, lgirdwood@gmail.com, lars@metafoo.de,
rafael@kernel.org, quic_gurus@quicinc.com,
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: Re: [PATCH v2 15/17] power: axp20x_battery: Add constant charge current table
Date: Fri, 10 Jun 2022 16:40:42 +0100 [thread overview]
Message-ID: <gKpfihJrKPqPrh3VA3orlvQrkllR4TMW@localhost> (raw)
In-Reply-To: <20220609211128.5knoptfwhongwrtq@mercury.elektranox.org>
Sebastian Reichel <sebastian.reichel@collabora.com> writes:
> Hi,
>
> On Tue, Jun 07, 2022 at 04:53:22PM +0100, Aidan MacDonald wrote:
>> Add a table-based lookup method for constant charge current,
>> which is necessary when the setting cannot be represented as
>> a linear range.
>>
>> Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
>> ---
>> drivers/power/supply/axp20x_battery.c | 53 +++++++++++++++++++++------
>> 1 file changed, 41 insertions(+), 12 deletions(-)
>>
>> diff --git a/drivers/power/supply/axp20x_battery.c b/drivers/power/supply/axp20x_battery.c
>> index 9106077c0dbb..87fb958f2224 100644
>> --- a/drivers/power/supply/axp20x_battery.c
>> +++ b/drivers/power/supply/axp20x_battery.c
>> @@ -61,6 +61,7 @@ struct axp20x_batt_ps;
>> struct axp_data {
>> int ccc_scale;
>> int ccc_offset;
>> + const int *ccc_table;
>
> Please document the struct; especially the fact that ccc_table must
> have a size of AXP20X_CHRG_CTRL1_TGT_CURR + 1.
>
> -- Sebastian
>
Thanks, I'll make sure to do that in v3.
Regards,
Aidan
>> 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);
>> @@ -176,7 +177,10 @@ static int axp20x_get_constant_charge_current(struct axp20x_batt_ps *axp,
>>
>> *val &= AXP20X_CHRG_CTRL1_TGT_CURR;
>>
>> - *val = *val * axp->data->ccc_scale + axp->data->ccc_offset;
>> + if (axp->data->ccc_table)
>> + *val = axp->data->ccc_table[*val];
>> + else
>> + *val = *val * axp->data->ccc_scale + axp->data->ccc_offset;
>>
>> return 0;
>> }
>> @@ -389,16 +393,36 @@ static int axp20x_battery_set_max_voltage(struct axp20x_batt_ps *axp20x_batt,
>> AXP20X_CHRG_CTRL1_TGT_VOLT, val);
>> }
>>
>> +static int axp20x_get_constant_charge_current_sel(struct axp20x_batt_ps *axp_batt,
>> + int charge_current)
>> +{
>> + int i;
>> +
>> + if (axp_batt->data->ccc_table) {
>> + for (i = AXP20X_CHRG_CTRL1_TGT_CURR; i >= 0; --i) {
>> + if (axp_batt->data->ccc_table[i] <= charge_current)
>> + return i;
>> + }
>> +
>> + return -EINVAL;
>> + }
>> +
>> + i = (charge_current - axp_batt->data->ccc_offset) / axp_batt->data->ccc_scale;
>> +
>> + if (i > AXP20X_CHRG_CTRL1_TGT_CURR || i < 0)
>> + return -EINVAL;
>> +
>> + return i;
>> +}
>> +
>> static int axp20x_set_constant_charge_current(struct axp20x_batt_ps *axp_batt,
>> int charge_current)
>> {
>> if (charge_current > axp_batt->max_ccc)
>> return -EINVAL;
>>
>> - 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)
>> + charge_current = axp20x_get_constant_charge_current_sel(axp_batt, charge_current);
>> + if (charge_current < 0)
>> return -EINVAL;
>>
>> return regmap_update_bits(axp_batt->regmap, AXP20X_CHRG_CTRL1,
>> @@ -410,14 +434,14 @@ static int axp20x_set_max_constant_charge_current(struct axp20x_batt_ps *axp,
>> {
>> bool lower_max = false;
>>
>> - charge_current = (charge_current - axp->data->ccc_offset) /
>> - axp->data->ccc_scale;
>> -
>> - if (charge_current > AXP20X_CHRG_CTRL1_TGT_CURR || charge_current < 0)
>> + charge_current = axp20x_get_constant_charge_current_sel(axp, charge_current);
>> + if (charge_current < 0)
>> return -EINVAL;
>>
>> - charge_current = charge_current * axp->data->ccc_scale +
>> - axp->data->ccc_offset;
>> + if (axp->data->ccc_table)
>> + charge_current = axp->data->ccc_table[charge_current];
>> + else
>> + charge_current = charge_current * axp->data->ccc_scale + axp->data->ccc_offset;
>>
>> if (charge_current > axp->max_ccc)
>> dev_warn(axp->dev,
>> @@ -629,7 +653,12 @@ static int axp20x_power_probe(struct platform_device *pdev)
>> ccc)) {
>> dev_err(&pdev->dev,
>> "couldn't set constant charge current from DT: fallback to minimum value\n");
>> - ccc = 300000;
>> +
>> + if (axp20x_batt->data->ccc_table)
>> + ccc = axp20x_batt->data->ccc_table[0];
>> + else
>> + ccc = axp20x_batt->data->ccc_offset;
>> +
>> axp20x_batt->max_ccc = ccc;
>> axp20x_set_constant_charge_current(axp20x_batt, ccc);
>> }
>> --
>> 2.35.1
>>
next prev parent reply other threads:[~2022-06-10 15:42 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-07 15:53 [PATCH v2 00/17] Add support for AXP192 PMIC Aidan MacDonald
2022-06-07 15:53 ` [PATCH v2 01/17] regmap-irq: Use sub_irq_reg() to calculate unmask register address Aidan MacDonald
2022-06-09 16:39 ` Guru Das Srinagesh
2022-06-11 14:32 ` Aidan MacDonald
2022-06-07 15:53 ` [PATCH v2 02/17] regmap-irq: Add get_irq_reg to support unusual register layouts Aidan MacDonald
2022-06-08 16:17 ` Mark Brown
2022-06-10 15:40 ` Aidan MacDonald
2022-06-10 16:47 ` Mark Brown
2022-06-11 14:22 ` Aidan MacDonald
2022-06-23 8:54 ` Matti Vaittinen
2022-06-23 20:35 ` Aidan MacDonald
2022-06-07 15:53 ` [PATCH v2 03/17] dt-bindings: mfd: add bindings for AXP192 MFD device Aidan MacDonald
2022-06-08 10:48 ` Krzysztof Kozlowski
2022-06-09 17:52 ` Aidan MacDonald
2022-06-07 15:53 ` [PATCH v2 04/17] dt-bindings: iio: adc: axp209: Add AXP192 compatible Aidan MacDonald
2022-06-08 10:49 ` Krzysztof Kozlowski
2022-06-07 15:53 ` [PATCH v2 05/17] dt-bindings: power: supply: axp20x: " Aidan MacDonald
2022-06-08 10:50 ` Krzysztof Kozlowski
2022-06-07 15:53 ` [PATCH v2 06/17] dt-bindings: gpio: Add AXP192 GPIO bindings Aidan MacDonald
2022-06-09 20:24 ` Rob Herring
2022-06-07 15:53 ` [PATCH v2 07/17] dt-bindings: power: axp20x-battery: Add AXP192 compatible Aidan MacDonald
2022-06-09 20:24 ` Rob Herring
2022-06-07 15:53 ` [PATCH v2 08/17] mfd: axp20x: Add support for AXP192 Aidan MacDonald
2022-06-07 15:53 ` [PATCH v2 09/17] regulator: " Aidan MacDonald
2022-06-07 15:53 ` [PATCH v2 10/17] iio: adc: axp20x_adc: Minor code cleanups Aidan MacDonald
2022-06-08 13:22 ` Jonathan Cameron
2022-06-08 22:58 ` Aidan MacDonald
2022-06-07 15:53 ` [PATCH v2 11/17] iio: adc: axp20x_adc: Consolidate ADC raw read functions Aidan MacDonald
2022-06-08 13:28 ` Jonathan Cameron
2022-06-08 23:13 ` Aidan MacDonald
2022-06-11 18:23 ` Jonathan Cameron
2022-06-08 13:30 ` Jonathan Cameron
2022-06-07 15:53 ` [PATCH v2 12/17] iio: adc: axp20x_adc: Add support for AXP192 Aidan MacDonald
2022-06-08 13:35 ` Jonathan Cameron
2022-06-07 15:53 ` [PATCH v2 13/17] power: supply: axp20x_usb_power: " Aidan MacDonald
2022-06-09 20:53 ` Sebastian Reichel
2022-06-07 15:53 ` [PATCH v2 14/17] pinctrl: Add AXP192 pin control driver Aidan MacDonald
2022-06-07 15:53 ` [PATCH v2 15/17] power: axp20x_battery: Add constant charge current table Aidan MacDonald
2022-06-09 21:11 ` Sebastian Reichel
2022-06-10 15:40 ` Aidan MacDonald [this message]
2022-06-07 15:53 ` [PATCH v2 16/17] power: axp20x_battery: Support battery status without fuel gauge Aidan MacDonald
2022-06-09 21:11 ` Sebastian Reichel
2022-06-07 15:53 ` [PATCH v2 17/17] power: axp20x_battery: Add support for AXP192 Aidan MacDonald
2022-06-09 21:12 ` Sebastian Reichel
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=gKpfihJrKPqPrh3VA3orlvQrkllR4TMW@localhost \
--to=aidanmacdonald.0x0@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=quic_gurus@quicinc.com \
--cc=rafael@kernel.org \
--cc=robh+dt@kernel.org \
--cc=sebastian.reichel@collabora.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).