Commit cd0c2edf authored by Thierry Reding's avatar Thierry Reding
Browse files

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: default avatarThierry Reding <treding@nvidia.com>
parent 5710e16a

arch/arm64/boot/dts/nvidia/tegra194.dtsi

+4 −5
Original line number Diff line number Diff line
@@ -286,6 +286,10 @@ tegra_admaif: admaif@290f000 { 
						    "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 @@ sound { 
		 * 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 {