Merge tag 'kvmarm-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmar...

[linux-2.6-microblaze.git] / drivers / regulator / fan53555.c

diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c
index 26f06f6..dac1fb5 100644 (file)
--- a/drivers/regulator/fan53555.c
+++ b/drivers/regulator/fan53555.c
@@ -56,7 +56,6 @@
 #define FAN53555_NVOLTAGES     64      /* Numbers of voltages */
 #define FAN53526_NVOLTAGES     128
 
-#define TCS_VSEL_NSEL_MASK     0x7f
 #define TCS_VSEL0_MODE         (1 << 7)
 #define TCS_VSEL1_MODE         (1 << 6)
 
@@ -67,7 +66,7 @@ enum fan53555_vendor {
        FAN53526_VENDOR_FAIRCHILD = 0,
        FAN53555_VENDOR_FAIRCHILD,
        FAN53555_VENDOR_SILERGY,
-       FAN53555_VENDOR_TCS,
+       FAN53526_VENDOR_TCS,
 };
 
 enum {
@@ -89,6 +88,14 @@ enum {
        FAN53555_CHIP_ID_08 = 8,
 };
 
+enum {
+       TCS4525_CHIP_ID_12 = 12,
+};
+
+enum {
+       TCS4526_CHIP_ID_00 = 0,
+};
+
 /* IC mask revision */
 enum {
        FAN53555_CHIP_REV_00 = 0x3,
@@ -123,7 +130,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;
 };
 
@@ -197,7 +205,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,
@@ -208,51 +216,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 FAN53555_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,
@@ -265,7 +235,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,
 };
@@ -293,6 +263,10 @@ static int fan53526_voltages_setup_fairchild(struct fan53555_device_info *di)
                return -EINVAL;
        }
 
+       di->slew_reg = FAN53555_CONTROL;
+       di->slew_mask = CTL_SLEW_MASK;
+       di->ramp_delay_table = slew_rates;
+       di->n_ramp_values = ARRAY_SIZE(slew_rates);
        di->vsel_count = FAN53526_NVOLTAGES;
 
        return 0;
@@ -337,7 +311,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;
@@ -358,24 +333,33 @@ static int fan53555_voltages_setup_silergy(struct fan53555_device_info *di)
                return -EINVAL;
        }
        di->slew_reg = FAN53555_CONTROL;
-       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;
 }
 
-static int fan53555_voltages_setup_tcs(struct fan53555_device_info *di)
+static int fan53526_voltages_setup_tcs(struct fan53555_device_info *di)
 {
-       di->slew_reg = TCS4525_TIME;
-       di->slew_mask = TCS_SLEW_MASK;
-       di->slew_shift = TCS_SLEW_MASK;
-
-       /* Init voltage range and step */
-       di->vsel_min = 600000;
-       di->vsel_step = 6250;
-       di->vsel_count = FAN53526_NVOLTAGES;
+       switch (di->chip_id) {
+       case TCS4525_CHIP_ID_12:
+       case TCS4526_CHIP_ID_00:
+               di->slew_reg = TCS4525_TIME;
+               di->slew_mask = TCS_SLEW_MASK;
+               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;
+               di->vsel_step = 6250;
+               di->vsel_count = FAN53526_NVOLTAGES;
+               break;
+       default:
+               dev_err(di->dev, "Chip ID %d not supported!\n", di->chip_id);
+               return -EINVAL;
+       }
 
        return 0;
 }
@@ -409,7 +393,7 @@ static int fan53555_device_setup(struct fan53555_device_info *di,
                        return -EINVAL;
                }
                break;
-       case FAN53555_VENDOR_TCS:
+       case FAN53526_VENDOR_TCS:
                switch (pdata->sleep_vsel_id) {
                case FAN53555_VSEL_ID_0:
                        di->sleep_reg = TCS4525_VSEL0;
@@ -448,7 +432,7 @@ static int fan53555_device_setup(struct fan53555_device_info *di,
                di->mode_reg = di->vol_reg;
                di->mode_mask = VSEL_MODE;
                break;
-       case FAN53555_VENDOR_TCS:
+       case FAN53526_VENDOR_TCS:
                di->mode_reg = TCS4525_COMMAND;
 
                switch (pdata->sleep_vsel_id) {
@@ -476,8 +460,8 @@ static int fan53555_device_setup(struct fan53555_device_info *di,
        case FAN53555_VENDOR_SILERGY:
                ret = fan53555_voltages_setup_silergy(di);
                break;
-       case FAN53555_VENDOR_TCS:
-               ret = fan53555_voltages_setup_tcs(di);
+       case FAN53526_VENDOR_TCS:
+               ret = fan53526_voltages_setup_tcs(di);
                break;
        default:
                dev_err(di->dev, "vendor %d not supported!\n", di->vendor);
@@ -504,6 +488,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);
@@ -552,7 +540,10 @@ static const struct of_device_id __maybe_unused fan53555_dt_ids[] = {
                .data = (void *)FAN53555_VENDOR_SILERGY,
        }, {
                .compatible = "tcs,tcs4525",
-               .data = (void *)FAN53555_VENDOR_TCS
+               .data = (void *)FAN53526_VENDOR_TCS
+       }, {
+               .compatible = "tcs,tcs4526",
+               .data = (void *)FAN53526_VENDOR_TCS
        },
        { }
 };
@@ -660,7 +651,10 @@ static const struct i2c_device_id fan53555_id[] = {
                .driver_data = FAN53555_VENDOR_SILERGY
        }, {
                .name = "tcs4525",
-               .driver_data = FAN53555_VENDOR_TCS
+               .driver_data = FAN53526_VENDOR_TCS
+       }, {
+               .name = "tcs4526",
+               .driver_data = FAN53526_VENDOR_TCS
        },
        { },
 };