[PATCH] pinctrl: sunxi: Don't enforce bias disable (for now)

[Chen-Yu Tsai]

On Mon, Jan 23, 2017 at 4:21 PM, Maxime Ripard
<maxime.ripard at free-electrons.com> wrote:
> Commit 07fe64ba213f ("pinctrl: sunxi: Handle bias disable") actually
> enforced enforced the disabling of the pull up/down resistors instead of
> ignoring it like it was done before.
>
> This was part of a wider rework to switch to the generic pinconf bindings,
> and was meant to be merged together with DT patches that were switching to
> it, and removing what was considered default values by both the binding and
> the boards. This included no bias on a pin.
>
> However, those DT patches were delayed to 4.11, which would be fine only
> for a significant number boards having the bias setup wrong, which in turns
> break the MMC on those boards (and possibly other devices too).
>
> In order to avoid conflicts as much as possible, bring back the old
> behaviour for 4.10, and we'll revert that commit once all the DT bits will
> have landed.
>
> Tested-by: Priit Laes <plaes at plaes.org>
> Signed-off-by: Maxime Ripard <maxime.ripard at free-electrons.com>

Acked-by: Chen-Yu Tsai <wens at csie.org>

> ---
> Hi Linus,
>
> This is intended as a fix for 4.10.
>
> Thanks!
> Maxime
>
>  drivers/pinctrl/sunxi/pinctrl-sunxi.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
> index 0eb51e33cb1b..207a8de4e1ed 100644
> --- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
> +++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
> @@ -564,8 +564,7 @@ static int sunxi_pconf_group_set(struct pinctrl_dev *pctldev,
>                         val = arg / 10 - 1;
>                         break;
>                 case PIN_CONFIG_BIAS_DISABLE:
> -                       val = 0;
> -                       break;
> +                       continue;
>                 case PIN_CONFIG_BIAS_PULL_UP:
>                         if (arg == 0)
>                                 return -EINVAL;
> --
> 2.11.0
>