diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2019-07-17 19:21:48 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-08-17 16:57:32 +0200 |
| commit | 1eb851143a442d78dfebc1a3d925e5f04880d796 (patch) | |
| tree | 63aafcfe03f3559d2a1b1d08a483451bbc908733 /target/linux/gemini | |
| parent | 87b3203664698652122ed6985efff8d38cb0407d (diff) | |
| download | upstream-1eb851143a442d78dfebc1a3d925e5f04880d796.tar.gz upstream-1eb851143a442d78dfebc1a3d925e5f04880d796.tar.bz2 upstream-1eb851143a442d78dfebc1a3d925e5f04880d796.zip | |
gemini: Fix up some confused pin config on SL93512r
Upstream patch fixing the errors in the device tree.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'target/linux/gemini')
| -rw-r--r-- | target/linux/gemini/patches-4.19/0024-ARM-dts-gemini-Fix-up-confused-pin-settings.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/target/linux/gemini/patches-4.19/0024-ARM-dts-gemini-Fix-up-confused-pin-settings.patch b/target/linux/gemini/patches-4.19/0024-ARM-dts-gemini-Fix-up-confused-pin-settings.patch new file mode 100644 index 0000000000..9ae2a79cbf --- /dev/null +++ b/target/linux/gemini/patches-4.19/0024-ARM-dts-gemini-Fix-up-confused-pin-settings.patch @@ -0,0 +1,54 @@ +From 384ec5ed82845c2c81968743dde4a758f572c11b Mon Sep 17 00:00:00 2001 +From: Linus Walleij <linus.walleij@linaro.org> +Date: Sat, 13 Jul 2019 11:52:29 +0200 +Subject: [PATCH] ARM: dts: gemini: Fix up confused pin settings + +The SL93512r board has its pin muxing set up for the wrong +ASIC: SL3516 instead of SL3512 that it is using. Fix it +up and reference the right GPIO for the WPS button. + +Signed-off-by: Linus Walleij <linus.walleij@linaro.org> +--- + arch/arm/boot/dts/gemini-sl93512r.dts | 19 +++++++++++-------- + 1 file changed, 11 insertions(+), 8 deletions(-) + +--- a/arch/arm/boot/dts/gemini-sl93512r.dts ++++ b/arch/arm/boot/dts/gemini-sl93512r.dts +@@ -36,8 +36,8 @@ + wakeup-source; + linux,code = <KEY_WPS_BUTTON>; + label = "WPS"; +- /* Conflict with NAND flash */ +- gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; ++ /* Conflicts with TVC and extended flash */ ++ gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; + }; + + button-setup { +@@ -153,17 +153,20 @@ + syscon: syscon@40000000 { + pinctrl { + /* +- * gpio0egrp cover line 16 used by HD LED +- * gpio0fgrp cover line 17, 18 used by wireless LED and reset button +- * gpio0hgrp cover line 21, 22 used by MDIO for Marvell PHY +- * gpio0kgrp cover line 31 used by USB LED ++ * gpio0agrp cover line 0, used by WPS button ++ * gpio0fgrp cover line 16 used by HD LED ++ * gpio0ggrp cover line 17, 18 used by wireless LAN LED and ++ * reset button OR USB ID select on 17 and USB VBUS select ++ * on 18. (Confusing.) ++ * gpio0igrp cover line 21, 22 used by MDIO for Marvell PHY + */ + gpio0_default_pins: pinctrl-gpio0 { + mux { + function = "gpio0"; +- groups = "gpio0egrp", ++ groups = "gpio0agrp", + "gpio0fgrp", +- "gpio0hgrp"; ++ "gpio0ggrp", ++ "gpio0igrp"; + }; + }; + /* |