linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: <patrice.chotard.st@gmail.com>
To: <linux-kernel@vger.kernel.org>, Linus Walleij <linus.walleij@linaro.org>
Cc: Olivier Clergeaud <olivier.clergeaud@st.com>,
	Lee Jones <lee.jones@linaro.org>,
	Fabio Baltieri <fabio.baltieri@linaro.org>,
	Patrice Chotard <patrice.chotard@st.com>
Subject: [PATCH v2 2/4] pinctrl: abx500: fix abx500_gpio_get()
Date: Thu, 20 Jun 2013 16:05:43 +0200	[thread overview]
Message-ID: <1371737145-27662-3-git-send-email-patrice.chotard.st@gmail.com> (raw)
In-Reply-To: <1371737145-27662-1-git-send-email-patrice.chotard.st@gmail.com>

From: Patrice Chotard <patrice.chotard@st.com>

_ allow to get output GPIO value
_ as there is no GPIO0 on ABX500, use correct offset with
  abx500_gpio_get_bit()

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
---
 drivers/pinctrl/pinctrl-abx500.c |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/drivers/pinctrl/pinctrl-abx500.c b/drivers/pinctrl/pinctrl-abx500.c
index d1d42e7..5bf66ad 100644
--- a/drivers/pinctrl/pinctrl-abx500.c
+++ b/drivers/pinctrl/pinctrl-abx500.c
@@ -162,10 +162,23 @@ static int abx500_gpio_get(struct gpio_chip *chip, unsigned offset)
 {
 	struct abx500_pinctrl *pct = to_abx500_pinctrl(chip);
 	bool bit;
+	bool is_out;
+	u8 gpio_offset = offset - 1;
 	int ret;
 
-	ret = abx500_gpio_get_bit(chip, AB8500_GPIO_IN1_REG,
-				  offset, &bit);
+	ret = abx500_gpio_get_bit(chip, AB8500_GPIO_DIR1_REG,
+			gpio_offset, &is_out);
+	if (ret < 0) {
+		dev_err(pct->dev, "%s failed\n", __func__);
+		return ret;
+	}
+
+	if (is_out)
+		ret = abx500_gpio_get_bit(chip, AB8500_GPIO_OUT1_REG,
+				gpio_offset, &bit);
+	else
+		ret = abx500_gpio_get_bit(chip, AB8500_GPIO_IN1_REG,
+				gpio_offset, &bit);
 	if (ret < 0) {
 		dev_err(pct->dev, "%s failed\n", __func__);
 		return ret;
-- 
1.7.10


  parent reply	other threads:[~2013-06-20 14:07 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-20 14:05 [PATCH v2 0/4] pinctrl: ABX500: fix patrice.chotard.st
2013-06-20 14:05 ` [PATCH v2 1/4] pinctrl: abx500: suppress hardcoded value patrice.chotard.st
2013-06-24 11:29   ` Linus Walleij
2013-06-24 12:13     ` Patrice CHOTARD
2013-06-20 14:05 ` patrice.chotard.st [this message]
2013-06-24 11:32   ` [PATCH v2 2/4] pinctrl: abx500: fix abx500_gpio_get() Linus Walleij
2013-06-20 14:05 ` [PATCH v2 3/4] pinctrl: abx500: factorize code patrice.chotard.st
2013-06-24 11:34   ` Linus Walleij
2013-06-20 14:05 ` [PATCH v2 4/4] pinctrl: abx500: rework error path patrice.chotard.st
2013-06-24 11:37   ` Linus Walleij
2013-06-24 12:23     ` Patrice CHOTARD

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=1371737145-27662-3-git-send-email-patrice.chotard.st@gmail.com \
    --to=patrice.chotard.st@gmail.com \
    --cc=fabio.baltieri@linaro.org \
    --cc=lee.jones@linaro.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=olivier.clergeaud@st.com \
    --cc=patrice.chotard@st.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).