1 files changed, 120 insertions, 16 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)