regulator: tps80031: Convert tps80031_dcdc_ops to [get|set]_voltage_sel_regmap

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/drivers/regulator/tps80031-regulator.c b/drivers/regulator/tps80031-regulator.c
index 6430789b8347b1353be7ef79dbab10bb314ce7bc..6511d0bfd8964ecba4861dfd30c91d727c39ef25 100644 (file)
--- a/drivers/regulator/tps80031-regulator.c
+++ b/drivers/regulator/tps80031-regulator.c
@@ -282,37 +282,6 @@ static int tps80031_ldo_map_voltage(struct regulator_dev *rdev,
        return regulator_map_voltage_linear(rdev, min_uV, max_uV);
 }
 
-static int tps80031_ldo_set_voltage_sel(struct regulator_dev *rdev,
-               unsigned sel)
-{
-       struct tps80031_regulator *ri = rdev_get_drvdata(rdev);
-       struct device *parent = to_tps80031_dev(rdev);
-       int ret;
-
-       ret = tps80031_write(parent, ri->rinfo->volt_id,
-                       ri->rinfo->volt_reg, sel);
-       if (ret < 0)
-               dev_err(ri->dev, "Error in writing reg 0x%02x, e = %d\n",
-                       ri->rinfo->volt_reg, ret);
-       return ret;
-}
-
-static int tps80031_ldo_get_voltage_sel(struct regulator_dev *rdev)
-{
-       struct tps80031_regulator *ri = rdev_get_drvdata(rdev);
-       struct device *parent = to_tps80031_dev(rdev);
-       uint8_t vsel;
-       int ret;
-
-       ret = tps80031_read(parent, ri->rinfo->volt_id,
-                               ri->rinfo->volt_reg, &vsel);
-       if (ret < 0) {
-               dev_err(ri->dev, "Error in writing the Voltage register\n");
-               return ret;
-       }
-       return vsel & rdev->desc->vsel_mask;
-}
-
 static int tps80031_vbus_is_enabled(struct regulator_dev *rdev)
 {
        struct tps80031_regulator *ri = rdev_get_drvdata(rdev);
@@ -421,8 +390,8 @@ static struct regulator_ops tps80031_dcdc_ops = {
 static struct regulator_ops tps80031_ldo_ops = {
        .list_voltage           = tps80031_ldo_list_voltage,
        .map_voltage            = tps80031_ldo_map_voltage,
-       .set_voltage_sel        = tps80031_ldo_set_voltage_sel,
-       .get_voltage_sel        = tps80031_ldo_get_voltage_sel,
+       .set_voltage_sel        = regulator_set_voltage_sel_regmap,
+       .get_voltage_sel        = regulator_get_voltage_sel_regmap,
        .enable                 = tps80031_reg_enable,
        .disable                = tps80031_reg_disable,
        .is_enabled             = tps80031_reg_is_enabled,
@@ -489,6 +458,7 @@ static struct regulator_ops tps80031_ext_reg_ops = {
                .uV_step = 100000,                              \
                .linear_min_sel = 1,                            \
                .n_voltages = 25,                               \
+               .vsel_reg = TPS80031_##_id##_CFG_VOLTAGE,       \
                .vsel_mask = LDO_VSEL_MASK,                     \
                .enable_time = 500,                             \
        },                                                      \
@@ -710,6 +680,7 @@ static int tps80031_regulator_probe(struct platform_device *pdev)
        struct tps80031_regulator *pmic;
        struct regulator_dev *rdev;
        struct regulator_config config = { };
+       struct tps80031 *tps80031_mfd = dev_get_drvdata(pdev->dev.parent);
        int ret;
        int num;
 
@@ -737,6 +708,8 @@ static int tps80031_regulator_probe(struct platform_device *pdev)
                config.dev = &pdev->dev;
                config.init_data = NULL;
                config.driver_data = ri;
+               config.regmap = tps80031_mfd->regmap[ri->rinfo->volt_id];
+
                if (tps_pdata) {
                        config.init_data = tps_pdata->reg_init_data;
                        ri->config_flags = tps_pdata->config_flags;