arm64: tegra: Enable SMMU on Tegra194 display controllers

These use a separate SMMU instance compared to everything else currently
enabled for the SoC.

Signed-off-by: Aaron Kling <webgeek1234@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm64/boot/dts/nvidia/tegra194.dtsi b/arch/arm64/boot/dts/nvidia/tegra194.dtsi
index 5042224d8736327f8e96b161fdfecfe34f7ba711..eb7e3c666df629511e68113728c69b5bc71d2974 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra194.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra194.dtsi
@@ -1722,7 +1722,7 @@
                        nvidia,apbmisc = <&apbmisc>;
                };
 
-               iommu@10000000 {
+               smmu_iso: iommu@10000000 {
                        compatible = "nvidia,tegra194-smmu", "nvidia,smmu-500";
                        reg = <0x0 0x10000000 0x0 0x800000>;
                        interrupts = <GIC_SPI 240 IRQ_TYPE_LEVEL_HIGH>,
@@ -1962,6 +1962,7 @@
                                        interconnects = <&mc TEGRA194_MEMORY_CLIENT_NVDISPLAYR &emc>,
                                                        <&mc TEGRA194_MEMORY_CLIENT_NVDISPLAYR1 &emc>;
                                        interconnect-names = "dma-mem", "read-1";
+                                       iommus = <&smmu_iso TEGRA194_SID_NVDISPLAY>;
 
                                        nvidia,outputs = <&sor0 &sor1 &sor2 &sor3>;
                                        nvidia,head = <0>;
@@ -1980,6 +1981,7 @@
                                        interconnects = <&mc TEGRA194_MEMORY_CLIENT_NVDISPLAYR &emc>,
                                                        <&mc TEGRA194_MEMORY_CLIENT_NVDISPLAYR1 &emc>;
                                        interconnect-names = "dma-mem", "read-1";
+                                       iommus = <&smmu_iso TEGRA194_SID_NVDISPLAY>;
 
                                        nvidia,outputs = <&sor0 &sor1 &sor2 &sor3>;
                                        nvidia,head = <1>;
@@ -1998,6 +2000,7 @@
                                        interconnects = <&mc TEGRA194_MEMORY_CLIENT_NVDISPLAYR &emc>,
                                                        <&mc TEGRA194_MEMORY_CLIENT_NVDISPLAYR1 &emc>;
                                        interconnect-names = "dma-mem", "read-1";
+                                       iommus = <&smmu_iso TEGRA194_SID_NVDISPLAY>;
 
                                        nvidia,outputs = <&sor0 &sor1 &sor2 &sor3>;
                                        nvidia,head = <2>;
@@ -2016,6 +2019,7 @@
                                        interconnects = <&mc TEGRA194_MEMORY_CLIENT_NVDISPLAYR &emc>,
                                                        <&mc TEGRA194_MEMORY_CLIENT_NVDISPLAYR1 &emc>;
                                        interconnect-names = "dma-mem", "read-1";
+                                       iommus = <&smmu_iso TEGRA194_SID_NVDISPLAY>;
 
                                        nvidia,outputs = <&sor0 &sor1 &sor2 &sor3>;
                                        nvidia,head = <3>;