regulator: fan53555: Convert to use regulator_set_ramp_delay_regmap

Use regulator_set_ramp_delay_regmap instead of open-coded.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Link: https://lore.kernel.org/r/20210525124017.2550029-2-axel.lin@ingics.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c
index 9770a4df83d488d2224667ed7cc79143fd0df919..eb67500ad279e6de43541084a35e73bad5b69b3a 100644 (file)
--- a/drivers/regulator/fan53555.c
+++ b/drivers/regulator/fan53555.c
@@ -126,7 +126,8 @@ struct fan53555_device_info {
        /* Slew rate */
        unsigned int slew_reg;
        unsigned int slew_mask;
-       unsigned int slew_shift;
+       const unsigned int *ramp_delay_table;
+       unsigned int n_ramp_values;
        unsigned int slew_rate;
 };
 
@@ -200,7 +201,7 @@ static unsigned int fan53555_get_mode(struct regulator_dev *rdev)
                return REGULATOR_MODE_NORMAL;
 }
 
-static const int slew_rates[] = {
+static const unsigned int slew_rates[] = {
        64000,
        32000,
        16000,
@@ -211,51 +212,13 @@ static const int slew_rates[] = {
          500,
 };
 
-static const int tcs_slew_rates[] = {
+static const unsigned int tcs_slew_rates[] = {
        18700,
         9300,
         4600,
         2300,
 };
 
-static int fan53555_set_ramp(struct regulator_dev *rdev, int ramp)
-{
-       struct fan53555_device_info *di = rdev_get_drvdata(rdev);
-       int regval = -1, i;
-       const int *slew_rate_t;
-       int slew_rate_n;
-
-       switch (di->vendor) {
-       case FAN53526_VENDOR_FAIRCHILD:
-       case FAN53555_VENDOR_FAIRCHILD:
-       case FAN53555_VENDOR_SILERGY:
-               slew_rate_t = slew_rates;
-               slew_rate_n = ARRAY_SIZE(slew_rates);
-               break;
-       case FAN53526_VENDOR_TCS:
-               slew_rate_t = tcs_slew_rates;
-               slew_rate_n = ARRAY_SIZE(tcs_slew_rates);
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       for (i = 0; i < slew_rate_n; i++) {
-               if (ramp <= slew_rate_t[i])
-                       regval = i;
-               else
-                       break;
-       }
-
-       if (regval < 0) {
-               dev_err(di->dev, "unsupported ramp value %d\n", ramp);
-               return -EINVAL;
-       }
-
-       return regmap_update_bits(rdev->regmap, di->slew_reg,
-                                 di->slew_mask, regval << di->slew_shift);
-}
-
 static const struct regulator_ops fan53555_regulator_ops = {
        .set_voltage_sel = regulator_set_voltage_sel_regmap,
        .get_voltage_sel = regulator_get_voltage_sel_regmap,
@@ -268,7 +231,7 @@ static const struct regulator_ops fan53555_regulator_ops = {
        .is_enabled = regulator_is_enabled_regmap,
        .set_mode = fan53555_set_mode,
        .get_mode = fan53555_get_mode,
-       .set_ramp_delay = fan53555_set_ramp,
+       .set_ramp_delay = regulator_set_ramp_delay_regmap,
        .set_suspend_enable = fan53555_set_suspend_enable,
        .set_suspend_disable = fan53555_set_suspend_disable,
 };
@@ -298,7 +261,8 @@ static int fan53526_voltages_setup_fairchild(struct fan53555_device_info *di)
 
        di->slew_reg = FAN53555_CONTROL;
        di->slew_mask = CTL_SLEW_MASK;
-       di->slew_shift = CTL_SLEW_SHIFT;
+       di->ramp_delay_table = slew_rates;
+       di->n_ramp_values = ARRAY_SIZE(slew_rates);
        di->vsel_count = FAN53526_NVOLTAGES;
 
        return 0;
@@ -343,7 +307,8 @@ static int fan53555_voltages_setup_fairchild(struct fan53555_device_info *di)
        }
        di->slew_reg = FAN53555_CONTROL;
        di->slew_mask = CTL_SLEW_MASK;
-       di->slew_shift = CTL_SLEW_SHIFT;
+       di->ramp_delay_table = slew_rates;
+       di->n_ramp_values = ARRAY_SIZE(slew_rates);
        di->vsel_count = FAN53555_NVOLTAGES;
 
        return 0;
@@ -365,7 +330,8 @@ static int fan53555_voltages_setup_silergy(struct fan53555_device_info *di)
        }
        di->slew_reg = FAN53555_CONTROL;
        di->slew_mask = CTL_SLEW_MASK;
-       di->slew_shift = CTL_SLEW_SHIFT;
+       di->ramp_delay_table = slew_rates;
+       di->n_ramp_values = ARRAY_SIZE(slew_rates);
        di->vsel_count = FAN53555_NVOLTAGES;
 
        return 0;
@@ -377,7 +343,8 @@ static int fan53526_voltages_setup_tcs(struct fan53555_device_info *di)
        case TCS4525_CHIP_ID_12:
                di->slew_reg = TCS4525_TIME;
                di->slew_mask = TCS_SLEW_MASK;
-               di->slew_shift = TCS_SLEW_SHIFT;
+               di->ramp_delay_table = tcs_slew_rates;
+               di->n_ramp_values = ARRAY_SIZE(tcs_slew_rates);
 
                /* Init voltage range and step */
                di->vsel_min = 600000;
@@ -516,6 +483,10 @@ static int fan53555_regulator_register(struct fan53555_device_info *di,
        rdesc->uV_step = di->vsel_step;
        rdesc->vsel_reg = di->vol_reg;
        rdesc->vsel_mask = di->vsel_count - 1;
+       rdesc->ramp_reg = di->slew_reg;
+       rdesc->ramp_mask = di->slew_mask;
+       rdesc->ramp_delay_table = di->ramp_delay_table;
+       rdesc->n_ramp_values = di->n_ramp_values;
        rdesc->owner = THIS_MODULE;
 
        rdev = devm_regulator_register(di->dev, &di->desc, config);