From 3b62ebec37cc47774b9ac7eecd0e6f8d171d3be5 Mon Sep 17 00:00:00 2001
From: Saurabh Ambulkar <sambulka@qti.qualcomm.com>
Date: Mon, 24 Aug 2020 18:55:02 +0530
Subject: [PATCH] ARM: dts: msm: Add ION support for SM6150

Add ION support for SM6150 target.

Change-Id: I26c32957e860d79d8f349b150298998e13b5f1bf
---
 qcom/sm6150-ion.dtsi | 55 ++++++++++++++++++++++++++++++++++++++++++++
 qcom/sm6150.dtsi     | 11 ++++++++-
 2 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 qcom/sm6150-ion.dtsi

diff --git a/qcom/sm6150-ion.dtsi b/qcom/sm6150-ion.dtsi
new file mode 100644
index 000000000000..b32c1fef4c51
--- /dev/null
+++ b/qcom/sm6150-ion.dtsi
@@ -0,0 +1,55 @@
+#include <dt-bindings/arm/msm/msm_ion_ids.h>
+
+&soc {
+	qcom,ion {
+		compatible = "qcom,msm-ion";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		system_heap: qcom,ion-heap-sys {
+			reg = <ION_SYSTEM_HEAP_ID>;
+			qcom,ion-heap-type = "MSM_SYSTEM";
+		};
+
+		qcom,ion-heap-adsp { /* ADSP HEAP */
+			reg = <ION_ADSP_HEAP_ID>;
+			memory-region = <&adsp_mem>;
+			qcom,ion-heap-type = "DMA";
+		};
+
+		qcom,ion-heap-user { /* USER CONTIG HEAP */
+			reg = <ION_USER_CONTIG_HEAP_ID>;
+			memory-region = <&user_contig_mem>;
+			qcom,ion-heap-type = "DMA";
+		};
+
+		qcom,ion-heap-qsee { /* QSEECOM HEAP */
+			reg = <ION_QSECOM_HEAP_ID>;
+			memory-region = <&qseecom_mem>;
+			qcom,ion-heap-type = "DMA";
+		};
+
+		qcom,ion-heap-qseeta { /* QSEECOM TA HEAP */
+			reg = <ION_QSECOM_TA_HEAP_ID>;
+			memory-region = <&qseecom_ta_mem>;
+			qcom,ion-heap-type = "DMA";
+		};
+
+		qcom,ion-heap-spss { /* SPSS HEAP */
+			reg = <ION_SPSS_HEAP_ID>;
+			memory-region = <&sp_mem>;
+			qcom,ion-heap-type = "HYP_CMA";
+		};
+
+		qcom,ion-heap-secdisp { /* SECURE DISPLAY HEAP */
+			reg = <ION_SECURE_DISPLAY_HEAP_ID>;
+			memory-region = <&secure_display_memory>;
+			qcom,ion-heap-type = "HYP_CMA";
+		};
+
+		qcom,ion-heap-syssecure {
+			reg = <ION_SECURE_HEAP_ID>;
+			qcom,ion-heap-type = "SYSTEM_SECURE";
+		};
+	};
+};
diff --git a/qcom/sm6150.dtsi b/qcom/sm6150.dtsi
index 81a6fc094f2f..fb05130d9fab 100644
--- a/qcom/sm6150.dtsi
+++ b/qcom/sm6150.dtsi
@@ -335,7 +335,7 @@
 			reg = <0x0 0x97715000 0x0 0x2000>;
 		};
 
-		qseecom_mem: qseecom_region@0x9e400000 {
+		qseecom_mem: qseecom_region {
 			compatible = "shared-dma-pool";
 			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
 			reusable;
@@ -364,6 +364,14 @@
 			size = <0 0x400000>;
 		};
 
+		user_contig_mem: user_contig_region {
+			compatible = "shared-dma-pool";
+			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
+			reusable;
+			alignment = <0x0 0x400000>;
+			size = <0x0 0x1000000>;
+		};
+
 		qseecom_ta_mem: qseecom_ta_region {
 			compatible = "shared-dma-pool";
 			alloc-ranges = <0 0x00000000 0 0xffffffff>;
@@ -2369,3 +2377,4 @@
 #include "sm6150-slpi-pinctrl.dtsi"
 #include "sm6150-usb.dtsi"
 #include "sm6150-vidc.dtsi"
+#include "sm6150-ion.dtsi"