diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-05 00:29:57 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-05 11:34:53 +0000 |
| commit | 5b1ada83bae7d689cf1fe76eb1bdd058ea84a97c (patch) | |
| tree | 798bdad12bba1cd7e664d7753600bc0972ec1b79 /drivers/regulator/gpio-regulator.c | |
| parent | 251b9c21d26ca9d210e7673f0819ee1f6c19402a (diff) | |
| download | linux-stable-5b1ada83bae7d689cf1fe76eb1bdd058ea84a97c.tar.gz linux-stable-5b1ada83bae7d689cf1fe76eb1bdd058ea84a97c.tar.bz2 linux-stable-5b1ada83bae7d689cf1fe76eb1bdd058ea84a97c.zip | |
regulator: gpio: Don't require a regulator-type property
Since essentially all GPIO controlled regulators are voltage regulators
make the regulator-type property optional, defaulting to voltage.
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/regulator/gpio-regulator.c')
| -rw-r--r-- | drivers/regulator/gpio-regulator.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c index bcd827c363dc..cdb9d947d914 100644 --- a/drivers/regulator/gpio-regulator.c +++ b/drivers/regulator/gpio-regulator.c @@ -203,17 +203,15 @@ of_get_gpio_regulator_config(struct device *dev, struct device_node *np) } config->nr_states = i; + config->type = REGULATOR_VOLTAGE; ret = of_property_read_string(np, "regulator-type", ®type); - if (ret < 0) { - dev_err(dev, "Missing 'regulator-type' property\n"); - return ERR_PTR(-EINVAL); + if (ret >= 0) { + if (!strncmp("voltage", regtype, 7)) + config->type = REGULATOR_VOLTAGE; + else if (!strncmp("current", regtype, 7)) + config->type = REGULATOR_CURRENT; } - if (!strncmp("voltage", regtype, 7)) - config->type = REGULATOR_VOLTAGE; - else if (!strncmp("current", regtype, 7)) - config->type = REGULATOR_CURRENT; - return config; } |