From 056344fd565ee9407921a574620479a7fc3d2fc8 Mon Sep 17 00:00:00 2001
From: Saurabh Ambulkar <sambulka@qti.qualcomm.com>
Date: Wed, 22 Jul 2020 09:39:51 +0530
Subject: [PATCH 1/2] ARM: dts: msm: Add slpi pinctrl to SDMSHRIKE

Add slpi pinctrl support for SDMSHRIKE

Change-Id: I0806b8d183a9f81b024650bc4b7c112045bcf6ea
---
 qcom/sdmshrike.dtsi | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/qcom/sdmshrike.dtsi b/qcom/sdmshrike.dtsi
index aeb490411db7..c841ad2b4405 100644
--- a/qcom/sdmshrike.dtsi
+++ b/qcom/sdmshrike.dtsi
@@ -1433,6 +1433,7 @@
 #include "sa8195-smp2p.dtsi"
 #include "sa8195-gdsc.dtsi"
 #include "msm-arm-smmu-sdmshrike.dtsi"
+#include "sm8150-slpi-pinctrl.dtsi"
 
 &emac_gdsc {
 	status = "ok";
@@ -1622,3 +1623,7 @@
 	parent-supply = <&VDD_MMCX_LEVEL>;
 	status = "ok";
 };
+
+&slpi_tlmm {
+	status = "ok";
+};

From 22227dd0aa31da4315877ae5fca9beb92ce1dd23 Mon Sep 17 00:00:00 2001
From: Vivek Kumar <vivekuma@qti.qualcomm.com>
Date: Thu, 30 Jul 2020 20:36:27 +0530
Subject: [PATCH 2/2] ARM: dts: msm: Add ion support for SDMSHRIKE

Add ION support for SDMSHRIKE and reserved memory
changes.

Change-Id: I418bfa88f995e4ea48747346570c3f2668eb2199
---
 qcom/sdmshrike-ion.dtsi | 55 +++++++++++++++++++++++++++++++++++++++++
 qcom/sdmshrike.dtsi     |  1 +
 2 files changed, 56 insertions(+)
 create mode 100644 qcom/sdmshrike-ion.dtsi

diff --git a/qcom/sdmshrike-ion.dtsi b/qcom/sdmshrike-ion.dtsi
new file mode 100644
index 000000000000..b32c1fef4c51
--- /dev/null
+++ b/qcom/sdmshrike-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/sdmshrike.dtsi b/qcom/sdmshrike.dtsi
index c841ad2b4405..bff586f63aeb 100644
--- a/qcom/sdmshrike.dtsi
+++ b/qcom/sdmshrike.dtsi
@@ -1434,6 +1434,7 @@
 #include "sa8195-gdsc.dtsi"
 #include "msm-arm-smmu-sdmshrike.dtsi"
 #include "sm8150-slpi-pinctrl.dtsi"
+#include "sdmshrike-ion.dtsi"
 
 &emac_gdsc {
 	status = "ok";