target/linux/bcm27xx/patches-5.4/950-0417-ARM-dts-Rebuild-downstream-DTS-files.patch

   1 From b229e7f5a6d21d1b52f3f19fed58bba638714884 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.com>
   3 Date: Thu, 30 Jan 2020 15:48:00 +0000
   4 Subject: [PATCH] ARM: dts: Rebuild downstream DTS files
   5
   6 Refactor the tree of downstream DTS files to achieve approximately the
   7 same end result but wihout modifying upstream files (except for
   8 bcm2711-rpi-4-b.dts).
   9
  10 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  11 ---
  12  arch/arm/boot/dts/bcm2708-rpi.dtsi         | 133 +--------
  13  arch/arm/boot/dts/bcm2708.dtsi             |   4 +
  14  arch/arm/boot/dts/bcm2709.dtsi             |   4 +
  15  arch/arm/boot/dts/bcm270x-rpi.dtsi         | 139 +++++++++
  16  arch/arm/boot/dts/bcm270x.dtsi             |  98 ++++---
  17  arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts |  13 +
  18  arch/arm/boot/dts/bcm2710.dtsi             |   4 +
  19  arch/arm/boot/dts/bcm2711-rpi-4-b.dts      | 315 ++++++++++++++++++++-
  20  arch/arm/boot/dts/bcm2711-rpi.dtsi         | 222 +++++++++++++++
  21  9 files changed, 766 insertions(+), 166 deletions(-)
  22  create mode 100644 arch/arm/boot/dts/bcm270x-rpi.dtsi
  23  create mode 100644 arch/arm/boot/dts/bcm2711-rpi.dtsi
  24
  25 --- a/arch/arm/boot/dts/bcm2708-rpi.dtsi
  26 +++ b/arch/arm/boot/dts/bcm2708-rpi.dtsi
  27 @@ -1,6 +1,7 @@
  28 -/* Downstream modifications to bcm2835-rpi.dtsi */
  29 +/* Downstream modifications common to bcm2835, bcm2836, bcm2837 */
  30
  31  #include "bcm2835-rpi.dtsi"
  32 +#include "bcm270x-rpi.dtsi"
  33
  34  / {
  35         memory@0 {
  36 @@ -9,147 +10,27 @@
  37         };
  38
  39         aliases {
  40 -               audio = &audio;
  41 -               aux = &aux;
  42 -               sound = &sound;
  43 -               soc = &soc;
  44 -               dma = &dma;
  45 -               intc = &intc;
  46 -               watchdog = &watchdog;
  47 -               random = &random;
  48 -               mailbox = &mailbox;
  49 -               gpio = &gpio;
  50 -               uart0 = &uart0;
  51 -               sdhost = &sdhost;
  52 -               mmc0 = &sdhost;
  53 -               i2s = &i2s;
  54 -               spi0 = &spi0;
  55 -               i2c0 = &i2c0;
  56 -               uart1 = &uart1;
  57 -               spi1 = &spi1;
  58 -               spi2 = &spi2;
  59 -               mmc = &mmc;
  60 -               mmc1 = &mmc;
  61 -               i2c1 = &i2c1;
  62                 i2c2 = &i2c2;
  63 -               usb = &usb;
  64 -               leds = &leds;
  65 -               fb = &fb;
  66 -               thermal = &thermal;
  67 -               axiperf = &axiperf;
  68 -       };
  69 -
  70 -       leds: leds {
  71 -               compatible = "gpio-leds";
  72 -       };
  73 -
  74 -       soc {
  75 -               gpiomem {
  76 -                       compatible = "brcm,bcm2835-gpiomem";
  77 -                       reg = <0x7e200000 0x1000>;
  78 -               };
  79 -
  80 -               fb: fb {
  81 -                       compatible = "brcm,bcm2708-fb";
  82 -                       firmware = <&firmware>;
  83 -                       status = "okay";
  84 -               };
  85 -
  86 -               vcsm: vcsm {
  87 -                       compatible = "raspberrypi,bcm2835-vcsm";
  88 -                       firmware = <&firmware>;
  89 -                       status = "okay";
  90 -               };
  91 -
  92 -               /* Onboard audio */
  93 -               audio: audio {
  94 -                       compatible = "brcm,bcm2835-audio";
  95 -                       brcm,pwm-channels = <8>;
  96 -                       status = "disabled";
  97 -               };
  98 -
  99 -               /* External sound card */
 100 -               sound: sound {
 101 -                       status = "disabled";
 102 -               };
 103         };
 104
 105         __overrides__ {
 106 -               cache_line_size;
 107 -
 108 -               uart0 = <&uart0>,"status";
 109 -               uart1 = <&uart1>,"status";
 110 -               i2s = <&i2s>,"status";
 111 -               spi = <&spi0>,"status";
 112 -               i2c0 = <&i2c0>,"status";
 113 -               i2c1 = <&i2c1>,"status";
 114                 i2c2_iknowwhatimdoing = <&i2c2>,"status";
 115 -               i2c0_baudrate = <&i2c0>,"clock-frequency:0";
 116 -               i2c1_baudrate = <&i2c1>,"clock-frequency:0";
 117                 i2c2_baudrate = <&i2c2>,"clock-frequency:0";
 118 -
 119 -               audio = <&audio>,"status";
 120 -               watchdog = <&watchdog>,"status";
 121 -               random = <&random>,"status";
 122 -               sd_overclock = <&sdhost>,"brcm,overclock-50:0";
 123 -               sd_poll_once = <&sdhost>,"non-removable?";
 124 -               sd_force_pio = <&sdhost>,"brcm,force-pio?";
 125 -               sd_pio_limit = <&sdhost>,"brcm,pio-limit:0";
 126 -               sd_debug     = <&sdhost>,"brcm,debug";
 127 -               sdio_overclock = <&mmc>,"brcm,overclock-50:0",
 128 -                                <&mmcnr>,"brcm,overclock-50:0";
 129 -               axiperf      = <&axiperf>,"status";
 130 +               sd_poll_once = <&sdhost>, "non-removable?";
 131         };
 132  };
 133
 134 -&hdmi {
 135 -       power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
 136 -       status = "disabled";
 137 -};
 138 -
 139 -&txp {
 140 -       status = "disabled";
 141 -};
 142 -
 143 -&i2c0 {
 144 -       status = "disabled";
 145 -};
 146 -
 147 -&i2c1 {
 148 -       status = "disabled";
 149 -};
 150 -
 151 -&i2c2 {
 152 -       status = "disabled";
 153 -};
 154 -
 155 -&clocks {
 156 -       firmware = <&firmware>;
 157 -};
 158 -
 159 -&sdhci {
 160 -       pinctrl-names = "default";
 161 -       pinctrl-0 = <&emmc_gpio48>;
 162 -       bus-width = <4>;
 163 -};
 164 -
 165 -sdhost_pins: &sdhost_gpio48 {
 166 -       /* Add alias */
 167 -};
 168 -
 169  &sdhost {
 170         pinctrl-names = "default";
 171         pinctrl-0 = <&sdhost_gpio48>;
 172 -       bus-width = <4>;
 173 -       brcm,overclock-50 = <0>;
 174 -       brcm,pio-limit = <1>;
 175         status = "okay";
 176  };
 177
 178 -&cpu_thermal {
 179 -       /delete-node/ trips;
 180 +&hdmi {
 181 +       power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
 182 +       status = "disabled";
 183  };
 184
 185 -&vec {
 186 +&i2c2 {
 187         status = "disabled";
 188  };
 189 --- a/arch/arm/boot/dts/bcm2708.dtsi
 190 +++ b/arch/arm/boot/dts/bcm2708.dtsi
 191 @@ -8,3 +8,7 @@
 192                 arm_freq;
 193         };
 194  };
 195 +
 196 +&vc4 {
 197 +       status = "disabled";
 198 +};
 199 --- a/arch/arm/boot/dts/bcm2709.dtsi
 200 +++ b/arch/arm/boot/dts/bcm2709.dtsi
 201 @@ -16,3 +16,7 @@
 202                            <&v7_cpu3>, "clock-frequency:0";
 203         };
 204  };
 205 +
 206 +&vc4 {
 207 +       status = "disabled";
 208 +};
 209 --- /dev/null
 210 +++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi
 211 @@ -0,0 +1,139 @@
 212 +/* Downstream modifications to bcm2835-rpi.dtsi */
 213 +
 214 +/ {
 215 +       aliases {
 216 +               audio = &audio;
 217 +               aux = &aux;
 218 +               sound = &sound;
 219 +               soc = &soc;
 220 +               dma = &dma;
 221 +               intc = &intc;
 222 +               watchdog = &watchdog;
 223 +               random = &random;
 224 +               mailbox = &mailbox;
 225 +               gpio = &gpio;
 226 +               uart0 = &uart0;
 227 +               uart1 = &uart1;
 228 +               sdhost = &sdhost;
 229 +               mmc = &mmc;
 230 +               mmc1 = &mmc;
 231 +               mmc0 = &sdhost;
 232 +               i2s = &i2s;
 233 +               i2c0 = &i2c0;
 234 +               i2c1 = &i2c1;
 235 +               spi0 = &spi0;
 236 +               spi1 = &spi1;
 237 +               spi2 = &spi2;
 238 +               usb = &usb;
 239 +               leds = &leds;
 240 +               fb = &fb;
 241 +               thermal = &thermal;
 242 +               axiperf = &axiperf;
 243 +       };
 244 +
 245 +       /* Define these notional regulators for use by overlays */
 246 +       vdd_3v3_reg: fixedregulator_3v3 {
 247 +               compatible = "regulator-fixed";
 248 +               regulator-always-on;
 249 +               regulator-max-microvolt = <3300000>;
 250 +               regulator-min-microvolt = <3300000>;
 251 +               regulator-name = "3v3";
 252 +       };
 253 +
 254 +       vdd_5v0_reg: fixedregulator_5v0 {
 255 +               compatible = "regulator-fixed";
 256 +               regulator-always-on;
 257 +               regulator-max-microvolt = <5000000>;
 258 +               regulator-min-microvolt = <5000000>;
 259 +               regulator-name = "5v0";
 260 +       };
 261 +
 262 +       leds: leds {
 263 +               compatible = "gpio-leds";
 264 +       };
 265 +
 266 +       soc {
 267 +               gpiomem {
 268 +                       compatible = "brcm,bcm2835-gpiomem";
 269 +                       reg = <0x7e200000 0x1000>;
 270 +               };
 271 +
 272 +               fb: fb {
 273 +                       compatible = "brcm,bcm2708-fb";
 274 +                       firmware = <&firmware>;
 275 +                       status = "okay";
 276 +               };
 277 +
 278 +               vcsm: vcsm {
 279 +                       compatible = "raspberrypi,bcm2835-vcsm";
 280 +                       firmware = <&firmware>;
 281 +                       status = "okay";
 282 +               };
 283 +
 284 +               /* Onboard audio */
 285 +               audio: audio {
 286 +                       compatible = "brcm,bcm2835-audio";
 287 +                       brcm,pwm-channels = <8>;
 288 +                       status = "disabled";
 289 +               };
 290 +
 291 +               /* External sound card */
 292 +               sound: sound {
 293 +                       status = "disabled";
 294 +               };
 295 +       };
 296 +
 297 +       __overrides__ {
 298 +               cache_line_size;
 299 +
 300 +               uart0 = <&uart0>,"status";
 301 +               uart1 = <&uart1>,"status";
 302 +               i2s = <&i2s>,"status";
 303 +               spi = <&spi0>,"status";
 304 +               i2c0 = <&i2c0>,"status";
 305 +               i2c1 = <&i2c1>,"status";
 306 +               i2c0_baudrate = <&i2c0>,"clock-frequency:0";
 307 +               i2c1_baudrate = <&i2c1>,"clock-frequency:0";
 308 +
 309 +               audio = <&audio>,"status";
 310 +               watchdog = <&watchdog>,"status";
 311 +               random = <&random>,"status";
 312 +               sd_overclock = <&sdhost>,"brcm,overclock-50:0";
 313 +               sd_force_pio = <&sdhost>,"brcm,force-pio?";
 314 +               sd_pio_limit = <&sdhost>,"brcm,pio-limit:0";
 315 +               sd_debug     = <&sdhost>,"brcm,debug";
 316 +               sdio_overclock = <&mmc>,"brcm,overclock-50:0",
 317 +                                <&mmcnr>,"brcm,overclock-50:0";
 318 +               axiperf      = <&axiperf>,"status";
 319 +       };
 320 +};
 321 +
 322 +&txp {
 323 +       status = "disabled";
 324 +};
 325 +
 326 +&i2c0 {
 327 +       status = "disabled";
 328 +};
 329 +
 330 +&i2c1 {
 331 +       status = "disabled";
 332 +};
 333 +
 334 +&clocks {
 335 +       firmware = <&firmware>;
 336 +};
 337 +
 338 +&sdhci {
 339 +       pinctrl-names = "default";
 340 +       pinctrl-0 = <&emmc_gpio48>;
 341 +       bus-width = <4>;
 342 +};
 343 +
 344 +&cpu_thermal {
 345 +       /delete-node/ trips;
 346 +};
 347 +
 348 +&vec {
 349 +       status = "disabled";
 350 +};
 351 --- a/arch/arm/boot/dts/bcm270x.dtsi
 352 +++ b/arch/arm/boot/dts/bcm270x.dtsi
 353 @@ -17,32 +17,8 @@
 354                         /* Add label */
 355                 };
 356
 357 -               gpio@7e200000 { /* gpio */
 358 -                       interrupts = <2 17>, <2 18>;
 359 -
 360 -                       dpi_18bit_gpio0: dpi_18bit_gpio0 {
 361 -                               brcm,pins = <0 1 2 3 4 5 6 7 8 9 10 11
 362 -                                            12 13 14 15 16 17 18 19
 363 -                                            20 21>;
 364 -                               brcm,function = <BCM2835_FSEL_ALT2>;
 365 -                       };
 366 -               };
 367 -
 368 -               serial@7e201000 { /* uart0 */
 369 -                       /* Enable CTS bug workaround */
 370 -                       cts-event-workaround;
 371 -               };
 372 -
 373 -               i2s@7e203000 { /* i2s */
 374 -                       #sound-dai-cells = <0>;
 375 -                       reg = <0x7e203000 0x24>;
 376 -                       clocks = <&clocks BCM2835_CLOCK_PCM>;
 377 -               };
 378 -
 379                 spi0: spi@7e204000 {
 380                         /* Add label */
 381 -                       dmas = <&dma 6>, <&dma 7>;
 382 -                       dma-names = "tx", "rx";
 383                 };
 384
 385                 pixelvalve0: pixelvalve@7e206000 {
 386 @@ -55,17 +31,6 @@
 387                         status = "disabled";
 388                 };
 389
 390 -               dpi: dpi@7e208000 {
 391 -                       compatible = "brcm,bcm2835-dpi";
 392 -                       reg = <0x7e208000 0x8c>;
 393 -                       clocks = <&clocks BCM2835_CLOCK_VPU>,
 394 -                                <&clocks BCM2835_CLOCK_DPI>;
 395 -                       clock-names = "core", "pixel";
 396 -                       #address-cells = <1>;
 397 -                       #size-cells = <0>;
 398 -                       status = "disabled";
 399 -               };
 400 -
 401                 /delete-node/ sdhci@7e300000;
 402
 403                 sdhci: mmc: mmc@7e300000 {
 404 @@ -118,6 +83,34 @@
 405                         status = "disabled";
 406                 };
 407
 408 +               csi0: csi@7e800000 {
 409 +                       compatible = "brcm,bcm2835-unicam";
 410 +                       reg = <0x7e800000 0x800>,
 411 +                             <0x7e802000 0x4>;
 412 +                       interrupts = <2 6>;
 413 +                       clocks = <&clocks BCM2835_CLOCK_CAM0>;
 414 +                       clock-names = "lp";
 415 +                       power-domains = <&power RPI_POWER_DOMAIN_UNICAM0>;
 416 +                       #address-cells = <1>;
 417 +                       #size-cells = <0>;
 418 +                       #clock-cells = <1>;
 419 +                       status = "disabled";
 420 +               };
 421 +
 422 +               csi1: csi@7e801000 {
 423 +                       compatible = "brcm,bcm2835-unicam";
 424 +                       reg = <0x7e801000 0x800>,
 425 +                             <0x7e802004 0x4>;
 426 +                       interrupts = <2 7>;
 427 +                       clocks = <&clocks BCM2835_CLOCK_CAM1>;
 428 +                       clock-names = "lp";
 429 +                       power-domains = <&power RPI_POWER_DOMAIN_UNICAM1>;
 430 +                       #address-cells = <1>;
 431 +                       #size-cells = <0>;
 432 +                       #clock-cells = <1>;
 433 +                       status = "disabled";
 434 +               };
 435 +
 436                 pixelvalve2: pixelvalve@7e807000 {
 437                         /* Add label */
 438                         status = "disabled";
 439 @@ -160,6 +153,37 @@
 440         };
 441  };
 442
 443 -&vc4 {
 444 -       status = "disabled";
 445 +&gpio {
 446 +       interrupts = <2 17>, <2 18>;
 447 +
 448 +       dpi_18bit_gpio0: dpi_18bit_gpio0 {
 449 +               brcm,pins = <0 1 2 3 4 5 6 7 8 9 10 11
 450 +                            12 13 14 15 16 17 18 19
 451 +                            20 21>;
 452 +               brcm,function = <BCM2835_FSEL_ALT2>;
 453 +       };
 454 +};
 455 +
 456 +&uart0 {
 457 +       /* Enable CTS bug workaround */
 458 +       cts-event-workaround;
 459 +};
 460 +
 461 +&i2s {
 462 +       #sound-dai-cells = <0>;
 463 +       dmas = <&dma 2>, <&dma 3>;
 464 +       dma-names = "tx", "rx";
 465 +};
 466 +
 467 +&sdhost {
 468 +       dmas = <&dma (13|(1<<29))>;
 469 +       dma-names = "rx-tx";
 470 +       bus-width = <4>;
 471 +       brcm,overclock-50 = <0>;
 472 +       brcm,pio-limit = <1>;
 473 +};
 474 +
 475 +&spi0 {
 476 +       dmas = <&dma 6>, <&dma 7>;
 477 +       dma-names = "tx", "rx";
 478  };
 479 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 480 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 481 @@ -170,6 +170,12 @@
 482         pinctrl-0 = <&audio_pins>;
 483  };
 484
 485 +&eth_phy {
 486 +       microchip,eee-enabled;
 487 +       microchip,tx-lpi-timer = <600>; /* non-aggressive*/
 488 +       microchip,downshift-after = <2>;
 489 +};
 490 +
 491  / {
 492         __overrides__ {
 493                 act_led_gpio = <&act_led>,"gpios:4";
 494 @@ -179,5 +185,12 @@
 495                 pwr_led_gpio = <&pwr_led>,"gpios:4";
 496                 pwr_led_activelow = <&pwr_led>,"gpios:8";
 497                 pwr_led_trigger = <&pwr_led>,"linux,default-trigger";
 498 +
 499 +               eee = <&eth_phy>,"microchip,eee-enabled?";
 500 +               tx_lpi_timer = <&eth_phy>,"microchip,tx-lpi-timer:0";
 501 +               eth_led0 = <&eth_phy>,"microchip,led-modes:0";
 502 +               eth_led1 = <&eth_phy>,"microchip,led-modes:4";
 503 +               eth_downshift_after = <&eth_phy>,"microchip,downshift-after:0";
 504 +               eth_max_speed = <&eth_phy>,"max-speed:0";
 505         };
 506  };
 507 --- a/arch/arm/boot/dts/bcm2710.dtsi
 508 +++ b/arch/arm/boot/dts/bcm2710.dtsi
 509 @@ -23,3 +23,7 @@
 510                        <&cpu3>, "clock-frequency:0";
 511         };
 512  };
 513 +
 514 +&vc4 {
 515 +       status = "disabled";
 516 +};
 517 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 518 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 519 @@ -2,7 +2,6 @@
 520  /dts-v1/;
 521  #include "bcm2711.dtsi"
 522  #include "bcm2835-rpi.dtsi"
 523 -#include "bcm283x-rpi-usb-peripheral.dtsi"
 524
 525  / {
 526         compatible = "raspberrypi,4-model-b", "brcm,bcm2711";
 527 @@ -65,8 +64,8 @@
 528                                   "GLOBAL_RESET",
 529                                   "VDD_SD_IO_SEL",
 530                                   "CAM_GPIO",
 531 -                                 "",
 532 -                                 "";
 533 +                                 "SD_PWR_ON",
 534 +                                 "SD_OC_N";
 535                 status = "okay";
 536         };
 537  };
 538 @@ -138,3 +137,313 @@
 539  &vchiq {
 540         interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
 541  };
 542 +
 543 +// =============================================
 544 +// Downstream rpi- changes
 545 +
 546 +#include "bcm270x.dtsi"
 547 +#include "bcm2711-rpi.dtsi"
 548 +#include "bcm283x-rpi-csi1-2lane.dtsi"
 549 +
 550 +/ {
 551 +       chosen {
 552 +               bootargs = "coherent_pool=1M 8250.nr_uarts=1 cma=64M";
 553 +       };
 554 +
 555 +       aliases {
 556 +               serial0 = &uart1;
 557 +               serial1 = &uart0;
 558 +               mmc0 = &emmc2;
 559 +               mmc1 = &mmcnr;
 560 +               mmc2 = &sdhost;
 561 +               /delete-property/ i2c2;
 562 +               i2c3 = &i2c3;
 563 +               i2c4 = &i2c4;
 564 +               i2c5 = &i2c5;
 565 +               i2c6 = &i2c6;
 566 +               /delete-property/ ethernet;
 567 +               /delete-property/ intc;
 568 +               pcie0 = &pcie_0;
 569 +       };
 570 +
 571 +       /delete-node/ wifi-pwrseq;
 572 +};
 573 +
 574 +&mmcnr {
 575 +       pinctrl-names = "default";
 576 +       pinctrl-0 = <&sdio_pins>;
 577 +       bus-width = <4>;
 578 +       status = "okay";
 579 +};
 580 +
 581 +&uart0 {
 582 +       pinctrl-0 = <&uart0_pins &bt_pins>;
 583 +       status = "okay";
 584 +
 585 +       /delete-node/ bluetooth;
 586 +};
 587 +
 588 +&uart1 {
 589 +       pinctrl-0 = <&uart1_pins>;
 590 +};
 591 +
 592 +&spi0 {
 593 +       pinctrl-names = "default";
 594 +       pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
 595 +       cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
 596 +
 597 +       spidev0: spidev@0{
 598 +               compatible = "spidev";
 599 +               reg = <0>;      /* CE0 */
 600 +               #address-cells = <1>;
 601 +               #size-cells = <0>;
 602 +               spi-max-frequency = <125000000>;
 603 +       };
 604 +
 605 +       spidev1: spidev@1{
 606 +               compatible = "spidev";
 607 +               reg = <1>;      /* CE1 */
 608 +               #address-cells = <1>;
 609 +               #size-cells = <0>;
 610 +               spi-max-frequency = <125000000>;
 611 +       };
 612 +};
 613 +
 614 +&gpio {
 615 +       spi0_pins: spi0_pins {
 616 +               brcm,pins = <9 10 11>;
 617 +               brcm,function = <BCM2835_FSEL_ALT0>;
 618 +       };
 619 +
 620 +       spi0_cs_pins: spi0_cs_pins {
 621 +               brcm,pins = <8 7>;
 622 +               brcm,function = <BCM2835_FSEL_GPIO_OUT>;
 623 +       };
 624 +
 625 +       spi3_pins: spi3_pins {
 626 +               brcm,pins = <1 2 3>;
 627 +               brcm,function = <BCM2835_FSEL_ALT3>;
 628 +       };
 629 +
 630 +       spi3_cs_pins: spi3_cs_pins {
 631 +               brcm,pins = <0 24>;
 632 +               brcm,function = <BCM2835_FSEL_GPIO_OUT>;
 633 +       };
 634 +
 635 +       spi4_pins: spi4_pins {
 636 +               brcm,pins = <5 6 7>;
 637 +               brcm,function = <BCM2835_FSEL_ALT3>;
 638 +       };
 639 +
 640 +       spi4_cs_pins: spi4_cs_pins {
 641 +               brcm,pins = <4 25>;
 642 +               brcm,function = <BCM2835_FSEL_GPIO_OUT>;
 643 +       };
 644 +
 645 +       spi5_pins: spi5_pins {
 646 +               brcm,pins = <13 14 15>;
 647 +               brcm,function = <BCM2835_FSEL_ALT3>;
 648 +       };
 649 +
 650 +       spi5_cs_pins: spi5_cs_pins {
 651 +               brcm,pins = <12 26>;
 652 +               brcm,function = <BCM2835_FSEL_GPIO_OUT>;
 653 +       };
 654 +
 655 +       spi6_pins: spi6_pins {
 656 +               brcm,pins = <19 20 21>;
 657 +               brcm,function = <BCM2835_FSEL_ALT3>;
 658 +       };
 659 +
 660 +       spi6_cs_pins: spi6_cs_pins {
 661 +               brcm,pins = <18 27>;
 662 +               brcm,function = <BCM2835_FSEL_GPIO_OUT>;
 663 +       };
 664 +
 665 +       i2c0_pins: i2c0 {
 666 +               brcm,pins = <0 1>;
 667 +               brcm,function = <BCM2835_FSEL_ALT0>;
 668 +               brcm,pull = <BCM2835_PUD_UP>;
 669 +       };
 670 +
 671 +       i2c1_pins: i2c1 {
 672 +               brcm,pins = <2 3>;
 673 +               brcm,function = <BCM2835_FSEL_ALT0>;
 674 +               brcm,pull = <BCM2835_PUD_UP>;
 675 +       };
 676 +
 677 +       i2c3_pins: i2c3 {
 678 +               brcm,pins = <4 5>;
 679 +               brcm,function = <BCM2835_FSEL_ALT5>;
 680 +               brcm,pull = <BCM2835_PUD_UP>;
 681 +       };
 682 +
 683 +       i2c4_pins: i2c4 {
 684 +               brcm,pins = <8 9>;
 685 +               brcm,function = <BCM2835_FSEL_ALT5>;
 686 +               brcm,pull = <BCM2835_PUD_UP>;
 687 +       };
 688 +
 689 +       i2c5_pins: i2c5 {
 690 +               brcm,pins = <12 13>;
 691 +               brcm,function = <BCM2835_FSEL_ALT5>;
 692 +               brcm,pull = <BCM2835_PUD_UP>;
 693 +       };
 694 +
 695 +       i2c6_pins: i2c6 {
 696 +               brcm,pins = <22 23>;
 697 +               brcm,function = <BCM2835_FSEL_ALT5>;
 698 +               brcm,pull = <BCM2835_PUD_UP>;
 699 +       };
 700 +
 701 +       i2s_pins: i2s {
 702 +               brcm,pins = <18 19 20 21>;
 703 +               brcm,function = <BCM2835_FSEL_ALT0>;
 704 +       };
 705 +
 706 +       sdio_pins: sdio_pins {
 707 +               brcm,pins =     <34 35 36 37 38 39>;
 708 +               brcm,function = <BCM2835_FSEL_ALT3>; // alt3 = SD1
 709 +               brcm,pull =     <0 2 2 2 2 2>;
 710 +       };
 711 +
 712 +       bt_pins: bt_pins {
 713 +               brcm,pins = "-"; // non-empty to keep btuart happy, //4 = 0
 714 +                                // to fool pinctrl
 715 +               brcm,function = <0>;
 716 +               brcm,pull = <2>;
 717 +       };
 718 +
 719 +       uart0_pins: uart0_pins {
 720 +               brcm,pins = <32 33>;
 721 +               brcm,function = <BCM2835_FSEL_ALT3>;
 722 +               brcm,pull = <0 2>;
 723 +       };
 724 +
 725 +       uart1_pins: uart1_pins {
 726 +               brcm,pins;
 727 +               brcm,function;
 728 +               brcm,pull;
 729 +       };
 730 +
 731 +       uart2_pins: uart2_pins {
 732 +               brcm,pins = <0 1>;
 733 +               brcm,function = <BCM2835_FSEL_ALT4>;
 734 +               brcm,pull = <0 2>;
 735 +       };
 736 +
 737 +       uart3_pins: uart3_pins {
 738 +               brcm,pins = <4 5>;
 739 +               brcm,function = <BCM2835_FSEL_ALT4>;
 740 +               brcm,pull = <0 2>;
 741 +       };
 742 +
 743 +       uart4_pins: uart4_pins {
 744 +               brcm,pins = <8 9>;
 745 +               brcm,function = <BCM2835_FSEL_ALT4>;
 746 +               brcm,pull = <0 2>;
 747 +       };
 748 +
 749 +       uart5_pins: uart5_pins {
 750 +               brcm,pins = <12 13>;
 751 +               brcm,function = <BCM2835_FSEL_ALT4>;
 752 +               brcm,pull = <0 2>;
 753 +       };
 754 +};
 755 +
 756 +&i2c0 {
 757 +       pinctrl-names = "default";
 758 +       pinctrl-0 = <&i2c0_pins>;
 759 +       clock-frequency = <100000>;
 760 +};
 761 +
 762 +&i2c1 {
 763 +       pinctrl-names = "default";
 764 +       pinctrl-0 = <&i2c1_pins>;
 765 +       clock-frequency = <100000>;
 766 +};
 767 +
 768 +&i2s {
 769 +       pinctrl-names = "default";
 770 +       pinctrl-0 = <&i2s_pins>;
 771 +};
 772 +
 773 +/ {
 774 +       __overrides__ {
 775 +               /delete-property/ i2c2_baudrate;
 776 +               /delete-property/ i2c2_iknowwhatimdoing;
 777 +       };
 778 +};
 779 +
 780 +// =============================================
 781 +// Board specific stuff here
 782 +
 783 +/ {
 784 +       sd_vcc_reg: sd_vcc_reg {
 785 +               compatible = "regulator-fixed";
 786 +               regulator-name = "vcc-sd";
 787 +               regulator-min-microvolt = <3300000>;
 788 +               regulator-max-microvolt = <3300000>;
 789 +               regulator-boot-on;
 790 +               enable-active-high;
 791 +               gpio = <&expgpio 6 GPIO_ACTIVE_HIGH>;
 792 +       };
 793 +};
 794 +
 795 +&sdhost {
 796 +       status = "disabled";
 797 +};
 798 +
 799 +&emmc2 {
 800 +       vmmc-supply = <&sd_vcc_reg>;
 801 +};
 802 +
 803 +&phy1 {
 804 +       led-modes = <0x00 0x08>; /* link/activity link */
 805 +};
 806 +
 807 +&gpio {
 808 +       audio_pins: audio_pins {
 809 +               brcm,pins = <40 41>;
 810 +               brcm,function = <4>;
 811 +       };
 812 +};
 813 +
 814 +&leds {
 815 +       act_led: act {
 816 +               label = "led0";
 817 +               linux,default-trigger = "mmc0";
 818 +               gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
 819 +       };
 820 +
 821 +       pwr_led: pwr {
 822 +               label = "led1";
 823 +               linux,default-trigger = "default-on";
 824 +               gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
 825 +       };
 826 +};
 827 +
 828 +&pwm1 {
 829 +       status = "disabled";
 830 +};
 831 +
 832 +&audio {
 833 +       pinctrl-names = "default";
 834 +       pinctrl-0 = <&audio_pins>;
 835 +};
 836 +
 837 +/ {
 838 +       __overrides__ {
 839 +               act_led_gpio = <&act_led>,"gpios:4";
 840 +               act_led_activelow = <&act_led>,"gpios:8";
 841 +               act_led_trigger = <&act_led>,"linux,default-trigger";
 842 +
 843 +               pwr_led_gpio = <&pwr_led>,"gpios:4";
 844 +               pwr_led_activelow = <&pwr_led>,"gpios:8";
 845 +               pwr_led_trigger = <&pwr_led>,"linux,default-trigger";
 846 +
 847 +               eth_led0 = <&phy1>,"led-modes:0";
 848 +               eth_led1 = <&phy1>,"led-modes:4";
 849 +
 850 +       };
 851 +};
 852 --- /dev/null
 853 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 854 @@ -0,0 +1,222 @@
 855 +// SPDX-License-Identifier: GPL-2.0
 856 +#include "bcm270x-rpi.dtsi"
 857 +
 858 +/ {
 859 +       soc {
 860 +               /delete-node/ v3d@7ec00000;
 861 +               /delete-node/ mailbox@7e00b840;
 862 +       };
 863 +
 864 +       __overrides__ {
 865 +               arm_freq;
 866 +               sd_poll_once = <&emmc2>, "non-removable?";
 867 +       };
 868 +
 869 +       v3dbus {
 870 +               compatible = "simple-bus";
 871 +               #address-cells = <1>;
 872 +               #size-cells = <2>;
 873 +               ranges = <0x7c500000  0x0 0xfc500000  0x0 0x03300000>,
 874 +                        <0x40000000  0x0 0xff800000  0x0 0x00800000>;
 875 +               dma-ranges = <0x00000000  0x0 0x00000000  0x4 0x00000000>;
 876 +
 877 +               v3d: v3d@7ec04000 {
 878 +                       compatible = "brcm,2711-v3d";
 879 +                       reg =
 880 +                           <0x7ec00000  0x0 0x4000>,
 881 +                           <0x7ec04000  0x0 0x4000>;
 882 +                       reg-names = "hub", "core0";
 883 +
 884 +                       power-domains = <&pm BCM2835_POWER_DOMAIN_GRAFX_V3D>;
 885 +                       resets = <&pm BCM2835_RESET_V3D>;
 886 +                       clocks = <&clocks BCM2835_CLOCK_V3D>;
 887 +                       interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
 888 +                       status = "disabled";
 889 +               };
 890 +       };
 891 +
 892 +       scb: scb {
 893 +            /* Add a label */
 894 +       };
 895 +};
 896 +
 897 +&soc {
 898 +       thermal: thermal@7d5d2200 {
 899 +               compatible = "brcm,avs-tmon-bcm2838";
 900 +               reg = <0x7d5d2200 0x2c>;
 901 +               interrupts = <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;
 902 +               interrupt-names = "tmon";
 903 +               clocks = <&clocks BCM2835_CLOCK_TSENS>;
 904 +               #thermal-sensor-cells = <0>;
 905 +               status = "okay";
 906 +       };
 907 +
 908 +       vc4: gpu {
 909 +               compatible = "brcm,bcm2835-vc4";
 910 +               status = "disabled";
 911 +       };
 912 +};
 913 +
 914 +&scb {
 915 +       ranges = <0x0 0x7c000000  0x0 0xfc000000  0x03800000>,
 916 +                <0x0 0x40000000  0x0 0xff800000  0x00800000>,
 917 +                <0x6 0x00000000  0x6 0x00000000  0x40000000>,
 918 +                <0x0 0x00000000  0x0 0x00000000  0xfc000000>;
 919 +       dma-ranges = <0x0 0x00000000  0x0 0x00000000  0xfc000000>;
 920 +
 921 +       pcie_0: pcie@7d500000 {
 922 +               reg = <0x0 0x7d500000 0x9310>,
 923 +                     <0x0 0x7e00f300 0x20>;
 924 +               msi-controller;
 925 +               msi-parent = <&pcie_0>;
 926 +               #address-cells = <3>;
 927 +               #interrupt-cells = <1>;
 928 +               #size-cells = <2>;
 929 +               bus-range = <0x0 0x01>;
 930 +               compatible = "brcm,bcm2711b0-pcie", // Safe value
 931 +                            "brcm,bcm2711-pcie",
 932 +                            "brcm,pci-plat-dev";
 933 +               max-link-speed = <2>;
 934 +               tot-num-pcie = <1>;
 935 +               linux,pci-domain = <0>;
 936 +               interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
 937 +                            <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
 938 +               interrupt-names = "pcie", "msi";
 939 +               interrupt-map-mask = <0x0 0x0 0x0 0x7>;
 940 +               interrupt-map = <0 0 0 1 &gicv2 GIC_SPI 143
 941 +                                       IRQ_TYPE_LEVEL_HIGH
 942 +                                0 0 0 2 &gicv2 GIC_SPI 144
 943 +                                       IRQ_TYPE_LEVEL_HIGH
 944 +                                0 0 0 3 &gicv2 GIC_SPI 145
 945 +                                       IRQ_TYPE_LEVEL_HIGH
 946 +                                0 0 0 4 &gicv2 GIC_SPI 146
 947 +                                       IRQ_TYPE_LEVEL_HIGH>;
 948 +
 949 +               /* Map outbound accesses from scb:0x6_00000000-03ffffff
 950 +                * to pci:0x0_f8000000-fbffffff
 951 +                */
 952 +               ranges = <0x02000000 0x0 0xf8000000  0x6 0x00000000
 953 +                         0x0 0x04000000>;
 954 +               /* Map inbound accesses from pci:0x0_00000000..ffffffff
 955 +                * to scb:0x0_00000000-ffffffff
 956 +                */
 957 +               dma-ranges = <0x02000000 0x0 0x00000000  0x0 0x00000000
 958 +                             0x1 0x00000000>;
 959 +               status = "okay";
 960 +       };
 961 +
 962 +       dma40: dma@7e007b00 {
 963 +               compatible = "brcm,bcm2838-dma";
 964 +               reg = <0x0 0x7e007b00 0x400>;
 965 +               interrupts =
 966 +                       <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>, /* dma4 11 */
 967 +                       <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>, /* dma4 12 */
 968 +                       <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>, /* dma4 13 */
 969 +                       <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>; /* dma4 14 */
 970 +               interrupt-names = "dma11",
 971 +                       "dma12",
 972 +                       "dma13",
 973 +                       "dma14";
 974 +               #dma-cells = <1>;
 975 +               brcm,dma-channel-mask = <0x7800>;
 976 +       };
 977 +
 978 +       vchiq: mailbox@7e00b840 {
 979 +               compatible = "brcm,bcm2838-vchiq";
 980 +               reg = <0 0x7e00b840 0x3c>;
 981 +               interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
 982 +       };
 983 +
 984 +       xhci: xhci@7e9c0000 {
 985 +               compatible = "generic-xhci";
 986 +               status = "disabled";
 987 +               reg = <0x0 0x7e9c0000 0x100000>;
 988 +               interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>;
 989 +       };
 990 +
 991 +       hevc-decoder@7eb00000 {
 992 +               compatible = "raspberrypi,rpivid-hevc-decoder";
 993 +               reg = <0x0 0x7eb00000 0x10000>;
 994 +               status = "okay";
 995 +       };
 996 +
 997 +       rpivid-local-intc@7eb10000 {
 998 +               compatible = "raspberrypi,rpivid-local-intc";
 999 +               reg = <0x0 0x7eb10000 0x1000>;
1000 +               status = "okay";
1001 +               interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
1002 +       };
1003 +
1004 +       h264-decoder@7eb20000 {
1005 +               compatible = "raspberrypi,rpivid-h264-decoder";
1006 +               reg = <0x0 0x7eb20000 0x10000>;
1007 +               status = "okay";
1008 +       };
1009 +
1010 +       vp9-decoder@7eb30000 {
1011 +               compatible = "raspberrypi,rpivid-vp9-decoder";
1012 +               reg = <0x0 0x7eb30000 0x10000>;
1013 +               status = "okay";
1014 +       };
1015 +};
1016 +
1017 +&dma {
1018 +       /* The VPU firmware uses DMA channel 11 for VCHIQ */
1019 +       brcm,dma-channel-mask = <0x1f5>;
1020 +};
1021 +
1022 +&dma40 {
1023 +       /* The VPU firmware DMA channel 11 for VCHIQ */
1024 +       brcm,dma-channel-mask = <0x7000>;
1025 +};
1026 +
1027 +&firmwarekms {
1028 +       interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
1029 +};
1030 +
1031 +&smi {
1032 +       interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
1033 +};
1034 +
1035 +&mmc {
1036 +       interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
1037 +};
1038 +
1039 +&mmcnr {
1040 +       interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
1041 +};
1042 +
1043 +&csi0 {
1044 +       interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
1045 +};
1046 +
1047 +&csi1 {
1048 +       interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
1049 +};
1050 +
1051 +&random {
1052 +       compatible = "brcm,bcm2711-rng200", "brcm,bcm2838-rng200";
1053 +       status = "okay";
1054 +};
1055 +
1056 +&usb {
1057 +       /* Enable the FIQ support */
1058 +       reg = <0x7e980000 0x10000>,
1059 +             <0x7e00b200 0x200>;
1060 +       interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,
1061 +                    <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
1062 +       status = "disabled";
1063 +};
1064 +
1065 +&gpio {
1066 +       interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,
1067 +                    <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
1068 +};
1069 +
1070 +&cpu_thermal {
1071 +        thermal-sensors = <&thermal>;
1072 +};
1073 +
1074 +&genet {
1075 +       compatible = "brcm,bcm2711-genet-v5", "brcm,genet-v5";
1076 +};