* [PATCH] pinctrl: at91: disable Pull-Down or Pull-Up property before enabling Pull-Up or Pull-Down.
@ 2014-09-11 14:40 Alexandre Belloni
2014-09-11 16:27 ` Nicolas Ferre
2014-09-23 15:00 ` Linus Walleij
0 siblings, 2 replies; 3+ messages in thread
From: Alexandre Belloni @ 2014-09-11 14:40 UTC (permalink / raw)
To: linux-arm-kernel
From: Wenyou Yang <wenyou.yang@atmel.com>
Because the pin's Pull-Up and Pull-Down property is mutually exclusive.
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
---
drivers/pinctrl/pinctrl-at91.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index a3d8902438c7..ee9c0b7aad14 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -371,6 +371,9 @@ static unsigned at91_mux_get_pullup(void __iomem *pio, unsigned pin)
static void at91_mux_set_pullup(void __iomem *pio, unsigned mask, bool on)
{
+ if (on)
+ writel_relaxed(mask, pio + PIO_PPDDR);
+
writel_relaxed(mask, pio + (on ? PIO_PUER : PIO_PUDR));
}
@@ -499,6 +502,9 @@ static bool at91_mux_pio3_get_pulldown(void __iomem *pio, unsigned pin)
static void at91_mux_pio3_set_pulldown(void __iomem *pio, unsigned mask, bool is_on)
{
+ if (is_on)
+ __raw_writel(mask, pio + PIO_PUDR);
+
__raw_writel(mask, pio + (is_on ? PIO_PPDER : PIO_PPDDR));
}
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] pinctrl: at91: disable Pull-Down or Pull-Up property before enabling Pull-Up or Pull-Down.
2014-09-11 14:40 [PATCH] pinctrl: at91: disable Pull-Down or Pull-Up property before enabling Pull-Up or Pull-Down Alexandre Belloni
@ 2014-09-11 16:27 ` Nicolas Ferre
2014-09-23 15:00 ` Linus Walleij
1 sibling, 0 replies; 3+ messages in thread
From: Nicolas Ferre @ 2014-09-11 16:27 UTC (permalink / raw)
To: linux-arm-kernel
On 11/09/2014 16:40, Alexandre Belloni :
> From: Wenyou Yang <wenyou.yang@atmel.com>
>
> Because the pin's Pull-Up and Pull-Down property is mutually exclusive.
>
> Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Yes, indeed:
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> drivers/pinctrl/pinctrl-at91.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
> index a3d8902438c7..ee9c0b7aad14 100644
> --- a/drivers/pinctrl/pinctrl-at91.c
> +++ b/drivers/pinctrl/pinctrl-at91.c
> @@ -371,6 +371,9 @@ static unsigned at91_mux_get_pullup(void __iomem *pio, unsigned pin)
>
> static void at91_mux_set_pullup(void __iomem *pio, unsigned mask, bool on)
> {
> + if (on)
> + writel_relaxed(mask, pio + PIO_PPDDR);
> +
> writel_relaxed(mask, pio + (on ? PIO_PUER : PIO_PUDR));
> }
>
> @@ -499,6 +502,9 @@ static bool at91_mux_pio3_get_pulldown(void __iomem *pio, unsigned pin)
>
> static void at91_mux_pio3_set_pulldown(void __iomem *pio, unsigned mask, bool is_on)
> {
> + if (is_on)
> + __raw_writel(mask, pio + PIO_PUDR);
> +
> __raw_writel(mask, pio + (is_on ? PIO_PPDER : PIO_PPDDR));
> }
>
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] pinctrl: at91: disable Pull-Down or Pull-Up property before enabling Pull-Up or Pull-Down.
2014-09-11 14:40 [PATCH] pinctrl: at91: disable Pull-Down or Pull-Up property before enabling Pull-Up or Pull-Down Alexandre Belloni
2014-09-11 16:27 ` Nicolas Ferre
@ 2014-09-23 15:00 ` Linus Walleij
1 sibling, 0 replies; 3+ messages in thread
From: Linus Walleij @ 2014-09-23 15:00 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Sep 11, 2014 at 4:40 PM, Alexandre Belloni
<alexandre.belloni@free-electrons.com> wrote:
> From: Wenyou Yang <wenyou.yang@atmel.com>
>
> Because the pin's Pull-Up and Pull-Down property is mutually exclusive.
>
> Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Patch applied with Nicolas' ACK.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-09-23 15:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-11 14:40 [PATCH] pinctrl: at91: disable Pull-Down or Pull-Up property before enabling Pull-Up or Pull-Down Alexandre Belloni
2014-09-11 16:27 ` Nicolas Ferre
2014-09-23 15:00 ` Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).