regulator: remove use of __devexit_p
[linux-3.10.git] / drivers / regulator / da9052-regulator.c
index 3767364..9caa6e6 100644 (file)
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
+#ifdef CONFIG_OF
+#include <linux/of.h>
+#include <linux/regulator/of_regulator.h>
+#endif
 
 #include <linux/mfd/da9052/da9052.h>
 #include <linux/mfd/da9052/reg.h>
 #define DA9052_BUCK_ILIM_MASK_EVEN     0x0c
 #define DA9052_BUCK_ILIM_MASK_ODD      0xc0
 
+/* DA9052 REGULATOR IDs */
+#define DA9052_ID_BUCK1                0
+#define DA9052_ID_BUCK2                1
+#define DA9052_ID_BUCK3                2
+#define DA9052_ID_BUCK4                3
+#define DA9052_ID_LDO1         4
+#define DA9052_ID_LDO2         5
+#define DA9052_ID_LDO3         6
+#define DA9052_ID_LDO4         7
+#define DA9052_ID_LDO5         8
+#define DA9052_ID_LDO6         9
+#define DA9052_ID_LDO7         10
+#define DA9052_ID_LDO8         11
+#define DA9052_ID_LDO9         12
+#define DA9052_ID_LDO10                13
+
 static const u32 da9052_current_limits[3][4] = {
        {700000, 800000, 1000000, 1200000},     /* DA9052-BC BUCKs */
        {1600000, 2000000, 2400000, 3000000},   /* DA9053-AA/Bx BUCK-CORE */
@@ -50,8 +70,6 @@ struct da9052_regulator_info {
        int step_uV;
        int min_uV;
        int max_uV;
-       unsigned char volt_shift;
-       unsigned char en_bit;
        unsigned char activate_bit;
 };
 
@@ -70,42 +88,6 @@ static int verify_range(struct da9052_regulator_info *info,
        return 0;
 }
 
-static int da9052_regulator_enable(struct regulator_dev *rdev)
-{
-       struct da9052_regulator *regulator = rdev_get_drvdata(rdev);
-       struct da9052_regulator_info *info = regulator->info;
-       int offset = rdev_get_id(rdev);
-
-       return da9052_reg_update(regulator->da9052,
-                                DA9052_BUCKCORE_REG + offset,
-                                1 << info->en_bit, 1 << info->en_bit);
-}
-
-static int da9052_regulator_disable(struct regulator_dev *rdev)
-{
-       struct da9052_regulator *regulator = rdev_get_drvdata(rdev);
-       struct da9052_regulator_info *info = regulator->info;
-       int offset = rdev_get_id(rdev);
-
-       return da9052_reg_update(regulator->da9052,
-                                DA9052_BUCKCORE_REG + offset,
-                                1 << info->en_bit, 0);
-}
-
-static int da9052_regulator_is_enabled(struct regulator_dev *rdev)
-{
-       struct da9052_regulator *regulator = rdev_get_drvdata(rdev);
-       struct da9052_regulator_info *info = regulator->info;
-       int offset = rdev_get_id(rdev);
-       int ret;
-
-       ret = da9052_reg_read(regulator->da9052, DA9052_BUCKCORE_REG + offset);
-       if (ret < 0)
-               return ret;
-
-       return ret & (1 << info->en_bit);
-}
-
 static int da9052_dcdc_get_current_limit(struct regulator_dev *rdev)
 {
        struct da9052_regulator *regulator = rdev_get_drvdata(rdev);
@@ -151,8 +133,8 @@ static int da9052_dcdc_set_current_limit(struct regulator_dev *rdev, int min_uA,
            max_uA < da9052_current_limits[row][DA9052_MIN_UA])
                return -EINVAL;
 
-       for (i = 0; i < DA9052_CURRENT_RANGE; i++) {
-               if (min_uA <= da9052_current_limits[row][i]) {
+       for (i = DA9052_CURRENT_RANGE - 1; i >= 0; i--) {
+               if (da9052_current_limits[row][i] <= max_uA) {
                        reg_val = i;
                        break;
                }
@@ -173,36 +155,23 @@ static int da9052_dcdc_set_current_limit(struct regulator_dev *rdev, int min_uA,
                                         reg_val << 6);
 }
 
-static int da9052_list_buckperi_voltage(struct regulator_dev *rdev,
-                                        unsigned int selector)
-{
-       struct da9052_regulator *regulator = rdev_get_drvdata(rdev);
-       struct da9052_regulator_info *info = regulator->info;
-       int volt_uV;
-
-       if ((regulator->da9052->chip_id == DA9052) &&
-           (selector >= DA9052_BUCK_PERI_REG_MAP_UPTO_3uV)) {
-               volt_uV = ((DA9052_BUCK_PERI_REG_MAP_UPTO_3uV * info->step_uV)
-                           + info->min_uV);
-               volt_uV += (selector - DA9052_BUCK_PERI_REG_MAP_UPTO_3uV)
-                           * (DA9052_BUCK_PERI_3uV_STEP);
-       } else
-                       volt_uV = (selector * info->step_uV) + info->min_uV;
-
-       if (volt_uV > info->max_uV)
-               return -EINVAL;
-
-       return volt_uV;
-}
-
 static int da9052_list_voltage(struct regulator_dev *rdev,
                                unsigned int selector)
 {
        struct da9052_regulator *regulator = rdev_get_drvdata(rdev);
        struct da9052_regulator_info *info = regulator->info;
+       int id = rdev_get_id(rdev);
        int volt_uV;
 
-       volt_uV = info->min_uV + info->step_uV * selector;
+       if ((id == DA9052_ID_BUCK4) && (regulator->da9052->chip_id == DA9052)
+               && (selector >= DA9052_BUCK_PERI_REG_MAP_UPTO_3uV)) {
+               volt_uV = ((DA9052_BUCK_PERI_REG_MAP_UPTO_3uV * info->step_uV)
+                         + info->min_uV);
+               volt_uV += (selector - DA9052_BUCK_PERI_REG_MAP_UPTO_3uV)
+                                   * (DA9052_BUCK_PERI_3uV_STEP);
+       } else {
+               volt_uV = (selector * info->step_uV) + info->min_uV;
+       }
 
        if (volt_uV > info->max_uV)
                return -EINVAL;
@@ -210,103 +179,13 @@ static int da9052_list_voltage(struct regulator_dev *rdev,
        return volt_uV;
 }
 
-static int da9052_regulator_set_voltage_int(struct regulator_dev *rdev,
-                                            int min_uV, int max_uV,
-                                            unsigned int *selector)
-{
-       struct da9052_regulator *regulator = rdev_get_drvdata(rdev);
-       struct da9052_regulator_info *info = regulator->info;
-       int offset = rdev_get_id(rdev);
-       int ret;
-
-       ret = verify_range(info, min_uV, max_uV);
-       if (ret < 0)
-               return ret;
-
-       if (min_uV < info->min_uV)
-               min_uV = info->min_uV;
-
-       *selector = (min_uV - info->min_uV) / info->step_uV;
-
-       ret = da9052_list_voltage(rdev, *selector);
-       if (ret < 0)
-               return ret;
-
-       return da9052_reg_update(regulator->da9052,
-                                DA9052_BUCKCORE_REG + offset,
-                                (1 << info->volt_shift) - 1, *selector);
-}
-
-static int da9052_set_ldo_voltage(struct regulator_dev *rdev,
-                                  int min_uV, int max_uV,
-                                  unsigned int *selector)
-{
-       return da9052_regulator_set_voltage_int(rdev, min_uV, max_uV, selector);
-}
-
-static int da9052_set_ldo5_6_voltage(struct regulator_dev *rdev,
-                                     int min_uV, int max_uV,
-                                     unsigned int *selector)
-{
-       struct da9052_regulator *regulator = rdev_get_drvdata(rdev);
-       struct da9052_regulator_info *info = regulator->info;
-       int ret;
-
-       ret = da9052_regulator_set_voltage_int(rdev, min_uV, max_uV, selector);
-       if (ret < 0)
-               return ret;
-
-       /* Some LDOs are DVC controlled which requires enabling of
-        * the LDO activate bit to implment the changes on the
-        * LDO output.
-       */
-       return da9052_reg_update(regulator->da9052, DA9052_SUPPLY_REG, 0,
-                                info->activate_bit);
-}
-
-static int da9052_set_dcdc_voltage(struct regulator_dev *rdev,
-                                   int min_uV, int max_uV,
-                                   unsigned int *selector)
+static int da9052_map_voltage(struct regulator_dev *rdev,
+                             int min_uV, int max_uV)
 {
        struct da9052_regulator *regulator = rdev_get_drvdata(rdev);
        struct da9052_regulator_info *info = regulator->info;
-       int ret;
-
-       ret = da9052_regulator_set_voltage_int(rdev, min_uV, max_uV, selector);
-       if (ret < 0)
-               return ret;
-
-       /* Some DCDCs are DVC controlled which requires enabling of
-        * the DCDC activate bit to implment the changes on the
-        * DCDC output.
-       */
-       return da9052_reg_update(regulator->da9052, DA9052_SUPPLY_REG, 0,
-                                info->activate_bit);
-}
-
-static int da9052_get_regulator_voltage_sel(struct regulator_dev *rdev)
-{
-       struct da9052_regulator *regulator = rdev_get_drvdata(rdev);
-       struct da9052_regulator_info *info = regulator->info;
-       int offset = rdev_get_id(rdev);
-       int ret;
-
-       ret = da9052_reg_read(regulator->da9052, DA9052_BUCKCORE_REG + offset);
-       if (ret < 0)
-               return ret;
-
-       ret &= ((1 << info->volt_shift) - 1);
-
-       return ret;
-}
-
-static int da9052_set_buckperi_voltage(struct regulator_dev *rdev, int min_uV,
-                                       int max_uV, unsigned int *selector)
-{
-       struct da9052_regulator *regulator = rdev_get_drvdata(rdev);
-       struct da9052_regulator_info *info = regulator->info;
-       int offset = rdev_get_id(rdev);
-       int ret;
+       int id = rdev_get_id(rdev);
+       int ret, sel;
 
        ret = verify_range(info, min_uV, max_uV);
        if (ret < 0)
@@ -315,188 +194,147 @@ static int da9052_set_buckperi_voltage(struct regulator_dev *rdev, int min_uV,
        if (min_uV < info->min_uV)
                min_uV = info->min_uV;
 
-       if ((regulator->da9052->chip_id == DA9052) &&
-           (min_uV >= DA9052_CONST_3uV))
-               *selector = DA9052_BUCK_PERI_REG_MAP_UPTO_3uV +
-                           ((min_uV - DA9052_CONST_3uV) /
-                           (DA9052_BUCK_PERI_3uV_STEP));
-       else
-               *selector = (min_uV - info->min_uV) / info->step_uV;
+       if ((id == DA9052_ID_BUCK4) && (regulator->da9052->chip_id == DA9052)
+               && (min_uV >= DA9052_CONST_3uV)) {
+                       sel = DA9052_BUCK_PERI_REG_MAP_UPTO_3uV +
+                             DIV_ROUND_UP(min_uV - DA9052_CONST_3uV,
+                                          DA9052_BUCK_PERI_3uV_STEP);
+       } else {
+               sel = DIV_ROUND_UP(min_uV - info->min_uV, info->step_uV);
+       }
 
-       ret = da9052_list_buckperi_voltage(rdev, *selector);
+       ret = da9052_list_voltage(rdev, sel);
        if (ret < 0)
                return ret;
 
-       return da9052_reg_update(regulator->da9052,
-                                DA9052_BUCKCORE_REG + offset,
-                                (1 << info->volt_shift) - 1, *selector);
+       return sel;
 }
 
-static int da9052_get_buckperi_voltage_sel(struct regulator_dev *rdev)
+static int da9052_regulator_set_voltage_sel(struct regulator_dev *rdev,
+                                           unsigned int selector)
 {
        struct da9052_regulator *regulator = rdev_get_drvdata(rdev);
        struct da9052_regulator_info *info = regulator->info;
-       int offset = rdev_get_id(rdev);
+       int id = rdev_get_id(rdev);
        int ret;
 
-       ret = da9052_reg_read(regulator->da9052, DA9052_BUCKCORE_REG + offset);
+       ret = da9052_reg_update(regulator->da9052, rdev->desc->vsel_reg,
+                               rdev->desc->vsel_mask, selector);
        if (ret < 0)
                return ret;
 
-       ret &= ((1 << info->volt_shift) - 1);
+       /* Some LDOs and DCDCs are DVC controlled which requires enabling of
+        * the activate bit to implment the changes on the output.
+        */
+       switch (id) {
+       case DA9052_ID_BUCK1:
+       case DA9052_ID_BUCK2:
+       case DA9052_ID_BUCK3:
+       case DA9052_ID_LDO2:
+       case DA9052_ID_LDO3:
+               ret = da9052_reg_update(regulator->da9052, DA9052_SUPPLY_REG,
+                                       info->activate_bit, info->activate_bit);
+               break;
+       }
 
        return ret;
 }
 
-static struct regulator_ops da9052_buckperi_ops = {
-       .list_voltage = da9052_list_buckperi_voltage,
-       .get_voltage_sel = da9052_get_buckperi_voltage_sel,
-       .set_voltage = da9052_set_buckperi_voltage,
-
-       .get_current_limit = da9052_dcdc_get_current_limit,
-       .set_current_limit = da9052_dcdc_set_current_limit,
-
-       .is_enabled = da9052_regulator_is_enabled,
-       .enable = da9052_regulator_enable,
-       .disable = da9052_regulator_disable,
-};
-
 static struct regulator_ops da9052_dcdc_ops = {
-       .set_voltage = da9052_set_dcdc_voltage,
        .get_current_limit = da9052_dcdc_get_current_limit,
        .set_current_limit = da9052_dcdc_set_current_limit,
 
        .list_voltage = da9052_list_voltage,
-       .get_voltage_sel = da9052_get_regulator_voltage_sel,
-       .is_enabled = da9052_regulator_is_enabled,
-       .enable = da9052_regulator_enable,
-       .disable = da9052_regulator_disable,
-};
-
-static struct regulator_ops da9052_ldo5_6_ops = {
-       .set_voltage = da9052_set_ldo5_6_voltage,
-
-       .list_voltage = da9052_list_voltage,
-       .get_voltage_sel = da9052_get_regulator_voltage_sel,
-       .is_enabled = da9052_regulator_is_enabled,
-       .enable = da9052_regulator_enable,
-       .disable = da9052_regulator_disable,
+       .map_voltage = da9052_map_voltage,
+       .get_voltage_sel = regulator_get_voltage_sel_regmap,
+       .set_voltage_sel = da9052_regulator_set_voltage_sel,
+       .is_enabled = regulator_is_enabled_regmap,
+       .enable = regulator_enable_regmap,
+       .disable = regulator_disable_regmap,
 };
 
 static struct regulator_ops da9052_ldo_ops = {
-       .set_voltage = da9052_set_ldo_voltage,
-
        .list_voltage = da9052_list_voltage,
-       .get_voltage_sel = da9052_get_regulator_voltage_sel,
-       .is_enabled = da9052_regulator_is_enabled,
-       .enable = da9052_regulator_enable,
-       .disable = da9052_regulator_disable,
+       .map_voltage = da9052_map_voltage,
+       .get_voltage_sel = regulator_get_voltage_sel_regmap,
+       .set_voltage_sel = da9052_regulator_set_voltage_sel,
+       .is_enabled = regulator_is_enabled_regmap,
+       .enable = regulator_enable_regmap,
+       .disable = regulator_disable_regmap,
 };
 
-#define DA9052_LDO5_6(_id, step, min, max, sbits, ebits, abits) \
-{\
-       .reg_desc = {\
-               .name = "LDO" #_id,\
-               .ops = &da9052_ldo5_6_ops,\
-               .type = REGULATOR_VOLTAGE,\
-               .id = _id,\
-               .owner = THIS_MODULE,\
-       },\
-       .min_uV = (min) * 1000,\
-       .max_uV = (max) * 1000,\
-       .step_uV = (step) * 1000,\
-       .volt_shift = (sbits),\
-       .en_bit = (ebits),\
-       .activate_bit = (abits),\
-}
-
 #define DA9052_LDO(_id, step, min, max, sbits, ebits, abits) \
 {\
        .reg_desc = {\
-               .name = "LDO" #_id,\
+               .name = #_id,\
                .ops = &da9052_ldo_ops,\
                .type = REGULATOR_VOLTAGE,\
-               .id = _id,\
+               .id = DA9052_ID_##_id,\
+               .n_voltages = (max - min) / step + 1, \
                .owner = THIS_MODULE,\
+               .vsel_reg = DA9052_BUCKCORE_REG + DA9052_ID_##_id, \
+               .vsel_mask = (1 << (sbits)) - 1,\
+               .enable_reg = DA9052_BUCKCORE_REG + DA9052_ID_##_id, \
+               .enable_mask = 1 << (ebits),\
        },\
        .min_uV = (min) * 1000,\
        .max_uV = (max) * 1000,\
        .step_uV = (step) * 1000,\
-       .volt_shift = (sbits),\
-       .en_bit = (ebits),\
        .activate_bit = (abits),\
 }
 
 #define DA9052_DCDC(_id, step, min, max, sbits, ebits, abits) \
 {\
        .reg_desc = {\
-               .name = "BUCK" #_id,\
+               .name = #_id,\
                .ops = &da9052_dcdc_ops,\
                .type = REGULATOR_VOLTAGE,\
-               .id = _id,\
+               .id = DA9052_ID_##_id,\
+               .n_voltages = (max - min) / step + 1, \
                .owner = THIS_MODULE,\
+               .vsel_reg = DA9052_BUCKCORE_REG + DA9052_ID_##_id, \
+               .vsel_mask = (1 << (sbits)) - 1,\
+               .enable_reg = DA9052_BUCKCORE_REG + DA9052_ID_##_id, \
+               .enable_mask = 1 << (ebits),\
        },\
        .min_uV = (min) * 1000,\
        .max_uV = (max) * 1000,\
        .step_uV = (step) * 1000,\
-       .volt_shift = (sbits),\
-       .en_bit = (ebits),\
-       .activate_bit = (abits),\
-}
-
-#define DA9052_BUCKPERI(_id, step, min, max, sbits, ebits, abits) \
-{\
-       .reg_desc = {\
-               .name = "BUCK" #_id,\
-               .ops = &da9052_buckperi_ops,\
-               .type = REGULATOR_VOLTAGE,\
-               .id = _id,\
-               .owner = THIS_MODULE,\
-       },\
-       .min_uV = (min) * 1000,\
-       .max_uV = (max) * 1000,\
-       .step_uV = (step) * 1000,\
-       .volt_shift = (sbits),\
-       .en_bit = (ebits),\
        .activate_bit = (abits),\
 }
 
 static struct da9052_regulator_info da9052_regulator_info[] = {
-       /* Buck1 - 4 */
-       DA9052_DCDC(0, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBCOREGO),
-       DA9052_DCDC(1, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBPROGO),
-       DA9052_DCDC(2, 25, 925, 2500, 6, 6, DA9052_SUPPLY_VBMEMGO),
-       DA9052_BUCKPERI(3, 50, 1800, 3600, 5, 6, 0),
-       /* LD01 - LDO10 */
-       DA9052_LDO(4, 50, 600, 1800, 5, 6, 0),
-       DA9052_LDO5_6(5, 25, 600, 1800, 6, 6, DA9052_SUPPLY_VLDO2GO),
-       DA9052_LDO5_6(6, 25, 1725, 3300, 6, 6, DA9052_SUPPLY_VLDO3GO),
-       DA9052_LDO(7, 25, 1725, 3300, 6, 6, 0),
-       DA9052_LDO(8, 50, 1200, 3600, 6, 6, 0),
-       DA9052_LDO(9, 50, 1200, 3600, 6, 6, 0),
-       DA9052_LDO(10, 50, 1200, 3600, 6, 6, 0),
-       DA9052_LDO(11, 50, 1200, 3600, 6, 6, 0),
-       DA9052_LDO(12, 50, 1250, 3650, 6, 6, 0),
-       DA9052_LDO(13, 50, 1200, 3600, 6, 6, 0),
+       DA9052_DCDC(BUCK1, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBCOREGO),
+       DA9052_DCDC(BUCK2, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBPROGO),
+       DA9052_DCDC(BUCK3, 25, 925, 2500, 6, 6, DA9052_SUPPLY_VBMEMGO),
+       DA9052_DCDC(BUCK4, 50, 1800, 3600, 5, 6, 0),
+       DA9052_LDO(LDO1, 50, 600, 1800, 5, 6, 0),
+       DA9052_LDO(LDO2, 25, 600, 1800, 6, 6, DA9052_SUPPLY_VLDO2GO),
+       DA9052_LDO(LDO3, 25, 1725, 3300, 6, 6, DA9052_SUPPLY_VLDO3GO),
+       DA9052_LDO(LDO4, 25, 1725, 3300, 6, 6, 0),
+       DA9052_LDO(LDO5, 50, 1200, 3600, 6, 6, 0),
+       DA9052_LDO(LDO6, 50, 1200, 3600, 6, 6, 0),
+       DA9052_LDO(LDO7, 50, 1200, 3600, 6, 6, 0),
+       DA9052_LDO(LDO8, 50, 1200, 3600, 6, 6, 0),
+       DA9052_LDO(LDO9, 50, 1250, 3650, 6, 6, 0),
+       DA9052_LDO(LDO10, 50, 1200, 3600, 6, 6, 0),
 };
 
 static struct da9052_regulator_info da9053_regulator_info[] = {
-       /* Buck1 - 4 */
-       DA9052_DCDC(0, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBCOREGO),
-       DA9052_DCDC(1, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBPROGO),
-       DA9052_DCDC(2, 25, 925, 2500, 6, 6, DA9052_SUPPLY_VBMEMGO),
-       DA9052_BUCKPERI(3, 25, 925, 2500, 6, 6, 0),
-       /* LD01 - LDO10 */
-       DA9052_LDO(4, 50, 600, 1800, 5, 6, 0),
-       DA9052_LDO5_6(5, 25, 600, 1800, 6, 6, DA9052_SUPPLY_VLDO2GO),
-       DA9052_LDO5_6(6, 25, 1725, 3300, 6, 6, DA9052_SUPPLY_VLDO3GO),
-       DA9052_LDO(7, 25, 1725, 3300, 6, 6, 0),
-       DA9052_LDO(8, 50, 1200, 3600, 6, 6, 0),
-       DA9052_LDO(9, 50, 1200, 3600, 6, 6, 0),
-       DA9052_LDO(10, 50, 1200, 3600, 6, 6, 0),
-       DA9052_LDO(11, 50, 1200, 3600, 6, 6, 0),
-       DA9052_LDO(12, 50, 1250, 3650, 6, 6, 0),
-       DA9052_LDO(13, 50, 1200, 3600, 6, 6, 0),
+       DA9052_DCDC(BUCK1, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBCOREGO),
+       DA9052_DCDC(BUCK2, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBPROGO),
+       DA9052_DCDC(BUCK3, 25, 925, 2500, 6, 6, DA9052_SUPPLY_VBMEMGO),
+       DA9052_DCDC(BUCK4, 25, 925, 2500, 6, 6, 0),
+       DA9052_LDO(LDO1, 50, 600, 1800, 5, 6, 0),
+       DA9052_LDO(LDO2, 25, 600, 1800, 6, 6, DA9052_SUPPLY_VLDO2GO),
+       DA9052_LDO(LDO3, 25, 1725, 3300, 6, 6, DA9052_SUPPLY_VLDO3GO),
+       DA9052_LDO(LDO4, 25, 1725, 3300, 6, 6, 0),
+       DA9052_LDO(LDO5, 50, 1200, 3600, 6, 6, 0),
+       DA9052_LDO(LDO6, 50, 1200, 3600, 6, 6, 0),
+       DA9052_LDO(LDO7, 50, 1200, 3600, 6, 6, 0),
+       DA9052_LDO(LDO8, 50, 1200, 3600, 6, 6, 0),
+       DA9052_LDO(LDO9, 50, 1250, 3650, 6, 6, 0),
+       DA9052_LDO(LDO10, 50, 1200, 3600, 6, 6, 0),
 };
 
 static inline struct da9052_regulator_info *find_regulator_info(u8 chip_id,
@@ -529,10 +367,10 @@ static inline struct da9052_regulator_info *find_regulator_info(u8 chip_id,
 
 static int __devinit da9052_regulator_probe(struct platform_device *pdev)
 {
+       struct regulator_config config = { };
        struct da9052_regulator *regulator;
        struct da9052 *da9052;
        struct da9052_pdata *pdata;
-       int ret;
 
        regulator = devm_kzalloc(&pdev->dev, sizeof(struct da9052_regulator),
                                 GFP_KERNEL);
@@ -547,26 +385,49 @@ static int __devinit da9052_regulator_probe(struct platform_device *pdev)
                                              pdev->id);
        if (regulator->info == NULL) {
                dev_err(&pdev->dev, "invalid regulator ID specified\n");
-               ret = -EINVAL;
-               goto err;
+               return -EINVAL;
        }
+
+       config.dev = &pdev->dev;
+       config.driver_data = regulator;
+       config.regmap = da9052->regmap;
+       if (pdata && pdata->regulators) {
+               config.init_data = pdata->regulators[pdev->id];
+       } else {
+#ifdef CONFIG_OF
+               struct device_node *nproot = da9052->dev->of_node;
+               struct device_node *np;
+
+               if (!nproot)
+                       return -ENODEV;
+
+               nproot = of_find_node_by_name(nproot, "regulators");
+               if (!nproot)
+                       return -ENODEV;
+
+               for_each_child_of_node(nproot, np) {
+                       if (!of_node_cmp(np->name,
+                                        regulator->info->reg_desc.name)) {
+                               config.init_data = of_get_regulator_init_data(
+                                       &pdev->dev, np);
+                               config.of_node = np;
+                               break;
+                       }
+               }
+#endif
+       }
+
        regulator->rdev = regulator_register(&regulator->info->reg_desc,
-                                            &pdev->dev,
-                                            pdata->regulators[pdev->id],
-                                            regulator, NULL);
+                                            &config);
        if (IS_ERR(regulator->rdev)) {
                dev_err(&pdev->dev, "failed to register regulator %s\n",
                        regulator->info->reg_desc.name);
-               ret = PTR_ERR(regulator->rdev);
-               goto err;
+               return PTR_ERR(regulator->rdev);
        }
 
        platform_set_drvdata(pdev, regulator);
 
        return 0;
-err:
-       devm_kfree(&pdev->dev, regulator);
-       return ret;
 }
 
 static int __devexit da9052_regulator_remove(struct platform_device *pdev)
@@ -574,14 +435,12 @@ static int __devexit da9052_regulator_remove(struct platform_device *pdev)
        struct da9052_regulator *regulator = platform_get_drvdata(pdev);
 
        regulator_unregister(regulator->rdev);
-       devm_kfree(&pdev->dev, regulator);
-
        return 0;
 }
 
 static struct platform_driver da9052_regulator_driver = {
        .probe = da9052_regulator_probe,
-       .remove = __devexit_p(da9052_regulator_remove),
+       .remove = da9052_regulator_remove,
        .driver = {
                .name = "da9052-regulator",
                .owner = THIS_MODULE,