| Message ID | 1377609561-22054-1-git-send-email-b.brezillon@overkiz.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 27/08/2013 15:19, Boris BREZILLON : > 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> Indeed. Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> and even: Cc: stable <stable@vger.kernel.org> # 3.8+ Thanks for fixing this Boris. > --- > drivers/pinctrl/pinctrl-at91.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c > index b90a3a0..19afb9a 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) > > 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) >
On Tue, Aug 27, 2013 at 3:19 PM, Boris BREZILLON <b.brezillon@overkiz.com> wrote: > 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> Patch applied, tagged for stable. Yours, Linus Walleij
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c index b90a3a0..19afb9a 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) 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)
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> --- drivers/pinctrl/pinctrl-at91.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)