git.openwrt.org Git - openwrt/staging/xback.git/blob

   1 From 085021cc825ed90a6ddc4406f608fb8a85745f81 Mon Sep 17 00:00:00 2001
   2 From: Trevor Woerner <twoerner@gmail.com>
   3 Date: Tue, 19 Dec 2023 12:38:13 -0500
   4 Subject: [PATCH] arm64: dts: rockchip: rk3308-rock-pi-s gpio-line-names
   5  cleanup
   6
   7 Perform the following cleanups on a previous patch:
   8 - indent lines after "gpio-line-names"
   9 - fix D0-D8 -> D0-D7
  10 - sort phandle references
  11
  12 Fixes: c45de75d7a9a ("arm64: dts: rockchip: add gpio-line-names to rk3308-rock-pi-s")
  13 Signed-off-by: Trevor Woerner <twoerner@gmail.com>
  14 Link: https://lore.kernel.org/r/20231219173814.1569-1-twoerner@gmail.com
  15 Signed-off-by: Heiko Stuebner <heiko@sntech.de>
  16 ---
  17  .../boot/dts/rockchip/rk3308-rock-pi-s.dts    | 120 +++++++++---------
  18  1 file changed, 62 insertions(+), 58 deletions(-)
  19
  20 --- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
  21 +++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts
  22 @@ -166,6 +166,68 @@
  23         };
  24  };
  25
  26 +&gpio0 {
  27 +       gpio-line-names =
  28 +               /* GPIO0_A0 - A7 */
  29 +               "", "", "", "", "", "", "", "",
  30 +               /* GPIO0_B0 - B7 */
  31 +               "", "", "", "header1-pin3 [GPIO0_B3]",
  32 +               "header1-pin5 [GPIO0_B4]", "", "",
  33 +               "header1-pin11 [GPIO0_B7]",
  34 +               /* GPIO0_C0 - C7 */
  35 +               "header1-pin13 [GPIO0_C0]",
  36 +               "header1-pin15 [GPIO0_C1]", "", "", "",
  37 +               "", "", "",
  38 +               /* GPIO0_D0 - D7 */
  39 +               "", "", "", "", "", "", "", "";
  40 +};
  41 +
  42 +&gpio1 {
  43 +       gpio-line-names =
  44 +               /* GPIO1_A0 - A7 */
  45 +               "", "", "", "", "", "", "", "",
  46 +               /* GPIO1_B0 - B7 */
  47 +               "", "", "", "", "", "", "", "",
  48 +               /* GPIO1_C0 - C7 */
  49 +               "", "", "", "", "", "", "header1-pin21 [GPIO1_C6]",
  50 +               "header1-pin19 [GPIO1_C7]",
  51 +               /* GPIO1_D0 - D7 */
  52 +               "header1-pin23 [GPIO1_D0]", "header1-pin24 [GPIO1_D1]",
  53 +               "", "", "", "", "", "";
  54 +};
  55 +
  56 +&gpio2 {
  57 +       gpio-line-names =
  58 +               /* GPIO2_A0 - A7 */
  59 +               "header1-pin10 [GPIO2_A0]", "header1-pin8 [GPIO2_A1]",
  60 +               "", "",
  61 +               "header1-pin7 [GPIO2_A4]", "header1-pin12 [GPIO2_A5]",
  62 +               "header2-pin46 [GPIO2_A6]", "header1-pin22 [GPIO1_A7]",
  63 +               /* GPIO2_B0 - B7 */
  64 +               "header2-pin45 [GPIO2_B0]", "header1-pin18 [GPIO2_B1]",
  65 +               "header1-pin16 [GPIO2_B2]", "header2-pin44 [GPIO2_B3]",
  66 +               "header2-pin43 [GPIO2_B4]", "header2-pin28 [GPIO2_B5]",
  67 +               "header2-pin30 [GPIO2_B6]", "header2-pin32 [GPIO2_B7]",
  68 +               /* GPIO2_C0 - C7 */
  69 +               "header2-pin34 [GPIO2_C0]", "", "", "", "", "", "", "",
  70 +               /* GPIO2_D0 - D7 */
  71 +               "", "", "", "", "", "", "", "";
  72 +};
  73 +
  74 +&gpio3 {
  75 +       gpio-line-names =
  76 +               /* GPIO3_A0 - A7 */
  77 +               "", "", "", "", "", "", "", "",
  78 +               /* GPIO3_B0 - B7 */
  79 +               "", "", "header2-pin42 [GPIO3_B2]",
  80 +               "header2-pin41 [GPIO3_B3]", "header2-pin40 [GPIO3_B4]",
  81 +               "header2-pin39 [GPIO3_B5]", "", "",
  82 +               /* GPIO3_C0 - C7 */
  83 +               "", "", "", "", "", "", "", "",
  84 +               /* GPIO3_D0 - D7 */
  85 +               "", "", "", "", "", "", "", "";
  86 +};
  87 +
  88  &i2c1 {
  89         status = "okay";
  90  };
  91 @@ -315,61 +377,3 @@
  92  &wdt {
  93         status = "okay";
  94  };
  95 -
  96 -&gpio0 {
  97 -       gpio-line-names =
  98 -       /* GPIO0_A0 - A7 */
  99 -       "", "", "", "", "", "", "", "",
 100 -       /* GPIO0_B0 - B7 */
 101 -       "", "", "", "header1-pin3 [GPIO0_B3]", "header1-pin5 [GPIO0_B4]",
 102 -       "", "", "header1-pin11 [GPIO0_B7]",
 103 -       /* GPIO0_C0 - C7 */
 104 -       "header1-pin13 [GPIO0_C0]", "header1-pin15 [GPIO0_C1]", "", "", "",
 105 -       "", "", "",
 106 -       /* GPIO0_D0 - D8 */
 107 -       "", "", "", "", "", "", "", "";
 108 -};
 109 -
 110 -&gpio1 {
 111 -       gpio-line-names =
 112 -       /* GPIO1_A0 - A7 */
 113 -       "", "", "", "", "", "", "", "",
 114 -       /* GPIO1_B0 - B7 */
 115 -       "", "", "", "", "", "", "", "",
 116 -       /* GPIO1_C0 - C7 */
 117 -       "", "", "", "", "", "", "header1-pin21 [GPIO1_C6]",
 118 -       "header1-pin19 [GPIO1_C7]",
 119 -       /* GPIO1_D0 - D8 */
 120 -       "header1-pin23 [GPIO1_D0]", "header1-pin24 [GPIO1_D1]", "", "", "",
 121 -       "", "", "";
 122 -};
 123 -
 124 -&gpio2 {
 125 -       gpio-line-names =
 126 -       /* GPIO2_A0 - A7 */
 127 -       "header1-pin10 [GPIO2_A0]", "header1-pin8 [GPIO2_A1]", "", "",
 128 -       "header1-pin7 [GPIO2_A4]", "header1-pin12 [GPIO2_A5]",
 129 -       "header2-pin46 [GPIO2_A6]", "header1-pin22 [GPIO1_A7]",
 130 -       /* GPIO2_B0 - B7 */
 131 -       "header2-pin45 [GPIO2_B0]", "header1-pin18 [GPIO2_B1]",
 132 -       "header1-pin16 [GPIO2_B2]", "header2-pin44 [GPIO2_B3]",
 133 -       "header2-pin43 [GPIO2_B4]", "header2-pin28 [GPIO2_B5]",
 134 -       "header2-pin30 [GPIO2_B6]", "header2-pin32 [GPIO2_B7]",
 135 -       /* GPIO2_C0 - C7 */
 136 -       "header2-pin34 [GPIO2_C0]", "", "", "", "", "", "", "",
 137 -       /* GPIO2_D0 - D8 */
 138 -       "", "", "", "", "", "", "", "";
 139 -};
 140 -
 141 -&gpio3 {
 142 -       gpio-line-names =
 143 -       /* GPIO3_A0 - A7 */
 144 -       "", "", "", "", "", "", "", "",
 145 -       /* GPIO3_B0 - B7 */
 146 -       "", "", "header2-pin42 [GPIO3_B2]", "header2-pin41 [GPIO3_B3]",
 147 -       "header2-pin40 [GPIO3_B4]", "header2-pin39 [GPIO3_B5]", "", "",
 148 -       /* GPIO3_C0 - C7 */
 149 -       "", "", "", "", "", "", "", "",
 150 -       /* GPIO3_D0 - D8 */
 151 -       "", "", "", "", "", "", "", "";
 152 -};