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

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / nvidia / tegra186.dtsi

diff --git a/arch/arm64/boot/dts/nvidia/tegra186.dtsi b/arch/arm64/boot/dts/nvidia/tegra186.dtsi
index 9f75bbf..d02f6bf 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra186.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra186.dtsi
@@ -1082,7 +1082,7 @@
        };
 
        smmu: iommu@12000000 {
-               compatible = "arm,mmu-500";
+               compatible = "nvidia,tegra186-smmu", "nvidia,smmu-500";
                reg = <0 0x12000000 0 0x800000>;
                interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>,
@@ -1152,6 +1152,8 @@
                stream-match-mask = <0x7f80>;
                #global-interrupts = <1>;
                #iommu-cells = <1>;
+
+               nvidia,memory-controller = <&mc>;
        };
 
        host1x@13e00000 {