A selection of voltage or current values (AKA states) should always
be specified when using a GPIO regulator. If there are no switchable
states then the fixed regulators should be used instead.
Cc: Mark Brown <broo...@opensource.wolfsonmicro.com>
Cc: Frank Li <frank...@freescale.com>
Signed-off-by: Lee Jones <lee.jo...@linaro.org>
---
.../bindings/regulator/gpio-regulator.txt | 3 ++-
drivers/regulator/gpio-regulator.c | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/regulator/gpio-regulator.txt
b/Documentation/devicetree/bindings/regulator/gpio-regulator.txt
index 3703be2..51527c6 100644
--- a/Documentation/devicetree/bindings/regulator/gpio-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/gpio-regulator.txt
@@ -2,11 +2,12 @@ GPIO controlled regulators
Required properties:
- compatible : Must be "regulator-gpio".
+- states : Selection of available voltages and GPIO configs.
+ if there are no states, then use a fixed regulator
Optional properties:
- gpio-enable : GPIO to use to enable/disable the regulator.
- gpios : GPIO group used to control voltage.
-- states : Selection of available voltages and GPIO configs.
- startup-delay-us : Startup time in microseconds.
- enable-active-high : Polarity of GPIO is active high (default is low).
diff --git a/drivers/regulator/gpio-regulator.c
b/drivers/regulator/gpio-regulator.c
index e467d0a..a7a2974 100644
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -183,6 +183,11 @@ of_get_gpio_regulator_config(struct device *dev, struct
device_node *np)
/* Fetch states. */
prop = of_find_property(np, "states", NULL);
+ if (!prop) {
+ dev_err(dev, "No 'states' property found\n");
+ return ERR_PTR(-EINVAL);
+ }
+
proplen = prop->length / sizeof(int);
config->states = devm_kzalloc(dev,
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
