Merge tag 'block-5.14-2021-08-07' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / arch / arm / boot / dts / bcm2711-rpi-4-b.dts

diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
index 3b4ab94..f24bdd0 100644 (file)
--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
@@ -1,11 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 #include "bcm2711.dtsi"
-#include "bcm2835-rpi.dtsi"
+#include "bcm2711-rpi.dtsi"
 #include "bcm283x-rpi-usb-peripheral.dtsi"
 
-#include <dt-bindings/reset/raspberrypi,firmware-reset.h>
-
 / {
        compatible = "raspberrypi,4-model-b", "brcm,bcm2711";
        model = "Raspberry Pi 4 Model B";
@@ -15,25 +13,12 @@
                stdout-path = "serial1:115200n8";
        };
 
-       /* Will be filled by the bootloader */
-       memory@0 {
-               device_type = "memory";
-               reg = <0 0 0>;
-       };
-
-       aliases {
-               emmc2bus = &emmc2bus;
-               ethernet0 = &genet;
-               pcie0 = &pcie0;
-               blconfig = &blconfig;
-       };
-
        leds {
-               act {
+               led-act {
                        gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
                };
 
-               pwr {
+               led-pwr {
                        label = "PWR";
                        gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
@@ -79,31 +64,15 @@
        status = "okay";
 };
 
-&firmware {
-       firmware_clocks: clocks {
-               compatible = "raspberrypi,firmware-clocks";
-               #clock-cells = <1>;
-       };
-
-       expgpio: gpio {
-               compatible = "raspberrypi,firmware-gpio";
-               gpio-controller;
-               #gpio-cells = <2>;
-               gpio-line-names = "BT_ON",
-                                 "WL_ON",
-                                 "PWR_LED_OFF",
-                                 "GLOBAL_RESET",
-                                 "VDD_SD_IO_SEL",
-                                 "CAM_GPIO",
-                                 "SD_PWR_ON",
-                                 "";
-               status = "okay";
-       };
-
-       reset: reset {
-               compatible = "raspberrypi,firmware-reset";
-               #reset-cells = <1>;
-       };
+&expgpio {
+       gpio-line-names = "BT_ON",
+                         "WL_ON",
+                         "PWR_LED_OFF",
+                         "GLOBAL_RESET",
+                         "VDD_SD_IO_SEL",
+                         "CAM_GPIO",
+                         "SD_PWR_ON",
+                         "";
 };
 
 &gpio {
@@ -180,23 +149,13 @@
 };
 
 &hdmi0 {
-       clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>;
-       clock-names = "hdmi", "bvb", "audio", "cec";
-       wifi-2.4ghz-coexistence;
        status = "okay";
 };
 
 &hdmi1 {
-       clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
-       clock-names = "hdmi", "bvb", "audio", "cec";
-       wifi-2.4ghz-coexistence;
        status = "okay";
 };
 
-&hvs {
-       clocks = <&firmware_clocks 4>;
-};
-
 &pixelvalve0 {
        status = "okay";
 };
@@ -219,22 +178,6 @@
        status = "okay";
 };
 
-&rmem {
-       /*
-        * RPi4's co-processor will copy the board's bootloader configuration
-        * into memory for the OS to consume. It'll also update this node with
-        * its placement information.
-        */
-       blconfig: nvram@0 {
-               compatible = "raspberrypi,bootloader-config", "nvmem-rmem";
-               #address-cells = <1>;
-               #size-cells = <1>;
-               reg = <0x0 0x0 0x0>;
-               no-map;
-               status = "disabled";
-       };
-};
-
 /* SDHCI is used to control the SDIO for wireless */
 &sdhci {
        #address-cells = <1>;
@@ -309,10 +252,6 @@
        status = "okay";
 };
 
-&vchiq {
-       interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
-};
-
 &vc4 {
        status = "okay";
 };