diff options
author | Boris BREZILLON <b.brezillon@overkiz.com> | 2013-08-27 09:19:21 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-26 20:18:14 -0400 |
commit | 25a870d4dc930531f545aa1ae0cdca281d99f980 (patch) | |
tree | ed52fb1d09de128217afe17e74f3a9479ab88009 /drivers/pinctrl | |
parent | ff70cfafb27ead6e06ba3d2e2f648fee7137d9e8 (diff) |
pinctrl: at91: fix get_pullup/down function return
commit 05d3534a321d7fe4524b3b83bb20318282f3ec2c upstream.
In PIO_PUSR and PIO_PPDSR register if a given bit is set 1 this means the
pullup/down for this pin (pin is represented as a bit position) is
disabled.
Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r-- | drivers/pinctrl/pinctrl-at91.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c index 5d7529ed5392..314e5e8e9122 100644 --- a/drivers/pinctrl/pinctrl-at91.c +++ b/drivers/pinctrl/pinctrl-at91.c | |||
@@ -325,7 +325,7 @@ static void at91_mux_disable_interrupt(void __iomem *pio, unsigned mask) | |||
325 | 325 | ||
326 | static unsigned at91_mux_get_pullup(void __iomem *pio, unsigned pin) | 326 | static unsigned at91_mux_get_pullup(void __iomem *pio, unsigned pin) |
327 | { | 327 | { |
328 | return (readl_relaxed(pio + PIO_PUSR) >> pin) & 0x1; | 328 | return !((readl_relaxed(pio + PIO_PUSR) >> pin) & 0x1); |
329 | } | 329 | } |
330 | 330 | ||
331 | static void at91_mux_set_pullup(void __iomem *pio, unsigned mask, bool on) | 331 | static void at91_mux_set_pullup(void __iomem *pio, unsigned mask, bool on) |
@@ -445,7 +445,7 @@ static void at91_mux_pio3_set_debounce(void __iomem *pio, unsigned mask, | |||
445 | 445 | ||
446 | static bool at91_mux_pio3_get_pulldown(void __iomem *pio, unsigned pin) | 446 | static bool at91_mux_pio3_get_pulldown(void __iomem *pio, unsigned pin) |
447 | { | 447 | { |
448 | return (__raw_readl(pio + PIO_PPDSR) >> pin) & 0x1; | 448 | return !((__raw_readl(pio + PIO_PPDSR) >> pin) & 0x1); |
449 | } | 449 | } |
450 | 450 | ||
451 | static void at91_mux_pio3_set_pulldown(void __iomem *pio, unsigned mask, bool is_on) | 451 | static void at91_mux_pio3_set_pulldown(void __iomem *pio, unsigned mask, bool is_on) |