7 files changed, 143 insertions, 192 deletions

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 9713b1b860cb..4e919b2ac7ee 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -93,6 +93,7 @@ config REGULATOR_MAX1586
 config REGULATOR_MAX8649
         tristate "Maxim 8649 voltage regulator"
         depends on I2C
+        select REGMAP_I2C
         help
           This driver controls a Maxim 8649 voltage output regulator via
           I2C bus.
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 9867ebc00bed..f489bed2d848 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2560,7 +2560,8 @@ static int add_regulator_attributes(struct regulator_dev *rdev)
         int                     status = 0;
 
         /* some attributes need specific methods to be displayed */
-        if (ops->get_voltage || ops->get_voltage_sel) {
+        if ((ops->get_voltage && ops->get_voltage(rdev) >= 0) ||
+            (ops->get_voltage_sel && ops->get_voltage_sel(rdev) >= 0)) {
                 status = device_create_file(dev, &dev_attr_microvolts);
                 if (status < 0)
                         return status;
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index 703c26b756dc..6828dce72371 100644
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -135,7 +135,10 @@ static int fixed_voltage_get_voltage(struct regulator_dev *dev)
 {
         struct fixed_voltage_data *data = rdev_get_drvdata(dev);
 
-        return data->microvolts;
+        if (data->microvolts)
+                return data->microvolts;
+        else
+                return -EINVAL;
 }
 
 static int fixed_voltage_list_voltage(struct regulator_dev *dev,
diff --git a/drivers/regulator/max8649.c b/drivers/regulator/max8649.c
index 524a5da23c75..b06a2399587c 100644
--- a/drivers/regulator/max8649.c
+++ b/drivers/regulator/max8649.c
@@ -16,6 +16,7 @@
 #include <linux/regulator/driver.h>
 #include <linux/slab.h>
 #include <linux/regulator/max8649.h>
+#include <linux/regmap.h>
 
 #define MAX8649_DCDC_VMIN       750000          /* uV */
 #define MAX8649_DCDC_VMAX       1380000         /* uV */
@@ -49,9 +50,8 @@
 
 struct max8649_regulator_info {
         struct regulator_dev    *regulator;
-        struct i2c_client       *i2c;
         struct device           *dev;
-        struct mutex            io_lock;
+        struct regmap           *regmap;
 
         int             vol_reg;
         unsigned        mode:2; /* bit[1:0] = VID1, VID0 */
@@ -63,71 +63,6 @@ struct max8649_regulator_info {
 
 /* I2C operations */
 
-static inline int max8649_read_device(struct i2c_client *i2c,
-                                      int reg, int bytes, void *dest)
-{
-        unsigned char data;
-        int ret;
-
-        data = (unsigned char)reg;
-        ret = i2c_master_send(i2c, &data, 1);
-        if (ret < 0)
-                return ret;
-        ret = i2c_master_recv(i2c, dest, bytes);
-        if (ret < 0)
-                return ret;
-        return 0;
-}
-
-static inline int max8649_write_device(struct i2c_client *i2c,
-                                       int reg, int bytes, void *src)
-{
-        unsigned char buf[bytes + 1];
-        int ret;
-
-        buf[0] = (unsigned char)reg;
-        memcpy(&buf[1], src, bytes);
-
-        ret = i2c_master_send(i2c, buf, bytes + 1);
-        if (ret < 0)
-                return ret;
-        return 0;
-}
-
-static int max8649_reg_read(struct i2c_client *i2c, int reg)
-{
-        struct max8649_regulator_info *info = i2c_get_clientdata(i2c);
-        unsigned char data;
-        int ret;
-
-        mutex_lock(&info->io_lock);
-        ret = max8649_read_device(i2c, reg, 1, &data);
-        mutex_unlock(&info->io_lock);
-
-        if (ret < 0)
-                return ret;
-        return (int)data;
-}
-
-static int max8649_set_bits(struct i2c_client *i2c, int reg,
-                            unsigned char mask, unsigned char data)
-{
-        struct max8649_regulator_info *info = i2c_get_clientdata(i2c);
-        unsigned char value;
-        int ret;
-
-        mutex_lock(&info->io_lock);
-        ret = max8649_read_device(i2c, reg, 1, &value);
-        if (ret < 0)
-                goto out;
-        value &= ~mask;
-        value |= data;
-        ret = max8649_write_device(i2c, reg, 1, &value);
-out:
-        mutex_unlock(&info->io_lock);
-        return ret;
-}
-
 static inline int check_range(int min_uV, int max_uV)
 {
         if ((min_uV < MAX8649_DCDC_VMIN) || (max_uV > MAX8649_DCDC_VMAX)
@@ -144,13 +79,14 @@ static int max8649_list_voltage(struct regulator_dev *rdev, unsigned index)
 static int max8649_get_voltage(struct regulator_dev *rdev)
 {
         struct max8649_regulator_info *info = rdev_get_drvdata(rdev);
+        unsigned int val;
         unsigned char data;
         int ret;
 
-        ret = max8649_reg_read(info->i2c, info->vol_reg);
-        if (ret < 0)
+        ret = regmap_read(info->regmap, info->vol_reg, &val);
+        if (ret != 0)
                 return ret;
-        data = (unsigned char)ret & MAX8649_VOL_MASK;
+        data = (unsigned char)val & MAX8649_VOL_MASK;
         return max8649_list_voltage(rdev, data);
 }
 
@@ -170,14 +106,14 @@ static int max8649_set_voltage(struct regulator_dev *rdev,
         mask = MAX8649_VOL_MASK;
         *selector = data & mask;
 
-        return max8649_set_bits(info->i2c, info->vol_reg, mask, data);
+        return regmap_update_bits(info->regmap, info->vol_reg, mask, data);
 }
 
 /* EN_PD means pulldown on EN input */
 static int max8649_enable(struct regulator_dev *rdev)
 {
         struct max8649_regulator_info *info = rdev_get_drvdata(rdev);
-        return max8649_set_bits(info->i2c, MAX8649_CONTROL, MAX8649_EN_PD, 0);
+        return regmap_update_bits(info->regmap, MAX8649_CONTROL, MAX8649_EN_PD, 0);
 }
 
 /*
@@ -187,38 +123,40 @@ static int max8649_enable(struct regulator_dev *rdev)
 static int max8649_disable(struct regulator_dev *rdev)
 {
         struct max8649_regulator_info *info = rdev_get_drvdata(rdev);
-        return max8649_set_bits(info->i2c, MAX8649_CONTROL, MAX8649_EN_PD,
+        return regmap_update_bits(info->regmap, MAX8649_CONTROL, MAX8649_EN_PD,
                                 MAX8649_EN_PD);
 }
 
 static int max8649_is_enabled(struct regulator_dev *rdev)
 {
         struct max8649_regulator_info *info = rdev_get_drvdata(rdev);
+        unsigned int val;
         int ret;
 
-        ret = max8649_reg_read(info->i2c, MAX8649_CONTROL);
-        if (ret < 0)
+        ret = regmap_read(info->regmap, MAX8649_CONTROL, &val);
+        if (ret != 0)
                 return ret;
-        return !((unsigned char)ret & MAX8649_EN_PD);
+        return !((unsigned char)val & MAX8649_EN_PD);
 }
 
 static int max8649_enable_time(struct regulator_dev *rdev)
 {
         struct max8649_regulator_info *info = rdev_get_drvdata(rdev);
         int voltage, rate, ret;
+        unsigned int val;
 
         /* get voltage */
-        ret = max8649_reg_read(info->i2c, info->vol_reg);
-        if (ret < 0)
+        ret = regmap_read(info->regmap, info->vol_reg, &val);
+        if (ret != 0)
                 return ret;
-        ret &= MAX8649_VOL_MASK;
+        val &= MAX8649_VOL_MASK;
         voltage = max8649_list_voltage(rdev, (unsigned char)ret); /* uV */
 
         /* get rate */
-        ret = max8649_reg_read(info->i2c, MAX8649_RAMP);
-        if (ret < 0)
+        ret = regmap_read(info->regmap, MAX8649_RAMP, &val);
+        if (ret != 0)
                 return ret;
-        ret = (ret & MAX8649_RAMP_MASK) >> 5;
+        ret = (val & MAX8649_RAMP_MASK) >> 5;
         rate = (32 * 1000) >> ret;      /* uV/uS */
 
         return DIV_ROUND_UP(voltage, rate);
@@ -230,12 +168,12 @@ static int max8649_set_mode(struct regulator_dev *rdev, unsigned int mode)
 
         switch (mode) {
         case REGULATOR_MODE_FAST:
-                max8649_set_bits(info->i2c, info->vol_reg, MAX8649_FORCE_PWM,
-                                 MAX8649_FORCE_PWM);
+                regmap_update_bits(info->regmap, info->vol_reg, MAX8649_FORCE_PWM,
+                                   MAX8649_FORCE_PWM);
                 break;
         case REGULATOR_MODE_NORMAL:
-                max8649_set_bits(info->i2c, info->vol_reg,
-                                 MAX8649_FORCE_PWM, 0);
+                regmap_update_bits(info->regmap, info->vol_reg,
+                                   MAX8649_FORCE_PWM, 0);
                 break;
         default:
                 return -EINVAL;
@@ -246,10 +184,13 @@ static int max8649_set_mode(struct regulator_dev *rdev, unsigned int mode)
 static unsigned int max8649_get_mode(struct regulator_dev *rdev)
 {
         struct max8649_regulator_info *info = rdev_get_drvdata(rdev);
+        unsigned int val;
         int ret;
 
-        ret = max8649_reg_read(info->i2c, info->vol_reg);
-        if (ret & MAX8649_FORCE_PWM)
+        ret = regmap_read(info->regmap, info->vol_reg, &val);
+        if (ret != 0)
+                return ret;
+        if (val & MAX8649_FORCE_PWM)
                 return REGULATOR_MODE_FAST;
         return REGULATOR_MODE_NORMAL;
 }
@@ -275,11 +216,17 @@ static struct regulator_desc dcdc_desc = {
         .owner          = THIS_MODULE,
 };
 
+static struct regmap_config max8649_regmap_config = {
+        .reg_bits = 8,
+        .val_bits = 8,
+};
+
 static int __devinit max8649_regulator_probe(struct i2c_client *client,
                                              const struct i2c_device_id *id)
 {
         struct max8649_platform_data *pdata = client->dev.platform_data;
         struct max8649_regulator_info *info = NULL;
+        unsigned int val;
         unsigned char data;
         int ret;
 
@@ -289,9 +236,14 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client,
                 return -ENOMEM;
         }
 
-        info->i2c = client;
+        info->regmap = regmap_init_i2c(client, &max8649_regmap_config);
+        if (IS_ERR(info->regmap)) {
+                ret = PTR_ERR(info->regmap);
+                dev_err(&client->dev, "Failed to allocate register map: %d\n", ret);
+                goto fail;
+        }
+
         info->dev = &client->dev;
-        mutex_init(&info->io_lock);
         i2c_set_clientdata(client, info);
 
         info->mode = pdata->mode;
@@ -312,8 +264,8 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client,
                 break;
         }
 
-        ret = max8649_reg_read(info->i2c, MAX8649_CHIP_ID1);
-        if (ret < 0) {
+        ret = regmap_read(info->regmap, MAX8649_CHIP_ID1, &val);
+        if (ret != 0) {
                 dev_err(info->dev, "Failed to detect ID of MAX8649:%d\n",
                         ret);
                 goto out;
@@ -321,29 +273,29 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client,
         dev_info(info->dev, "Detected MAX8649 (ID:%x)\n", ret);
 
         /* enable VID0 & VID1 */
-        max8649_set_bits(info->i2c, MAX8649_CONTROL, MAX8649_VID_MASK, 0);
+        regmap_update_bits(info->regmap, MAX8649_CONTROL, MAX8649_VID_MASK, 0);
 
         /* enable/disable external clock synchronization */
         info->extclk = pdata->extclk;
         data = (info->extclk) ? MAX8649_SYNC_EXTCLK : 0;
-        max8649_set_bits(info->i2c, info->vol_reg, MAX8649_SYNC_EXTCLK, data);
+        regmap_update_bits(info->regmap, info->vol_reg, MAX8649_SYNC_EXTCLK, data);
         if (info->extclk) {
                 /* set external clock frequency */
                 info->extclk_freq = pdata->extclk_freq;
-                max8649_set_bits(info->i2c, MAX8649_SYNC, MAX8649_EXT_MASK,
-                                 info->extclk_freq << 6);
+                regmap_update_bits(info->regmap, MAX8649_SYNC, MAX8649_EXT_MASK,
+                                   info->extclk_freq << 6);
         }
 
         if (pdata->ramp_timing) {
                 info->ramp_timing = pdata->ramp_timing;
-                max8649_set_bits(info->i2c, MAX8649_RAMP, MAX8649_RAMP_MASK,
-                                 info->ramp_timing << 5);
+                regmap_update_bits(info->regmap, MAX8649_RAMP, MAX8649_RAMP_MASK,
+                                   info->ramp_timing << 5);
         }
 
         info->ramp_down = pdata->ramp_down;
         if (info->ramp_down) {
-                max8649_set_bits(info->i2c, MAX8649_RAMP, MAX8649_RAMP_DOWN,
-                                 MAX8649_RAMP_DOWN);
+                regmap_update_bits(info->regmap, MAX8649_RAMP, MAX8649_RAMP_DOWN,
+                                   MAX8649_RAMP_DOWN);
         }
 
         info->regulator = regulator_register(&dcdc_desc, &client->dev,
@@ -358,6 +310,8 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client,
         dev_info(info->dev, "Max8649 regulator device is detected.\n");
         return 0;
 out:
+        regmap_exit(info->regmap);
+fail:
         kfree(info);
         return ret;
 }
@@ -369,6 +323,7 @@ static int __devexit max8649_regulator_remove(struct i2c_client *client)
         if (info) {
                 if (info->regulator)
                         regulator_unregister(info->regulator);
+                regmap_exit(info->regmap);
                 kfree(info);
         }
 
diff --git a/drivers/regulator/tps65023-regulator.c b/drivers/regulator/tps65023-regulator.c
index 7fd3b9092d1b..18d61a0529a9 100644
--- a/drivers/regulator/tps65023-regulator.c
+++ b/drivers/regulator/tps65023-regulator.c
@@ -152,48 +152,21 @@ struct tps_driver_data {
         u8 core_regulator;
 };
 
-static int tps_65023_set_bits(struct tps_pmic *tps, u8 reg, u8 mask)
-{
-        return regmap_update_bits(tps->regmap, reg, mask, mask);
-}
-
-static int tps_65023_clear_bits(struct tps_pmic *tps, u8 reg, u8 mask)
-{
-        return regmap_update_bits(tps->regmap, reg, mask, 0);
-}
-
-static int tps_65023_reg_read(struct tps_pmic *tps, u8 reg)
-{
-        unsigned int val;
-        int ret;
-
-        ret = regmap_read(tps->regmap, reg, &val);
-
-        if (ret != 0)
-                return ret;
-        else
-                return val;
-}
-
-static int tps_65023_reg_write(struct tps_pmic *tps, u8 reg, u8 val)
-{
-        return regmap_write(tps->regmap, reg, val);
-}
-
 static int tps65023_dcdc_is_enabled(struct regulator_dev *dev)
 {
         struct tps_pmic *tps = rdev_get_drvdata(dev);
         int data, dcdc = rdev_get_id(dev);
+        int ret;
         u8 shift;
 
         if (dcdc < TPS65023_DCDC_1 || dcdc > TPS65023_DCDC_3)
                 return -EINVAL;
 
         shift = TPS65023_NUM_REGULATOR - dcdc;
-        data = tps_65023_reg_read(tps, TPS65023_REG_REG_CTRL);
+        ret = regmap_read(tps->regmap, TPS65023_REG_REG_CTRL, &data);
 
-        if (data < 0)
-                return data;
+        if (ret != 0)
+                return ret;
         else
                 return (data & 1<<shift) ? 1 : 0;
 }
@@ -202,16 +175,17 @@ static int tps65023_ldo_is_enabled(struct regulator_dev *dev)
 {
         struct tps_pmic *tps = rdev_get_drvdata(dev);
         int data, ldo = rdev_get_id(dev);
+        int ret;
         u8 shift;
 
         if (ldo < TPS65023_LDO_1 || ldo > TPS65023_LDO_2)
                 return -EINVAL;
 
         shift = (ldo == TPS65023_LDO_1 ? 1 : 2);
-        data = tps_65023_reg_read(tps, TPS65023_REG_REG_CTRL);
+        ret = regmap_read(tps->regmap, TPS65023_REG_REG_CTRL, &data);
 
-        if (data < 0)
-                return data;
+        if (ret != 0)
+                return ret;
         else
                 return (data & 1<<shift) ? 1 : 0;
 }
@@ -226,7 +200,7 @@ static int tps65023_dcdc_enable(struct regulator_dev *dev)
                 return -EINVAL;
 
         shift = TPS65023_NUM_REGULATOR - dcdc;
-        return tps_65023_set_bits(tps, TPS65023_REG_REG_CTRL, 1 << shift);
+        return regmap_update_bits(tps->regmap, TPS65023_REG_REG_CTRL, 1 << shift, 1 << shift);
 }
 
 static int tps65023_dcdc_disable(struct regulator_dev *dev)
@@ -239,7 +213,7 @@ static int tps65023_dcdc_disable(struct regulator_dev *dev)
                 return -EINVAL;
 
         shift = TPS65023_NUM_REGULATOR - dcdc;
-        return tps_65023_clear_bits(tps, TPS65023_REG_REG_CTRL, 1 << shift);
+        return regmap_update_bits(tps->regmap, TPS65023_REG_REG_CTRL, 1 << shift, 0);
 }
 
 static int tps65023_ldo_enable(struct regulator_dev *dev)
@@ -252,7 +226,7 @@ static int tps65023_ldo_enable(struct regulator_dev *dev)
                 return -EINVAL;
 
         shift = (ldo == TPS65023_LDO_1 ? 1 : 2);
-        return tps_65023_set_bits(tps, TPS65023_REG_REG_CTRL, 1 << shift);
+        return regmap_update_bits(tps->regmap, TPS65023_REG_REG_CTRL, 1 << shift, 1 << shift);
 }
 
 static int tps65023_ldo_disable(struct regulator_dev *dev)
@@ -265,21 +239,22 @@ static int tps65023_ldo_disable(struct regulator_dev *dev)
                 return -EINVAL;
 
         shift = (ldo == TPS65023_LDO_1 ? 1 : 2);
-        return tps_65023_clear_bits(tps, TPS65023_REG_REG_CTRL, 1 << shift);
+        return regmap_update_bits(tps->regmap, TPS65023_REG_REG_CTRL, 1 << shift, 0);
 }
 
 static int tps65023_dcdc_get_voltage(struct regulator_dev *dev)
 {
         struct tps_pmic *tps = rdev_get_drvdata(dev);
+        int ret;
         int data, dcdc = rdev_get_id(dev);
 
         if (dcdc < TPS65023_DCDC_1 || dcdc > TPS65023_DCDC_3)
                 return -EINVAL;
 
         if (dcdc == tps->core_regulator) {
-                data = tps_65023_reg_read(tps, TPS65023_REG_DEF_CORE);
-                if (data < 0)
-                        return data;
+                ret = regmap_read(tps->regmap, TPS65023_REG_DEF_CORE, &data);
+                if (ret != 0)
+                        return ret;
                 data &= (tps->info[dcdc]->table_len - 1);
                 return tps->info[dcdc]->table[data] * 1000;
         } else
@@ -318,13 +293,13 @@ static int tps65023_dcdc_set_voltage(struct regulator_dev *dev,
         if (vsel == tps->info[dcdc]->table_len)
                 goto failed;
 
-        ret = tps_65023_reg_write(tps, TPS65023_REG_DEF_CORE, vsel);
+        ret = regmap_write(tps->regmap, TPS65023_REG_DEF_CORE, vsel);
 
         /* Tell the chip that we have changed the value in DEFCORE
          * and its time to update the core voltage
          */
-        tps_65023_set_bits(tps, TPS65023_REG_CON_CTRL2,
-                                                TPS65023_REG_CTRL2_GO);
+        regmap_update_bits(tps->regmap, TPS65023_REG_CON_CTRL2,
+                        TPS65023_REG_CTRL2_GO, TPS65023_REG_CTRL2_GO);
 
         return ret;
 
@@ -336,13 +311,14 @@ static int tps65023_ldo_get_voltage(struct regulator_dev *dev)
 {
         struct tps_pmic *tps = rdev_get_drvdata(dev);
         int data, ldo = rdev_get_id(dev);
+        int ret;
 
         if (ldo < TPS65023_LDO_1 || ldo > TPS65023_LDO_2)
                 return -EINVAL;
 
-        data = tps_65023_reg_read(tps, TPS65023_REG_LDO_CTRL);
-        if (data < 0)
-                return data;
+        ret = regmap_read(tps->regmap, TPS65023_REG_LDO_CTRL, &data);
+        if (ret != 0)
+                return ret;
 
         data >>= (TPS65023_LDO_CTRL_LDOx_SHIFT(ldo - TPS65023_LDO_1));
         data &= (tps->info[ldo]->table_len - 1);
@@ -354,6 +330,7 @@ static int tps65023_ldo_set_voltage(struct regulator_dev *dev,
 {
         struct tps_pmic *tps = rdev_get_drvdata(dev);
         int data, vsel, ldo = rdev_get_id(dev);
+        int ret;
 
         if (ldo < TPS65023_LDO_1 || ldo > TPS65023_LDO_2)
                 return -EINVAL;
@@ -377,13 +354,13 @@ static int tps65023_ldo_set_voltage(struct regulator_dev *dev,
 
         *selector = vsel;
 
-        data = tps_65023_reg_read(tps, TPS65023_REG_LDO_CTRL);
-        if (data < 0)
-                return data;
+        ret = regmap_read(tps->regmap, TPS65023_REG_LDO_CTRL, &data);
+        if (ret != 0)
+                return ret;
 
         data &= TPS65023_LDO_CTRL_LDOx_MASK(ldo - TPS65023_LDO_1);
         data |= (vsel << (TPS65023_LDO_CTRL_LDOx_SHIFT(ldo - TPS65023_LDO_1)));
-        return tps_65023_reg_write(tps, TPS65023_REG_LDO_CTRL, data);
+        return regmap_write(tps->regmap, TPS65023_REG_LDO_CTRL, data);
 }
 
 static int tps65023_dcdc_list_voltage(struct regulator_dev *dev,
@@ -511,12 +488,12 @@ static int __devinit tps_65023_probe(struct i2c_client *client,
         i2c_set_clientdata(client, tps);
 
         /* Enable setting output voltage by I2C */
-        tps_65023_clear_bits(tps, TPS65023_REG_CON_CTRL2,
-                                                TPS65023_REG_CTRL2_CORE_ADJ);
+        regmap_update_bits(tps->regmap, TPS65023_REG_CON_CTRL2,
+                        TPS65023_REG_CTRL2_CORE_ADJ, TPS65023_REG_CTRL2_CORE_ADJ);
 
         /* Enable setting output voltage by I2C */
-        tps_65023_clear_bits(tps, TPS65023_REG_CON_CTRL2,
-                                                TPS65023_REG_CTRL2_CORE_ADJ);
+        regmap_update_bits(tps->regmap, TPS65023_REG_CON_CTRL2,
+                        TPS65023_REG_CTRL2_CORE_ADJ, TPS65023_REG_CTRL2_CORE_ADJ);
 
         return 0;
 
diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c
index eaea9b4a09d0..5c15ba01e9c7 100644
--- a/drivers/regulator/tps65910-regulator.c
+++ b/drivers/regulator/tps65910-regulator.c
@@ -25,30 +25,6 @@
 #include <linux/gpio.h>
 #include <linux/mfd/tps65910.h>
 
-#define TPS65910_REG_VRTC               0
-#define TPS65910_REG_VIO                1
-#define TPS65910_REG_VDD1               2
-#define TPS65910_REG_VDD2               3
-#define TPS65910_REG_VDD3               4
-#define TPS65910_REG_VDIG1              5
-#define TPS65910_REG_VDIG2              6
-#define TPS65910_REG_VPLL               7
-#define TPS65910_REG_VDAC               8
-#define TPS65910_REG_VAUX1              9
-#define TPS65910_REG_VAUX2              10
-#define TPS65910_REG_VAUX33             11
-#define TPS65910_REG_VMMC               12
-
-#define TPS65911_REG_VDDCTRL            4
-#define TPS65911_REG_LDO1               5
-#define TPS65911_REG_LDO2               6
-#define TPS65911_REG_LDO3               7
-#define TPS65911_REG_LDO4               8
-#define TPS65911_REG_LDO5               9
-#define TPS65911_REG_LDO6               10
-#define TPS65911_REG_LDO7               11
-#define TPS65911_REG_LDO8               12
-
 #define TPS65910_SUPPLY_STATE_ENABLED   0x1
 
 /* supported VIO voltages in milivolts */
@@ -664,10 +640,10 @@ static int tps65910_set_voltage_dcdc(struct regulator_dev *dev,
 
         switch (id) {
         case TPS65910_REG_VDD1:
-                dcdc_mult = (selector / VDD1_2_NUM_VOLTS) + 1;
+                dcdc_mult = (selector / VDD1_2_NUM_VOLT_FINE) + 1;
                 if (dcdc_mult == 1)
                         dcdc_mult--;
-                vsel = (selector % VDD1_2_NUM_VOLTS) + 3;
+                vsel = (selector % VDD1_2_NUM_VOLT_FINE) + 3;
 
                 tps65910_modify_bits(pmic, TPS65910_VDD1,
                                 (dcdc_mult << VDD1_VGAIN_SEL_SHIFT),
@@ -675,10 +651,10 @@ static int tps65910_set_voltage_dcdc(struct regulator_dev *dev,
                 tps65910_reg_write(pmic, TPS65910_VDD1_OP, vsel);
                 break;
         case TPS65910_REG_VDD2:
-                dcdc_mult = (selector / VDD1_2_NUM_VOLTS) + 1;
+                dcdc_mult = (selector / VDD1_2_NUM_VOLT_FINE) + 1;
                 if (dcdc_mult == 1)
                         dcdc_mult--;
-                vsel = (selector % VDD1_2_NUM_VOLTS) + 3;
+                vsel = (selector % VDD1_2_NUM_VOLT_FINE) + 3;
 
                 tps65910_modify_bits(pmic, TPS65910_VDD2,
                                 (dcdc_mult << VDD2_VGAIN_SEL_SHIFT),
@@ -756,9 +732,9 @@ static int tps65910_list_voltage_dcdc(struct regulator_dev *dev,
         switch (id) {
         case TPS65910_REG_VDD1:
         case TPS65910_REG_VDD2:
-                mult = (selector / VDD1_2_NUM_VOLTS) + 1;
+                mult = (selector / VDD1_2_NUM_VOLT_FINE) + 1;
                 volt = VDD1_2_MIN_VOLT +
-                                (selector % VDD1_2_NUM_VOLTS) * VDD1_2_OFFSET;
+                                (selector % VDD1_2_NUM_VOLT_FINE) * VDD1_2_OFFSET;
                 break;
         case TPS65911_REG_VDDCTRL:
                 volt = VDDCTRL_MIN_VOLT + (selector * VDDCTRL_OFFSET);
@@ -885,8 +861,6 @@ static __devinit int tps65910_probe(struct platform_device *pdev)
         if (!pmic_plat_data)
                 return -EINVAL;
 
-        reg_data = pmic_plat_data->tps65910_pmic_init_data;
-
         pmic = kzalloc(sizeof(*pmic), GFP_KERNEL);
         if (!pmic)
                 return -ENOMEM;
@@ -937,7 +911,16 @@ static __devinit int tps65910_probe(struct platform_device *pdev)
                 goto err_free_info;
         }
 
-        for (i = 0; i < pmic->num_regulators; i++, info++, reg_data++) {
+        for (i = 0; i < pmic->num_regulators && i < TPS65910_NUM_REGS;
+                        i++, info++) {
+
+                reg_data = pmic_plat_data->tps65910_pmic_init_data[i];
+
+                /* Regulator API handles empty constraints but not NULL
+                 * constraints */
+                if (!reg_data)
+                        continue;
+
                 /* Register the regulators */
                 pmic->info[i] = info;
 
@@ -947,6 +930,8 @@ static __devinit int tps65910_probe(struct platform_device *pdev)
 
                 if (i == TPS65910_REG_VDD1 || i == TPS65910_REG_VDD2) {
                         pmic->desc[i].ops = &tps65910_ops_dcdc;
+                        pmic->desc[i].n_voltages = VDD1_2_NUM_VOLT_FINE *
+                                                        VDD1_2_NUM_VOLT_COARSE;
                 } else if (i == TPS65910_REG_VDD3) {
                         if (tps65910_chip_id(tps65910) == TPS65910)
                                 pmic->desc[i].ops = &tps65910_ops_vdd3;
diff --git a/include/linux/mfd/tps65910.h b/include/linux/mfd/tps65910.h
index 82b4c8801a4f..d0cb12eba402 100644
--- a/include/linux/mfd/tps65910.h
+++ b/include/linux/mfd/tps65910.h
@@ -243,7 +243,8 @@
 
 
 /*Registers VDD1, VDD2 voltage values definitions */
-#define VDD1_2_NUM_VOLTS                                73
+#define VDD1_2_NUM_VOLT_FINE                            73
+#define VDD1_2_NUM_VOLT_COARSE                          3
 #define VDD1_2_MIN_VOLT                                 6000
 #define VDD1_2_OFFSET                                   125
 
@@ -739,6 +740,34 @@
 #define TPS65910_GPIO_STS                               BIT(1)
 #define TPS65910_GPIO_SET                               BIT(0)
 
+/* Regulator Index Definitions */
+#define TPS65910_REG_VRTC                               0
+#define TPS65910_REG_VIO                                1
+#define TPS65910_REG_VDD1                               2
+#define TPS65910_REG_VDD2                               3
+#define TPS65910_REG_VDD3                               4
+#define TPS65910_REG_VDIG1                              5
+#define TPS65910_REG_VDIG2                              6
+#define TPS65910_REG_VPLL                               7
+#define TPS65910_REG_VDAC                               8
+#define TPS65910_REG_VAUX1                              9
+#define TPS65910_REG_VAUX2                              10
+#define TPS65910_REG_VAUX33                             11
+#define TPS65910_REG_VMMC                               12
+
+#define TPS65911_REG_VDDCTRL                            4
+#define TPS65911_REG_LDO1                               5
+#define TPS65911_REG_LDO2                               6
+#define TPS65911_REG_LDO3                               7
+#define TPS65911_REG_LDO4                               8
+#define TPS65911_REG_LDO5                               9
+#define TPS65911_REG_LDO6                               10
+#define TPS65911_REG_LDO7                               11
+#define TPS65911_REG_LDO8                               12
+
+/* Max number of TPS65910/11 regulators */
+#define TPS65910_NUM_REGS                               13
+
 /**
  * struct tps65910_board
  * Board platform data may be used to initialize regulators.
@@ -750,7 +779,7 @@ struct tps65910_board {
         int irq_base;
         int vmbch_threshold;
         int vmbch2_threshold;
-        struct regulator_init_data *tps65910_pmic_init_data;
+        struct regulator_init_data *tps65910_pmic_init_data[TPS65910_NUM_REGS];
 };
 
 /**