Merge tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

Pull MFD changes from Samuel Ortiz:
 "MFD bits for the 3.7 merge window.

  As usual we have a few new drivers:

   - TI LP8788
   - TI OMAP USB TLL
   - Maxim MAX8907
   - SMSC ECE1099
   - Dialog Semiconductor DA9055
   - A simpler syscon driver that allow us to get rid of the anatop one.

  Drivers are also gradually getting Device Tree and IRQ domain support.

  The following drivers got DT support:
   - palmas, 88pm860x, tc3589x and twl4030-audio

  And those ones now use the IRQ domain APIs:
   - 88pm860x, tc3589x, db8500_prcmu

  Also some other interesting changes:
   - Intel's ICH LPC now supports Lynx Point
   - TI's twl4030-audio added a GPO child
   - tps6527 enabled its backlight subdevice
   - The twl6030 pwm driver moved to the new PWM subsystem

  And finally a bunch of cleanup and casual fixes for mc13xxx, 88pm860x,
  palmas, ab8500, wm8994, wm5110, max8907 and the tps65xxx family."

Fix up various annoying conflicts: the DT and IRQ domain support came in
twice and was already in 3.6. And then it was apparently rebased.

Guys, DON'T REBASE!

* tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (89 commits)
  ARM: dts: Enable 88pm860x pmic
  mfd: 88pm860x: Move gpadc init into touch
  mfd: 88pm860x: Device tree support
  mfd: 88pm860x: Use irqdomain
  mfd: smsc: Add support for smsc gpio io/keypad driver
  backlight: tps65217_bl: Add missing platform_set_drvdata in tps65217_bl_probe
  mfd: DA9055 core driver
  mfd: tps65910: Add alarm interrupt of TPS65910 RTC to mfd device list
  mfd: wm5110: Add register patches for revision B
  mfd: wm5110: Disable control interface error report for WM5110 rev B
  mfd: max8907: Remove regulator-compatible from DT docs
  backlight: Add TPS65217 WLED driver
  mfd: Add backlight as subdevice to the tps65217
  mfd: Provide the PRCMU with its own IRQ domain
  mfd: Fix max8907 sparse warning
  mfd: Add lp8788 mfd driver
  mfd: dbx500: Provide a more accurate smp_twd clock
  mfd: rc5t583: Fix warning messages
  regulator: palmas: Add DT support
  mfd: palmas: Change regulator defns to better suite DT
  ...

9 files changed, 293 insertions, 67 deletions

diff --git a/drivers/regulator/88pm8607.c b/drivers/regulator/88pm8607.c
index c3482b954cb7..1c5ab0172ea2 100644
--- a/drivers/regulator/88pm8607.c
+++ b/drivers/regulator/88pm8607.c
@@ -12,6 +12,8 @@
 #include <linux/init.h>
 #include <linux/err.h>
 #include <linux/i2c.h>
+#include <linux/of.h>
+#include <linux/regulator/of_regulator.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
@@ -23,6 +25,7 @@ struct pm8607_regulator_info {
         struct pm860x_chip      *chip;
         struct regulator_dev    *regulator;
         struct i2c_client       *i2c;
+        struct i2c_client       *i2c_8606;
 
         unsigned int    *vol_table;
         unsigned int    *vol_suspend;
@@ -242,6 +245,35 @@ static int pm8607_set_voltage_sel(struct regulator_dev *rdev, unsigned selector)
         return ret;
 }
 
+static int pm8606_preg_enable(struct regulator_dev *rdev)
+{
+        struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
+
+        return pm860x_set_bits(info->i2c, rdev->desc->enable_reg,
+                               1 << rdev->desc->enable_mask, 0);
+}
+
+static int pm8606_preg_disable(struct regulator_dev *rdev)
+{
+        struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
+
+        return pm860x_set_bits(info->i2c, rdev->desc->enable_reg,
+                               1 << rdev->desc->enable_mask,
+                               1 << rdev->desc->enable_mask);
+}
+
+static int pm8606_preg_is_enabled(struct regulator_dev *rdev)
+{
+        struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
+        int ret;
+
+        ret = pm860x_reg_read(info->i2c, rdev->desc->enable_reg);
+        if (ret < 0)
+                return ret;
+
+        return !((unsigned char)ret & (1 << rdev->desc->enable_mask));
+}
+
 static struct regulator_ops pm8607_regulator_ops = {
         .list_voltage   = pm8607_list_voltage,
         .set_voltage_sel = pm8607_set_voltage_sel,
@@ -251,6 +283,25 @@ static struct regulator_ops pm8607_regulator_ops = {
         .is_enabled = regulator_is_enabled_regmap,
 };
 
+static struct regulator_ops pm8606_preg_ops = {
+        .enable         = pm8606_preg_enable,
+        .disable        = pm8606_preg_disable,
+        .is_enabled     = pm8606_preg_is_enabled,
+};
+
+#define PM8606_PREG(ereg, ebit)                                         \
+{                                                                       \
+        .desc   = {                                                     \
+                .name   = "PREG",                                       \
+                .ops    = &pm8606_preg_ops,                             \
+                .type   = REGULATOR_CURRENT,                            \
+                .id     = PM8606_ID_PREG,                               \
+                .owner  = THIS_MODULE,                                  \
+                .enable_reg = PM8606_##ereg,                            \
+                .enable_mask = (ebit),                                  \
+        },                                                              \
+}
+
 #define PM8607_DVC(vreg, ureg, ubit, ereg, ebit)                        \
 {                                                                       \
         .desc   = {                                                     \
@@ -311,6 +362,38 @@ static struct pm8607_regulator_info pm8607_regulator_info[] = {
         PM8607_LDO(14,        LDO14, 0, SUPPLIES_EN12, 6),
 };
 
+static struct pm8607_regulator_info pm8606_regulator_info[] = {
+        PM8606_PREG(PREREGULATORB, 5),
+};
+
+#ifdef CONFIG_OF
+static int pm8607_regulator_dt_init(struct platform_device *pdev,
+                                    struct pm8607_regulator_info *info,
+                                    struct regulator_config *config)
+{
+        struct device_node *nproot, *np;
+        nproot = pdev->dev.parent->of_node;
+        if (!nproot)
+                return -ENODEV;
+        nproot = of_find_node_by_name(nproot, "regulators");
+        if (!nproot) {
+                dev_err(&pdev->dev, "failed to find regulators node\n");
+                return -ENODEV;
+        }
+        for_each_child_of_node(nproot, np) {
+                if (!of_node_cmp(np->name, info->desc.name)) {
+                        config->init_data =
+                                of_get_regulator_init_data(&pdev->dev, np);
+                        config->of_node = np;
+                        break;
+                }
+        }
+        return 0;
+}
+#else
+#define pm8607_regulator_dt_init(x, y, z)       (-1)
+#endif
+
 static int __devinit pm8607_regulator_probe(struct platform_device *pdev)
 {
         struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);
@@ -320,22 +403,28 @@ static int __devinit pm8607_regulator_probe(struct platform_device *pdev)
         struct resource *res;
         int i;
 
-        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
-        if (res == NULL) {
-                dev_err(&pdev->dev, "No I/O resource!\n");
-                return -EINVAL;
-        }
-        for (i = 0; i < ARRAY_SIZE(pm8607_regulator_info); i++) {
-                info = &pm8607_regulator_info[i];
-                if (info->desc.id == res->start)
-                        break;
-        }
-        if (i == ARRAY_SIZE(pm8607_regulator_info)) {
-                dev_err(&pdev->dev, "Failed to find regulator %llu\n",
-                        (unsigned long long)res->start);
-                return -EINVAL;
+        res = platform_get_resource(pdev, IORESOURCE_REG, 0);
+        if (res) {
+                /* There're resources in 88PM8607 regulator driver */
+                for (i = 0; i < ARRAY_SIZE(pm8607_regulator_info); i++) {
+                        info = &pm8607_regulator_info[i];
+                        if (info->desc.vsel_reg == res->start)
+                                break;
+                }
+                if (i == ARRAY_SIZE(pm8607_regulator_info)) {
+                        dev_err(&pdev->dev, "Failed to find regulator %llu\n",
+                                (unsigned long long)res->start);
+                        return -EINVAL;
+                }
+        } else {
+                /* There's no resource in 88PM8606 PREG regulator driver */
+                info = &pm8606_regulator_info[0];
+                /* i is used to check regulator ID */
+                i = -1;
         }
         info->i2c = (chip->id == CHIP_PM8607) ? chip->client : chip->companion;
+        info->i2c_8606 = (chip->id == CHIP_PM8607) ? chip->companion :
+                        chip->client;
         info->chip = chip;
 
         /* check DVC ramp slope double */
@@ -343,15 +432,17 @@ static int __devinit pm8607_regulator_probe(struct platform_device *pdev)
                 info->slope_double = 1;
 
         config.dev = &pdev->dev;
-        config.init_data = pdata;
         config.driver_data = info;
 
+        if (pm8607_regulator_dt_init(pdev, info, &config))
+                if (pdata)
+                        config.init_data = pdata;
+
         if (chip->id == CHIP_PM8607)
                 config.regmap = chip->regmap;
         else
                 config.regmap = chip->regmap_companion;
 
-        /* replace driver_data with info */
         info->regulator = regulator_register(&info->desc, &config);
         if (IS_ERR(info->regulator)) {
                 dev_err(&pdev->dev, "failed to register regulator %s\n",
@@ -372,6 +463,18 @@ static int __devexit pm8607_regulator_remove(struct platform_device *pdev)
         return 0;
 }
 
+static struct platform_device_id pm8607_regulator_driver_ids[] = {
+        {
+                .name   = "88pm860x-regulator",
+                .driver_data    = 0,
+        }, {
+                .name   = "88pm860x-preg",
+                .driver_data    = 0,
+        },
+        { },
+};
+MODULE_DEVICE_TABLE(platform, pm8607_regulator_driver_ids);
+
 static struct platform_driver pm8607_regulator_driver = {
         .driver         = {
                 .name   = "88pm860x-regulator",
@@ -379,6 +482,7 @@ static struct platform_driver pm8607_regulator_driver = {
         },
         .probe          = pm8607_regulator_probe,
         .remove         = __devexit_p(pm8607_regulator_remove),
+        .id_table       = pm8607_regulator_driver_ids,
 };
 
 static int __init pm8607_regulator_init(void)
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index e98a5e7827df..67d47b59a66d 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -122,7 +122,7 @@ config REGULATOR_FAN53555
 
 config REGULATOR_ANATOP
         tristate "Freescale i.MX on-chip ANATOP LDO regulators"
-        depends on MFD_ANATOP
+        depends on MFD_SYSCON
         help
           Say y here to support Freescale i.MX on-chip ANATOP LDOs
           regulators. It is recommended that this option be
diff --git a/drivers/regulator/ab3100.c b/drivers/regulator/ab3100.c
index 65ad2b36ce36..df4ad8927f0c 100644
--- a/drivers/regulator/ab3100.c
+++ b/drivers/regulator/ab3100.c
@@ -15,6 +15,7 @@
 #include <linux/err.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
+#include <linux/mfd/ab3100.h>
 #include <linux/mfd/abx500.h>
 
 /* LDO registers and some handy masking definitions for AB3100 */
diff --git a/drivers/regulator/anatop-regulator.c b/drivers/regulator/anatop-regulator.c
index ce0fe72a428e..1af97686f444 100644
--- a/drivers/regulator/anatop-regulator.c
+++ b/drivers/regulator/anatop-regulator.c
@@ -21,19 +21,20 @@
 #include <linux/slab.h>
 #include <linux/device.h>
 #include <linux/module.h>
+#include <linux/mfd/syscon.h>
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/platform_device.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
-#include <linux/mfd/anatop.h>
+#include <linux/regmap.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/of_regulator.h>
 
 struct anatop_regulator {
         const char *name;
         u32 control_reg;
-        struct anatop *mfd;
+        struct regmap *anatop;
         int vol_bit_shift;
         int vol_bit_width;
         int min_bit_val;
@@ -43,7 +44,8 @@ struct anatop_regulator {
         struct regulator_init_data *initdata;
 };
 
-static int anatop_set_voltage_sel(struct regulator_dev *reg, unsigned selector)
+static int anatop_regmap_set_voltage_sel(struct regulator_dev *reg,
+                                        unsigned selector)
 {
         struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);
         u32 val, mask;
@@ -56,12 +58,13 @@ static int anatop_set_voltage_sel(struct regulator_dev *reg, unsigned selector)
         mask = ((1 << anatop_reg->vol_bit_width) - 1) <<
                 anatop_reg->vol_bit_shift;
         val <<= anatop_reg->vol_bit_shift;
-        anatop_write_reg(anatop_reg->mfd, anatop_reg->control_reg, val, mask);
+        regmap_update_bits(anatop_reg->anatop, anatop_reg->control_reg,
+                                mask, val);
 
         return 0;
 }
 
-static int anatop_get_voltage_sel(struct regulator_dev *reg)
+static int anatop_regmap_get_voltage_sel(struct regulator_dev *reg)
 {
         struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);
         u32 val, mask;
@@ -69,7 +72,7 @@ static int anatop_get_voltage_sel(struct regulator_dev *reg)
         if (!anatop_reg->control_reg)
                 return -ENOTSUPP;
 
-        val = anatop_read_reg(anatop_reg->mfd, anatop_reg->control_reg);
+        regmap_read(anatop_reg->anatop, anatop_reg->control_reg, &val);
         mask = ((1 << anatop_reg->vol_bit_width) - 1) <<
                 anatop_reg->vol_bit_shift;
         val = (val & mask) >> anatop_reg->vol_bit_shift;
@@ -78,8 +81,8 @@ static int anatop_get_voltage_sel(struct regulator_dev *reg)
 }
 
 static struct regulator_ops anatop_rops = {
-        .set_voltage_sel = anatop_set_voltage_sel,
-        .get_voltage_sel = anatop_get_voltage_sel,
+        .set_voltage_sel = anatop_regmap_set_voltage_sel,
+        .get_voltage_sel = anatop_regmap_get_voltage_sel,
         .list_voltage = regulator_list_voltage_linear,
         .map_voltage = regulator_map_voltage_linear,
 };
@@ -88,11 +91,11 @@ static int __devinit anatop_regulator_probe(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
         struct device_node *np = dev->of_node;
+        struct device_node *anatop_np;
         struct regulator_desc *rdesc;
         struct regulator_dev *rdev;
         struct anatop_regulator *sreg;
         struct regulator_init_data *initdata;
-        struct anatop *anatopmfd = dev_get_drvdata(pdev->dev.parent);
         struct regulator_config config = { };
         int ret = 0;
 
@@ -109,7 +112,15 @@ static int __devinit anatop_regulator_probe(struct platform_device *pdev)
         rdesc->ops = &anatop_rops;
         rdesc->type = REGULATOR_VOLTAGE;
         rdesc->owner = THIS_MODULE;
-        sreg->mfd = anatopmfd;
+
+        anatop_np = of_get_parent(np);
+        if (!anatop_np)
+                return -ENODEV;
+        sreg->anatop = syscon_node_to_regmap(anatop_np);
+        of_node_put(anatop_np);
+        if (IS_ERR(sreg->anatop))
+                return PTR_ERR(sreg->anatop);
+
         ret = of_property_read_u32(np, "anatop-reg-offset",
                                    &sreg->control_reg);
         if (ret) {
diff --git a/drivers/regulator/max8925-regulator.c b/drivers/regulator/max8925-regulator.c
index 43dc97ec3932..9bb0be37495f 100644
--- a/drivers/regulator/max8925-regulator.c
+++ b/drivers/regulator/max8925-regulator.c
@@ -214,37 +214,36 @@ static struct max8925_regulator_info max8925_regulator_info[] = {
         MAX8925_LDO(20, 750, 3900, 50),
 };
 
-static struct max8925_regulator_info * __devinit find_regulator_info(int id)
-{
-        struct max8925_regulator_info *ri;
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(max8925_regulator_info); i++) {
-                ri = &max8925_regulator_info[i];
-                if (ri->desc.id == id)
-                        return ri;
-        }
-        return NULL;
-}
-
 static int __devinit max8925_regulator_probe(struct platform_device *pdev)
 {
         struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
-        struct max8925_platform_data *pdata = chip->dev->platform_data;
+        struct regulator_init_data *pdata = pdev->dev.platform_data;
         struct regulator_config config = { };
         struct max8925_regulator_info *ri;
+        struct resource *res;
         struct regulator_dev *rdev;
+        int i;
 
-        ri = find_regulator_info(pdev->id);
-        if (ri == NULL) {
-                dev_err(&pdev->dev, "invalid regulator ID specified\n");
+        res = platform_get_resource(pdev, IORESOURCE_REG, 0);
+        if (!res) {
+                dev_err(&pdev->dev, "No REG resource!\n");
+                return -EINVAL;
+        }
+        for (i = 0; i < ARRAY_SIZE(max8925_regulator_info); i++) {
+                ri = &max8925_regulator_info[i];
+                if (ri->vol_reg == res->start)
+                        break;
+        }
+        if (i == ARRAY_SIZE(max8925_regulator_info)) {
+                dev_err(&pdev->dev, "Failed to find regulator %llu\n",
+                        (unsigned long long)res->start);
                 return -EINVAL;
         }
         ri->i2c = chip->i2c;
         ri->chip = chip;
 
         config.dev = &pdev->dev;
-        config.init_data = pdata->regulator[pdev->id];
+        config.init_data = pdata;
         config.driver_data = ri;
 
         rdev = regulator_register(&ri->desc, &config);
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c
index 2ba7502fa3b2..07aee694ba92 100644
--- a/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@ -22,6 +22,9 @@
 #include <linux/slab.h>
 #include <linux/regmap.h>
 #include <linux/mfd/palmas.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
+#include <linux/regulator/of_regulator.h>
 
 struct regs_info {
         char    *name;
@@ -568,10 +571,103 @@ static int palmas_ldo_init(struct palmas *palmas, int id,
         return 0;
 }
 
+static struct of_regulator_match palmas_matches[] = {
+        { .name = "smps12", },
+        { .name = "smps123", },
+        { .name = "smps3", },
+        { .name = "smps45", },
+        { .name = "smps457", },
+        { .name = "smps6", },
+        { .name = "smps7", },
+        { .name = "smps8", },
+        { .name = "smps9", },
+        { .name = "smps10", },
+        { .name = "ldo1", },
+        { .name = "ldo2", },
+        { .name = "ldo3", },
+        { .name = "ldo4", },
+        { .name = "ldo5", },
+        { .name = "ldo6", },
+        { .name = "ldo7", },
+        { .name = "ldo8", },
+        { .name = "ldo9", },
+        { .name = "ldoln", },
+        { .name = "ldousb", },
+};
+
+static void __devinit palmas_dt_to_pdata(struct device *dev,
+                struct device_node *node,
+                struct palmas_pmic_platform_data *pdata)
+{
+        struct device_node *regulators;
+        u32 prop;
+        int idx, ret;
+
+        regulators = of_find_node_by_name(node, "regulators");
+        if (!regulators) {
+                dev_info(dev, "regulator node not found\n");
+                return;
+        }
+
+        ret = of_regulator_match(dev, regulators, palmas_matches,
+                        PALMAS_NUM_REGS);
+        if (ret < 0) {
+                dev_err(dev, "Error parsing regulator init data: %d\n", ret);
+                return;
+        }
+
+        for (idx = 0; idx < PALMAS_NUM_REGS; idx++) {
+                if (!palmas_matches[idx].init_data ||
+                                !palmas_matches[idx].of_node)
+                        continue;
+
+                pdata->reg_data[idx] = palmas_matches[idx].init_data;
+
+                pdata->reg_init[idx] = devm_kzalloc(dev,
+                                sizeof(struct palmas_reg_init), GFP_KERNEL);
+
+                ret = of_property_read_u32(palmas_matches[idx].of_node,
+                                "ti,warm_reset", &prop);
+                if (!ret)
+                        pdata->reg_init[idx]->warm_reset = prop;
+
+                ret = of_property_read_u32(palmas_matches[idx].of_node,
+                                "ti,roof_floor", &prop);
+                if (!ret)
+                        pdata->reg_init[idx]->roof_floor = prop;
+
+                ret = of_property_read_u32(palmas_matches[idx].of_node,
+                                "ti,mode_sleep", &prop);
+                if (!ret)
+                        pdata->reg_init[idx]->mode_sleep = prop;
+
+                ret = of_property_read_u32(palmas_matches[idx].of_node,
+                                "ti,warm_reset", &prop);
+                if (!ret)
+                        pdata->reg_init[idx]->warm_reset = prop;
+
+                ret = of_property_read_u32(palmas_matches[idx].of_node,
+                                "ti,tstep", &prop);
+                if (!ret)
+                        pdata->reg_init[idx]->tstep = prop;
+
+                ret = of_property_read_u32(palmas_matches[idx].of_node,
+                                "ti,vsel", &prop);
+                if (!ret)
+                        pdata->reg_init[idx]->vsel = prop;
+        }
+
+        ret = of_property_read_u32(node, "ti,ldo6_vibrator", &prop);
+        if (!ret)
+                pdata->ldo6_vibrator = prop;
+}
+
+
 static __devinit int palmas_probe(struct platform_device *pdev)
 {
         struct palmas *palmas = dev_get_drvdata(pdev->dev.parent);
         struct palmas_pmic_platform_data *pdata = pdev->dev.platform_data;
+        struct device_node *node = pdev->dev.of_node;
         struct regulator_dev *rdev;
         struct regulator_config config = { };
         struct palmas_pmic *pmic;
@@ -579,10 +675,14 @@ static __devinit int palmas_probe(struct platform_device *pdev)
         int id = 0, ret;
         unsigned int addr, reg;
 
-        if (!pdata)
-                return -EINVAL;
-        if (!pdata->reg_data)
-                return -EINVAL;
+        if (node && !pdata) {
+                pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
+
+                if (!pdata)
+                        return -ENOMEM;
+
+                palmas_dt_to_pdata(&pdev->dev, node, pdata);
+        }
 
         pmic = devm_kzalloc(&pdev->dev, sizeof(*pmic), GFP_KERNEL);
         if (!pmic)
@@ -661,7 +761,7 @@ static __devinit int palmas_probe(struct platform_device *pdev)
                 pmic->desc[id].owner = THIS_MODULE;
 
                 /* Initialise sleep/init values from platform data */
-                if (pdata && pdata->reg_init) {
+                if (pdata) {
                         reg_init = pdata->reg_init[id];
                         if (reg_init) {
                                 ret = palmas_smps_init(palmas, id, reg_init);
@@ -685,11 +785,13 @@ static __devinit int palmas_probe(struct platform_device *pdev)
                                 pmic->range[id] = 1;
                 }
 
-                if (pdata && pdata->reg_data)
+                if (pdata)
                         config.init_data = pdata->reg_data[id];
                 else
                         config.init_data = NULL;
 
+                config.of_node = palmas_matches[id].of_node;
+
                 rdev = regulator_register(&pmic->desc[id], &config);
                 if (IS_ERR(rdev)) {
                         dev_err(&pdev->dev,
@@ -726,11 +828,13 @@ static __devinit int palmas_probe(struct platform_device *pdev)
                                                 palmas_regs_info[id].ctrl_addr);
                 pmic->desc[id].enable_mask = PALMAS_LDO1_CTRL_MODE_ACTIVE;
 
-                if (pdata && pdata->reg_data)
+                if (pdata)
                         config.init_data = pdata->reg_data[id];
                 else
                         config.init_data = NULL;
 
+                config.of_node = palmas_matches[id].of_node;
+
                 rdev = regulator_register(&pmic->desc[id], &config);
                 if (IS_ERR(rdev)) {
                         dev_err(&pdev->dev,
@@ -744,7 +848,7 @@ static __devinit int palmas_probe(struct platform_device *pdev)
                 pmic->rdev[id] = rdev;
 
                 /* Initialise sleep/init values from platform data */
-                if (pdata->reg_init) {
+                if (pdata) {
                         reg_init = pdata->reg_init[id];
                         if (reg_init) {
                                 ret = palmas_ldo_init(palmas, id, reg_init);
@@ -774,9 +878,15 @@ static int __devexit palmas_remove(struct platform_device *pdev)
         return 0;
 }
 
+static struct of_device_id __devinitdata of_palmas_match_tbl[] = {
+        { .compatible = "ti,palmas-pmic", },
+        { /* end */ }
+};
+
 static struct platform_driver palmas_driver = {
         .driver = {
                 .name = "palmas-pmic",
+                .of_match_table = of_palmas_match_tbl,
                 .owner = THIS_MODULE,
         },
         .probe = palmas_probe,
@@ -799,3 +909,4 @@ MODULE_AUTHOR("Graeme Gregory <gg@slimlogic.co.uk>");
 MODULE_DESCRIPTION("Palmas voltage regulator driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:palmas-pmic");
+MODULE_DEVICE_TABLE(of, of_palmas_match_tbl);
diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c
index 90cbcc683704..782c228a19bd 100644
--- a/drivers/regulator/wm831x-dcdc.c
+++ b/drivers/regulator/wm831x-dcdc.c
@@ -475,9 +475,9 @@ static __devinit int wm831x_buckv_probe(struct platform_device *pdev)
 
         dcdc->wm831x = wm831x;
 
-        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        res = platform_get_resource(pdev, IORESOURCE_REG, 0);
         if (res == NULL) {
-                dev_err(&pdev->dev, "No I/O resource\n");
+                dev_err(&pdev->dev, "No REG resource\n");
                 ret = -EINVAL;
                 goto err;
         }
@@ -650,9 +650,9 @@ static __devinit int wm831x_buckp_probe(struct platform_device *pdev)
 
         dcdc->wm831x = wm831x;
 
-        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        res = platform_get_resource(pdev, IORESOURCE_REG, 0);
         if (res == NULL) {
-                dev_err(&pdev->dev, "No I/O resource\n");
+                dev_err(&pdev->dev, "No REG resource\n");
                 ret = -EINVAL;
                 goto err;
         }
@@ -794,9 +794,9 @@ static __devinit int wm831x_boostp_probe(struct platform_device *pdev)
 
         dcdc->wm831x = wm831x;
 
-        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        res = platform_get_resource(pdev, IORESOURCE_REG, 0);
         if (res == NULL) {
-                dev_err(&pdev->dev, "No I/O resource\n");
+                dev_err(&pdev->dev, "No REG resource\n");
                 ret = -EINVAL;
                 goto err;
         }
diff --git a/drivers/regulator/wm831x-isink.c b/drivers/regulator/wm831x-isink.c
index 0d207c297714..2646a1902b33 100644
--- a/drivers/regulator/wm831x-isink.c
+++ b/drivers/regulator/wm831x-isink.c
@@ -172,9 +172,9 @@ static __devinit int wm831x_isink_probe(struct platform_device *pdev)
 
         isink->wm831x = wm831x;
 
-        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        res = platform_get_resource(pdev, IORESOURCE_REG, 0);
         if (res == NULL) {
-                dev_err(&pdev->dev, "No I/O resource\n");
+                dev_err(&pdev->dev, "No REG resource\n");
                 ret = -EINVAL;
                 goto err;
         }
diff --git a/drivers/regulator/wm831x-ldo.c b/drivers/regulator/wm831x-ldo.c
index 9af512672be1..c2dc03993dc7 100644
--- a/drivers/regulator/wm831x-ldo.c
+++ b/drivers/regulator/wm831x-ldo.c
@@ -273,9 +273,9 @@ static __devinit int wm831x_gp_ldo_probe(struct platform_device *pdev)
 
         ldo->wm831x = wm831x;
 
-        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        res = platform_get_resource(pdev, IORESOURCE_REG, 0);
         if (res == NULL) {
-                dev_err(&pdev->dev, "No I/O resource\n");
+                dev_err(&pdev->dev, "No REG resource\n");
                 ret = -EINVAL;
                 goto err;
         }
@@ -530,9 +530,9 @@ static __devinit int wm831x_aldo_probe(struct platform_device *pdev)
 
         ldo->wm831x = wm831x;
 
-        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        res = platform_get_resource(pdev, IORESOURCE_REG, 0);
         if (res == NULL) {
-                dev_err(&pdev->dev, "No I/O resource\n");
+                dev_err(&pdev->dev, "No REG resource\n");
                 ret = -EINVAL;
                 goto err;
         }
@@ -687,9 +687,9 @@ static __devinit int wm831x_alive_ldo_probe(struct platform_device *pdev)
 
         ldo->wm831x = wm831x;
 
-        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        res = platform_get_resource(pdev, IORESOURCE_REG, 0);
         if (res == NULL) {
-                dev_err(&pdev->dev, "No I/O resource\n");
+                dev_err(&pdev->dev, "No REG resource\n");
                 ret = -EINVAL;
                 goto err;
         }