regulator: of: Provide simplified DT parsing method

Currently regulator drivers which support DT all repeat very similar code
to supply a list of known regulator identifiers to be matched with DT,
convert that to platform data which is then matched up with the regulators
as they are registered. This is both fiddly to get right and for devices
which can use the standard helpers to provide their operations is the main
source of code in the driver.

Since this code is essentially identical for most drivers we can factor it
out into the core, moving the identifiers in the match table into the
regulator descriptors and also allowing drivers to pass in the name of the
subnode to search. When a driver provides an of_match string for the
regulator the core will attempt to use that to obtain init_data, allowing
the driver to remove all explicit code for DT parsing and simply provide
data instead.

The current code leaks the phandles for the child nodes, this will be
addressed incrementally and makes no practical difference for FDT anyway
as the DT data structures are never freed.

Signed-off-by: Mark Brown <broonie@linaro.org>

4 files changed, 66 insertions, 3 deletions

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index a3c3785901f5..496002efd961 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -3516,12 +3516,17 @@ regulator_register(const struct regulator_desc *regulator_desc,
                 return ERR_PTR(-EINVAL);
         }
 
-        init_data = config->init_data;
-
         rdev = kzalloc(sizeof(struct regulator_dev), GFP_KERNEL);
         if (rdev == NULL)
                 return ERR_PTR(-ENOMEM);
 
+        init_data = regulator_of_get_init_data(dev, regulator_desc,
+                                               &rdev->dev.of_node);
+        if (!init_data) {
+                init_data = config->init_data;
+                rdev->dev.of_node = of_node_get(config->of_node);
+        }
+
         mutex_lock(&regulator_list_mutex);
 
         mutex_init(&rdev->mutex);
@@ -3548,7 +3553,6 @@ regulator_register(const struct regulator_desc *regulator_desc,
 
         /* register with sysfs */
         rdev->dev.class = &regulator_class;
-        rdev->dev.of_node = of_node_get(config->of_node);
         rdev->dev.parent = dev;
         dev_set_name(&rdev->dev, "regulator.%d",
                      atomic_inc_return(&regulator_no) - 1);
diff --git a/drivers/regulator/internal.h b/drivers/regulator/internal.h
index 84bbda10c396..a6043ad32ead 100644
--- a/drivers/regulator/internal.h
+++ b/drivers/regulator/internal.h
@@ -35,4 +35,8 @@ struct regulator {
         struct dentry *debugfs;
 };
 
+struct regulator_init_data *regulator_of_get_init_data(struct device *dev,
+                                 const struct regulator_desc *desc,
+                                 struct device_node **node);
+
 #endif
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index ee5e67bc8d5b..7a51814abdc5 100644
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -14,8 +14,11 @@
 #include <linux/slab.h>
 #include <linux/of.h>
 #include <linux/regulator/machine.h>
+#include <linux/regulator/driver.h>
 #include <linux/regulator/of_regulator.h>
 
+#include "internal.h"
+
 static void of_get_regulation_constraints(struct device_node *np,
                                         struct regulator_init_data **init_data)
 {
@@ -189,3 +192,51 @@ int of_regulator_match(struct device *dev, struct device_node *node,
         return count;
 }
 EXPORT_SYMBOL_GPL(of_regulator_match);
+
+struct regulator_init_data *regulator_of_get_init_data(struct device *dev,
+                                            const struct regulator_desc *desc,
+                                            struct device_node **node)
+{
+        struct device_node *search, *child;
+        struct regulator_init_data *init_data = NULL;
+        const char *name;
+
+        if (!dev->of_node || !desc->of_match)
+                return NULL;
+
+        if (desc->regulators_node)
+                search = of_get_child_by_name(dev->of_node,
+                                              desc->regulators_node);
+        else
+                search = dev->of_node;
+
+        if (!search) {
+                dev_err(dev, "Failed to find regulator container node\n");
+                return NULL;
+        }
+
+        for_each_child_of_node(search, child) {
+                name = of_get_property(child, "regulator-compatible", NULL);
+                if (!name)
+                        name = child->name;
+
+                if (strcmp(desc->of_match, name))
+                        continue;
+
+                init_data = of_get_regulator_init_data(dev, child);
+                if (!init_data) {
+                        dev_err(dev,
+                                "failed to parse DT for regulator %s\n",
+                                child->name);
+                        break;
+                }
+
+                of_node_get(child);
+                *node = child;
+                break;
+        }
+
+        of_node_put(search);
+
+        return init_data;
+}
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index bbe03a1924c0..c35f5f97a147 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -203,6 +203,8 @@ enum regulator_type {
  *
  * @name: Identifying name for the regulator.
  * @supply_name: Identifying the regulator supply
+ * @of_match: Name used to identify regulator in DT.
+ * @regulators_node: Name of node containing regulator definitions in DT.
  * @id: Numerical identifier for the regulator.
  * @ops: Regulator operations table.
  * @irq: Interrupt number for the regulator.
@@ -242,6 +244,8 @@ enum regulator_type {
 struct regulator_desc {
         const char *name;
         const char *supply_name;
+        const char *of_match;
+        const char *regulators_node;
         int id;
         bool continuous_voltage_range;
         unsigned n_voltages;