arm64: tegra: Move audio IOMMU properties to ADMAIF node

The ADMAIF node represents the device that accesses memory in the Tegra
audio subsystem, so that's where the iommus and interconnects properties
should reside. Move them out of the sound card node and into the ADMAIF
node to properly reflect the memory data path.

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 8b58f5cb3186adddf2f01f9028a89633fd5c3661..db26a5741e482d96a2f1803f723ac64450b0a685 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra194.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra194.dtsi
@@ -286,6 +286,10 @@
                                                    "rx19", "tx19",
                                                    "rx20", "tx20";
                                        status = "disabled";
+                                       interconnects = <&mc TEGRA194_MEMORY_CLIENT_APEDMAR &emc>,
+                                                       <&mc TEGRA194_MEMORY_CLIENT_APEDMAW &emc>;
+                                       interconnect-names = "dma-mem", "write";
+                                       iommus = <&smmu TEGRA194_SID_APE>;
                                };
 
                                tegra_i2s1: i2s@2901000 {
@@ -2919,11 +2923,6 @@
                 * for 8x and 11.025x sample rate streams.
                 */
                assigned-clock-rates = <258000000>;
-
-               interconnects = <&mc TEGRA194_MEMORY_CLIENT_APEDMAR &emc>,
-                               <&mc TEGRA194_MEMORY_CLIENT_APEDMAW &emc>;
-               interconnect-names = "dma-mem", "write";
-               iommus = <&smmu TEGRA194_SID_APE>;
        };
 
        tcu: serial {