power: supply: axp20x_battery: Make iio and battery config per device

Move the configuration of battery specific information and available
iio channels from the probe function to a device specific routine,
allowing us to use this driver for devices with slightly different
configurations (such as the AXP717).

Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20240821215456.962564-4-macroalpha82@gmail.com
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/drivers/power/supply/axp20x_battery.c b/drivers/power/supply/axp20x_battery.c
index 7520b599eb3d17245845c0569c718ff917aaef83..c903c588b361a5e678d10f243e3b6cb2d957cf19 100644 (file)
--- a/drivers/power/supply/axp20x_battery.c
+++ b/drivers/power/supply/axp20x_battery.c
@@ -58,11 +58,19 @@
 struct axp20x_batt_ps;
 
 struct axp_data {
-       int     ccc_scale;
-       int     ccc_offset;
-       bool    has_fg_valid;
+       int             ccc_scale;
+       int             ccc_offset;
+       unsigned int    ccc_reg;
+       unsigned int    ccc_mask;
+       bool            has_fg_valid;
+       const struct    power_supply_desc *bat_ps_desc;
        int     (*get_max_voltage)(struct axp20x_batt_ps *batt, int *val);
        int     (*set_max_voltage)(struct axp20x_batt_ps *batt, int val);
+       int     (*cfg_iio_chan)(struct platform_device *pdev,
+                               struct axp20x_batt_ps *axp_batt);
+       void    (*set_bat_info)(struct platform_device *pdev,
+                               struct axp20x_batt_ps *axp_batt,
+                               struct power_supply_battery_info *info);
 };
 
 struct axp20x_batt_ps {
@@ -508,7 +516,7 @@ static int axp20x_battery_prop_writeable(struct power_supply *psy,
               psp == POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX;
 }
 
-static const struct power_supply_desc axp20x_batt_ps_desc = {
+static const struct power_supply_desc axp209_batt_ps_desc = {
        .name = "axp20x-battery",
        .type = POWER_SUPPLY_TYPE_BATTERY,
        .properties = axp20x_battery_props,
@@ -518,27 +526,94 @@ static const struct power_supply_desc axp20x_batt_ps_desc = {
        .set_property = axp20x_battery_set_prop,
 };
 
+static int axp209_bat_cfg_iio_channels(struct platform_device *pdev,
+                                      struct axp20x_batt_ps *axp_batt)
+{
+       axp_batt->batt_v = devm_iio_channel_get(&pdev->dev, "batt_v");
+       if (IS_ERR(axp_batt->batt_v)) {
+               if (PTR_ERR(axp_batt->batt_v) == -ENODEV)
+                       return -EPROBE_DEFER;
+               return PTR_ERR(axp_batt->batt_v);
+       }
+
+       axp_batt->batt_chrg_i = devm_iio_channel_get(&pdev->dev,
+                                                       "batt_chrg_i");
+       if (IS_ERR(axp_batt->batt_chrg_i)) {
+               if (PTR_ERR(axp_batt->batt_chrg_i) == -ENODEV)
+                       return -EPROBE_DEFER;
+               return PTR_ERR(axp_batt->batt_chrg_i);
+       }
+
+       axp_batt->batt_dischrg_i = devm_iio_channel_get(&pdev->dev,
+                                                          "batt_dischrg_i");
+       if (IS_ERR(axp_batt->batt_dischrg_i)) {
+               if (PTR_ERR(axp_batt->batt_dischrg_i) == -ENODEV)
+                       return -EPROBE_DEFER;
+               return PTR_ERR(axp_batt->batt_dischrg_i);
+       }
+
+       return 0;
+}
+
+static void axp209_set_battery_info(struct platform_device *pdev,
+                                   struct axp20x_batt_ps *axp_batt,
+                                   struct power_supply_battery_info *info)
+{
+       int vmin = info->voltage_min_design_uv;
+       int ccc = info->constant_charge_current_max_ua;
+
+       if (vmin > 0 && axp20x_set_voltage_min_design(axp_batt, vmin))
+               dev_err(&pdev->dev,
+                       "couldn't set voltage_min_design\n");
+
+       /* Set max to unverified value to be able to set CCC */
+       axp_batt->max_ccc = ccc;
+
+       if (ccc <= 0 || axp20x_set_constant_charge_current(axp_batt, ccc)) {
+               dev_err(&pdev->dev,
+                       "couldn't set ccc from DT: fallback to min value\n");
+               ccc = 300000;
+               axp_batt->max_ccc = ccc;
+               axp20x_set_constant_charge_current(axp_batt, ccc);
+       }
+}
+
 static const struct axp_data axp209_data = {
        .ccc_scale = 100000,
        .ccc_offset = 300000,
+       .ccc_reg = AXP20X_CHRG_CTRL1,
+       .ccc_mask = AXP20X_CHRG_CTRL1_TGT_CURR,
+       .bat_ps_desc = &axp209_batt_ps_desc,
        .get_max_voltage = axp20x_battery_get_max_voltage,
        .set_max_voltage = axp20x_battery_set_max_voltage,
+       .cfg_iio_chan = axp209_bat_cfg_iio_channels,
+       .set_bat_info = axp209_set_battery_info,
 };
 
 static const struct axp_data axp221_data = {
        .ccc_scale = 150000,
        .ccc_offset = 300000,
+       .ccc_reg = AXP20X_CHRG_CTRL1,
+       .ccc_mask = AXP20X_CHRG_CTRL1_TGT_CURR,
        .has_fg_valid = true,
+       .bat_ps_desc = &axp209_batt_ps_desc,
        .get_max_voltage = axp22x_battery_get_max_voltage,
        .set_max_voltage = axp22x_battery_set_max_voltage,
+       .cfg_iio_chan = axp209_bat_cfg_iio_channels,
+       .set_bat_info = axp209_set_battery_info,
 };
 
 static const struct axp_data axp813_data = {
        .ccc_scale = 200000,
        .ccc_offset = 200000,
+       .ccc_reg = AXP20X_CHRG_CTRL1,
+       .ccc_mask = AXP20X_CHRG_CTRL1_TGT_CURR,
        .has_fg_valid = true,
+       .bat_ps_desc = &axp209_batt_ps_desc,
        .get_max_voltage = axp813_battery_get_max_voltage,
        .set_max_voltage = axp20x_battery_set_max_voltage,
+       .cfg_iio_chan = axp209_bat_cfg_iio_channels,
+       .set_bat_info = axp209_set_battery_info,
 };
 
 static const struct of_device_id axp20x_battery_ps_id[] = {
@@ -561,6 +636,7 @@ static int axp20x_power_probe(struct platform_device *pdev)
        struct power_supply_config psy_cfg = {};
        struct power_supply_battery_info *info;
        struct device *dev = &pdev->dev;
+       int ret;
 
        if (!of_device_is_available(pdev->dev.of_node))
                return -ENODEV;
@@ -572,29 +648,6 @@ static int axp20x_power_probe(struct platform_device *pdev)
 
        axp20x_batt->dev = &pdev->dev;
 
-       axp20x_batt->batt_v = devm_iio_channel_get(&pdev->dev, "batt_v");
-       if (IS_ERR(axp20x_batt->batt_v)) {
-               if (PTR_ERR(axp20x_batt->batt_v) == -ENODEV)
-                       return -EPROBE_DEFER;
-               return PTR_ERR(axp20x_batt->batt_v);
-       }
-
-       axp20x_batt->batt_chrg_i = devm_iio_channel_get(&pdev->dev,
-                                                       "batt_chrg_i");
-       if (IS_ERR(axp20x_batt->batt_chrg_i)) {
-               if (PTR_ERR(axp20x_batt->batt_chrg_i) == -ENODEV)
-                       return -EPROBE_DEFER;
-               return PTR_ERR(axp20x_batt->batt_chrg_i);
-       }
-
-       axp20x_batt->batt_dischrg_i = devm_iio_channel_get(&pdev->dev,
-                                                          "batt_dischrg_i");
-       if (IS_ERR(axp20x_batt->batt_dischrg_i)) {
-               if (PTR_ERR(axp20x_batt->batt_dischrg_i) == -ENODEV)
-                       return -EPROBE_DEFER;
-               return PTR_ERR(axp20x_batt->batt_dischrg_i);
-       }
-
        axp20x_batt->regmap = dev_get_regmap(pdev->dev.parent, NULL);
        platform_set_drvdata(pdev, axp20x_batt);
 
@@ -603,8 +656,12 @@ static int axp20x_power_probe(struct platform_device *pdev)
 
        axp20x_batt->data = (struct axp_data *)of_device_get_match_data(dev);
 
+       ret = axp20x_batt->data->cfg_iio_chan(pdev, axp20x_batt);
+       if (ret)
+               return ret;
+
        axp20x_batt->batt = devm_power_supply_register(&pdev->dev,
-                                                      &axp20x_batt_ps_desc,
+                                                      axp20x_batt->data->bat_ps_desc,
                                                       &psy_cfg);
        if (IS_ERR(axp20x_batt->batt)) {
                dev_err(&pdev->dev, "failed to register power supply: %ld\n",
@@ -613,33 +670,15 @@ static int axp20x_power_probe(struct platform_device *pdev)
        }
 
        if (!power_supply_get_battery_info(axp20x_batt->batt, &info)) {
-               int vmin = info->voltage_min_design_uv;
-               int ccc = info->constant_charge_current_max_ua;
-
-               if (vmin > 0 && axp20x_set_voltage_min_design(axp20x_batt,
-                                                             vmin))
-                       dev_err(&pdev->dev,
-                               "couldn't set voltage_min_design\n");
-
-               /* Set max to unverified value to be able to set CCC */
-               axp20x_batt->max_ccc = ccc;
-
-               if (ccc <= 0 || axp20x_set_constant_charge_current(axp20x_batt,
-                                                                  ccc)) {
-                       dev_err(&pdev->dev,
-                               "couldn't set constant charge current from DT: fallback to minimum value\n");
-                       ccc = 300000;
-                       axp20x_batt->max_ccc = ccc;
-                       axp20x_set_constant_charge_current(axp20x_batt, ccc);
-               }
+               axp20x_batt->data->set_bat_info(pdev, axp20x_batt, info);
+               power_supply_put_battery_info(axp20x_batt->batt, info);
        }
 
        /*
         * Update max CCC to a valid value if battery info is present or set it
         * to current register value by default.
         */
-       axp20x_get_constant_charge_current(axp20x_batt,
-                                          &axp20x_batt->max_ccc);
+       axp20x_get_constant_charge_current(axp20x_batt, &axp20x_batt->max_ccc);
 
        return 0;
 }