From f97ba33547711d727fbbcb10eb046f8ac605a966 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 5 Dec 2019 18:02:08 +0000 Subject: [PATCH] dts: bcm2711: Move emmc2 to its own "bus" Moving the EMMC2 controller under a dedicated bus allows the firmware to patch the dma-ranges property for different memory sizes without affecting anything else. Signed-off-by: Phil Elwell --- arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -193,6 +193,8 @@ #include "bcm2711-rpi.dtsi" #include "bcm283x-rpi-csi1-2lane.dtsi" +/delete-node/ &emmc2; + / { chosen { bootargs = "coherent_pool=1M 8250.nr_uarts=1"; @@ -212,6 +214,26 @@ /delete-property/ ethernet; /delete-property/ intc; pcie0 = &pcie0; + emmc2bus = &emmc2bus; + }; + + emmc2bus: emmc2bus { + compatible = "simple-bus"; + #address-cells = <2>; + #size-cells = <1>; + + ranges = <0x0 0x7e000000 0x0 0xfe000000 0x01800000>; + dma-ranges = <0x0 0xc0000000 0x0 0x00000000 0x3c000000>; + + emmc2: emmc2@7e340000 { + compatible = "brcm,bcm2711-emmc2"; + status = "okay"; + interrupts = ; + clocks = <&clocks BCM2711_CLOCK_EMMC2>; + reg = <0x0 0x7e340000 0x100>; + vqmmc-supply = <&sd_io_1v8_reg>; + broken-cd; + }; }; /delete-node/ wifi-pwrseq;