target/linux/bcm27xx/patches-5.15/950-0577-ARM-dts-Update-rpi-400-and-cm4-dts-to-match-4-b.patch

   1 From 34e658087e54db26ebd86f86a1549a393002a9ad Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.com>
   3 Date: Fri, 26 Nov 2021 15:20:06 +0000
   4 Subject: [PATCH] ARM: dts: Update rpi-400 and cm4 dts to match 4-b
   5
   6 The Pi 4B dts file has had numerous updates since the Pi 400 and CM4
   7 dts files were written. Apply those updates to the other files to
   8 minimise the differences. The change is largely cosmetic, except for
   9 the PCI "device-type" to "device_type" rename, and the correction of
  10 the labels on the Pi 400 GPIO expander pins.
  11
  12 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  13 ---
  14  arch/arm/boot/dts/bcm2711-rpi-400.dts | 90 ++++--------------------
  15  arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 98 ++++++---------------------
  16  2 files changed, 36 insertions(+), 152 deletions(-)
  17
  18 --- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
  19 +++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
  20 @@ -1,9 +1,8 @@
  21  // SPDX-License-Identifier: GPL-2.0
  22  /dts-v1/;
  23  #include "bcm2711.dtsi"
  24 -#include "bcm2835-rpi.dtsi"
  25 -
  26 -#include <dt-bindings/reset/raspberrypi,firmware-reset.h>
  27 +#include "bcm2711-rpi.dtsi"
  28 +//#include "bcm283x-rpi-usb-peripheral.dtsi"
  29
  30  / {
  31         compatible = "raspberrypi,400", "brcm,bcm2711";
  32 @@ -14,19 +13,6 @@
  33                 stdout-path = "serial1:115200n8";
  34         };
  35
  36 -       /* Will be filled by the bootloader */
  37 -       memory@0 {
  38 -               device_type = "memory";
  39 -               reg = <0 0 0>;
  40 -       };
  41 -
  42 -       aliases {
  43 -               emmc2bus = &emmc2bus;
  44 -               ethernet0 = &genet;
  45 -               pcie0 = &pcie0;
  46 -               blconfig = &blconfig;
  47 -       };
  48 -
  49         leds {
  50                 led-act {
  51                         gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
  52 @@ -54,8 +40,8 @@
  53                 regulator-always-on;
  54                 regulator-settling-time-us = <5000>;
  55                 gpios = <&expgpio 4 GPIO_ACTIVE_HIGH>;
  56 -               states = <1800000 0x1
  57 -                         3300000 0x0>;
  58 +               states = <1800000 0x1>,
  59 +                        <3300000 0x0>;
  60                 status = "okay";
  61         };
  62
  63 @@ -179,23 +165,13 @@
  64  };
  65
  66  &hdmi0 {
  67 -       clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>;
  68 -       clock-names = "hdmi", "bvb", "audio", "cec";
  69 -       wifi-2.4ghz-coexistence;
  70         status = "okay";
  71  };
  72
  73  &hdmi1 {
  74 -       clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
  75 -       clock-names = "hdmi", "bvb", "audio", "cec";
  76 -       wifi-2.4ghz-coexistence;
  77         status = "okay";
  78  };
  79
  80 -&hvs {
  81 -       clocks = <&firmware_clocks 4>;
  82 -};
  83 -
  84  &pixelvalve0 {
  85         status = "okay";
  86  };
  87 @@ -218,22 +194,6 @@
  88         status = "okay";
  89  };
  90
  91 -&rmem {
  92 -       /*
  93 -        * RPi4's co-processor will copy the board's bootloader configuration
  94 -        * into memory for the OS to consume. It'll also update this node with
  95 -        * its placement information.
  96 -        */
  97 -       blconfig: nvram@0 {
  98 -               compatible = "raspberrypi,bootloader-config", "nvmem-rmem";
  99 -               #address-cells = <1>;
 100 -               #size-cells = <1>;
 101 -               reg = <0x0 0x0 0x0>;
 102 -               no-map;
 103 -               status = "disabled";
 104 -       };
 105 -};
 106 -
 107  /* SDHCI is used to control the SDIO for wireless */
 108  &sdhci {
 109         #address-cells = <1>;
 110 @@ -274,7 +234,7 @@
 111
 112  &pcie0 {
 113         pci@0,0 {
 114 -               device-type = "pci";
 115 +               device_type = "pci";
 116                 #address-cells = <3>;
 117                 #size-cells = <2>;
 118                 ranges;
 119 @@ -282,7 +242,7 @@
 120                 reg = <0 0 0 0 0>;
 121
 122                 usb@0,0 {
 123 -                       reg = <0x0 0 0 0 0>;
 124 +                       reg = <0 0 0 0 0>;
 125                         resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>;
 126                 };
 127         };
 128 @@ -309,10 +269,6 @@
 129         status = "okay";
 130  };
 131
 132 -&vchiq {
 133 -       interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
 134 -};
 135 -
 136  &vc4 {
 137         status = "okay";
 138  };
 139 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 140 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 141 @@ -1,9 +1,8 @@
 142  // SPDX-License-Identifier: GPL-2.0
 143  /dts-v1/;
 144  #include "bcm2711.dtsi"
 145 -#include "bcm2835-rpi.dtsi"
 146 -
 147 -#include <dt-bindings/reset/raspberrypi,firmware-reset.h>
 148 +#include "bcm2711-rpi.dtsi"
 149 +//#include "bcm283x-rpi-usb-peripheral.dtsi"
 150
 151  / {
 152         compatible = "raspberrypi,4-compute-module", "brcm,bcm2711";
 153 @@ -14,19 +13,6 @@
 154                 stdout-path = "serial1:115200n8";
 155         };
 156
 157 -       /* Will be filled by the bootloader */
 158 -       memory@0 {
 159 -               device_type = "memory";
 160 -               reg = <0 0 0>;
 161 -       };
 162 -
 163 -       aliases {
 164 -               emmc2bus = &emmc2bus;
 165 -               ethernet0 = &genet;
 166 -               pcie0 = &pcie0;
 167 -               blconfig = &blconfig;
 168 -       };
 169 -
 170         leds {
 171                 led-act {
 172                         gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
 173 @@ -54,8 +40,8 @@
 174                 regulator-always-on;
 175                 regulator-settling-time-us = <5000>;
 176                 gpios = <&expgpio 4 GPIO_ACTIVE_HIGH>;
 177 -               states = <1800000 0x1
 178 -                         3300000 0x0>;
 179 +               states = <1800000 0x1>,
 180 +                        <3300000 0x0>;
 181                 status = "okay";
 182         };
 183
 184 @@ -78,42 +64,26 @@
 185         status = "okay";
 186  };
 187
 188 -&firmware {
 189 -       firmware_clocks: clocks {
 190 -               compatible = "raspberrypi,firmware-clocks";
 191 -               #clock-cells = <1>;
 192 -       };
 193 -
 194 -       expgpio: gpio {
 195 -               compatible = "raspberrypi,firmware-gpio";
 196 -               gpio-controller;
 197 -               #gpio-cells = <2>;
 198 -               gpio-line-names = "BT_ON",
 199 -                                 "WL_ON",
 200 -                                 "PWR_LED_OFF",
 201 -                                 "ANT1",
 202 -                                 "VDD_SD_IO_SEL",
 203 -                                 "CAM_GPIO",
 204 -                                 "SD_PWR_ON",
 205 -                                 "ANT2";
 206 -               status = "okay";
 207 -
 208 -               ant1: ant1 {
 209 -                       gpio-hog;
 210 -                       gpios = <3 GPIO_ACTIVE_HIGH>;
 211 -                       output-high;
 212 -               };
 213 -
 214 -               ant2: ant2 {
 215 -                       gpio-hog;
 216 -                       gpios = <7 GPIO_ACTIVE_HIGH>;
 217 -                       output-low;
 218 -               };
 219 -       };
 220 -
 221 -       reset: reset {
 222 -               compatible = "raspberrypi,firmware-reset";
 223 -               #reset-cells = <1>;
 224 +&expgpio {
 225 +       gpio-line-names = "BT_ON",
 226 +                         "WL_ON",
 227 +                         "PWR_LED_OFF",
 228 +                         "ANT1",
 229 +                         "VDD_SD_IO_SEL",
 230 +                         "CAM_GPIO",
 231 +                         "SD_PWR_ON",
 232 +                         "ANT2";
 233 +
 234 +       ant1: ant1 {
 235 +               gpio-hog;
 236 +               gpios = <3 GPIO_ACTIVE_HIGH>;
 237 +               output-high;
 238 +       };
 239 +
 240 +       ant2: ant2 {
 241 +               gpio-hog;
 242 +               gpios = <7 GPIO_ACTIVE_HIGH>;
 243 +               output-low;
 244         };
 245  };
 246
 247 @@ -191,23 +161,13 @@
 248  };
 249
 250  &hdmi0 {
 251 -       clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>;
 252 -       clock-names = "hdmi", "bvb", "audio", "cec";
 253 -       wifi-2.4ghz-coexistence;
 254         status = "okay";
 255  };
 256
 257  &hdmi1 {
 258 -       clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
 259 -       clock-names = "hdmi", "bvb", "audio", "cec";
 260 -       wifi-2.4ghz-coexistence;
 261         status = "okay";
 262  };
 263
 264 -&hvs {
 265 -       clocks = <&firmware_clocks 4>;
 266 -};
 267 -
 268  &pixelvalve0 {
 269         status = "okay";
 270  };
 271 @@ -230,22 +190,6 @@
 272         status = "okay";
 273  };
 274
 275 -&rmem {
 276 -       /*
 277 -        * RPi4's co-processor will copy the board's bootloader configuration
 278 -        * into memory for the OS to consume. It'll also update this node with
 279 -        * its placement information.
 280 -        */
 281 -       blconfig: nvram@0 {
 282 -               compatible = "raspberrypi,bootloader-config", "nvmem-rmem";
 283 -               #address-cells = <1>;
 284 -               #size-cells = <1>;
 285 -               reg = <0x0 0x0 0x0>;
 286 -               no-map;
 287 -               status = "disabled";
 288 -       };
 289 -};
 290 -
 291  /* SDHCI is used to control the SDIO for wireless */
 292  &sdhci {
 293         #address-cells = <1>;