Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05d3534a authored by Boris BREZILLON's avatar Boris BREZILLON Committed by Linus Walleij
Browse files

pinctrl: at91: fix get_pullup/down function return 



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: default avatarBoris BREZILLON <b.brezillon@overkiz.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent db8ed174

drivers/pinctrl/pinctrl-at91.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

{

	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)
@@ -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)

{

	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)