leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pinctrl: at91: fix get_pullup/down function return

Browse Source 
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.

Cc: stable <stable@vger.kernel.org> # 3.8+
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>
This commit is contained in:
Boris BREZILLON 2013-08-27 15:19:21 +02:00 committed by Linus Walleij
parent db8ed17429
commit 05d3534a32
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pinctrl/pinctrl-at91.c
View File

@ -325,7 +325,7 @@ static void at91_mux_disable_interrupt(void __iomem *pio, unsigned mask)
static unsigned at91_mux_get_pullup(void __iomem *pio, unsigned pin) static unsigned at91_mux_get_pullup(void __iomem *pio, unsigned pin)
{ {
return (readl_relaxed(pio + PIO_PUSR) >> pin) & 0x1; return !((readl_relaxed(pio + PIO_PUSR) >> pin) & 0x1);
} }
static void at91_mux_set_pullup(void __iomem *pio, unsigned mask, bool on) 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,
static bool at91_mux_pio3_get_pulldown(void __iomem *pio, unsigned pin) static bool at91_mux_pio3_get_pulldown(void __iomem *pio, unsigned pin)
{ {
return (__raw_readl(pio + PIO_PPDSR) >> pin) & 0x1; return !((__raw_readl(pio + PIO_PPDSR) >> pin) & 0x1);
} }
static void at91_mux_pio3_set_pulldown(void __iomem *pio, unsigned mask, bool is_on) static void at91_mux_pio3_set_pulldown(void __iomem *pio, unsigned mask, bool is_on)