Revert "pinctrl: sunxi: Don't enforce bias disable (for now)"

Message ID 20170827125523.29208-1-plaes@plaes.org
State New
Headers show

Commit Message

Priit Laes Aug. 27, 2017, 12:55 p.m.
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>
---
 drivers/pinctrl/sunxi/pinctrl-sunxi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Maxime Ripard Aug. 28, 2017, 6:46 a.m. | #1
1;4803;0c
On Sun, Aug 27, 2017 at 03:55:23PM +0300, Priit Laes wrote:
> 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>

Thanks!
Maxime
Linus Walleij Aug. 31, 2017, 1:52 p.m. | #2
On Sun, Aug 27, 2017 at 2:55 PM, Priit Laes <plaes@plaes.org> wrote:

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

Patch applied with Maxime's ACK.

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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,
 			val = arg / 10 - 1;
 			break;
 		case PIN_CONFIG_BIAS_DISABLE:
-			continue;
+			val = 0;
+			break;
 		case PIN_CONFIG_BIAS_PULL_UP:
 			if (arg == 0)
 				return -EINVAL;