1 files changed, 68 insertions, 5 deletions

diff --git a/drivers/regulator/da9055-regulator.c b/drivers/regulator/da9055-regulator.c
index 7f340206d329..9516317e1a9f 100644
--- a/drivers/regulator/da9055-regulator.c
+++ b/drivers/regulator/da9055-regulator.c
@@ -19,6 +19,8 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
+#include <linux/of.h>
+#include <linux/regulator/of_regulator.h>
 
 #include <linux/mfd/da9055/core.h>
 #include <linux/mfd/da9055/reg.h>
@@ -446,6 +448,9 @@ static int da9055_gpio_init(struct da9055_regulator *regulator,
         struct da9055_regulator_info *info = regulator->info;
         int ret = 0;
 
+        if (!pdata)
+                return 0;
+
         if (pdata->gpio_ren && pdata->gpio_ren[id]) {
                 char name[18];
                 int gpio_mux = pdata->gpio_ren[id];
@@ -530,6 +535,59 @@ static inline struct da9055_regulator_info *find_regulator_info(int id)
         return NULL;
 }
 
+#ifdef CONFIG_OF
+static struct of_regulator_match da9055_reg_matches[] = {
+        { .name = "BUCK1", },
+        { .name = "BUCK2", },
+        { .name = "LDO1", },
+        { .name = "LDO2", },
+        { .name = "LDO3", },
+        { .name = "LDO4", },
+        { .name = "LDO5", },
+        { .name = "LDO6", },
+};
+
+static int da9055_regulator_dt_init(struct platform_device *pdev,
+                                    struct da9055_regulator *regulator,
+                                    struct regulator_config *config,
+                                    int regid)
+{
+        struct device_node *nproot, *np;
+        int ret;
+
+        nproot = of_node_get(pdev->dev.parent->of_node);
+        if (!nproot)
+                return -ENODEV;
+
+        np = of_get_child_by_name(nproot, "regulators");
+        if (!np)
+                return -ENODEV;
+
+        ret = of_regulator_match(&pdev->dev, np, &da9055_reg_matches[regid], 1);
+        of_node_put(nproot);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "Error matching regulator: %d\n", ret);
+                return ret;
+        }
+
+        config->init_data = da9055_reg_matches[regid].init_data;
+        config->of_node = da9055_reg_matches[regid].of_node;
+
+        if (!config->of_node)
+                return -ENODEV;
+
+        return 0;
+}
+#else
+static inline int da9055_regulator_dt_init(struct platform_device *pdev,
+                                       struct da9055_regulator *regulator,
+                                       struct regulator_config *config,
+                                       int regid)
+{
+        return -ENODEV;
+}
+#endif /* CONFIG_OF */
+
 static int da9055_regulator_probe(struct platform_device *pdev)
 {
         struct regulator_config config = { };
@@ -538,9 +596,6 @@ static int da9055_regulator_probe(struct platform_device *pdev)
         struct da9055_pdata *pdata = dev_get_platdata(da9055->dev);
         int ret, irq;
 
-        if (pdata == NULL || pdata->regulators[pdev->id] == NULL)
-                return -ENODEV;
-
         regulator = devm_kzalloc(&pdev->dev, sizeof(struct da9055_regulator),
                                  GFP_KERNEL);
         if (!regulator)
@@ -557,8 +612,14 @@ static int da9055_regulator_probe(struct platform_device *pdev)
         config.driver_data = regulator;
         config.regmap = da9055->regmap;
 
-        if (pdata && pdata->regulators)
+        if (pdata && pdata->regulators) {
                 config.init_data = pdata->regulators[pdev->id];
+        } else {
+                ret = da9055_regulator_dt_init(pdev, regulator, &config,
+                                               pdev->id);
+                if (ret < 0)
+                        return ret;
+        }
 
         ret = da9055_gpio_init(regulator, &config, pdata, pdev->id);
         if (ret < 0)
@@ -576,7 +637,9 @@ static int da9055_regulator_probe(struct platform_device *pdev)
         /* Only LDO 5 and 6 has got the over current interrupt */
         if (pdev->id == DA9055_ID_LDO5 || pdev->id ==  DA9055_ID_LDO6) {
                 irq = platform_get_irq_byname(pdev, "REGULATOR");
-                irq = regmap_irq_get_virq(da9055->irq_data, irq);
+                if (irq < 0)
+                        return irq;
+
                 ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
                                                 da9055_ldo5_6_oc_irq,
                                                 IRQF_TRIGGER_HIGH |