Subject: [PATCH] pinctrl: at91: disable Pull-Down or Pull-Up property before enabling Pull-Up or Pull-Down.

From: [email-masked] (Nicolas Ferre)
Date: Thu, 11 Sep 2014 18:27:07 +0200

On 11/09/2014 16:40, Alexandre Belloni :
> From: Wenyou Yang <[email-masked]>
> 
> Because the pin's Pull-Up and Pull-Down property is mutually exclusive.
> 
> Signed-off-by: Wenyou Yang <[email-masked]>

Yes, indeed:

Acked-by: Nicolas Ferre <[email-masked]>

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