summaryrefslogtreecommitdiff
path: root/arch/arm64/boot/dts/nvidia
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2021-07-08 12:34:32 +0200
committerThierry Reding <treding@nvidia.com>2022-02-24 20:06:53 +0100
commitcd0c2edf20f0307098fc2be668ecdb533ab3e248 (patch)
tree1a8e148e2ab0a6db5f42c033954efb53a407e044 /arch/arm64/boot/dts/nvidia
parent5710e16afa6cd385d3bd2becb47635dabbc050e7 (diff)
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>
Diffstat (limited to 'arch/arm64/boot/dts/nvidia')
-rw-r--r--arch/arm64/boot/dts/nvidia/tegra194.dtsi9
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm64/boot/dts/nvidia/tegra194.dtsi b/arch/arm64/boot/dts/nvidia/tegra194.dtsi
index 8b58f5cb3186..db26a5741e48 100644
--- 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 {