regulator: dt: regulator match by regulator-compatible

Match the device's regulators with the property of
"regulator-compatible" of each regulator node.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 33 insertions, 18 deletions

diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index 68dc3d43dd37..3e4106f2bda9 100644
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -92,15 +92,17 @@ struct regulator_init_data *of_get_regulator_init_data(struct device *dev,
 EXPORT_SYMBOL_GPL(of_get_regulator_init_data);
 
 /**
- * of_regulator_match - extract regulator init data
+ * of_regulator_match - extract regulator init data when node
+ * property "regulator-compatible" matches with the regulator name.
  * @dev: device requesting the data
  * @node: parent device node of the regulators
  * @matches: match table for the regulators
  * @num_matches: number of entries in match table
  *
  * This function uses a match table specified by the regulator driver and
- * looks up the corresponding init data in the device tree. Note that the
- * match table is modified in place.
+ * looks up the corresponding init data in the device tree  if
+ * regulator-compatible matches. Note that the match table is modified
+ * in place.
  *
  * Returns the number of matches found or a negative error code on failure.
  */
@@ -110,27 +112,40 @@ int of_regulator_match(struct device *dev, struct device_node *node,
 {
         unsigned int count = 0;
         unsigned int i;
+        const char *regulator_comp;
+        struct device_node *child;
 
         if (!dev || !node)
                 return -EINVAL;
 
-        for (i = 0; i < num_matches; i++) {
-                struct of_regulator_match *match = &matches[i];
-                struct device_node *child;
-
-                child = of_find_node_by_name(node, match->name);
-                if (!child)
-                        continue;
-
-                match->init_data = of_get_regulator_init_data(dev, child);
-                if (!match->init_data) {
-                        dev_err(dev, "failed to parse DT for regulator %s\n",
+        for_each_child_of_node(node, child) {
+                regulator_comp = of_get_property(child,
+                                        "regulator-compatible", NULL);
+                if (!regulator_comp) {
+                        dev_err(dev, "regulator-compatible is missing for node %s\n",
                                 child->name);
-                        return -EINVAL;
+                        continue;
+                }
+                for (i = 0; i < num_matches; i++) {
+                        struct of_regulator_match *match = &matches[i];
+                        if (match->of_node)
+                                continue;
+
+                        if (strcmp(match->name, regulator_comp))
+                                continue;
+
+                        match->init_data =
+                                of_get_regulator_init_data(dev, child);
+                        if (!match->init_data) {
+                                dev_err(dev,
+                                        "failed to parse DT for regulator %s\n",
+                                        child->name);
+                                return -EINVAL;
+                        }
+                        match->of_node = child;
+                        count++;
+                        break;
                 }
-
-                match->of_node = child;
-                count++;
         }
 
         return count;