From: Kuninori Morimoto <kuninori.morimoto.gx@gmail.com>
To: Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Lee Jones <lee.jones@linaro.org>
Cc: Simon <horms@verge.net.au>, Magnus <magnus.damm@gmail.com>,
Linux-SH <linux-sh@vger.kernel.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH] regulator: gpio: bugfix: add gpios-status for DT
Date: Fri, 31 Jan 2014 05:25:14 +0000 [thread overview]
Message-ID: <87eh3o7mfc.wl%kuninori.morimoto.gx@gmail.com> (raw)
In-Reply-To: <20140130121251.GO22609@sirena.org.uk>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
config->gpios[x].flags indicates initial pin status,
and it will be used for drvdata->state
on gpio_regulator_probe().
But, current of_get_gpio_regulator_config() doesn't care
about this flags.
This patch adds new gpios-status property in order to
care about initial pin status.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
.../bindings/regulator/gpio-regulator.txt | 1 +
drivers/regulator/gpio-regulator.c | 11 +++++++++++
2 files changed, 12 insertions(+)
diff --git a/Documentation/devicetree/bindings/regulator/gpio-regulator.txt b/Documentation/devicetree/bindings/regulator/gpio-regulator.txt
index 63c6598..3ecb585 100644
--- a/Documentation/devicetree/bindings/regulator/gpio-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/gpio-regulator.txt
@@ -8,6 +8,7 @@ Required properties:
Optional properties:
- enable-gpio : GPIO to use to enable/disable the regulator.
- gpios : GPIO group used to control voltage.
+- gpios-states : gpios pin's initial states. 1 means HIGH
- 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 c0a1d00..7c8e37a 100644
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -172,11 +172,22 @@ of_get_gpio_regulator_config(struct device *dev, struct device_node *np)
if (!config->gpios)
return ERR_PTR(-ENOMEM);
+ prop = of_find_property(np, "gpios-states", NULL);
+ if (prop) {
+ proplen = prop->length / sizeof(int);
+ if (proplen != config->nr_gpios) {
+ /* gpios <-> gpios-states mismatch */
+ prop = NULL;
+ }
+ }
+
for (i = 0; i < config->nr_gpios; i++) {
gpio = of_get_named_gpio(np, "gpios", i);
if (gpio < 0)
break;
config->gpios[i].gpio = gpio;
+ if (prop && be32_to_cpup((int *)prop->value + i))
+ config->gpios[i].flags = GPIOF_OUT_INIT_HIGH;
}
/* Fetch states. */
--
1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: Kuninori Morimoto <kuninori.morimoto.gx@gmail.com>
To: Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Lee Jones <lee.jones@linaro.org>
Cc: Simon <horms@verge.net.au>, Magnus <magnus.damm@gmail.com>,
Linux-SH <linux-sh@vger.kernel.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH] regulator: gpio: bugfix: add gpios-status for DT
Date: Thu, 30 Jan 2014 21:25:14 -0800 (PST) [thread overview]
Message-ID: <87eh3o7mfc.wl%kuninori.morimoto.gx@gmail.com> (raw)
In-Reply-To: <20140130121251.GO22609@sirena.org.uk>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
config->gpios[x].flags indicates initial pin status,
and it will be used for drvdata->state
on gpio_regulator_probe().
But, current of_get_gpio_regulator_config() doesn't care
about this flags.
This patch adds new gpios-status property in order to
care about initial pin status.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
.../bindings/regulator/gpio-regulator.txt | 1 +
drivers/regulator/gpio-regulator.c | 11 +++++++++++
2 files changed, 12 insertions(+)
diff --git a/Documentation/devicetree/bindings/regulator/gpio-regulator.txt b/Documentation/devicetree/bindings/regulator/gpio-regulator.txt
index 63c6598..3ecb585 100644
--- a/Documentation/devicetree/bindings/regulator/gpio-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/gpio-regulator.txt
@@ -8,6 +8,7 @@ Required properties:
Optional properties:
- enable-gpio : GPIO to use to enable/disable the regulator.
- gpios : GPIO group used to control voltage.
+- gpios-states : gpios pin's initial states. 1 means HIGH
- 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 c0a1d00..7c8e37a 100644
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -172,11 +172,22 @@ of_get_gpio_regulator_config(struct device *dev, struct device_node *np)
if (!config->gpios)
return ERR_PTR(-ENOMEM);
+ prop = of_find_property(np, "gpios-states", NULL);
+ if (prop) {
+ proplen = prop->length / sizeof(int);
+ if (proplen != config->nr_gpios) {
+ /* gpios <-> gpios-states mismatch */
+ prop = NULL;
+ }
+ }
+
for (i = 0; i < config->nr_gpios; i++) {
gpio = of_get_named_gpio(np, "gpios", i);
if (gpio < 0)
break;
config->gpios[i].gpio = gpio;
+ if (prop && be32_to_cpup((int *)prop->value + i))
+ config->gpios[i].flags = GPIOF_OUT_INIT_HIGH;
}
/* Fetch states. */
--
1.7.9.5
next prev parent reply other threads:[~2014-01-31 5:25 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-29 8:38 About gpio-regulator setting on DT Kuninori Morimoto
2014-01-29 8:38 ` Kuninori Morimoto
2014-01-29 12:45 ` Mark Brown
2014-01-29 16:16 ` Ben Dooks
2014-01-29 16:51 ` Mark Brown
2014-01-30 0:08 ` Kuninori Morimoto
2014-01-30 0:08 ` Kuninori Morimoto
2014-01-30 12:12 ` Mark Brown
2014-01-31 5:25 ` Kuninori Morimoto [this message]
2014-01-31 5:25 ` [PATCH] regulator: gpio: bugfix: add gpios-status for DT Kuninori Morimoto
2014-02-04 18:43 ` Mark Brown
2014-02-04 18:43 ` Mark Brown
2014-02-12 1:27 ` [PATCH 1/2] regulator: gpio: print warning if gpios <-> gpios-states mismatch on DT Kuninori Morimoto
2014-02-12 1:27 ` Kuninori Morimoto
2014-02-12 12:01 ` Mark Brown
2014-02-12 1:27 ` [PATCH 2/2] regulator: gpio: explain detail of gpios-states Kuninori Morimoto
2014-02-12 1:27 ` Kuninori Morimoto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87eh3o7mfc.wl%kuninori.morimoto.gx@gmail.com \
--to=kuninori.morimoto.gx@gmail.com \
--cc=broonie@kernel.org \
--cc=horms@verge.net.au \
--cc=lee.jones@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=magnus.damm@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.