From 9a7dea76dd9a1729cd87f3f772459bb81d2afd1d Mon Sep 17 00:00:00 2001
From: Swetha Chikkaboraiah <quic_schikk@quicinc.com>
Date: Tue, 5 Nov 2024 22:22:12 +0530
Subject: [PATCH] ARM: dts: msm: Update qup_iommu_region

Update node qup_iommu_region for parrot and ravelin.

Change-Id: I488e3eb0a1577b7e1aafbdfd91efd6e12fdfd55b
Signed-off-by: Swetha Chikkaboraiah <quic_schikk@quicinc.com>
(cherry picked from commit f5dc7ce0a9164acdb54725c38dd1f05aa0535db5)
---
 qcom/parrot-qupv3.dtsi  | 18 ++++++++++--------
 qcom/ravelin-qupv3.dtsi | 19 +++++++++++--------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/qcom/parrot-qupv3.dtsi b/qcom/parrot-qupv3.dtsi
index 26683de2..1163c5e5 100644
--- a/qcom/parrot-qupv3.dtsi
+++ b/qcom/parrot-qupv3.dtsi
@@ -19,11 +19,9 @@
 	 * Qup1 5: SE 11
 	 */
 
-	qup_iommu_region: qup_iommu_region {
+	qup_iommu_region0: qup_iommu_region {
 		iommu-addresses =  <&gpi_dma0 0x0 0x100000>, <&gpi_dma0 0x200000 0xffe00000>,
-			<&qupv3_0 0x0 0x40000000>, <&qupv3_0 0x50000000 0xb0000000>,
-			<&gpi_dma1 0x0 0x100000>, <&gpi_dma1 0x200000 0xffe00000>,
-			<&qupv3_1 0x0 0x40000000>, <&qupv3_1 0x50000000 0xb0000000>;
+			<&qupv3_0 0x0 0x40000000>, <&qupv3_0 0x50000000 0xb0000000>;
 	};
 
 	/* GPI Instance */
@@ -48,7 +46,7 @@
 			<GIC_SPI 255 IRQ_TYPE_LEVEL_HIGH>;
 		qcom,gpii-mask = <0x3f>;
 		qcom,ev-factor = <2>;
-		memory-region = <&qup_iommu_region>;
+		memory-region = <&qup_iommu_region0>;
 		dma-coherent;
 		qcom,gpi-ee-offset = <0x10000>;
 		status = "ok";
@@ -64,7 +62,7 @@
 		clocks = <&gcc GCC_QUPV3_WRAP_0_M_AHB_CLK>,
 			<&gcc GCC_QUPV3_WRAP_0_S_AHB_CLK>;
 		iommus = <&apps_smmu 0x163 0x0>;
-		memory-region = <&qup_iommu_region>;
+		memory-region = <&qup_iommu_region0>;
 		qcom,iommu-geometry = <0x40000000 0x10000000>;
 		qcom,iommu-dma = "fastmap";
 		dma-coherent;
@@ -327,6 +325,10 @@
 		};
 	};
 
+	qup_iommu_region1: qup_iommu_region {
+		iommu-addresses = <&gpi_dma1 0x0 0x100000>, <&gpi_dma1 0x200000 0xffe00000>,
+			<&qupv3_1 0x0 0x40000000>, <&qupv3_1 0x50000000 0xb0000000>;
+	};
 	/* GPI Instance */
 	gpi_dma1: qcom,gpi-dma@a00000  {
 		compatible = "qcom,gpi-dma";
@@ -350,7 +352,7 @@
 		qcom,static-gpii-mask = <0x1>;
 		qcom,gpii-mask = <0x3e>;
 		qcom,ev-factor = <2>;
-		memory-region = <&qup_iommu_region>;
+		memory-region = <&qup_iommu_region1>;
 		dma-coherent;
 		qcom,gpi-ee-offset = <0x10000>;
 		status = "ok";
@@ -366,7 +368,7 @@
 		clocks = <&gcc GCC_QUPV3_WRAP_1_M_AHB_CLK>,
 			<&gcc GCC_QUPV3_WRAP_1_S_AHB_CLK>;
 		iommus = <&apps_smmu 0x403 0x0>;
-		memory-region = <&qup_iommu_region>;
+		memory-region = <&qup_iommu_region1>;
 		qcom,iommu-geometry = <0x40000000 0x10000000>;
 		qcom,iommu-dma = "fastmap";
 		dma-coherent;
diff --git a/qcom/ravelin-qupv3.dtsi b/qcom/ravelin-qupv3.dtsi
index fa429b87..55cfe624 100644
--- a/qcom/ravelin-qupv3.dtsi
+++ b/qcom/ravelin-qupv3.dtsi
@@ -17,11 +17,9 @@
 	 * Qup1 4: SE 9
 	 */
 
-	qup_iommu_region: qup_iommu_region {
+	qup_iommu_region0: qup_iommu_region {
 		iommu-addresses =  <&gpi_dma0 0x0 0x100000>, <&gpi_dma0 0x200000 0xffe00000>,
-			<&qupv3_0 0x0 0x40000000>, <&qupv3_0 0x50000000 0xb0000000>,
-			<&gpi_dma1 0x0 0x100000>, <&gpi_dma1 0x200000 0xffe00000>,
-			<&qupv3_1 0x0 0x40000000>, <&qupv3_1 0x50000000 0xb0000000>;
+			<&qupv3_0 0x0 0x40000000>, <&qupv3_0 0x50000000 0xb0000000>;
 	};
 
 	/* GPI Instance */
@@ -47,7 +45,7 @@
 		qcom,static-gpii-mask = <0x1>;
 		qcom,gpii-mask = <0x3e>;
 		qcom,ev-factor = <2>;
-		memory-region = <&qup_iommu_region>;
+		memory-region = <&qup_iommu_region0>;
 		dma-coherent;
 		qcom,gpi-ee-offset = <0x10000>;
 		status = "ok";
@@ -63,7 +61,7 @@
 		clocks = <&gcc GCC_QUPV3_WRAP_0_M_AHB_CLK>,
 			<&gcc GCC_QUPV3_WRAP_0_S_AHB_CLK>;
 		iommus = <&apps_smmu 0x163 0x0>;
-		memory-region = <&qup_iommu_region>;
+		memory-region = <&qup_iommu_region0>;
 		qcom,iommu-geometry = <0x40000000 0x10000000>;
 		qcom,iommu-dma = "fastmap";
 		dma-coherent;
@@ -281,6 +279,11 @@
 		};
 	};
 
+	qup_iommu_region1: qup_iommu_region {
+		iommu-addresses = <&gpi_dma1 0x0 0x100000>, <&gpi_dma1 0x200000 0xffe00000>,
+			<&qupv3_1 0x0 0x40000000>, <&qupv3_1 0x50000000 0xb0000000>;
+	};
+
 	/* GPI Instance */
 	gpi_dma1: qcom,gpi-dma@a00000  {
 		compatible = "qcom,gpi-dma";
@@ -303,7 +306,7 @@
 			<GIC_SPI 298 IRQ_TYPE_LEVEL_HIGH>;
 		qcom,gpii-mask = <0x3f>;
 		qcom,ev-factor = <2>;
-		memory-region = <&qup_iommu_region>;
+		memory-region = <&qup_iommu_region1>;
 		dma-coherent;
 		qcom,gpi-ee-offset = <0x10000>;
 		status = "ok";
@@ -319,7 +322,7 @@
 		clocks = <&gcc GCC_QUPV3_WRAP_1_M_AHB_CLK>,
 			<&gcc GCC_QUPV3_WRAP_1_S_AHB_CLK>;
 		iommus = <&apps_smmu 0x403 0x0>;
-		memory-region = <&qup_iommu_region>;
+		memory-region = <&qup_iommu_region1>;
 		qcom,iommu-geometry = <0x40000000 0x10000000>;
 		qcom,iommu-dma = "fastmap";
 		dma-coherent;