aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPriit Laes <plaes@plaes.org>2017-08-27 08:55:23 -0400
committerLinus Walleij <linus.walleij@linaro.org>2017-08-31 09:51:49 -0400
commitac059e2aa01dcbbd7e0b2609abbef5790486fafe (patch)
tree04be30a234628470f378abcebe9ec629c703d317
parent12219fd2bf5304293f5cf014cbc2e6bfdfcab7b5 (diff)
Revert "pinctrl: sunxi: Don't enforce bias disable (for now)"
This reverts commit 2154d94b40ea2a5de05245521371d0461bb0d669. The original patch was intented to avoid some issues with the sunxi gpio rework and was supposed to be reverted after all the required DT bits had been merged around v4.10. Signed-off-by: Priit Laes <plaes@plaes.org> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/pinctrl/sunxi/pinctrl-sunxi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
index 0dfd7fa66c48..52edf3b5988d 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
@@ -564,7 +564,8 @@ static int sunxi_pconf_group_set(struct pinctrl_dev *pctldev,
564 val = arg / 10 - 1; 564 val = arg / 10 - 1;
565 break; 565 break;
566 case PIN_CONFIG_BIAS_DISABLE: 566 case PIN_CONFIG_BIAS_DISABLE:
567 continue; 567 val = 0;
568 break;
568 case PIN_CONFIG_BIAS_PULL_UP: 569 case PIN_CONFIG_BIAS_PULL_UP:
569 if (arg == 0) 570 if (arg == 0)
570 return -EINVAL; 571 return -EINVAL;