target/linux/gemini/patches-4.19/0024-ARM-dts-gemini-Fix-up-confused-pin-settings.patch

   1 From 384ec5ed82845c2c81968743dde4a758f572c11b Mon Sep 17 00:00:00 2001
   2 From: Linus Walleij <linus.walleij@linaro.org>
   3 Date: Sat, 13 Jul 2019 11:52:29 +0200
   4 Subject: [PATCH] ARM: dts: gemini: Fix up confused pin settings
   5
   6 The SL93512r board has its pin muxing set up for the wrong
   7 ASIC: SL3516 instead of SL3512 that it is using. Fix it
   8 up and reference the right GPIO for the WPS button.
   9
  10 Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  11 ---
  12  arch/arm/boot/dts/gemini-sl93512r.dts | 19 +++++++++++--------
  13  1 file changed, 11 insertions(+), 8 deletions(-)
  14
  15 --- a/arch/arm/boot/dts/gemini-sl93512r.dts
  16 +++ b/arch/arm/boot/dts/gemini-sl93512r.dts
  17 @@ -36,8 +36,8 @@
  18                         wakeup-source;
  19                         linux,code = <KEY_WPS_BUTTON>;
  20                         label = "WPS";
  21 -                       /* Conflict with NAND flash */
  22 -                       gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
  23 +                       /* Conflicts with TVC and extended flash */
  24 +                       gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
  25                 };
  26
  27                 button-setup {
  28 @@ -153,17 +153,20 @@
  29                 syscon: syscon@40000000 {
  30                         pinctrl {
  31                                 /*
  32 -                                * gpio0egrp cover line 16 used by HD LED
  33 -                                * gpio0fgrp cover line 17, 18 used by wireless LED and reset button
  34 -                                * gpio0hgrp cover line 21, 22 used by MDIO for Marvell PHY
  35 -                                * gpio0kgrp cover line 31 used by USB LED
  36 +                                * gpio0agrp cover line 0, used by WPS button
  37 +                                * gpio0fgrp cover line 16 used by HD LED
  38 +                                * gpio0ggrp cover line 17, 18 used by wireless LAN LED and
  39 +                                * reset button OR USB ID select on 17 and USB VBUS select
  40 +                                * on 18. (Confusing.)
  41 +                                * gpio0igrp cover line 21, 22 used by MDIO for Marvell PHY
  42                                  */
  43                                 gpio0_default_pins: pinctrl-gpio0 {
  44                                         mux {
  45                                                 function = "gpio0";
  46 -                                               groups = "gpio0egrp",
  47 +                                               groups = "gpio0agrp",
  48                                                 "gpio0fgrp",
  49 -                                               "gpio0hgrp";
  50 +                                               "gpio0ggrp",
  51 +                                               "gpio0igrp";
  52                                         };
  53                                 };
  54                                 /*