Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[karo-tx-linux.git] / drivers / regulator / tps51632-regulator.c

diff --git a/drivers/regulator/tps51632-regulator.c b/drivers/regulator/tps51632-regulator.c
index a9c3a4a6cca07ce5e92372a2f18ea9d3050ea61a..ab21133e6784dc43d5990de54427b4a64db9ca52 100644 (file)
--- a/drivers/regulator/tps51632-regulator.c
+++ b/drivers/regulator/tps51632-regulator.c
@@ -106,29 +106,23 @@ static int tps51632_dcdc_get_voltage_sel(struct regulator_dev *rdev)
        }
 
        vsel = data & TPS51632_VOUT_MASK;
-
-       if (vsel < TPS51632_MIN_VSEL)
-               return 0;
-       else
-               return vsel - TPS51632_MIN_VSEL;
+       return vsel;
 }
 
 static int tps51632_dcdc_set_voltage_sel(struct regulator_dev *rdev,
                unsigned selector)
 {
        struct tps51632_chip *tps = rdev_get_drvdata(rdev);
-       int vsel;
        int ret;
        unsigned int reg = TPS51632_VOLTAGE_SELECT_REG;
 
        if (tps->enable_pwm_dvfs)
                reg = TPS51632_VOLTAGE_BASE_REG;
 
-       vsel = selector + TPS51632_MIN_VSEL;
-       if (vsel > TPS51632_MAX_VSEL)
+       if (selector > TPS51632_MAX_VSEL)
                return -EINVAL;
 
-       ret = regmap_write(tps->regmap, TPS51632_VOLTAGE_SELECT_REG, vsel);
+       ret = regmap_write(tps->regmap, reg, selector);
        if (ret < 0)
                dev_err(tps->dev, "reg write failed, err %d\n", ret);
        return ret;
@@ -242,6 +236,21 @@ static int tps51632_probe(struct i2c_client *client,
                return -EINVAL;
        }
 
+       if (pdata->enable_pwm_dvfs) {
+               if ((pdata->base_voltage_uV < TPS51632_MIN_VOLATGE) ||
+                   (pdata->base_voltage_uV > TPS51632_MAX_VOLATGE)) {
+                       dev_err(&client->dev, "Invalid base_voltage_uV setting\n");
+                       return -EINVAL;
+               }
+
+               if ((pdata->max_voltage_uV) &&
+                   ((pdata->max_voltage_uV < TPS51632_MIN_VOLATGE) ||
+                    (pdata->max_voltage_uV > TPS51632_MAX_VOLATGE))) {
+                       dev_err(&client->dev, "Invalid max_voltage_uV setting\n");
+                       return -EINVAL;
+               }
+       }
+
        tps = devm_kzalloc(&client->dev, sizeof(*tps), GFP_KERNEL);
        if (!tps) {
                dev_err(&client->dev, "Memory allocation failed\n");
@@ -254,7 +263,8 @@ static int tps51632_probe(struct i2c_client *client,
        tps->desc.ramp_delay = TPS51632_DEFAULT_RAMP_DELAY;
        tps->desc.min_uV = TPS51632_MIN_VOLATGE;
        tps->desc.uV_step = TPS51632_VOLATGE_STEP_10mV;
-       tps->desc.n_voltages = (TPS51632_MAX_VSEL - TPS51632_MIN_VSEL) + 1;
+       tps->desc.linear_min_sel = TPS51632_MIN_VSEL;
+       tps->desc.n_voltages = TPS51632_MAX_VSEL + 1;
        tps->desc.ops = &tps51632_dcdc_ops;
        tps->desc.type = REGULATOR_VOLTAGE;
        tps->desc.owner = THIS_MODULE;