diff options
| author | Patrice Chotard <patrice.chotard@st.com> | 2013-06-20 16:05:43 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-06-24 13:31:00 +0200 |
| commit | d8d4f7f875bb8f94c52583a788e456eabbd6281a (patch) | |
| tree | c922e7462c737b1a25ddc146fc57ee26aabfb600 /drivers/pinctrl/pinctrl-abx500.c | |
| parent | 61ce135679d2b0b38f55edc7833b4b1f32c890ed (diff) | |
| download | linux-stable-d8d4f7f875bb8f94c52583a788e456eabbd6281a.tar.gz linux-stable-d8d4f7f875bb8f94c52583a788e456eabbd6281a.tar.bz2 linux-stable-d8d4f7f875bb8f94c52583a788e456eabbd6281a.zip | |
pinctrl: abx500: fix abx500_gpio_get()
- 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>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-abx500.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-abx500.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinctrl-abx500.c b/drivers/pinctrl/pinctrl-abx500.c index caa7ab6811d1..d9d7ffc35c3e 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; |