Skip to content

Commit

Permalink
regulator: core: don't require a supply when supply_name is specified
Browse files Browse the repository at this point in the history
Regulator drivers may specify regulator_desc->supply_name which
regulator_register() will use to find the supply node for a regulator.
If no supply was specified in the device tree or the supply has yet
to be registered regulator_register() will fail, deferring the probe
of the regulator.  In the case where no supply node was specified in the
device tree, there is no supply and it is pointless to try and find one
later, so go ahead and add the regulator without the supply.

Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Andrew Bresticker authored and Mark Brown committed Apr 5, 2013
1 parent 167d41d commit 0f7b87f
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion drivers/regulator/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -3477,7 +3477,14 @@ regulator_register(const struct regulator_desc *regulator_desc,

r = regulator_dev_lookup(dev, supply, &ret);

if (!r) {
if (ret == -ENODEV) {
/*
* No supply was specified for this regulator and
* there will never be one.
*/
ret = 0;
goto add_dev;
} else if (!r) {
dev_err(dev, "Failed to find supply %s\n", supply);
ret = -EPROBE_DEFER;
goto scrub;
Expand All @@ -3495,6 +3502,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
}
}

add_dev:
/* add consumers devices */
if (init_data) {
for (i = 0; i < init_data->num_consumer_supplies; i++) {
Expand Down

0 comments on commit 0f7b87f

Please sign in to comment.