target/linux/bcm27xx/patches-5.10/950-0736-ARM-dts-Adapt-to-upstream-changes.patch

   1 From e6942acef85ed8ce64d64147aa2328fbc67065c9 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.com>
   3 Date: Tue, 27 Jul 2021 22:22:52 +0100
   4 Subject: [PATCH] ARM: dts: Adapt to upstream changes
   5
   6 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
   7 ---
   8  arch/arm/boot/dts/bcm2708-rpi-b-plus.dts   |  4 ++--
   9  arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts   |  2 +-
  10  arch/arm/boot/dts/bcm2708-rpi-b.dts        |  2 +-
  11  arch/arm/boot/dts/bcm2708-rpi-cm.dtsi      |  2 +-
  12  arch/arm/boot/dts/bcm2708-rpi-zero-w.dts   |  2 +-
  13  arch/arm/boot/dts/bcm2708-rpi-zero.dts     |  2 +-
  14  arch/arm/boot/dts/bcm2709-rpi-2-b.dts      |  4 ++--
  15  arch/arm/boot/dts/bcm270x.dtsi             |  2 +-
  16  arch/arm/boot/dts/bcm2710-rpi-2-b.dts      |  4 ++--
  17  arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts |  4 ++--
  18  arch/arm/boot/dts/bcm2710-rpi-3-b.dts      |  4 ++--
  19  arch/arm/boot/dts/bcm2710-rpi-cm3.dts      |  2 +-
  20  arch/arm/boot/dts/bcm2711-rpi-4-b.dts      |  4 ++--
  21  arch/arm/boot/dts/bcm2711-rpi-400.dts      | 10 ++++++----
  22  arch/arm/boot/dts/bcm2711-rpi-cm4.dts      | 10 ++++++----
  23  15 files changed, 31 insertions(+), 27 deletions(-)
  24
  25 --- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
  26 +++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
  27 @@ -90,13 +90,13 @@
  28  };
  29
  30  &leds {
  31 -       act_led: act {
  32 +       act_led: led-act {
  33                 label = "led0";
  34                 linux,default-trigger = "mmc0";
  35                 gpios = <&gpio 47 0>;
  36         };
  37
  38 -       pwr_led: pwr {
  39 +       pwr_led: led-pwr {
  40                 label = "led1";
  41                 linux,default-trigger = "input";
  42                 gpios = <&gpio 35 0>;
  43 --- a/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
  44 +++ b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
  45 @@ -103,7 +103,7 @@ i2c_csi_dsi: &i2c1 {
  46  };
  47
  48  &leds {
  49 -       act_led: act {
  50 +       act_led: led-act {
  51                 label = "led0";
  52                 linux,default-trigger = "mmc0";
  53                 gpios = <&gpio 16 1>;
  54 --- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
  55 +++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
  56 @@ -90,7 +90,7 @@
  57  };
  58
  59  &leds {
  60 -       act_led: act {
  61 +       act_led: led-act {
  62                 label = "led0";
  63                 linux,default-trigger = "mmc0";
  64                 gpios = <&gpio 16 1>;
  65 --- a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
  66 +++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
  67 @@ -2,7 +2,7 @@
  68  #include "bcm2708-rpi.dtsi"
  69
  70  &leds {
  71 -       act_led: act {
  72 +       act_led: led-act {
  73                 label = "led0";
  74                 linux,default-trigger = "mmc0";
  75                 gpios = <&gpio 47 0>;
  76 --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
  77 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
  78 @@ -139,7 +139,7 @@
  79  };
  80
  81  &leds {
  82 -       act_led: act {
  83 +       act_led: led-act {
  84                 label = "led0";
  85                 linux,default-trigger = "actpwr";
  86                 gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
  87 --- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts
  88 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
  89 @@ -93,7 +93,7 @@
  90  };
  91
  92  &leds {
  93 -       act_led: act {
  94 +       act_led: led-act {
  95                 label = "led0";
  96                 linux,default-trigger = "actpwr";
  97                 gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
  98 --- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
  99 +++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
 100 @@ -90,13 +90,13 @@
 101  };
 102
 103  &leds {
 104 -       act_led: act {
 105 +       act_led: led-act {
 106                 label = "led0";
 107                 linux,default-trigger = "mmc0";
 108                 gpios = <&gpio 47 0>;
 109         };
 110
 111 -       pwr_led: pwr {
 112 +       pwr_led: led-pwr {
 113                 label = "led1";
 114                 linux,default-trigger = "input";
 115                 gpios = <&gpio 35 0>;
 116 --- a/arch/arm/boot/dts/bcm270x.dtsi
 117 +++ b/arch/arm/boot/dts/bcm270x.dtsi
 118 @@ -33,7 +33,7 @@
 119                 };
 120  #endif
 121
 122 -               /delete-node/ sdhci@7e300000;
 123 +               /delete-node/ mmc@7e300000;
 124
 125                 sdhci: mmc: mmc@7e300000 {
 126                         compatible = "brcm,bcm2835-mmc", "brcm,bcm2835-sdhci";
 127 --- a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
 128 +++ b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
 129 @@ -90,13 +90,13 @@
 130  };
 131
 132  &leds {
 133 -       act_led: act {
 134 +       act_led: led-act {
 135                 label = "led0";
 136                 linux,default-trigger = "mmc0";
 137                 gpios = <&gpio 47 0>;
 138         };
 139
 140 -       pwr_led: pwr {
 141 +       pwr_led: led-pwr {
 142                 label = "led1";
 143                 linux,default-trigger = "input";
 144                 gpios = <&gpio 35 0>;
 145 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 146 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 147 @@ -149,13 +149,13 @@
 148  };
 149
 150  &leds {
 151 -       act_led: act {
 152 +       act_led: led-act {
 153                 label = "led0";
 154                 linux,default-trigger = "mmc0";
 155                 gpios = <&gpio 29 0>;
 156         };
 157
 158 -       pwr_led: pwr {
 159 +       pwr_led: led-pwr {
 160                 label = "led1";
 161                 linux,default-trigger = "default-on";
 162                 gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
 163 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 164 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 165 @@ -164,13 +164,13 @@
 166  };
 167
 168  &leds {
 169 -       act_led: act {
 170 +       act_led: led-act {
 171                 label = "led0";
 172                 linux,default-trigger = "mmc0";
 173                 gpios = <&virtgpio 0 0>;
 174         };
 175
 176 -       pwr_led: pwr {
 177 +       pwr_led: led-pwr {
 178                 label = "led1";
 179                 linux,default-trigger = "input";
 180                 gpios = <&expgpio 7 0>;
 181 --- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
 182 +++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
 183 @@ -123,7 +123,7 @@
 184  };
 185
 186  &leds {
 187 -       act_led: act {
 188 +       act_led: led-act {
 189                 label = "led0";
 190                 linux,default-trigger = "mmc0";
 191                 gpios = <&virtgpio 0 0>;
 192 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 193 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 194 @@ -580,13 +580,13 @@
 195  };
 196
 197  &leds {
 198 -       act_led: act {
 199 +       act_led: led-act {
 200                 label = "led0";
 201                 linux,default-trigger = "mmc0";
 202                 gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
 203         };
 204
 205 -       pwr_led: pwr {
 206 +       pwr_led: led-pwr {
 207                 label = "led1";
 208                 linux,default-trigger = "default-on";
 209                 gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
 210 --- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
 211 +++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
 212 @@ -28,11 +28,11 @@
 213         };
 214
 215         leds {
 216 -               act {
 217 +               led-act {
 218                         gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
 219                 };
 220
 221 -               pwr {
 222 +               led-pwr {
 223                         label = "PWR";
 224                         gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
 225                         default-state = "keep";
 226 @@ -181,12 +181,14 @@
 227  &hdmi0 {
 228         clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>;
 229         clock-names = "hdmi", "bvb", "audio", "cec";
 230 +       wifi-2.4ghz-coexistence;
 231         status = "okay";
 232  };
 233
 234  &hdmi1 {
 235         clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
 236         clock-names = "hdmi", "bvb", "audio", "cec";
 237 +       wifi-2.4ghz-coexistence;
 238         status = "okay";
 239  };
 240
 241 @@ -586,14 +588,14 @@
 242  };
 243
 244  &leds {
 245 -       act_led: act {
 246 +       act_led: led-act {
 247                 label = "led0";
 248                 linux,default-trigger = "default-on";
 249                 default-state = "on";
 250                 gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
 251         };
 252
 253 -       pwr_led: pwr {
 254 +       pwr_led: led-pwr {
 255                 label = "led1";
 256                 linux,default-trigger = "default-on";
 257                 gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
 258 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 259 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 260 @@ -28,11 +28,11 @@
 261         };
 262
 263         leds {
 264 -               act {
 265 +               led-act {
 266                         gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
 267                 };
 268
 269 -               pwr {
 270 +               led-pwr {
 271                         label = "PWR";
 272                         gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
 273                         default-state = "keep";
 274 @@ -193,12 +193,14 @@
 275  &hdmi0 {
 276         clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>;
 277         clock-names = "hdmi", "bvb", "audio", "cec";
 278 +       wifi-2.4ghz-coexistence;
 279         status = "okay";
 280  };
 281
 282  &hdmi1 {
 283         clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
 284         clock-names = "hdmi", "bvb", "audio", "cec";
 285 +       wifi-2.4ghz-coexistence;
 286         status = "okay";
 287  };
 288
 289 @@ -597,13 +599,13 @@
 290  };
 291
 292  &leds {
 293 -       act_led: act {
 294 +       act_led: led-act {
 295                 label = "led0";
 296                 linux,default-trigger = "mmc0";
 297                 gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
 298         };
 299
 300 -       pwr_led: pwr {
 301 +       pwr_led: led-pwr {
 302                 label = "led1";
 303                 linux,default-trigger = "default-on";
 304                 gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;