3 files changed, 118 insertions, 17 deletions

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 1c3ae57082ed..07e6e27be23c 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -508,19 +508,31 @@ int arizona_of_get_type(struct device *dev)
 }
 EXPORT_SYMBOL_GPL(arizona_of_get_type);
 
+int arizona_of_get_named_gpio(struct arizona *arizona, const char *prop,
+                              bool mandatory)
+{
+        int gpio;
+
+        gpio = of_get_named_gpio(arizona->dev->of_node, prop, 0);
+        if (gpio < 0) {
+                if (mandatory)
+                        dev_err(arizona->dev,
+                                "Mandatory DT gpio %s missing/malformed: %d\n",
+                                prop, gpio);
+
+                gpio = 0;
+        }
+
+        return gpio;
+}
+EXPORT_SYMBOL_GPL(arizona_of_get_named_gpio);
+
 static int arizona_of_get_core_pdata(struct arizona *arizona)
 {
+        struct arizona_pdata *pdata = &arizona->pdata;
         int ret, i;
 
-        arizona->pdata.reset = of_get_named_gpio(arizona->dev->of_node,
-                                                 "wlf,reset", 0);
-        if (arizona->pdata.reset < 0)
-                arizona->pdata.reset = 0;
-
-        arizona->pdata.ldoena = of_get_named_gpio(arizona->dev->of_node,
-                                                  "wlf,ldoena", 0);
-        if (arizona->pdata.ldoena < 0)
-                arizona->pdata.ldoena = 0;
+        pdata->reset = arizona_of_get_named_gpio(arizona, "wlf,reset", true);
 
         ret = of_property_read_u32_array(arizona->dev->of_node,
                                          "wlf,gpio-defaults",
@@ -652,6 +664,9 @@ int arizona_dev_init(struct arizona *arizona)
                 return -EINVAL;
         }
 
+        /* Mark DCVDD as external, LDO1 driver will clear if internal */
+        arizona->external_dcvdd = true;
+
         ret = mfd_add_devices(arizona->dev, -1, early_devs,
                               ARRAY_SIZE(early_devs), NULL, 0, NULL);
         if (ret != 0) {
@@ -851,14 +866,6 @@ int arizona_dev_init(struct arizona *arizona)
                              arizona->pdata.gpio_defaults[i]);
         }
 
-        /*
-         * LDO1 can only be used to supply DCVDD so if it has no
-         * consumers then DCVDD is supplied externally.
-         */
-        if (arizona->pdata.ldo1 &&
-            arizona->pdata.ldo1->num_consumer_supplies == 0)
-                arizona->external_dcvdd = true;
-
         pm_runtime_set_autosuspend_delay(arizona->dev, 100);
         pm_runtime_use_autosuspend(arizona->dev);
         pm_runtime_enable(arizona->dev);
diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c
index b1033d30b504..d3787e11f535 100644
--- a/drivers/regulator/arizona-ldo1.c
+++ b/drivers/regulator/arizona-ldo1.c
@@ -19,6 +19,7 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
+#include <linux/regulator/of_regulator.h>
 #include <linux/gpio.h>
 #include <linux/slab.h>
 
@@ -178,6 +179,42 @@ static const struct regulator_init_data arizona_ldo1_default = {
         .num_consumer_supplies = 1,
 };
 
+static int arizona_ldo1_of_get_pdata(struct arizona *arizona,
+                                     struct regulator_config *config)
+{
+        struct arizona_pdata *pdata = &arizona->pdata;
+        struct arizona_ldo1 *ldo1 = config->driver_data;
+        struct device_node *init_node, *dcvdd_node;
+        struct regulator_init_data *init_data;
+
+        pdata->ldoena = arizona_of_get_named_gpio(arizona, "wlf,ldoena", true);
+
+        init_node = of_get_child_by_name(arizona->dev->of_node, "ldo1");
+        dcvdd_node = of_parse_phandle(arizona->dev->of_node, "DCVDD-supply", 0);
+
+        if (init_node) {
+                config->of_node = init_node;
+
+                init_data = of_get_regulator_init_data(arizona->dev, init_node);
+
+                if (init_data) {
+                        init_data->consumer_supplies = &ldo1->supply;
+                        init_data->num_consumer_supplies = 1;
+
+                        if (dcvdd_node && dcvdd_node != init_node)
+                                arizona->external_dcvdd = true;
+
+                        pdata->ldo1 = init_data;
+                }
+        } else if (dcvdd_node) {
+                arizona->external_dcvdd = true;
+        }
+
+        of_node_put(dcvdd_node);
+
+        return 0;
+}
+
 static int arizona_ldo1_probe(struct platform_device *pdev)
 {
         struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
@@ -186,6 +223,8 @@ static int arizona_ldo1_probe(struct platform_device *pdev)
         struct arizona_ldo1 *ldo1;
         int ret;
 
+        arizona->external_dcvdd = false;
+
         ldo1 = devm_kzalloc(&pdev->dev, sizeof(*ldo1), GFP_KERNEL);
         if (!ldo1)
                 return -ENOMEM;
@@ -216,6 +255,15 @@ static int arizona_ldo1_probe(struct platform_device *pdev)
         config.dev = arizona->dev;
         config.driver_data = ldo1;
         config.regmap = arizona->regmap;
+
+        if (IS_ENABLED(CONFIG_OF)) {
+                if (!dev_get_platdata(arizona->dev)) {
+                        ret = arizona_ldo1_of_get_pdata(arizona, &config);
+                        if (ret < 0)
+                                return ret;
+                }
+        }
+
         config.ena_gpio = arizona->pdata.ldoena;
 
         if (arizona->pdata.ldo1)
@@ -223,6 +271,13 @@ static int arizona_ldo1_probe(struct platform_device *pdev)
         else
                 config.init_data = &ldo1->init_data;
 
+        /*
+         * LDO1 can only be used to supply DCVDD so if it has no
+         * consumers then DCVDD is supplied externally.
+         */
+        if (config.init_data->num_consumer_supplies == 0)
+                arizona->external_dcvdd = true;
+
         ldo1->regulator = devm_regulator_register(&pdev->dev, desc, &config);
         if (IS_ERR(ldo1->regulator)) {
                 ret = PTR_ERR(ldo1->regulator);
@@ -231,6 +286,8 @@ static int arizona_ldo1_probe(struct platform_device *pdev)
                 return ret;
         }
 
+        of_node_put(config.of_node);
+
         platform_set_drvdata(pdev, ldo1);
 
         return 0;
diff --git a/drivers/regulator/arizona-micsupp.c b/drivers/regulator/arizona-micsupp.c
index 6fdd9bf6927f..b80ebbe88bac 100644
--- a/drivers/regulator/arizona-micsupp.c
+++ b/drivers/regulator/arizona-micsupp.c
@@ -19,6 +19,7 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
+#include <linux/regulator/of_regulator.h>
 #include <linux/gpio.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
@@ -195,6 +196,32 @@ static const struct regulator_init_data arizona_micsupp_ext_default = {
         .num_consumer_supplies = 1,
 };
 
+static int arizona_micsupp_of_get_pdata(struct arizona *arizona,
+                                        struct regulator_config *config)
+{
+        struct arizona_pdata *pdata = &arizona->pdata;
+        struct arizona_micsupp *micsupp = config->driver_data;
+        struct device_node *np;
+        struct regulator_init_data *init_data;
+
+        np = of_get_child_by_name(arizona->dev->of_node, "micvdd");
+
+        if (np) {
+                config->of_node = np;
+
+                init_data = of_get_regulator_init_data(arizona->dev, np);
+
+                if (init_data) {
+                        init_data->consumer_supplies = &micsupp->supply;
+                        init_data->num_consumer_supplies = 1;
+
+                        pdata->micvdd = init_data;
+                }
+        }
+
+        return 0;
+}
+
 static int arizona_micsupp_probe(struct platform_device *pdev)
 {
         struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
@@ -234,6 +261,14 @@ static int arizona_micsupp_probe(struct platform_device *pdev)
         config.driver_data = micsupp;
         config.regmap = arizona->regmap;
 
+        if (IS_ENABLED(CONFIG_OF)) {
+                if (!dev_get_platdata(arizona->dev)) {
+                        ret = arizona_micsupp_of_get_pdata(arizona, &config);
+                        if (ret < 0)
+                                return ret;
+                }
+        }
+
         if (arizona->pdata.micvdd)
                 config.init_data = arizona->pdata.micvdd;
         else
@@ -253,6 +288,8 @@ static int arizona_micsupp_probe(struct platform_device *pdev)
                 return ret;
         }
 
+        of_node_put(config.of_node);
+
         platform_set_drvdata(pdev, micsupp);
 
         return 0;