From e177fde95a29adbb12a50a42745c9fcf87fb41f3 Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Fri, 21 Jul 2023 15:25:44 +0000 Subject: [PATCH] tegra234: Move dma-coherant property from overlay to base The base DTSI file of tegra234, tegra234.dtsi, have already property of dma-coherent inside node host1x@13e00000 in mainline. Move this property from overlay to the base file to match tegra234.dtsi with mainline. Bug 4037899 Change-Id: I1260ce822a594308e9a0cc672c4669d185e20277 Signed-off-by: Laxman Dewangan Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/2940603 (cherry picked from commit 5fd589841fe310efae6acfb466a7653b9a38967a) Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/2955398 GVS: Gerrit_Virtual_Submit --- overlay/tegra234-soc-overlay.dtsi | 2 -- tegra234.dtsi | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/overlay/tegra234-soc-overlay.dtsi b/overlay/tegra234-soc-overlay.dtsi index 2dadf76..215b1e2 100644 --- a/overlay/tegra234-soc-overlay.dtsi +++ b/overlay/tegra234-soc-overlay.dtsi @@ -521,8 +521,6 @@ assigned-clocks = <&bpmp TEGRA234_CLK_HOST1X>; assigned-clock-rates = <204000000>; - dma-coherent; - reg = <0x0 0x13e00000 0x0 0x10000>, <0x0 0x13e10000 0x0 0x10000>, <0x0 0x13e40000 0x0 0x10000>, diff --git a/tegra234.dtsi b/tegra234.dtsi index 46a5507..cf2ed21 100644 --- a/tegra234.dtsi +++ b/tegra234.dtsi @@ -2150,6 +2150,7 @@ interconnects = <&mc TEGRA234_MEMORY_CLIENT_HOST1XDMAR &emc>; interconnect-names = "dma-mem"; iommus = <&smmu_niso1 TEGRA234_SID_HOST1X>; + dma-coherent; /* Context isolation domains */ iommu-map = <0 &smmu_niso0 TEGRA234_SID_HOST1X_CTX0 1>,