regulator: Allow regulator nodes to contain their own init data

Currently it is expected that regulator init data will be defined as a
series of sub-nodes from the node that bound in the driver. Add support
for a node to both bind in a driver and contain init data for that
regulator.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index 4bb8928bdb3f6a48915396649e1b6b8eb65ebaf2..ffa5fc3724e4f24b27d3981a43f0d05753e8b4c5 100644 (file)
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -380,12 +380,16 @@ struct device_node *regulator_of_get_init_node(struct device *dev,
        if (!dev->of_node || !desc->of_match)
                return NULL;
 
-       if (desc->regulators_node)
+       if (desc->regulators_node) {
                search = of_get_child_by_name(dev->of_node,
                                              desc->regulators_node);
-       else
+       } else {
                search = of_node_get(dev->of_node);
 
+               if (!strcmp(desc->of_match, search->name))
+                       return search;
+       }
+
        if (!search) {
                dev_dbg(dev, "Failed to find regulator container node '%s'\n",
                        desc->regulators_node);