commit 5b1ada83bae7d689cf1fe76eb1bdd058ea84a97c
author Mark Brown <broonie@linaro.org> Thu Dec 05 00:29:57 2013 +0000
committer Mark Brown <broonie@linaro.org> Thu Dec 05 11:34:53 2013 +0000
tree 798bdad12bba1cd7e664d7753600bc0972ec1b79
parent 251b9c21d26ca9d210e7673f0819ee1f6c19402a

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>

drivers/regulator/gpio-regulator.c

diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c
index bcd827c..cdb9d94 100644
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -203,17 +203,15 @@
 	}
 	config->nr_states = i;
 
+	config->type = REGULATOR_VOLTAGE;
 	ret = of_property_read_string(np, "regulator-type", &regtype);
-	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;
 }