[PATCH v2 2/2] regulator: da9052: add device tree support

[Ying-Chun Liu (PaulLiu)]

From: "Ying-Chun Liu (PaulLiu)" <paul....@linaro.org>

This patch adds device tree support for dialog regulators

Signed-off-by: Ying-Chun Liu (PaulLiu) <paul....@linaro.org>
Cc: Mark Brown <broo...@opensource.wolfsonmicro.com>
Cc: Liam Girdwood <l...@ti.com>
Cc: Samuel Ortiz <sa...@linux.intel.com>
Cc: Shawn Guo <shawn....@linaro.org>
Cc: Ashish Jangam <ashish.jan...@kpitcummins.com>
---
 drivers/regulator/da9052-regulator.c |   29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/drivers/regulator/da9052-regulator.c 
b/drivers/regulator/da9052-regulator.c
index b6c8c4b..2678cbe 100644
--- a/drivers/regulator/da9052-regulator.c
+++ b/drivers/regulator/da9052-regulator.c
@@ -19,6 +19,9 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
+#ifdef CONFIG_OF
+#include <linux/regulator/of_regulator.h>
+#endif
 
 #include <linux/mfd/da9052/da9052.h>
 #include <linux/mfd/da9052/reg.h>
@@ -425,8 +428,32 @@ static int __devinit da9052_regulator_probe(struct 
platform_device *pdev)
        }
 
        config.dev = &pdev->dev;
-       config.init_data = pdata->regulators[pdev->id];
        config.driver_data = regulator;
+       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 (np = of_get_next_child(nproot, NULL); !np;
+                    np = of_get_next_child(nproot, np)) {
+                       if (!of_node_cmp(np->name,
+                                        regulator->info->reg_desc.name)) {
+                               config.init_data = of_get_regulator_init_data(
+                                       &pdev->dev, np);
+                               break;
+                       }
+               }
+#endif
+       }
 
        regulator->rdev = regulator_register(&regulator->info->reg_desc,
                                             &config);
-- 
1.7.9.5


_______________________________________________
linaro-dev mailing list
linaro-dev@lists.linaro.org
http://lists.linaro.org/mailman/listinfo/linaro-dev