lkml.org 
[lkml]   [2012]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 02/12] regulator: gpio-regulator: Only read GPIO [dis|en]able pin if not always-on
Date
If a regulator is specified as always-on, then it can't have an
enable/disable pin, as it can't be turned off.

Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/regulator/gpio-regulator.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c
index 1a71be2..3afa46a 100644
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -160,7 +160,14 @@ of_get_gpio_regulator_config(struct device *dev, struct device_node *np)

of_property_read_u32(np, "startup-delay-us", &config->startup_delay);

- config->enable_gpio = of_get_named_gpio(np, "enable-gpio", 0);
+ if (!config->init_data->constraints.always_on) {
+ config->enable_gpio = of_get_named_gpio(np, "enable-gpio", 0);
+ if (config->enable_gpio < 0) {
+ dev_err(dev, "Couldn't get 'enable-gpio' (%d)\n",
+ config->enable_gpio);
+ return ERR_PTR(config->enable_gpio);
+ }
+ }

/* Fetch GPIOs. */
for (i = 0; ; i++)
--
1.7.9.5


\
 
 \ /
  Last update: 2012-12-10 10:21    [W:0.267 / U:0.300 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site