From bcf5d0343332f42b9ab07a08e83ddc262299eae0 Mon Sep 17 00:00:00 2001
From: Nurit Lichtenstein <quic_nuritl@quicinc.com>
Date: Mon, 30 Oct 2023 23:28:35 +0100
Subject: [PATCH] ARM: dts: qcom: Add SPU related DMA heaps to sun dtsi

Needed for SPU shared memory on sun dtsi.

Change-Id: I7871182d7ee4f5d41f8afc37f1811dacd988c50b
Signed-off-by: Nurit Lichtenstein <quic_nuritl@quicinc.com>
Signed-off-by: Gokul krishna Krishnakumar <quic_gokukris@quicinc.com>
---
 qcom/sun-dma-heaps.dtsi | 20 ++++++++++++++++++++
 qcom/sun.dtsi           | 15 +++++++++++----
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/qcom/sun-dma-heaps.dtsi b/qcom/sun-dma-heaps.dtsi
index 2b46e4bc..3dbc99dd 100644
--- a/qcom/sun-dma-heaps.dtsi
+++ b/qcom/sun-dma-heaps.dtsi
@@ -19,5 +19,25 @@
 			qcom,dma-heap-type = <HEAP_TYPE_CMA>;
 			memory-region = <&qseecom_ta_mem>;
 		};
+
+		qcom,sp_hlos {
+			qcom,dma-heap-name = "qcom,sp-hlos";
+			qcom,dma-heap-type = <HEAP_TYPE_CMA>;
+			memory-region = <&spss_region_mem>;
+		};
+
+		qcom,secure_sp_tz {
+			qcom,dma-heap-name = "qcom,secure-sp-tz";
+			qcom,dma-heap-type = <HEAP_TYPE_SECURE_CARVEOUT>;
+			memory-region = <&spu_tz_shared_mem>;
+			qcom,token = <0x01000000>;
+		};
+
+		qcom,secure_sp_modem {
+			qcom,dma-heap-name = "qcom,secure-sp-modem";
+			qcom,dma-heap-type = <HEAP_TYPE_SECURE_CARVEOUT>;
+			memory-region = <&spu_modem_shared_mem>;
+			qcom,token = <0x10800000>;
+		};
 	};
 };
diff --git a/qcom/sun.dtsi b/qcom/sun.dtsi
index 532b90e4..6e42008c 100644
--- a/qcom/sun.dtsi
+++ b/qcom/sun.dtsi
@@ -2567,14 +2567,21 @@
 		reg = <0x0 0x9b09a000 0x0 0x2000>;
 	};
 
-	spss_region_mem: spss_region_region@9b0a0000 {
+	spss_region_mem: spss_region_region@9b0a0000  {
 		no-map;
-		reg = <0x0 0x9b0a0000 0x0 0x180000>;
+		reg = <0x0 0x9b0a0000 0x0 0x1e0000>;
 	};
 
-	spu_secure_shared_memory_mem: spu_secure_shared_memory_region@9b280000 {
+	/* First part of the "SPU secure shared memory" region */
+	spu_tz_shared_mem: spu_secure_shared_memory_region@9b280000 {
 		no-map;
-		reg = <0x0 0x9b280000 0x0 0x80000>;
+		reg = <0x0 0x9b280000 0x0 0x40000>;
+	};
+
+	/* Second part of the "SPU secure shared memory" region */
+	spu_modem_shared_mem: spu_secure_shared_memory_region@9b2c0000 {
+		no-map;
+		reg = <0x0 0x9b2c0000 0x0 0x40000>;
 	};
 
 	camera_mem: camera_region@9b300000 {