| Message ID | 20220607155324.118102-18-aidanmacdonald.0x0@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add support for AXP192 PMIC | expand |
Hi, On Tue, Jun 07, 2022 at 04:53:24PM +0100, Aidan MacDonald wrote: > 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. > > Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com> > --- Acked-by: Sebastian Reichel <sebastian.reichel@collabora.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 e9547e2d7c48..3fa2faa6f0f8 100644 > --- a/drivers/power/supply/axp20x_battery.c > +++ b/drivers/power/supply/axp20x_battery.c > @@ -538,6 +538,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, > @@ -562,6 +575,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, > @@ -572,6 +595,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, > @@ -600,6 +636,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, > }, { > @@ -617,6 +656,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)) > @@ -660,9 +700,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 >
diff --git a/drivers/power/supply/axp20x_battery.c b/drivers/power/supply/axp20x_battery.c index e9547e2d7c48..3fa2faa6f0f8 100644 --- a/drivers/power/supply/axp20x_battery.c +++ b/drivers/power/supply/axp20x_battery.c @@ -538,6 +538,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, @@ -562,6 +575,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, @@ -572,6 +595,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, @@ -600,6 +636,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, }, { @@ -617,6 +656,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)) @@ -660,9 +700,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));
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. Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com> --- drivers/power/supply/axp20x_battery.c | 49 +++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 3 deletions(-)