Add support for mp2733 battery charger
Saravanan Sekar
maintainerv5 cover Add support for mp2733 battery charger
changes in v5:
- fixed commit message on v5-0002 and v5-0004
changes in v4:
- fixed attributes groups review comments in v3
- added new bug fix patches v4-0007 and v4-0008
changes in v3:
- fixed dt_binding_check error
- fixed spelling usb->USB
changes in v2:
- fixed spelling
- revert back probe to probe_new in mfd driver
I do not see a cover letter, but FWIW,
for all patches except DT binding
Note, some of the comments regarding spelling were given, I believe you are going to address them in v3.
add support for mp2733 Battery charger control driver for Monolithic Power System's MP2733 chipset
Saravanan Sekar (8):
iio: adc: mp2629: fix wrong comparison of channel
mfd: mp2629: fix failed to get iio channel by device name
iio: adc: mp2629: fix potential array out of bound access
power: supply: fix wrong interpretation of register value
mfd: mp2629: Add support for mps mp2733 battery charger
iio: adc: mp2629: restrict input voltage mask for mp2629
power: supply: Add support for mp2733 battery charger
power: supply: mp2629: Add USB fast charge settings
.../ABI/testing/sysfs-class-power-mp2629 | 16 ++ drivers/iio/adc/mp2629_adc.c | 8 +- drivers/mfd/mp2629.c | 7 +- drivers/power/supply/mp2629_charger.c | 229 +++++++++++++++--- include/linux/mfd/mp2629.h | 6 + 5 files changed, 228 insertions(+), 38 deletions(-)
Signature · 1 line
2.32.0
Saravanan Sekar
maintainerPATCH v5 1/8 iio: adc: mp2629: fix wrong comparison of channel
Input voltage channel enum is compared against iio address instead of the channel.
--- drivers/iio/adc/mp2629_adc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/mp2629_adc.c +1 -1
@@ -74,7 +74,7 @@ static int mp2629_read_raw(struct iio_dev *indio_dev,if (ret)return ret; -if (chan->address ==MP2629_INPUT_VOLT ) +if (chan->channel ==MP2629_INPUT_VOLT ) rval &=GENMASK (6 ,0 ); *val = rval;return IIO_VAL_INT ;
Signature · 1 line
2.32.0
Re: [PATCH v5 1/8] iio: adc: mp2629: fix wrong comparison of channel
Quoted 6 lines · On Sat, 29 Oct 2022 11:29:53 +0200 Saravanan Sekar <[email protected]> wrote:
Input voltage channel enum is compared against iio address instead of the channel.
Fixes 7abd9fb64682 ("iio: adc: mp2629: Add support for mp2629 ADC driver")Signed-off-by Saravanan Sekar <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>
Applied to the fixes-togreg branch of iio.git and marked for stable.
Thanks,
Jonathan
Quoted 17 lines
--- drivers/iio/adc/mp2629_adc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/iio/adc/mp2629_adc.c +1
-1@@ -74,7 +74,7 @@ static int mp2629_read_raw(struct iio_dev *indio_dev,if (ret)return ret; -if (chan->address ==MP2629_INPUT_VOLT ) +if (chan->channel ==MP2629_INPUT_VOLT ) rval &=GENMASK (6 ,0 ); *val = rval;return IIO_VAL_INT ;
Saravanan Sekar
maintainerPATCH v5 2/8 mfd: mp2629: fix failed to get iio channel by device name
In reply to Saravanan SekarThe mfd cell devices name populated on sysfs entry is dynamically derived from an auto instance which introduced a regression. As a result mpc2629_charger driver failed to get adc channel because of iio consumer name mismatch with the sysfs.
/sys/class/i2c-adapter/i2c-1/mp2629_adc.0.auto/ /sys/class/i2c-adapter/i2c-1/mp2629_charger.1.auto/
--- drivers/mfd/mp2629.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/mp2629.c +1 -1
@@ -51,7 +51,7 @@ static int mp2629_probe(struct i2c_client *client)return PTR_ERR (ddata->regmap); } - ret =devm_mfd_add_devices (ddata->dev,PLATFORM_DEVID_AUTO , mp2629_cell, + ret =devm_mfd_add_devices (ddata->dev,PLATFORM_DEVID_NONE , mp2629_cell,ARRAY_SIZE (mp2629_cell),NULL ,0 ,NULL );if (ret)dev_err (ddata->dev,"Failed to register sub-devices %d\n" , ret);
Signature · 1 line
2.32.0
Saravanan Sekar
maintainerPATCH v5 3/8 iio: adc: mp2629: fix potential array out of bound access
In reply to Saravanan SekarAdd sentinel at end of maps to avoid potential array out of bound access in iio core.
--- drivers/iio/adc/mp2629_adc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iio/adc/mp2629_adc.c +2 -1
@@ -57,7 +57,8 @@ static struct iio_map mp2629_adc_maps[] = {MP2629_MAP (SYSTEM_VOLT ,"system-volt" ),MP2629_MAP (INPUT_VOLT ,"input-volt" ),MP2629_MAP (BATT_CURRENT ,"batt-current" ), -MP2629_MAP (INPUT_CURRENT ,"input-current" ) + MP2629_MAP(INPUT_CURRENT, "input-current"), + { } }; static int mp2629_read_raw(struct iio_dev *indio_dev,
Signature · 1 line
2.32.0
Re: [PATCH v5 3/8] iio: adc: mp2629: fix potential array out of bound access
Quoted 5 lines · On Sat, 29 Oct 2022 11:29:55 +0200 Saravanan Sekar <[email protected]> wrote:
Add sentinel at end of maps to avoid potential array out of bound access in iio core.
Fixes 7abd9fb6468 ("iio: adc: mp2629: Add support for mp2629 ADC driver")Signed-off-by Saravanan Sekar <[email protected]>
Applied to the fixes-togreg branch of iio.git and marked for stable.
Thanks,
Jonathan
Quoted 18 lines
--- drivers/iio/adc/mp2629_adc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/iio/adc/mp2629_adc.c +2
-1@@ -57,7 +57,8 @@ static struct iio_map mp2629_adc_maps[] = {MP2629_MAP (SYSTEM_VOLT ,"system-volt" ),MP2629_MAP (INPUT_VOLT ,"input-volt" ),MP2629_MAP (BATT_CURRENT ,"batt-current" ), -MP2629_MAP (INPUT_CURRENT ,"input-current" ) + MP2629_MAP(INPUT_CURRENT, "input-current"), + { } }; static int mp2629_read_raw(struct iio_dev *indio_dev,
Saravanan Sekar
maintainerPATCH v5 4/8 power: supply: fix wrong interpretation of register value
In reply to Saravanan Sekarfix the switch cases to match the register value.
--- drivers/power/supply/mp2629_charger.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/power/supply/mp2629_charger.c +3 -3
@@ -284,10 +284,10 @@ static int mp2629_charger_battery_get_prop(struct power_supply *psy, val->intval =POWER_SUPPLY_STATUS_DISCHARGING ;break ;case 0x01 : -case 0x10 : +case 0x02 : val->intval =POWER_SUPPLY_STATUS_CHARGING ;break ; -case 0x11 : +case 0x03 : val->intval =POWER_SUPPLY_STATUS_FULL ; }break ;
@@ -305,7 +305,7 @@ static int mp2629_charger_battery_get_prop(struct power_supply *psy,case 0x01 : val->intval =POWER_SUPPLY_CHARGE_TYPE_TRICKLE ;break ; -case 0x10 : +case 0x02 : val->intval =POWER_SUPPLY_CHARGE_TYPE_STANDARD ;break ;default :
Signature · 1 line
2.32.0
Re: [PATCH v5 4/8] power: supply: fix wrong interpretation of register value
Quoted 2 lines · Saravanan Sekar
fix the switch cases to match the register value.
Something is still wrong with the English grammar (i.e. capitalization at the beginning of the sentence).
Signature · 2 lines
With Best Regards, Andy Shevchenko
Saravanan Sekar
maintainerPATCH v5 5/8 mfd: mp2629: Add support for mps mp2733 battery charger
In reply to Saravanan Sekarmp2733 is updated version of mp2629 battery charge management device for single-cell Li-ion or Li-polymer battery. Additionally supports USB fast-charge and higher range of input voltage.
--- drivers/mfd/mp2629.c | 5 ++++- include/linux/mfd/mp2629.h | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-)
drivers/mfd/mp2629.c +4 -1
@@ -13,6 +13,7 @@#include <linux/mfd/mp2629.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/property.h> #include <linux/regmap.h> #include <linux/slab.h>
@@ -43,6 +44,7 @@ static int mp2629_probe(struct i2c_client *client)return -ENOMEM ; ddata->dev = &client->dev; + ddata->chip_id = (uintptr_t )device_get_match_data (&client->dev);i2c_set_clientdata (client, ddata); ddata->regmap =devm_regmap_init_i2c (client, &mp2629_regmap_config);
@@ -60,7 +62,8 @@ static int mp2629_probe(struct i2c_client *client) }static const struct of_device_id mp2629_of_match[] = { - { .compatible ="mps,mp2629" }, + { .compatible ="mps,mp2629" , .data = (void *)CHIP_ID_MP2629 }, + { .compatible ="mps,mp2733" , .data = (void *)CHIP_ID_MP2733 }, { } };MODULE_DEVICE_TABLE (of, mp2629_of_match);
include/linux/mfd/mp2629.h +6 -0
@@ -9,9 +9,15 @@#include <linux/device.h> #include <linux/regmap.h> +enum mp2xx_chip_id { +CHIP_ID_MP2629 , +CHIP_ID_MP2733 , +}; +struct mp2629_data {struct device *dev;struct regmap *regmap; +enum mp2xx_chip_id chip_id; };enum mp2629_adc_chan {
Signature · 1 line
2.32.0
Jonathan Cameron
maintainerRe: [PATCH v5 5/8] mfd: mp2629: Add support for mps mp2733 battery charger
Quoted 7 lines · On Sat, 29 Oct 2022 11:29:57 +0200 Saravanan Sekar <[email protected]> wrote:
mp2733 is updated version of mp2629 battery charge management device for single-cell Li-ion or Li-polymer battery. Additionally supports USB fast-charge and higher range of input voltage.
Signed-off-by Saravanan Sekar <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>
There is a small ordering issue wrt to the next patch.
Ideal way to solve that is to introduce the new infrastructure for the chip ID, but not the new ID itself until after the next patch ensures we don't apply the wrong mask.
Jonathan
Quoted 55 lines
--- drivers/mfd/mp2629.c | 5 ++++- include/linux/mfd/mp2629.h | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-)drivers/mfd/mp2629.c +4
-1@@ -13,6 +13,7 @@#include <linux/mfd/mp2629.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/property.h> #include <linux/regmap.h> #include <linux/slab.h> @@ -43,6 +44,7 @@ static int mp2629_probe(struct i2c_client *client)return -ENOMEM ; ddata->dev = &client->dev; + ddata->chip_id = (uintptr_t )device_get_match_data (&client->dev);i2c_set_clientdata (client, ddata); ddata->regmap =devm_regmap_init_i2c (client, &mp2629_regmap_config);@@ -60,7 +62,8 @@ static int mp2629_probe(struct i2c_client *client) }static const struct of_device_id mp2629_of_match[] = { - { .compatible ="mps,mp2629" }, + { .compatible ="mps,mp2629" , .data = (void *)CHIP_ID_MP2629 }, + { .compatible ="mps,mp2733" , .data = (void *)CHIP_ID_MP2733 }, { } };MODULE_DEVICE_TABLE (of, mp2629_of_match);include/linux/mfd/mp2629.h +6
-0@@ -9,9 +9,15 @@#include <linux/device.h> #include <linux/regmap.h> +enum mp2xx_chip_id { +CHIP_ID_MP2629 , +CHIP_ID_MP2733 , +}; +struct mp2629_data {struct device *dev;struct regmap *regmap; +enum mp2xx_chip_id chip_id; };enum mp2629_adc_chan {
Saravanan Sekar
maintainerPATCH v5 6/8 iio: adc: mp2629: restrict input voltage mask for mp2629
In reply to Saravanan SekarAdd support for mp2733 which is updated version of mp2629 with a higher range of input voltage.
--- drivers/iio/adc/mp2629_adc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/iio/adc/mp2629_adc.c +4 -1
@@ -66,6 +66,7 @@ static int mp2629_read_raw(struct iio_dev *indio_dev, int *val, int *val2, long mask) { struct mp2629_adc *info = iio_priv(indio_dev); +struct mp2629_data *ddata =dev_get_drvdata (info->dev);unsigned int rval;int ret;
@@ -75,8 +76,10 @@ static int mp2629_read_raw(struct iio_dev *indio_dev,if (ret)return ret; -if (chan->channel ==MP2629_INPUT_VOLT ) +if (chan->channel ==MP2629_INPUT_VOLT && + ddata->chip_id ==CHIP_ID_MP2629 ) rval &=GENMASK (6 ,0 ); + *val = rval;return IIO_VAL_INT ;
Signature · 1 line
2.32.0
Re: [PATCH v5 6/8] iio: adc: mp2629: restrict input voltage mask for mp2629
Quoted 5 lines · On Sat, 29 Oct 2022 11:29:58 +0200 Saravanan Sekar <[email protected]> wrote:
Add support for mp2733 which is updated version of mp2629 with a higher range of input voltage.
Signed-off-by Saravanan Sekar <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>
Hmm. this is going to slow things down wrt to this series going in. We want the associated fix to go in during this cycle, and this is dependant on a change going via MFD. Ah well.
Generally I prefer to avoid using chip IDs for this sort of check because they don't generalize as well as an actual flag for this 'feature' stored in a chip_info type structure.
However, we can tidy that up if it becomes relevant as more parts are added to the driver.
On basis this might end up going via MFD,
Quoted 28 lines
--- drivers/iio/adc/mp2629_adc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)drivers/iio/adc/mp2629_adc.c +4
-1@@ -66,6 +66,7 @@ static int mp2629_read_raw(struct iio_dev *indio_dev, int *val, int *val2, long mask) { struct mp2629_adc *info = iio_priv(indio_dev); +struct mp2629_data *ddata =dev_get_drvdata (info->dev);unsigned int rval;int ret;@@ -75,8 +76,10 @@ static int mp2629_read_raw(struct iio_dev *indio_dev,if (ret)return ret; -if (chan->channel ==MP2629_INPUT_VOLT ) +if (chan->channel ==MP2629_INPUT_VOLT && + ddata->chip_id ==CHIP_ID_MP2629 ) rval &=GENMASK (6 ,0 ); + *val = rval;return IIO_VAL_INT ;
Saravanan Sekar
maintainerPATCH v5 7/8 power: supply: Add support for mp2733 battery charger
In reply to Saravanan Sekarmp2733 is updated version of mp2629 battery charge management which supports USB fast-charge and higher range of input voltage.
--- drivers/power/supply/mp2629_charger.c | 223 ++++++++++++++++++++++---- 1 file changed, 192 insertions(+), 31 deletions(-)
drivers/power/supply/mp2629_charger.c +192 -31
@@ -30,12 +30,15 @@#define MP2629_REG_INTERRUPT 0x0b#define MP2629_REG_STATUS 0x0c#define MP2629_REG_FAULT 0x0d +#define MP2629_REG_FAST_CHARGE 0x17#define MP2629_MASK_INPUT_TYPE GENMASK(7, 5)#define MP2629_MASK_CHARGE_TYPE GENMASK(4, 3)#define MP2629_MASK_CHARGE_CTRL GENMASK(5, 4)#define MP2629_MASK_WDOG_CTRL GENMASK(5, 4)#define MP2629_MASK_IMPEDANCE GENMASK(7, 4) +#define MP2733_MASK_FAST_CHARGE GENMASK(2, 1) +#define MP2733_MASK_FAST_CHARGE_RESET BIT(0)#define MP2629_INPUTSOURCE_CHANGE GENMASK(7, 5)#define MP2629_CHARGING_CHANGE GENMASK(4, 3)
@@ -62,6 +65,17 @@ enum mp2629_source_type { MP2629_SOURCE_TYPE_OTG = 7, }; +enum mp2733_source_type { +MP2733_SOURCE_TYPE_NO_INPUT , +MP2733_SOURCE_TYPE_NON_STD , + MP2733_SOURCE_TYPE_APPLE_1p0, + MP2733_SOURCE_TYPE_APPLE_2p1, + MP2733_SOURCE_TYPE_APPLE_2p4, +MP2733_SOURCE_TYPE_SDP , +MP2733_SOURCE_TYPE_CDP , +MP2733_SOURCE_TYPE_DCP , +}; +enum mp2629_field {INPUT_ILIM ,INPUT_VLIM ,
@@ -72,11 +86,30 @@ enum mp2629_field {MP2629_MAX_FIELD }; +struct mp2629_prop { +int reg; +int mask; +int min; +int max; +int step; +int shift; +}; + +struct mp2xx_chip_info { +const struct reg_field *rfields; +struct mp2629_prop *chip_props; +bool has_impedance; +bool has_fast_charge; + +int (*mp2xx_get_usb_type)(unsigned int rval); +}; +struct mp2629_charger {struct device *dev;int status;int fault; +const struct mp2xx_chip_info *chip_info;struct regmap *regmap;struct regmap_field *regmap_fields[MP2629_MAX_FIELD ];struct mutex lock;
@@ -85,15 +118,6 @@ struct mp2629_charger {struct iio_channel *iiochan[MP2629_ADC_CHAN_END ]; }; -struct mp2629_prop { -int reg; -int mask; -int min; -int max; -int step; -int shift; -}; -static enum power_supply_usb_type mp2629_usb_types[] = {POWER_SUPPLY_USB_TYPE_SDP ,POWER_SUPPLY_USB_TYPE_DCP ,
@@ -126,7 +150,25 @@ static enum power_supply_property mp2629_charger_bat_props[] = { POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX, }; -static struct mp2629_prop props[] = { +static struct mp2629_prop mp2733_chip_props[] = { +MP2629_PROPS (INPUT_ILIM ,100000 ,3250000 ,50000 ), +MP2629_PROPS (INPUT_VLIM ,3800000 ,15200000 ,100000 ), +MP2629_PROPS (CHARGE_ILIM ,320000 ,4520000 ,40000 ), +MP2629_PROPS (CHARGE_VLIM ,3400000 ,4670000 ,10000 ), +MP2629_PROPS (PRECHARGE ,120000 ,720000 ,40000 ), +MP2629_PROPS (TERM_CURRENT ,80000 ,680000 ,40000 ), +}; + +static const struct reg_field mp2733_reg_fields[] = { + [INPUT_ILIM ] =REG_FIELD (MP2629_REG_INPUT_ILIM ,0 ,5 ), + [INPUT_VLIM ] =REG_FIELD (MP2629_REG_INPUT_VLIM ,0 ,6 ), + [CHARGE_ILIM ] =REG_FIELD (MP2629_REG_CHARGE_ILIM ,0 ,6 ), + [CHARGE_VLIM ] =REG_FIELD (MP2629_REG_CHARGE_VLIM ,1 ,7 ), + [PRECHARGE ] =REG_FIELD (MP2629_REG_PRECHARGE ,4 ,7 ), + [TERM_CURRENT ] =REG_FIELD (MP2629_REG_TERM_CURRENT ,0 ,3 ), +}; + +static struct mp2629_prop mp2629_chip_props[] = {MP2629_PROPS (INPUT_ILIM ,100000 ,3250000 ,50000 ),MP2629_PROPS (INPUT_VLIM ,3800000 ,5300000 ,100000 ),MP2629_PROPS (CHARGE_ILIM ,320000 ,4520000 ,40000 ),
@@ -174,6 +216,7 @@ static int mp2629_get_prop(struct mp2629_charger *charger, {int ret;unsigned int rval; +struct mp2629_prop *props = charger->chip_info->chip_props; ret =regmap_field_read (charger->regmap_fields[fld], &rval);if (ret)
@@ -189,6 +232,7 @@ static int mp2629_set_prop(struct mp2629_charger *charger, const union power_supply_propval *val) {unsigned int rval; +struct mp2629_prop *props = charger->chip_info->chip_props;if (val->intval < props[fld].min || val->intval > props[fld].max)return -EINVAL ;
@@ -311,6 +355,16 @@ static int mp2629_charger_battery_get_prop(struct power_supply *psy,default : val->intval =POWER_SUPPLY_CHARGE_TYPE_UNKNOWN ; } + +if (charger->chip_info->has_fast_charge) { + ret =regmap_read (charger->regmap, +MP2629_REG_FAST_CHARGE , &rval); +if (ret) +break ; + +if (rval &BIT (6 )) + val->intval =POWER_SUPPLY_CHARGE_TYPE_FAST ; + }break ;default :
@@ -344,6 +398,40 @@ static int mp2629_charger_battery_set_prop(struct power_supply *psy, } } +static int mp2733_get_usb_type (unsigned int rval) +{ +switch (rval) { +case MP2733_SOURCE_TYPE_APPLE_1p0: +case MP2733_SOURCE_TYPE_APPLE_2p1: +case MP2733_SOURCE_TYPE_APPLE_2p4: +return POWER_SUPPLY_USB_TYPE_APPLE_BRICK_ID ; +case MP2733_SOURCE_TYPE_SDP : +return POWER_SUPPLY_USB_TYPE_SDP ; +case MP2733_SOURCE_TYPE_CDP : +return POWER_SUPPLY_USB_TYPE_CDP ; +case MP2733_SOURCE_TYPE_DCP : +return POWER_SUPPLY_USB_TYPE_DCP ; +default : +return POWER_SUPPLY_USB_TYPE_UNKNOWN ; + } +} + +static int mp2629_get_usb_type (unsigned int rval) +{ +switch (rval) { +case MP2629_SOURCE_TYPE_SDP : +return POWER_SUPPLY_USB_TYPE_SDP ; +case MP2629_SOURCE_TYPE_CDP : +return POWER_SUPPLY_USB_TYPE_CDP ; +case MP2629_SOURCE_TYPE_DCP : +return POWER_SUPPLY_USB_TYPE_DCP ; +case MP2629_SOURCE_TYPE_OTG : +return POWER_SUPPLY_USB_TYPE_PD_DRP ; +default : +return POWER_SUPPLY_USB_TYPE_UNKNOWN ; + } +} +static int mp2629_charger_usb_get_prop (struct power_supply *psy,enum power_supply_property psp,union power_supply_propval *val)
@@ -367,23 +455,7 @@ static int mp2629_charger_usb_get_prop(struct power_supply *psy,break ; rval = (rval &MP2629_MASK_INPUT_TYPE ) >>5 ; -switch (rval) { -case MP2629_SOURCE_TYPE_SDP : - val->intval =POWER_SUPPLY_USB_TYPE_SDP ; -break ; -case MP2629_SOURCE_TYPE_CDP : - val->intval =POWER_SUPPLY_USB_TYPE_CDP ; -break ; -case MP2629_SOURCE_TYPE_DCP : - val->intval =POWER_SUPPLY_USB_TYPE_DCP ; -break ; -case MP2629_SOURCE_TYPE_OTG : - val->intval =POWER_SUPPLY_USB_TYPE_PD_DRP ; -break ; -default : - val->intval =POWER_SUPPLY_USB_TYPE_UNKNOWN ; -break ; - } + val->intval = charger->chip_info->mp2xx_get_usb_type (rval);break ;case POWER_SUPPLY_PROP_VOLTAGE_NOW :
@@ -550,11 +622,72 @@ static ssize_t batt_impedance_compensation_store(struct device *dev,static DEVICE_ATTR_RW (batt_impedance_compensation); -static struct attribute *mp2629_charger_sysfs_attrs[] = { +static struct attribute *mp2xx_batt_imp_sysfs_attrs[] = { + &dev_attr_batt_impedance_compensation.attr, +NULL +}; +ATTRIBUTE_GROUPS (mp2xx_batt_imp_sysfs); + +static ssize_t usb_fast_charge_show (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +struct mp2629_charger *charger =dev_get_drvdata (dev->parent); +unsigned int rval; +int ret; + + ret =regmap_read (charger->regmap,MP2629_REG_INTERRUPT , &rval); +if (ret) +return ret; + +return sysfs_emit (buf,"USB DP %u:DM %u\n" , !!(rval &BIT (2 )), + !!(rval &BIT (1 ))); +} + +static ssize_t usb_fast_charge_store (struct device *dev, +struct device_attribute *attr, +const char *buf, +size_t count) +{ +struct mp2629_charger *charger =dev_get_drvdata (dev->parent); +unsigned int val; +int ret; + + ret =kstrtouint (buf,10 , &val); +if (ret) +return ret; + +if (val >3 ) +return -ERANGE ; + + ret =regmap_update_bits (charger->regmap,MP2629_REG_INTERRUPT , +MP2733_MASK_FAST_CHARGE , val <<1 ); +if (ret) +return ret; + + ret =regmap_update_bits (charger->regmap,MP2629_REG_INTERRUPT , +MP2733_MASK_FAST_CHARGE_RESET , +MP2733_MASK_FAST_CHARGE_RESET ); +if (ret) +return ret; + +return count; +} + +static DEVICE_ATTR_RW (usb_fast_charge); + +static struct attribute *mp2xx_fast_charge_sysfs_attrs[] = { + &dev_attr_usb_fast_charge.attr, +NULL +}; +ATTRIBUTE_GROUPS (mp2xx_fast_charge_sysfs); + +static struct attribute *mp2xx_all_sysfs_attrs[] = { + &dev_attr_usb_fast_charge.attr, &dev_attr_batt_impedance_compensation.attr,NULL }; -ATTRIBUTE_GROUPS (mp2629_charger_sysfs); +ATTRIBUTE_GROUPS (mp2xx_all_sysfs);static void mp2629_charger_disable (void *data) {
@@ -564,6 +697,23 @@ static void mp2629_charger_disable(void *data) MP2629_MASK_CHARGE_CTRL, 0); } +static const struct mp2xx_chip_info mp2xx_chip_info_tbl[] = { + [CHIP_ID_MP2629 ] = { + .rfields = mp2629_reg_fields, + .chip_props = mp2629_chip_props, + .has_impedance =1 , + + .mp2xx_get_usb_type = mp2629_get_usb_type, + }, + [CHIP_ID_MP2733 ] = { + .rfields = mp2733_reg_fields, + .chip_props = mp2733_chip_props, + .has_fast_charge =1 , + + .mp2xx_get_usb_type = mp2733_get_usb_type, + }, +}; +static int mp2629_charger_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;
@@ -578,6 +728,7 @@ static int mp2629_charger_probe(struct platform_device *pdev) charger->regmap = ddata->regmap; charger->dev = dev; + charger->chip_info = &mp2xx_chip_info_tbl[ddata->chip_id];platform_set_drvdata (pdev, charger); irq =platform_get_irq (to_platform_device (dev->parent),0 );
@@ -586,7 +737,8 @@ static int mp2629_charger_probe(struct platform_device *pdev)for (i =0 ; i <MP2629_MAX_FIELD ; i++) { charger->regmap_fields[i] =devm_regmap_field_alloc (dev, - charger->regmap, mp2629_reg_fields[i]); + charger->regmap, + charger->chip_info->rfields[i]);if (IS_ERR (charger->regmap_fields[i])) {dev_err (dev,"regmap field alloc fail %d\n" , i);return PTR_ERR (charger->regmap_fields[i]);
@@ -613,7 +765,16 @@ static int mp2629_charger_probe(struct platform_device *pdev) } psy_cfg.drv_data = charger; - psy_cfg.attr_grp = mp2629_charger_sysfs_groups; + +if (charger->chip_info->has_impedance && + charger->chip_info->has_fast_charge) { + psy_cfg.attr_grp = mp2xx_all_sysfs_groups; + }else if (charger->chip_info->has_impedance) { + psy_cfg.attr_grp = mp2xx_batt_imp_sysfs_groups; + }else if (charger->chip_info->has_fast_charge) { + psy_cfg.attr_grp = mp2xx_fast_charge_sysfs_groups; + } + charger->battery =devm_power_supply_register (dev, &mp2629_battery_desc, &psy_cfg);if (IS_ERR (charger->battery)) {
Signature · 1 line
2.32.0
Saravanan Sekar
maintainerPATCH v5 8/8 power: supply: mp2629: Add USB fast charge settings
In reply to Saravanan SekarAllows the user to change the USB device fast charge setting to advertise host on enumeration helps to accelerate the charging cycle. Altering this value resets USB existing connection.
--- .../ABI/testing/sysfs-class-power-mp2629 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
Documentation/ABI/testing/sysfs-class-power-mp2629 +16 -0
@@ -1,3 +1,19 @@ +What: /sys/class/power_supply/mp2629_battery/usb_fast_charge +Date: June 2022 +KernelVersion: 5.20 +Description: + Represents a USB device fast charge settings.Altering this + value resets USB existing connection + USB DP:DM[0:0] 0.6V : Hi-Z + USB DP:DM[0:1] 3.3V : 0.6V + USB DP:DM[1:0] 0.6V : 0.6V + USB DP:DM[1:1] 0.6V : 3.3V + + Access: Read, Write + + Valid values: Represented in bit DP & DM setting. Valid + range is [0, 3]. + What: /sys/class/power_supply/mp2629_battery/batt_impedance_compen Date: April 2020 KernelVersion: 5.7
Signature · 1 line
2.32.0
Hi,
Quoted 2 lines · Saravanan Sekar
add support for mp2733 Battery charger control driver for Monolithic Power System's MP2733 chipset.
I suppose you do not actually want to get this merged concidering you did not carry over the Acked-by you got in v4? :)
-- Sebastian
saravanan sekar
maintainerQuoted 10 lines · Sebastian Reichel
Hi,
Quoted 2 lines · Saravanan Sekar
add support for mp2733 Battery charger control driver for Monolithic Power System's MP2733 chipset.
I suppose you do not actually want to get this merged concidering you did not carry over the Acked-by you got in v4? :)
-- Sebastian
Sorry, my mistake I added your ack to v5-0005 instead of v5-0007
Thanks,
Saravanan
Quoted 11 lines · Saravanan Sekar
changes in v5:
- fixed commit message on v5-0002 and v5-0004changes in v4:
- fixed attributes groups review comments in v3
- added new bug fix patches v4-0007 and v4-0008changes in v3:
- fixeddt_binding_checkerror
- fixed spellingusb->USB
Quoted 6 lines
changes in v2:
- fixed spelling
- revert back probe toprobe_newin mfd driverI do not see a cover letter, but FWIW,
Reviewed-by Andy Shevchenko <[email protected]>
This does not belong to the cover letter. Please add respective tags to patches, where applicable. If Andy gave Rb tag for entire patchset, add it to the patches.
Quoted 3 lines
for all patches except DT binding
Note, some of the comments regarding spelling were given, I believe you are going to address them in v3.
...and this comment is from who? Andy?
Quoted 15 lines
add support for mp2733 Battery charger control driver for Monolithic Power System's MP2733 chipset
Saravanan Sekar (8):
iio: adc: mp2629: fix wrong comparison of channel
mfd: mp2629: fix failed to get iio channel by device name
iio: adc: mp2629: fix potential array out of bound access
power: supply: fix wrong interpretation of register value
mfd: mp2629: Add support for mps mp2733 battery charger
iio: adc: mp2629: restrict input voltage mask for mp2629
power: supply: Add support for mp2733 battery charger
power: supply: mp2629: Add USB fast charge settings
Quoted 5 lines
.../ABI/testing/sysfs-class-power-mp2629 | 16 ++ drivers/iio/adc/mp2629_adc.c | 8 +- drivers/mfd/mp2629.c | 7 +- drivers/power/supply/mp2629_charger.c | 229 +++++++++++++++--- include/linux/mfd/mp2629.h | 6 +
Why do you Cc DT maintainers?
Quoted 2 lines
5 files changed, 228 insertions(+), 38 deletions(-)
Best regards,
Krzysztof
saravanan sekar
maintainerQuoted 16 lines · Krzysztof Kozlowski
Quoted 15 lines · Saravanan Sekar
changes in v5:
- fixed commit message on v5-0002 and v5-0004changes in v4:
- fixed attributes groups review comments in v3
- added new bug fix patches v4-0007 and v4-0008changes in v3:
- fixeddt_binding_checkerror
- fixed spellingusb->USBchanges in v2:
- fixed spelling
- revert back probe toprobe_newin mfd driver
Quoted 7 lines
Quoted 2 lines
I do not see a cover letter, but FWIW,
Reviewed-by Andy Shevchenko <[email protected]>This does not belong to the cover letter. Please add respective tags to patches, where applicable. If Andy gave Rb tag for entire patchset, add it to the patches.
Hello Krzysztof,
These are v1 comments from Andy to me, all of them are addressed and I kept in cover letter for history
Quoted 21 lines
Quoted 3 lines
for all patches except DT binding
Note, some of the comments regarding spelling were given, I believe you are going to address them in v3....and this comment is from who? Andy?
Quoted 15 lines
add support for mp2733 Battery charger control driver for Monolithic Power System's MP2733 chipset
Saravanan Sekar (8):
iio: adc: mp2629: fix wrong comparison of channel
mfd: mp2629: fix failed to get iio channel by device name
iio: adc: mp2629: fix potential array out of bound access
power: supply: fix wrong interpretation of register value
mfd: mp2629: Add support for mps mp2733 battery charger
iio: adc: mp2629: restrict input voltage mask for mp2629
power: supply: Add support for mp2733 battery charger
power: supply: mp2629: Add USB fast charge settings
Quoted 8 lines
Quoted 5 lines
.../ABI/testing/sysfs-class-power-mp2629 | 16 ++ drivers/iio/adc/mp2629_adc.c | 8 +- drivers/mfd/mp2629.c | 7 +- drivers/power/supply/mp2629_charger.c | 229 +++++++++++++++--- include/linux/mfd/mp2629.h | 6 +Why do you Cc DT maintainers?
This patch series includes DT bindings documentation which has already merged by 15Jun2022.
https://lore.kernel.org/all/[email protected]/
Quoted 6 lines
Quoted 2 lines
5 files changed, 228 insertions(+), 38 deletions(-)Best regards,
Krzysztof
Thanks,
Saravanan
Quoted 11 lines · saravanan sekar
Quoted 8 lines
Quoted 5 lines
.../ABI/testing/sysfs-class-power-mp2629 | 16 ++ drivers/iio/adc/mp2629_adc.c | 8 +- drivers/mfd/mp2629.c | 7 +- drivers/power/supply/mp2629_charger.c | 229 +++++++++++++++--- include/linux/mfd/mp2629.h | 6 +Why do you Cc DT maintainers?
This patch series includes DT bindings documentation which has already merged by 15Jun2022.
I don't see the DT bindings patch in above log. I did not get it and it is not here:
https://lore.kernel.org/all/[email protected]/
Quoted 2 lines
This is v3, how is it related?
Best regards,
Krzysztof