mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
34a422794d
This backports multiple patches from kernel 4.10 which are adding missing support for the A64 and the pine64 board. These are the device tree files, the pinctlk and the clock driver. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
From 2154d94b40ea2a5de05245521371d0461bb0d669 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
Date: Mon, 23 Jan 2017 09:21:30 +0100
|
|
Subject: pinctrl: sunxi: Don't enforce bias disable (for now)
|
|
|
|
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@plaes.org>
|
|
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
Acked-by: Chen-Yu Tsai <wens@csie.org>
|
|
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
|
---
|
|
drivers/pinctrl/sunxi/pinctrl-sunxi.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
--- 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
|
|
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;
|