Messages in this thread Patch in this message |  | | From | Mark Brown <> | Date | Thu, 5 Dec 2013 00:31:55 +0000 | Subject | [PATCH] regulator: gpio: Don't require a regulator-type property |
| |
From: Mark Brown <broonie@linaro.org>
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> ---
Compile tested only.
drivers/regulator/gpio-regulator.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c index 234960dc9607..13ec94d984ca 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; } -- 1.8.5.1
|  |