arm64: tegra: Hook up MMC and BPMP to memory controller

Use the interconnects property to hook up the MMC and BPMP to the memory
controller. This is needed to set the correct bus-level DMA mask, which
is a prerequisite for adding IOMMU support.

Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm64/boot/dts/nvidia/tegra234.dtsi b/arch/arm64/boot/dts/nvidia/tegra234.dtsi
index 59ad115369bda7d4266f8f7d8b6a0fca6b7d657d..6b6f15804a1a5de7ba3756ff1623f468aa14c948 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra234.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra234.dtsi
@@ -156,6 +156,9 @@
                        assigned-clock-parents = <&bpmp TEGRA234_CLK_PLLC4>;
                        resets = <&bpmp TEGRA234_RESET_SDMMC4>;
                        reset-names = "sdhci";
+                       interconnects = <&mc TEGRA234_MEMORY_CLIENT_SDMMCRAB &emc>,
+                                       <&mc TEGRA234_MEMORY_CLIENT_SDMMCWAB &emc>;
+                       interconnect-names = "dma-mem", "write";
                        nvidia,pad-autocal-pull-up-offset-hs400 = <0x00>;
                        nvidia,pad-autocal-pull-down-offset-hs400 = <0x00>;
                        nvidia,pad-autocal-pull-up-offset-1v8-timeout = <0x0a>;
@@ -288,6 +291,11 @@
                #clock-cells = <1>;
                #reset-cells = <1>;
                #power-domain-cells = <1>;
+               interconnects = <&mc TEGRA234_MEMORY_CLIENT_BPMPR &emc>,
+                               <&mc TEGRA234_MEMORY_CLIENT_BPMPW &emc>,
+                               <&mc TEGRA234_MEMORY_CLIENT_BPMPDMAR &emc>,
+                               <&mc TEGRA234_MEMORY_CLIENT_BPMPDMAW &emc>;
+               interconnect-names = "read", "write", "dma-mem", "dma-write";
 
                bpmp_i2c: i2c {
                        compatible = "nvidia,tegra186-bpmp-i2c";