Skip to content

Commit 2154d94

Browse files
mripardlinusw
authored andcommitted
pinctrl: sunxi: Don't enforce bias disable (for now)
Commit 07fe64b ("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 <[email protected]> Signed-off-by: Maxime Ripard <[email protected]> Acked-by: Chen-Yu Tsai <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
1 parent e82d025 commit 2154d94

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/pinctrl/sunxi/pinctrl-sunxi.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -564,8 +564,7 @@ static int sunxi_pconf_group_set(struct pinctrl_dev *pctldev,
564564
val = arg / 10 - 1;
565565
break;
566566
case PIN_CONFIG_BIAS_DISABLE:
567-
val = 0;
568-
break;
567+
continue;
569568
case PIN_CONFIG_BIAS_PULL_UP:
570569
if (arg == 0)
571570
return -EINVAL;

0 commit comments

Comments
 (0)