45 files changed, 380 insertions, 266 deletions

diff --git a/drivers/regulator/88pm8607.c b/drivers/regulator/88pm8607.c
index ca0d608f8248..df33530cec4a 100644
--- a/drivers/regulator/88pm8607.c
+++ b/drivers/regulator/88pm8607.c
@@ -427,7 +427,7 @@ static int __devinit pm8607_regulator_probe(struct platform_device *pdev)
 
         /* replace driver_data with info */
         info->regulator = regulator_register(&info->desc, &pdev->dev,
-                                             pdata, info);
+                                             pdata, info, NULL);
         if (IS_ERR(info->regulator)) {
                 dev_err(&pdev->dev, "failed to register regulator %s\n",
                         info->desc.name);
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/Makefile b/drivers/regulator/Makefile
index 93a6318f5328..c75a5229cb27 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -4,6 +4,7 @@
 
 
 obj-$(CONFIG_REGULATOR) += core.o dummy.o
+obj-$(CONFIG_OF) += of_regulator.o
 obj-$(CONFIG_REGULATOR_FIXED_VOLTAGE) += fixed.o
 obj-$(CONFIG_REGULATOR_VIRTUAL_CONSUMER) += virtual.o
 obj-$(CONFIG_REGULATOR_USERSPACE_CONSUMER) += userspace-consumer.o
diff --git a/drivers/regulator/aat2870-regulator.c b/drivers/regulator/aat2870-regulator.c
index 298c6c6a2795..685ad43b0749 100644
--- a/drivers/regulator/aat2870-regulator.c
+++ b/drivers/regulator/aat2870-regulator.c
@@ -63,7 +63,7 @@ static int aat2870_ldo_set_voltage_sel(struct regulator_dev *rdev,
         struct aat2870_data *aat2870 = dev_get_drvdata(ri->pdev->dev.parent);
 
         return aat2870->update(aat2870, ri->voltage_addr, ri->voltage_mask,
-                        (selector << ri->voltage_shift) & ri->voltage_mask);
+                               selector << ri->voltage_shift);
 }
 
 static int aat2870_ldo_get_voltage_sel(struct regulator_dev *rdev)
@@ -188,7 +188,7 @@ static int aat2870_regulator_probe(struct platform_device *pdev)
         ri->pdev = pdev;
 
         rdev = regulator_register(&ri->desc, &pdev->dev,
-                                  pdev->dev.platform_data, ri);
+                                  pdev->dev.platform_data, ri, NULL);
         if (IS_ERR(rdev)) {
                 dev_err(&pdev->dev, "Failed to register regulator %s\n",
                         ri->desc.name);
diff --git a/drivers/regulator/ab3100.c b/drivers/regulator/ab3100.c
index 585e4946fe0a..042271aace6a 100644
--- a/drivers/regulator/ab3100.c
+++ b/drivers/regulator/ab3100.c
@@ -634,7 +634,7 @@ static int __devinit ab3100_regulators_probe(struct platform_device *pdev)
                 rdev = regulator_register(&ab3100_regulator_desc[i],
                                           &pdev->dev,
                                           &plfdata->reg_constraints[i],
-                                          reg);
+                                          reg, NULL);
 
                 if (IS_ERR(rdev)) {
                         err = PTR_ERR(rdev);
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index 6e1ae69646b3..e91b8ddc2793 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -822,7 +822,7 @@ static __devinit int ab8500_regulator_probe(struct platform_device *pdev)
 
                 /* register regulator with framework */
                 info->regulator = regulator_register(&info->desc, &pdev->dev,
-                                &pdata->regulator[i], info);
+                                &pdata->regulator[i], info, NULL);
                 if (IS_ERR(info->regulator)) {
                         err = PTR_ERR(info->regulator);
                         dev_err(&pdev->dev, "failed to register regulator %s\n",
diff --git a/drivers/regulator/ad5398.c b/drivers/regulator/ad5398.c
index a4be41614eeb..483c80930852 100644
--- a/drivers/regulator/ad5398.c
+++ b/drivers/regulator/ad5398.c
@@ -233,7 +233,7 @@ static int __devinit ad5398_probe(struct i2c_client *client,
         chip->current_mask = (chip->current_level - 1) << chip->current_offset;
 
         chip->rdev = regulator_register(&ad5398_reg, &client->dev,
-                                        init_data, chip);
+                                        init_data, chip, NULL);
         if (IS_ERR(chip->rdev)) {
                 ret = PTR_ERR(chip->rdev);
                 dev_err(&client->dev, "failed to register %s %s\n",
diff --git a/drivers/regulator/bq24022.c b/drivers/regulator/bq24022.c
index e24d1b7d97a8..9fab6d1bbe80 100644
--- a/drivers/regulator/bq24022.c
+++ b/drivers/regulator/bq24022.c
@@ -107,7 +107,7 @@ static int __init bq24022_probe(struct platform_device *pdev)
         ret = gpio_direction_output(pdata->gpio_nce, 1);
 
         bq24022 = regulator_register(&bq24022_desc, &pdev->dev,
-                                     pdata->init_data, pdata);
+                                     pdata->init_data, pdata, NULL);
         if (IS_ERR(bq24022)) {
                 dev_dbg(&pdev->dev, "couldn't register regulator\n");
                 ret = PTR_ERR(bq24022);
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 669d02160221..f489bed2d848 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -25,6 +25,8 @@
 #include <linux/mutex.h>
 #include <linux/suspend.h>
 #include <linux/delay.h>
+#include <linux/of.h>
+#include <linux/regulator/of_regulator.h>
 #include <linux/regulator/consumer.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
@@ -132,6 +134,33 @@ static struct regulator *get_device_regulator(struct device *dev)
         return NULL;
 }
 
+/**
+ * of_get_regulator - get a regulator device node based on supply name
+ * @dev: Device pointer for the consumer (of regulator) device
+ * @supply: regulator supply name
+ *
+ * Extract the regulator device node corresponding to the supply name.
+ * retruns the device node corresponding to the regulator if found, else
+ * returns NULL.
+ */
+static struct device_node *of_get_regulator(struct device *dev, const char *supply)
+{
+        struct device_node *regnode = NULL;
+        char prop_name[32]; /* 32 is max size of property name */
+
+        dev_dbg(dev, "Looking up %s-supply from device tree\n", supply);
+
+        snprintf(prop_name, 32, "%s-supply", supply);
+        regnode = of_parse_phandle(dev->of_node, prop_name, 0);
+
+        if (!regnode) {
+                dev_warn(dev, "%s property in node %s references invalid phandle",
+                                prop_name, dev->of_node->full_name);
+                return NULL;
+        }
+        return regnode;
+}
+
 /* Platform voltage constraint check */
 static int regulator_check_voltage(struct regulator_dev *rdev,
                                    int *min_uV, int *max_uV)
@@ -1148,6 +1177,30 @@ static int _regulator_get_enable_time(struct regulator_dev *rdev)
         return rdev->desc->ops->enable_time(rdev);
 }
 
+static struct regulator_dev *regulator_dev_lookup(struct device *dev,
+                                                         const char *supply)
+{
+        struct regulator_dev *r;
+        struct device_node *node;
+
+        /* first do a dt based lookup */
+        if (dev && dev->of_node) {
+                node = of_get_regulator(dev, supply);
+                if (node)
+                        list_for_each_entry(r, &regulator_list, list)
+                                if (r->dev.parent &&
+                                        node == r->dev.of_node)
+                                        return r;
+        }
+
+        /* if not found, try doing it non-dt way */
+        list_for_each_entry(r, &regulator_list, list)
+                if (strcmp(rdev_get_name(r), supply) == 0)
+                        return r;
+
+        return NULL;
+}
+
 /* Internal regulator request function */
 static struct regulator *_regulator_get(struct device *dev, const char *id,
                                         int exclusive)
@@ -1168,6 +1221,10 @@ static struct regulator *_regulator_get(struct device *dev, const char *id,
 
         mutex_lock(&regulator_list_mutex);
 
+        rdev = regulator_dev_lookup(dev, id);
+        if (rdev)
+                goto found;
+
         list_for_each_entry(map, &regulator_map_list, list) {
                 /* If the mapping has a device set up it must match */
                 if (map->dev_name &&
@@ -2503,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;
@@ -2637,11 +2695,12 @@ static void rdev_init_debugfs(struct regulator_dev *rdev)
  */
 struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
         struct device *dev, const struct regulator_init_data *init_data,
-        void *driver_data)
+        void *driver_data, struct device_node *of_node)
 {
         static atomic_t regulator_no = ATOMIC_INIT(0);
         struct regulator_dev *rdev;
         int ret, i;
+        const char *supply = NULL;
 
         if (regulator_desc == NULL)
                 return ERR_PTR(-EINVAL);
@@ -2696,6 +2755,7 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
 
         /* register with sysfs */
         rdev->dev.class = &regulator_class;
+        rdev->dev.of_node = of_node;
         rdev->dev.parent = dev;
         dev_set_name(&rdev->dev, "regulator.%d",
                      atomic_inc_return(&regulator_no) - 1);
@@ -2717,21 +2777,18 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
         if (ret < 0)
                 goto scrub;
 
-        if (init_data->supply_regulator) {
+        if (init_data->supply_regulator)
+                supply = init_data->supply_regulator;
+        else if (regulator_desc->supply_name)
+                supply = regulator_desc->supply_name;
+
+        if (supply) {
                 struct regulator_dev *r;
-                int found = 0;
 
-                list_for_each_entry(r, &regulator_list, list) {
-                        if (strcmp(rdev_get_name(r),
-                                   init_data->supply_regulator) == 0) {
-                                found = 1;
-                                break;
-                        }
-                }
+                r = regulator_dev_lookup(dev, supply);
 
-                if (!found) {
-                        dev_err(dev, "Failed to find supply %s\n",
-                                init_data->supply_regulator);
+                if (!r) {
+                        dev_err(dev, "Failed to find supply %s\n", supply);
                         ret = -ENODEV;
                         goto scrub;
                 }
diff --git a/drivers/regulator/da903x.c b/drivers/regulator/da903x.c
index e23ddfa8b2c6..8dbc54da7d70 100644
--- a/drivers/regulator/da903x.c
+++ b/drivers/regulator/da903x.c
@@ -537,7 +537,7 @@ static int __devinit da903x_regulator_probe(struct platform_device *pdev)
                 ri->desc.ops = &da9030_regulator_ldo1_15_ops;
 
         rdev = regulator_register(&ri->desc, &pdev->dev,
-                                  pdev->dev.platform_data, ri);
+                                  pdev->dev.platform_data, ri, NULL);
         if (IS_ERR(rdev)) {
                 dev_err(&pdev->dev, "failed to register regulator %s\n",
                                 ri->desc.name);
diff --git a/drivers/regulator/db8500-prcmu.c b/drivers/regulator/db8500-prcmu.c
index 78329751af54..515443fcd26b 100644
--- a/drivers/regulator/db8500-prcmu.c
+++ b/drivers/regulator/db8500-prcmu.c
@@ -486,7 +486,7 @@ static int __devinit db8500_regulator_probe(struct platform_device *pdev)
 
                 /* register with the regulator framework */
                 info->rdev = regulator_register(&info->desc, &pdev->dev,
-                                init_data, info);
+                                init_data, info, NULL);
                 if (IS_ERR(info->rdev)) {
                         err = PTR_ERR(info->rdev);
                         dev_err(&pdev->dev, "failed to register %s: err %i\n",
diff --git a/drivers/regulator/dummy.c b/drivers/regulator/dummy.c
index b8f520513ce7..0ee00de4be72 100644
--- a/drivers/regulator/dummy.c
+++ b/drivers/regulator/dummy.c
@@ -42,7 +42,7 @@ static int __devinit dummy_regulator_probe(struct platform_device *pdev)
         int ret;
 
         dummy_regulator_rdev = regulator_register(&dummy_desc, NULL,
-                                                  &dummy_initdata, NULL);
+                                                  &dummy_initdata, NULL, NULL);
         if (IS_ERR(dummy_regulator_rdev)) {
                 ret = PTR_ERR(dummy_regulator_rdev);
                 pr_err("Failed to register regulator: %d\n", ret);
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index 21ecf212a522..72abbf5507a6 100644
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -27,6 +27,10 @@
 #include <linux/gpio.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+#include <linux/regulator/of_regulator.h>
+#include <linux/regulator/machine.h>
 
 struct fixed_voltage_data {
         struct regulator_desc desc;
@@ -38,6 +42,57 @@ struct fixed_voltage_data {
         bool is_enabled;
 };
 
+
+/**
+ * of_get_fixed_voltage_config - extract fixed_voltage_config structure info
+ * @dev: device requesting for fixed_voltage_config
+ *
+ * Populates fixed_voltage_config structure by extracting data from device
+ * tree node, returns a pointer to the populated structure of NULL if memory
+ * alloc fails.
+ */
+static struct fixed_voltage_config *
+of_get_fixed_voltage_config(struct device *dev)
+{
+        struct fixed_voltage_config *config;
+        struct device_node *np = dev->of_node;
+        const __be32 *delay;
+        struct regulator_init_data *init_data;
+
+        config = devm_kzalloc(dev, sizeof(struct fixed_voltage_config),
+                                                                 GFP_KERNEL);
+        if (!config)
+                return NULL;
+
+        config->init_data = of_get_regulator_init_data(dev);
+        if (!config->init_data)
+                return NULL;
+
+        init_data = config->init_data;
+
+        config->supply_name = init_data->constraints.name;
+        if (init_data->constraints.min_uV == init_data->constraints.max_uV) {
+                config->microvolts = init_data->constraints.min_uV;
+        } else {
+                dev_err(dev,
+                         "Fixed regulator specified with variable voltages\n");
+                return NULL;
+        }
+
+        if (init_data->constraints.boot_on)
+                config->enabled_at_boot = true;
+
+        config->gpio = of_get_named_gpio(np, "gpio", 0);
+        delay = of_get_property(np, "startup-delay-us", NULL);
+        if (delay)
+                config->startup_delay = be32_to_cpu(*delay);
+
+        if (of_find_property(np, "enable-active-high", NULL))
+                config->enable_high = true;
+
+        return config;
+}
+
 static int fixed_voltage_is_enabled(struct regulator_dev *dev)
 {
         struct fixed_voltage_data *data = rdev_get_drvdata(dev);
@@ -80,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,
@@ -105,10 +163,18 @@ static struct regulator_ops fixed_voltage_ops = {
 
 static int __devinit reg_fixed_voltage_probe(struct platform_device *pdev)
 {
-        struct fixed_voltage_config *config = pdev->dev.platform_data;
+        struct fixed_voltage_config *config;
         struct fixed_voltage_data *drvdata;
         int ret;
 
+        if (pdev->dev.of_node)
+                config = of_get_fixed_voltage_config(&pdev->dev);
+        else
+                config = pdev->dev.platform_data;
+
+        if (!config)
+                return -ENOMEM;
+
         drvdata = kzalloc(sizeof(struct fixed_voltage_data), GFP_KERNEL);
         if (drvdata == NULL) {
                 dev_err(&pdev->dev, "Failed to allocate device data\n");
@@ -180,7 +246,7 @@ static int __devinit reg_fixed_voltage_probe(struct platform_device *pdev)
         }
 
         drvdata->dev = regulator_register(&drvdata->desc, &pdev->dev,
-                                          config->init_data, drvdata);
+                                          config->init_data, drvdata, NULL);
         if (IS_ERR(drvdata->dev)) {
                 ret = PTR_ERR(drvdata->dev);
                 dev_err(&pdev->dev, "Failed to register regulator: %d\n", ret);
@@ -217,12 +283,23 @@ static int __devexit reg_fixed_voltage_remove(struct platform_device *pdev)
         return 0;
 }
 
+#if defined(CONFIG_OF)
+static const struct of_device_id fixed_of_match[] __devinitconst = {
+        { .compatible = "regulator-fixed", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, fixed_of_match);
+#else
+#define fixed_of_match NULL
+#endif
+
 static struct platform_driver regulator_fixed_voltage_driver = {
         .probe          = reg_fixed_voltage_probe,
         .remove         = __devexit_p(reg_fixed_voltage_remove),
         .driver         = {
                 .name           = "reg-fixed-voltage",
                 .owner          = THIS_MODULE,
+                .of_match_table = fixed_of_match,
         },
 };
 
diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c
index f0acf52498bd..42e1cb1835e5 100644
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -284,7 +284,7 @@ static int __devinit gpio_regulator_probe(struct platform_device *pdev)
         drvdata->state = state;
 
         drvdata->dev = regulator_register(&drvdata->desc, &pdev->dev,
-                                          config->init_data, drvdata);
+                                          config->init_data, drvdata, NULL);
         if (IS_ERR(drvdata->dev)) {
                 ret = PTR_ERR(drvdata->dev);
                 dev_err(&pdev->dev, "Failed to register regulator: %d\n", ret);
diff --git a/drivers/regulator/isl6271a-regulator.c b/drivers/regulator/isl6271a-regulator.c
index e4b3592e8176..c1a456c4257c 100644
--- a/drivers/regulator/isl6271a-regulator.c
+++ b/drivers/regulator/isl6271a-regulator.c
@@ -170,7 +170,7 @@ static int __devinit isl6271a_probe(struct i2c_client *i2c,
 
         for (i = 0; i < 3; i++) {
                 pmic->rdev[i] = regulator_register(&isl_rd[i], &i2c->dev,
-                                                init_data, pmic);
+                                                init_data, pmic, NULL);
                 if (IS_ERR(pmic->rdev[i])) {
                         dev_err(&i2c->dev, "failed to register %s\n", id->name);
                         err = PTR_ERR(pmic->rdev[i]);
diff --git a/drivers/regulator/lp3971.c b/drivers/regulator/lp3971.c
index 72b16b5f3db6..0cfabd318a59 100644
--- a/drivers/regulator/lp3971.c
+++ b/drivers/regulator/lp3971.c
@@ -451,7 +451,7 @@ static int __devinit setup_regulators(struct lp3971 *lp3971,
         for (i = 0; i < pdata->num_regulators; i++) {
                 struct lp3971_regulator_subdev *reg = &pdata->regulators[i];
                 lp3971->rdev[i] = regulator_register(&regulators[reg->id],
-                                        lp3971->dev, reg->initdata, lp3971);
+                                lp3971->dev, reg->initdata, lp3971, NULL);
 
                 if (IS_ERR(lp3971->rdev[i])) {
                         err = PTR_ERR(lp3971->rdev[i]);
diff --git a/drivers/regulator/lp3972.c b/drivers/regulator/lp3972.c
index fbc5e3741bef..49a15eefe5fe 100644
--- a/drivers/regulator/lp3972.c
+++ b/drivers/regulator/lp3972.c
@@ -555,7 +555,7 @@ static int __devinit setup_regulators(struct lp3972 *lp3972,
         for (i = 0; i < pdata->num_regulators; i++) {
                 struct lp3972_regulator_subdev *reg = &pdata->regulators[i];
                 lp3972->rdev[i] = regulator_register(&regulators[reg->id],
-                                        lp3972->dev, reg->initdata, lp3972);
+                                lp3972->dev, reg->initdata, lp3972, NULL);
 
                 if (IS_ERR(lp3972->rdev[i])) {
                         err = PTR_ERR(lp3972->rdev[i]);
diff --git a/drivers/regulator/max1586.c b/drivers/regulator/max1586.c
index 3f49512c5134..40e7a4db2853 100644
--- a/drivers/regulator/max1586.c
+++ b/drivers/regulator/max1586.c
@@ -214,7 +214,7 @@ static int __devinit max1586_pmic_probe(struct i2c_client *client,
                 }
                 rdev[i] = regulator_register(&max1586_reg[id], &client->dev,
                                              pdata->subdevs[i].platform_data,
-                                             max1586);
+                                             max1586, NULL);
                 if (IS_ERR(rdev[i])) {
                         ret = PTR_ERR(rdev[i]);
                         dev_err(&client->dev, "failed to register %s\n",
diff --git a/drivers/regulator/max8649.c b/drivers/regulator/max8649.c
index 1062cf9f02dc..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,33 +273,33 @@ 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,
-                                             pdata->regulator, info);
+                                             pdata->regulator, info, NULL);
         if (IS_ERR(info->regulator)) {
                 dev_err(info->dev, "failed to register regulator %s\n",
                         dcdc_desc.name);
@@ -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/max8660.c b/drivers/regulator/max8660.c
index 33f5d9a492ef..a838e664569f 100644
--- a/drivers/regulator/max8660.c
+++ b/drivers/regulator/max8660.c
@@ -449,7 +449,7 @@ static int __devinit max8660_probe(struct i2c_client *client,
 
                 rdev[i] = regulator_register(&max8660_reg[id], &client->dev,
                                              pdata->subdevs[i].platform_data,
-                                             max8660);
+                                             max8660, NULL);
                 if (IS_ERR(rdev[i])) {
                         ret = PTR_ERR(rdev[i]);
                         dev_err(&client->dev, "failed to register %s\n",
diff --git a/drivers/regulator/max8925-regulator.c b/drivers/regulator/max8925-regulator.c
index cc9ec0e03271..f976e5d0867e 100644
--- a/drivers/regulator/max8925-regulator.c
+++ b/drivers/regulator/max8925-regulator.c
@@ -266,7 +266,7 @@ static int __devinit max8925_regulator_probe(struct platform_device *pdev)
         ri->chip = chip;
 
         rdev = regulator_register(&ri->desc, &pdev->dev,
-                                  pdata->regulator[pdev->id], ri);
+                                  pdata->regulator[pdev->id], ri, NULL);
         if (IS_ERR(rdev)) {
                 dev_err(&pdev->dev, "failed to register regulator %s\n",
                                 ri->desc.name);
diff --git a/drivers/regulator/max8952.c b/drivers/regulator/max8952.c
index 3883d85c5b88..75d89400c123 100644
--- a/drivers/regulator/max8952.c
+++ b/drivers/regulator/max8952.c
@@ -208,7 +208,7 @@ static int __devinit max8952_pmic_probe(struct i2c_client *client,
         max8952->pdata = pdata;
 
         max8952->rdev = regulator_register(&regulator, max8952->dev,
-                        &pdata->reg_data, max8952);
+                        &pdata->reg_data, max8952, NULL);
 
         if (IS_ERR(max8952->rdev)) {
                 ret = PTR_ERR(max8952->rdev);
diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c
index 6176129a27e5..d26e8646277b 100644
--- a/drivers/regulator/max8997.c
+++ b/drivers/regulator/max8997.c
@@ -1146,7 +1146,7 @@ static __devinit int max8997_pmic_probe(struct platform_device *pdev)
                         regulators[id].n_voltages = 16;
 
                 rdev[i] = regulator_register(&regulators[id], max8997->dev,
-                                pdata->regulators[i].initdata, max8997);
+                                pdata->regulators[i].initdata, max8997, NULL);
                 if (IS_ERR(rdev[i])) {
                         ret = PTR_ERR(rdev[i]);
                         dev_err(max8997->dev, "regulator init failed for %d\n",
diff --git a/drivers/regulator/max8998.c b/drivers/regulator/max8998.c
index 41a1495eec2b..2d38c2493a07 100644
--- a/drivers/regulator/max8998.c
+++ b/drivers/regulator/max8998.c
@@ -847,7 +847,7 @@ static __devinit int max8998_pmic_probe(struct platform_device *pdev)
                         regulators[index].n_voltages = count;
                 }
                 rdev[i] = regulator_register(&regulators[index], max8998->dev,
-                                pdata->regulators[i].initdata, max8998);
+                                pdata->regulators[i].initdata, max8998, NULL);
                 if (IS_ERR(rdev[i])) {
                         ret = PTR_ERR(rdev[i]);
                         dev_err(max8998->dev, "regulator init failed\n");
diff --git a/drivers/regulator/mc13783-regulator.c b/drivers/regulator/mc13783-regulator.c
index 8479082e1aea..56d4a677c404 100644
--- a/drivers/regulator/mc13783-regulator.c
+++ b/drivers/regulator/mc13783-regulator.c
@@ -357,7 +357,7 @@ static int __devinit mc13783_regulator_probe(struct platform_device *pdev)
                 init_data = &pdata->regulators[i];
                 priv->regulators[i] = regulator_register(
                                 &mc13783_regulators[init_data->id].desc,
-                                &pdev->dev, init_data->init_data, priv);
+                                &pdev->dev, init_data->init_data, priv, NULL);
 
                 if (IS_ERR(priv->regulators[i])) {
                         dev_err(&pdev->dev, "failed to register regulator %s\n",
diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
index 023d17d022cf..2824804a2892 100644
--- a/drivers/regulator/mc13892-regulator.c
+++ b/drivers/regulator/mc13892-regulator.c
@@ -573,7 +573,7 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
                 init_data = &pdata->regulators[i];
                 priv->regulators[i] = regulator_register(
                         &mc13892_regulators[init_data->id].desc,
-                        &pdev->dev, init_data->init_data, priv);
+                        &pdev->dev, init_data->init_data, priv, NULL);
 
                 if (IS_ERR(priv->regulators[i])) {
                         dev_err(&pdev->dev, "failed to register regulator %s\n",
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
new file mode 100644
index 000000000000..acd7045d1601
--- /dev/null
+++ b/drivers/regulator/of_regulator.c
@@ -0,0 +1,83 @@
+/*
+ * OF helpers for regulator framework
+ *
+ * Copyright (C) 2011 Texas Instruments, Inc.
+ * Rajendra Nayak <rnayak@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/of.h>
+#include <linux/regulator/machine.h>
+
+static void of_get_regulation_constraints(struct device_node *np,
+                                        struct regulator_init_data **init_data)
+{
+        const __be32 *min_uV, *max_uV, *uV_offset;
+        const __be32 *min_uA, *max_uA;
+        struct regulation_constraints *constraints = &(*init_data)->constraints;
+
+        constraints->name = of_get_property(np, "regulator-name", NULL);
+
+        min_uV = of_get_property(np, "regulator-min-microvolt", NULL);
+        if (min_uV)
+                constraints->min_uV = be32_to_cpu(*min_uV);
+        max_uV = of_get_property(np, "regulator-max-microvolt", NULL);
+        if (max_uV)
+                constraints->max_uV = be32_to_cpu(*max_uV);
+
+        /* Voltage change possible? */
+        if (constraints->min_uV != constraints->max_uV)
+                constraints->valid_ops_mask |= REGULATOR_CHANGE_VOLTAGE;
+
+        uV_offset = of_get_property(np, "regulator-microvolt-offset", NULL);
+        if (uV_offset)
+                constraints->uV_offset = be32_to_cpu(*uV_offset);
+        min_uA = of_get_property(np, "regulator-min-microamp", NULL);
+        if (min_uA)
+                constraints->min_uA = be32_to_cpu(*min_uA);
+        max_uA = of_get_property(np, "regulator-max-microamp", NULL);
+        if (max_uA)
+                constraints->max_uA = be32_to_cpu(*max_uA);
+
+        /* Current change possible? */
+        if (constraints->min_uA != constraints->max_uA)
+                constraints->valid_ops_mask |= REGULATOR_CHANGE_CURRENT;
+
+        if (of_find_property(np, "regulator-boot-on", NULL))
+                constraints->boot_on = true;
+
+        if (of_find_property(np, "regulator-always-on", NULL))
+                constraints->always_on = true;
+        else /* status change should be possible if not always on. */
+                constraints->valid_ops_mask |= REGULATOR_CHANGE_STATUS;
+}
+
+/**
+ * of_get_regulator_init_data - extract regulator_init_data structure info
+ * @dev: device requesting for regulator_init_data
+ *
+ * Populates regulator_init_data structure by extracting data from device
+ * tree node, returns a pointer to the populated struture or NULL if memory
+ * alloc fails.
+ */
+struct regulator_init_data *of_get_regulator_init_data(struct device *dev)
+{
+        struct regulator_init_data *init_data;
+
+        if (!dev->of_node)
+                return NULL;
+
+        init_data = devm_kzalloc(dev, sizeof(*init_data), GFP_KERNEL);
+        if (!init_data)
+                return NULL; /* Out of memory? */
+
+        of_get_regulation_constraints(dev->of_node, &init_data);
+        return init_data;
+}
+EXPORT_SYMBOL_GPL(of_get_regulator_init_data);
diff --git a/drivers/regulator/pcap-regulator.c b/drivers/regulator/pcap-regulator.c
index 31f6e11a7f16..a5aab1b08bcf 100644
--- a/drivers/regulator/pcap-regulator.c
+++ b/drivers/regulator/pcap-regulator.c
@@ -277,7 +277,7 @@ static int __devinit pcap_regulator_probe(struct platform_device *pdev)
         void *pcap = dev_get_drvdata(pdev->dev.parent);
 
         rdev = regulator_register(&pcap_regulators[pdev->id], &pdev->dev,
-                                pdev->dev.platform_data, pcap);
+                                pdev->dev.platform_data, pcap, NULL);
         if (IS_ERR(rdev))
                 return PTR_ERR(rdev);
 
diff --git a/drivers/regulator/pcf50633-regulator.c b/drivers/regulator/pcf50633-regulator.c
index 69a11d9dd87f..1d1c31056297 100644
--- a/drivers/regulator/pcf50633-regulator.c
+++ b/drivers/regulator/pcf50633-regulator.c
@@ -320,7 +320,7 @@ static int __devinit pcf50633_regulator_probe(struct platform_device *pdev)
         pcf = dev_to_pcf50633(pdev->dev.parent);
 
         rdev = regulator_register(&regulators[pdev->id], &pdev->dev,
-                                  pdev->dev.platform_data, pcf);
+                                  pdev->dev.platform_data, pcf, NULL);
         if (IS_ERR(rdev))
                 return PTR_ERR(rdev);
 
diff --git a/drivers/regulator/tps6105x-regulator.c b/drivers/regulator/tps6105x-regulator.c
index 1011873896dc..d9278da18a9e 100644
--- a/drivers/regulator/tps6105x-regulator.c
+++ b/drivers/regulator/tps6105x-regulator.c
@@ -151,7 +151,8 @@ static int __devinit tps6105x_regulator_probe(struct platform_device *pdev)
         /* Register regulator with framework */
         tps6105x->regulator = regulator_register(&tps6105x_regulator_desc,
                                              &tps6105x->client->dev,
-                                             pdata->regulator_data, tps6105x);
+                                             pdata->regulator_data, tps6105x,
+                                             NULL);
         if (IS_ERR(tps6105x->regulator)) {
                 ret = PTR_ERR(tps6105x->regulator);
                 dev_err(&tps6105x->client->dev,
diff --git a/drivers/regulator/tps65023-regulator.c b/drivers/regulator/tps65023-regulator.c
index 9fb4c7b81753..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,
@@ -496,7 +473,7 @@ static int __devinit tps_65023_probe(struct i2c_client *client,
 
                 /* Register the regulators */
                 rdev = regulator_register(&tps->desc[i], &client->dev,
-                                          init_data, tps);
+                                          init_data, tps, NULL);
                 if (IS_ERR(rdev)) {
                         dev_err(&client->dev, "failed to register %s\n",
                                 id->name);
@@ -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/tps6507x-regulator.c b/drivers/regulator/tps6507x-regulator.c
index bdef70365f52..0b63ef71a5fe 100644
--- a/drivers/regulator/tps6507x-regulator.c
+++ b/drivers/regulator/tps6507x-regulator.c
@@ -599,7 +599,7 @@ int tps6507x_pmic_probe(struct platform_device *pdev)
                 tps->desc[i].owner = THIS_MODULE;
 
                 rdev = regulator_register(&tps->desc[i],
-                                        tps6507x_dev->dev, init_data, tps);
+                                        tps6507x_dev->dev, init_data, tps, NULL);
                 if (IS_ERR(rdev)) {
                         dev_err(tps6507x_dev->dev,
                                 "failed to register %s regulator\n",
diff --git a/drivers/regulator/tps6524x-regulator.c b/drivers/regulator/tps6524x-regulator.c
index 9166aa0a9df7..70b7b1f4f000 100644
--- a/drivers/regulator/tps6524x-regulator.c
+++ b/drivers/regulator/tps6524x-regulator.c
@@ -651,7 +651,7 @@ static int __devinit pmic_probe(struct spi_device *spi)
                         hw->desc[i].n_voltages = 1;
 
                 hw->rdev[i] = regulator_register(&hw->desc[i], dev,
-                                                 init_data, hw);
+                                                 init_data, hw, NULL);
                 if (IS_ERR(hw->rdev[i])) {
                         ret = PTR_ERR(hw->rdev[i]);
                         hw->rdev[i] = NULL;
diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c
index 14b9389dd52a..c75fb20faa57 100644
--- a/drivers/regulator/tps6586x-regulator.c
+++ b/drivers/regulator/tps6586x-regulator.c
@@ -396,7 +396,7 @@ static int __devinit tps6586x_regulator_probe(struct platform_device *pdev)
                 return err;
 
         rdev = regulator_register(&ri->desc, &pdev->dev,
-                                  pdev->dev.platform_data, ri);
+                                  pdev->dev.platform_data, ri, NULL);
         if (IS_ERR(rdev)) {
                 dev_err(&pdev->dev, "failed to register regulator %s\n",
                                 ri->desc.name);
diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c
index b552aae55b41..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 */
@@ -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;
 
@@ -965,7 +948,7 @@ static __devinit int tps65910_probe(struct platform_device *pdev)
                 pmic->desc[i].owner = THIS_MODULE;
 
                 rdev = regulator_register(&pmic->desc[i],
-                                tps65910->dev, reg_data, pmic);
+                                tps65910->dev, reg_data, pmic, NULL);
                 if (IS_ERR(rdev)) {
                         dev_err(tps65910->dev,
                                 "failed to register %s regulator\n",
diff --git a/drivers/regulator/tps65912-regulator.c b/drivers/regulator/tps65912-regulator.c
index 39d4a1749e71..da00d88f94b7 100644
--- a/drivers/regulator/tps65912-regulator.c
+++ b/drivers/regulator/tps65912-regulator.c
@@ -727,7 +727,7 @@ static __devinit int tps65912_probe(struct platform_device *pdev)
                 pmic->desc[i].owner = THIS_MODULE;
                 range = tps65912_get_range(pmic, i);
                 rdev = regulator_register(&pmic->desc[i],
-                                        tps65912->dev, reg_data, pmic);
+                                        tps65912->dev, reg_data, pmic, NULL);
                 if (IS_ERR(rdev)) {
                         dev_err(tps65912->dev,
                                 "failed to register %s regulator\n",
diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
index ee8747f4fa08..9a2e07a094b3 100644
--- a/drivers/regulator/twl-regulator.c
+++ b/drivers/regulator/twl-regulator.c
@@ -1070,7 +1070,7 @@ static int __devinit twlreg_probe(struct platform_device *pdev)
                 break;
         }
 
-        rdev = regulator_register(&info->desc, &pdev->dev, initdata, info);
+        rdev = regulator_register(&info->desc, &pdev->dev, initdata, info, NULL);
         if (IS_ERR(rdev)) {
                 dev_err(&pdev->dev, "can't register %s, %ld\n",
                                 info->desc.name, PTR_ERR(rdev));
diff --git a/drivers/regulator/userspace-consumer.c b/drivers/regulator/userspace-consumer.c
index fc6655146999..518667ef9a0d 100644
--- a/drivers/regulator/userspace-consumer.c
+++ b/drivers/regulator/userspace-consumer.c
@@ -185,18 +185,7 @@ static struct platform_driver regulator_userspace_consumer_driver = {
         },
 };
 
-
-static int __init regulator_userspace_consumer_init(void)
-{
-        return platform_driver_register(&regulator_userspace_consumer_driver);
-}
-module_init(regulator_userspace_consumer_init);
-
-static void __exit regulator_userspace_consumer_exit(void)
-{
-        platform_driver_unregister(&regulator_userspace_consumer_driver);
-}
-module_exit(regulator_userspace_consumer_exit);
+module_platform_driver(regulator_userspace_consumer_driver);
 
 MODULE_AUTHOR("Mike Rapoport <mike@compulab.co.il>");
 MODULE_DESCRIPTION("Userspace consumer for voltage and current regulators");
diff --git a/drivers/regulator/virtual.c b/drivers/regulator/virtual.c
index 858c1f861ba5..ee0b161c998f 100644
--- a/drivers/regulator/virtual.c
+++ b/drivers/regulator/virtual.c
@@ -352,17 +352,7 @@ static struct platform_driver regulator_virtual_consumer_driver = {
         },
 };
 
-static int __init regulator_virtual_consumer_init(void)
-{
-        return platform_driver_register(&regulator_virtual_consumer_driver);
-}
-module_init(regulator_virtual_consumer_init);
-
-static void __exit regulator_virtual_consumer_exit(void)
-{
-        platform_driver_unregister(&regulator_virtual_consumer_driver);
-}
-module_exit(regulator_virtual_consumer_exit);
+module_platform_driver(regulator_virtual_consumer_driver);
 
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
 MODULE_DESCRIPTION("Virtual regulator consumer");
diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c
index bd3531d8b2ac..7558a9666a50 100644
--- a/drivers/regulator/wm831x-dcdc.c
+++ b/drivers/regulator/wm831x-dcdc.c
@@ -553,7 +553,7 @@ static __devinit int wm831x_buckv_probe(struct platform_device *pdev)
                 wm831x_buckv_dvs_init(dcdc, pdata->dcdc[id]->driver_data);
 
         dcdc->regulator = regulator_register(&dcdc->desc, &pdev->dev,
-                                             pdata->dcdc[id], dcdc);
+                                             pdata->dcdc[id], dcdc, NULL);
         if (IS_ERR(dcdc->regulator)) {
                 ret = PTR_ERR(dcdc->regulator);
                 dev_err(wm831x->dev, "Failed to register DCDC%d: %d\n",
@@ -747,7 +747,7 @@ static __devinit int wm831x_buckp_probe(struct platform_device *pdev)
         dcdc->desc.owner = THIS_MODULE;
 
         dcdc->regulator = regulator_register(&dcdc->desc, &pdev->dev,
-                                             pdata->dcdc[id], dcdc);
+                                             pdata->dcdc[id], dcdc, NULL);
         if (IS_ERR(dcdc->regulator)) {
                 ret = PTR_ERR(dcdc->regulator);
                 dev_err(wm831x->dev, "Failed to register DCDC%d: %d\n",
@@ -874,7 +874,7 @@ static __devinit int wm831x_boostp_probe(struct platform_device *pdev)
         dcdc->desc.owner = THIS_MODULE;
 
         dcdc->regulator = regulator_register(&dcdc->desc, &pdev->dev,
-                                             pdata->dcdc[id], dcdc);
+                                             pdata->dcdc[id], dcdc, NULL);
         if (IS_ERR(dcdc->regulator)) {
                 ret = PTR_ERR(dcdc->regulator);
                 dev_err(wm831x->dev, "Failed to register DCDC%d: %d\n",
@@ -973,7 +973,7 @@ static __devinit int wm831x_epe_probe(struct platform_device *pdev)
         dcdc->desc.owner = THIS_MODULE;
 
         dcdc->regulator = regulator_register(&dcdc->desc, &pdev->dev,
-                                             pdata->epe[id], dcdc);
+                                             pdata->epe[id], dcdc, NULL);
         if (IS_ERR(dcdc->regulator)) {
                 ret = PTR_ERR(dcdc->regulator);
                 dev_err(wm831x->dev, "Failed to register EPE%d: %d\n",
diff --git a/drivers/regulator/wm831x-isink.c b/drivers/regulator/wm831x-isink.c
index 01f27c7f4236..d3ad3f5cff46 100644
--- a/drivers/regulator/wm831x-isink.c
+++ b/drivers/regulator/wm831x-isink.c
@@ -189,7 +189,7 @@ static __devinit int wm831x_isink_probe(struct platform_device *pdev)
         isink->desc.owner = THIS_MODULE;
 
         isink->regulator = regulator_register(&isink->desc, &pdev->dev,
-                                             pdata->isink[id], isink);
+                                             pdata->isink[id], isink, NULL);
         if (IS_ERR(isink->regulator)) {
                 ret = PTR_ERR(isink->regulator);
                 dev_err(wm831x->dev, "Failed to register ISINK%d: %d\n",
diff --git a/drivers/regulator/wm831x-ldo.c b/drivers/regulator/wm831x-ldo.c
index 6709710a059e..5e96a2386b1d 100644
--- a/drivers/regulator/wm831x-ldo.c
+++ b/drivers/regulator/wm831x-ldo.c
@@ -351,7 +351,7 @@ static __devinit int wm831x_gp_ldo_probe(struct platform_device *pdev)
         ldo->desc.owner = THIS_MODULE;
 
         ldo->regulator = regulator_register(&ldo->desc, &pdev->dev,
-                                             pdata->ldo[id], ldo);
+                                             pdata->ldo[id], ldo, NULL);
         if (IS_ERR(ldo->regulator)) {
                 ret = PTR_ERR(ldo->regulator);
                 dev_err(wm831x->dev, "Failed to register LDO%d: %d\n",
@@ -621,7 +621,7 @@ static __devinit int wm831x_aldo_probe(struct platform_device *pdev)
         ldo->desc.owner = THIS_MODULE;
 
         ldo->regulator = regulator_register(&ldo->desc, &pdev->dev,
-                                             pdata->ldo[id], ldo);
+                                             pdata->ldo[id], ldo, NULL);
         if (IS_ERR(ldo->regulator)) {
                 ret = PTR_ERR(ldo->regulator);
                 dev_err(wm831x->dev, "Failed to register LDO%d: %d\n",
@@ -818,7 +818,7 @@ static __devinit int wm831x_alive_ldo_probe(struct platform_device *pdev)
         ldo->desc.owner = THIS_MODULE;
 
         ldo->regulator = regulator_register(&ldo->desc, &pdev->dev,
-                                             pdata->ldo[id], ldo);
+                                             pdata->ldo[id], ldo, NULL);
         if (IS_ERR(ldo->regulator)) {
                 ret = PTR_ERR(ldo->regulator);
                 dev_err(wm831x->dev, "Failed to register LDO%d: %d\n",
diff --git a/drivers/regulator/wm8350-regulator.c b/drivers/regulator/wm8350-regulator.c
index 1bcb22c44095..6894009d815a 100644
--- a/drivers/regulator/wm8350-regulator.c
+++ b/drivers/regulator/wm8350-regulator.c
@@ -1428,7 +1428,7 @@ static int wm8350_regulator_probe(struct platform_device *pdev)
         /* register regulator */
         rdev = regulator_register(&wm8350_reg[pdev->id], &pdev->dev,
                                   pdev->dev.platform_data,
-                                  dev_get_drvdata(&pdev->dev));
+                                  dev_get_drvdata(&pdev->dev), NULL);
         if (IS_ERR(rdev)) {
                 dev_err(&pdev->dev, "failed to register %s\n",
                         wm8350_reg[pdev->id].name);
diff --git a/drivers/regulator/wm8400-regulator.c b/drivers/regulator/wm8400-regulator.c
index 71632ddc3781..706f39563a7b 100644
--- a/drivers/regulator/wm8400-regulator.c
+++ b/drivers/regulator/wm8400-regulator.c
@@ -326,7 +326,7 @@ static int __devinit wm8400_regulator_probe(struct platform_device *pdev)
         struct regulator_dev *rdev;
 
         rdev = regulator_register(&regulators[pdev->id], &pdev->dev,
-                                  pdev->dev.platform_data, wm8400);
+                                  pdev->dev.platform_data, wm8400, NULL);
 
         if (IS_ERR(rdev))
                 return PTR_ERR(rdev);
diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c
index b87bf5c841f8..435e335d6e67 100644
--- a/drivers/regulator/wm8994-regulator.c
+++ b/drivers/regulator/wm8994-regulator.c
@@ -269,7 +269,7 @@ static __devinit int wm8994_ldo_probe(struct platform_device *pdev)
                 ldo->is_enabled = true;
 
         ldo->regulator = regulator_register(&wm8994_ldo_desc[id], &pdev->dev,
-                                             pdata->ldo[id].init_data, ldo);
+                                             pdata->ldo[id].init_data, ldo, NULL);
         if (IS_ERR(ldo->regulator)) {
                 ret = PTR_ERR(ldo->regulator);
                 dev_err(wm8994->dev, "Failed to register LDO%d: %d\n",