Merge branch 'elan-i2c' into next

[linux-2.6-microblaze.git] / arch / arm / boot / dts / bcm2711.dtsi

diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
index d1e684d..a91cf68 100644 (file)
--- a/arch/arm/boot/dts/bcm2711.dtsi
+++ b/arch/arm/boot/dts/bcm2711.dtsi
@@ -241,17 +241,32 @@
                        status = "disabled";
                };
 
+               hvs@7e400000 {
+                       interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
+               };
+       };
+
+       /*
+        * emmc2 has different DMA constraints based on SoC revisions. It was
+        * moved into its own bus, so as for RPi4's firmware to update them.
+        * The firmware will find whether the emmc2bus alias is defined, and if
+        * so, it'll edit the dma-ranges property below accordingly.
+        */
+       emmc2bus: emmc2bus {
+               compatible = "simple-bus";
+               #address-cells = <2>;
+               #size-cells = <1>;
+
+               ranges = <0x0 0x7e000000  0x0 0xfe000000  0x01800000>;
+               dma-ranges = <0x0 0xc0000000  0x0 0x00000000  0x40000000>;
+
                emmc2: emmc2@7e340000 {
                        compatible = "brcm,bcm2711-emmc2";
-                       reg = <0x7e340000 0x100>;
+                       reg = <0x0 0x7e340000 0x100>;
                        interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&clocks BCM2711_CLOCK_EMMC2>;
                        status = "disabled";
                };
-
-               hvs@7e400000 {
-                       interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
-               };
        };
 
        arm-pmu {