From 650dbd60dc2b6ba30d6be4f14aa1ac0d30669039 Mon Sep 17 00:00:00 2001
From: Vishwanath Raju K <c_vishk@qti.qualcomm.com>
Date: Wed, 11 Nov 2020 12:50:21 +0530
Subject: [PATCH 1/2] ARM: dts: msm: Add initial v1 memory map for Monaco

Added initial memory map and created regured cma areas
for monaco.

Change-Id: I3355fa9b9ec9b95b658e8f252b238cde2294c7fa
---
 qcom/monaco.dtsi | 87 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)

diff --git a/qcom/monaco.dtsi b/qcom/monaco.dtsi
index f33ea540e53e..864b5e1ab4eb 100644
--- a/qcom/monaco.dtsi
+++ b/qcom/monaco.dtsi
@@ -115,6 +115,93 @@
 
 	soc: soc { };
 
+	reserved-memory {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+
+		hyp_region: hyp_region@45700000 {
+			no-map;
+			reg = <0x0 0x45700000 0x0 0x600000>;
+		};
+
+		rpmbackup_mem: rpmbackup_mem@45D00000 {
+			no-map;
+			reg = <0x0 0x45D00000 0x0 0x100000>;
+		};
+
+		xbl_aop_mem: xbl_aop_mem@45e00000 {
+			no-map;
+			reg = <0x0 0x45e00000 0x0 0x110000>;
+		};
+
+		sec_apps_mem: sec_apps_region@45fff000 {
+			no-map;
+			reg = <0x0 0x45fff000 0x0 0x1000>;
+		};
+
+		smem_region: smem@46000000 {
+			no-map;
+			reg = <0x0 0x46000000 0x0 0x200000>;
+		};
+
+		pil_modem_mem: modem_region@4ab00000 {
+			no-map;
+			reg = <0x0 0x4ab00000 0x0 0x6900000>;
+		};
+
+		pil_video_mem: pil_video_region@51400000 {
+			no-map;
+			reg = <0x0 0x51400000 0x0 0x500000>;
+		};
+
+		wlan_msa_mem: wlan_msa_region@51900000 {
+			no-map;
+			reg = <0x0 0x51900000 0x0 0x100000>;
+		};
+
+		pil_adsp_mem: adsp_regions@51a00000 {
+			no-map;
+			reg = <0x0 0x51a00000 0x0 0x1c00000>;
+		};
+
+		pil_ipa_fw_mem: ips_fw_region@53600000 {
+			no-map;
+			reg = <0x0 0x53600000 0x0 0x10000>;
+		};
+
+		pil_ipa_gsi_mem: ipa_gsi_region@53610000 {
+			no-map;
+			reg = <0x0 0x53610000 0x0 0x5000>;
+		};
+
+		pil_gpu_mem: gpu_region@53615000 {
+			no-map;
+			reg = <0x0 0x53615000 0x0 0x2000>;
+		};
+
+		removed_region: removed_region@5f800000 {
+			no-map;
+			reg = <0x0 0x5f800000 0x0 0x2700000>;
+		};
+
+		dump_mem: mem_dump_region {
+			compatible = "shared-dma-pool";
+			reusable;
+			size = <0 0x800000>;
+		};
+
+		/* global autoconfigured region for contiguous allocations */
+		linux,cma {
+			compatible = "shared-dma-pool";
+			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
+			reusable;
+			alignment = <0x0 0x400000>;
+			size = <0x0 0x2000000>;
+			linux,cma-default;
+		};
+	};
+
 	chosen {
 		bootargs = "rcupdate.rcu_expedited=1 rcu_nocbs=0-7";
 	};

From 55aba0a4a2145be1cf0131508d8d8d3a09c2df7b Mon Sep 17 00:00:00 2001
From: Vishwanath Raju K <c_vishk@qti.qualcomm.com>
Date: Wed, 11 Nov 2020 14:15:14 +0530
Subject: [PATCH 2/2] ARM: dts: msm: Add ion heap for monaco

Describe the memory region reserved for the ion allocator.

Change-Id: I53ce5c36dc77909fdbd8e1b2b24bd7292e6ef728
---
 qcom/monaco-ion.dtsi | 17 +++++++++++++++++
 qcom/monaco.dtsi     |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 qcom/monaco-ion.dtsi

diff --git a/qcom/monaco-ion.dtsi b/qcom/monaco-ion.dtsi
new file mode 100644
index 000000000000..a0a50ce4dbd2
--- /dev/null
+++ b/qcom/monaco-ion.dtsi
@@ -0,0 +1,17 @@
+&soc {
+	qcom,ion {
+		compatible = "qcom,msm-ion";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		system_heap: qcom,ion-heap@25 {
+		reg = <25>;
+			qcom,ion-heap-type = "SYSTEM";
+		};
+
+		system_secure_heap: qcom,ion-heap@9 {
+			reg = <9>;
+			qcom,ion-heap-type = "SYSTEM_SECURE";
+		};
+	};
+};
diff --git a/qcom/monaco.dtsi b/qcom/monaco.dtsi
index 864b5e1ab4eb..cc7e290d0da2 100644
--- a/qcom/monaco.dtsi
+++ b/qcom/monaco.dtsi
@@ -474,3 +474,5 @@
 };
 
 #include "monaco-pinctrl.dtsi"
+#include "monaco-ion.dtsi"
+