diff options
| author | Charles Keepax <ckeepax@opensource.cirrus.com> | 2018-11-29 10:28:21 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-12-04 16:41:38 +0000 |
| commit | eba9473f6761d8df6cabf278b272cc5466733737 (patch) | |
| tree | 485e88784a60fef84ff4a482b3ee619cb5be6a43 /drivers/regulator | |
| parent | 925c85e21ed8773c8b0ab01d60618b862847a10f (diff) | |
| download | linux-stable-eba9473f6761d8df6cabf278b272cc5466733737.tar.gz linux-stable-eba9473f6761d8df6cabf278b272cc5466733737.tar.bz2 linux-stable-eba9473f6761d8df6cabf278b272cc5466733737.zip | |
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>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/of_regulator.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c index 4bb8928bdb3f..ffa5fc3724e4 100644 --- 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); |