target/linux/mediatek/patches-6.6/002-v6.2-arm64-dts-mt7986-harmonize-device-node-order.patch

   1 From 438e53828c08cf0e8a65b61cf6ce1e4b6620551a Mon Sep 17 00:00:00 2001
   2 From: Sam Shih <sam.shih@mediatek.com>
   3 Date: Sun, 6 Nov 2022 09:50:24 +0100
   4 Subject: [PATCH 02/19] arm64: dts: mt7986: harmonize device node order
   5
   6 This arrange device tree nodes in alphabetical order.
   7
   8 Signed-off-by: Sam Shih <sam.shih@mediatek.com>
   9 Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
  10 Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
  11 Link: https://lore.kernel.org/r/20221106085034.12582-2-linux@fw-web.de
  12 Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
  13 ---
  14  arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 94 ++++++++++----------
  15  arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 22 ++---
  16  2 files changed, 58 insertions(+), 58 deletions(-)
  17
  18 --- a/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts
  19 +++ b/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts
  20 @@ -54,6 +54,53 @@
  21         };
  22  };
  23
  24 +&pio {
  25 +       uart1_pins: uart1-pins {
  26 +               mux {
  27 +                       function = "uart";
  28 +                       groups = "uart1";
  29 +               };
  30 +       };
  31 +
  32 +       uart2_pins: uart2-pins {
  33 +               mux {
  34 +                       function = "uart";
  35 +                       groups = "uart2";
  36 +               };
  37 +       };
  38 +
  39 +       wf_2g_5g_pins: wf-2g-5g-pins {
  40 +               mux {
  41 +                       function = "wifi";
  42 +                       groups = "wf_2g", "wf_5g";
  43 +               };
  44 +               conf {
  45 +                       pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
  46 +                              "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
  47 +                              "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
  48 +                              "WF0_TOP_CLK", "WF0_TOP_DATA", "WF1_HB1",
  49 +                              "WF1_HB2", "WF1_HB3", "WF1_HB4", "WF1_HB0",
  50 +                              "WF1_HB5", "WF1_HB6", "WF1_HB7", "WF1_HB8",
  51 +                              "WF1_TOP_CLK", "WF1_TOP_DATA";
  52 +                       drive-strength = <4>;
  53 +               };
  54 +       };
  55 +
  56 +       wf_dbdc_pins: wf-dbdc-pins {
  57 +               mux {
  58 +                       function = "wifi";
  59 +                       groups = "wf_dbdc";
  60 +               };
  61 +               conf {
  62 +                       pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
  63 +                              "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
  64 +                              "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
  65 +                              "WF0_TOP_CLK", "WF0_TOP_DATA";
  66 +                       drive-strength = <4>;
  67 +               };
  68 +       };
  69 +};
  70 +
  71  &switch {
  72         ports {
  73                 #address-cells = <1>;
  74 @@ -121,50 +168,3 @@
  75         pinctrl-0 = <&wf_2g_5g_pins>;
  76         pinctrl-1 = <&wf_dbdc_pins>;
  77  };
  78 -
  79 -&pio {
  80 -       uart1_pins: uart1-pins {
  81 -               mux {
  82 -                       function = "uart";
  83 -                       groups = "uart1";
  84 -               };
  85 -       };
  86 -
  87 -       uart2_pins: uart2-pins {
  88 -               mux {
  89 -                       function = "uart";
  90 -                       groups = "uart2";
  91 -               };
  92 -       };
  93 -
  94 -       wf_2g_5g_pins: wf-2g-5g-pins {
  95 -               mux {
  96 -                       function = "wifi";
  97 -                       groups = "wf_2g", "wf_5g";
  98 -               };
  99 -               conf {
 100 -                       pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
 101 -                              "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
 102 -                              "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
 103 -                              "WF0_TOP_CLK", "WF0_TOP_DATA", "WF1_HB1",
 104 -                              "WF1_HB2", "WF1_HB3", "WF1_HB4", "WF1_HB0",
 105 -                              "WF1_HB5", "WF1_HB6", "WF1_HB7", "WF1_HB8",
 106 -                              "WF1_TOP_CLK", "WF1_TOP_DATA";
 107 -                       drive-strength = <4>;
 108 -               };
 109 -       };
 110 -
 111 -       wf_dbdc_pins: wf-dbdc-pins {
 112 -               mux {
 113 -                       function = "wifi";
 114 -                       groups = "wf_dbdc";
 115 -               };
 116 -               conf {
 117 -                       pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
 118 -                              "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
 119 -                              "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
 120 -                              "WF0_TOP_CLK", "WF0_TOP_DATA";
 121 -                       drive-strength = <4>;
 122 -               };
 123 -       };
 124 -};
 125 --- a/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts
 126 +++ b/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts
 127 @@ -25,10 +25,6 @@
 128         };
 129  };
 130
 131 -&uart0 {
 132 -       status = "okay";
 133 -};
 134 -
 135  &eth {
 136         status = "okay";
 137
 138 @@ -99,13 +95,6 @@
 139         };
 140  };
 141
 142 -&wifi {
 143 -       status = "okay";
 144 -       pinctrl-names = "default", "dbdc";
 145 -       pinctrl-0 = <&wf_2g_5g_pins>;
 146 -       pinctrl-1 = <&wf_dbdc_pins>;
 147 -};
 148 -
 149  &pio {
 150         wf_2g_5g_pins: wf-2g-5g-pins {
 151                 mux {
 152 @@ -138,3 +127,14 @@
 153                 };
 154         };
 155  };
 156 +
 157 +&uart0 {
 158 +       status = "okay";
 159 +};
 160 +
 161 +&wifi {
 162 +       status = "okay";
 163 +       pinctrl-names = "default", "dbdc";
 164 +       pinctrl-0 = <&wf_2g_5g_pins>;
 165 +       pinctrl-1 = <&wf_dbdc_pins>;
 166 +};