From 7cd5cd63960721c91d73c7dc08bbb112bdb7e3f7 Mon Sep 17 00:00:00 2001
From: Qingqing Zhou <qqzhou@qti.qualcomm.com>
Date: Fri, 1 Jul 2022 16:22:19 +0800
Subject: [PATCH 1/3] ARM: dts: msm: Add memory map for sdxbaagha

Update the memory map to version 1.

Change-Id: I147711f4775e2e52859ca15c4ac527b5bee3edc9
---
 qcom/sdxbaagha.dtsi | 69 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 65 insertions(+), 4 deletions(-)

diff --git a/qcom/sdxbaagha.dtsi b/qcom/sdxbaagha.dtsi
index 0cfb2bf5..ab790d46 100644
--- a/qcom/sdxbaagha.dtsi
+++ b/qcom/sdxbaagha.dtsi
@@ -15,16 +15,77 @@
 
 	memory { device_type = "memory"; reg = <0 0>; };
 
-	reserved-memory {
+	reserved_memory: reserved-memory {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		ranges;
 
-		peripheral2_mem: peripheral2_region@8fd00000 {
+		mpss_mem: mpss_region@82400000 {
 			no-map;
-			reg = <0x8fd00000 0x140000>;
-			label = "peripheral2_mem";
+			reg = <0x82400000 0x4600000>;
 		};
+
+		quickboot_mem: quickboot_region@86a00000 {
+			no-map;
+			reg = <0x86a00000 0x100000>;
+		};
+
+		aop_image_mem: aop_image_region@86b00000 {
+			no-map;
+			reg = <0x86b00000 0x20000>;
+		};
+
+		aop_cmd_db_mem: aop_cmd_db_region@86b20000 {
+			compatible = "qcom,cmd-db";
+			no-map;
+			reg = <0x86b20000 0x20000>;
+		};
+
+		aop_config_mem: aop_config_region@86b40000 {
+			no-map;
+			reg = <0x86b40000 0x40000>;
+		};
+
+		smem_mem: smem_region@86b80000 {
+			no-map;
+			reg = <0x86b80000 0xc0000>;
+		};
+
+		tme_crashdump_mem: tme_crashdump_region@86c40000 {
+			no-map;
+			reg = <0x86c40000 0x40000>;
+		};
+
+		tme_log_mem: tme_log_region@86c80000 {
+			no-map;
+			reg = <0x86c80000 0x4000>;
+		};
+
+		access_control_db_mem: access_control_db_region@86c84000 {
+			no-map;
+			reg = <0x86c84000 0x20000>;
+		};
+
+		secdata_mem: secdata_region@86ca4000 {
+			no-map;
+			reg = <0x86ca4000 0x1000>;
+		};
+
+		xbl_ramdump_mem: xbl_ramdump_region@86d00000 {
+			no-map;
+			reg = <0x86d00000 0x100000>;
+		};
+
+		qtee_tz_mem: qtee_tz_region@86e00000 {
+			no-map;
+			reg = <0x86e00000 0x200000>;
+		};
+
+		trusted_apps_mem: trusted_apps_region@87000000 {
+			no-map;
+			reg = <0x87000000 0x400000>;
+		};
+
 	};
 
 	cpus {

From 84c4efda152b94009478d67d9eece8e388d09db3 Mon Sep 17 00:00:00 2001
From: Qingqing Zhou <qqzhou@qti.qualcomm.com>
Date: Fri, 1 Jul 2022 16:42:04 +0800
Subject: [PATCH 2/3] ARM: dts: msm: Add CMA region for sdxbaagha

Add a 12MB common CMA region for system use.

Change-Id: If3df6fed2dc8600ebd032425b34cea4d5da48897
---
 qcom/sdxbaagha.dtsi | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/qcom/sdxbaagha.dtsi b/qcom/sdxbaagha.dtsi
index ab790d46..dee17518 100644
--- a/qcom/sdxbaagha.dtsi
+++ b/qcom/sdxbaagha.dtsi
@@ -86,6 +86,16 @@
 			reg = <0x87000000 0x400000>;
 		};
 
+		/* global autoconfigured region for contiguous allocations */
+		system_cma: linux,cma {
+			compatible = "shared-dma-pool";
+			alloc-ranges = <0x00000000 0xffffffff>;
+			reusable;
+			alignment = <0x400000>;
+			size = <0xc00000>;
+			linux,cma-default;
+		};
+
 	};
 
 	cpus {

From 2fddd76c2489fbfa0dce862685e2a8e1982f08a8 Mon Sep 17 00:00:00 2001
From: Qingqing Zhou <qqzhou@qti.qualcomm.com>
Date: Fri, 1 Jul 2022 17:08:14 +0800
Subject: [PATCH 3/3] ARM: dts: msm: Add dma-buf heaps for sdxbaagha

Add dma-buf heaps device node for dma-buf heaps driver.

Change-Id: I4b60d4be4eb0795b5dde74c0eb410dd4107f4245
---
 qcom/sdxbaagha-dma-heaps.dtsi | 7 +++++++
 qcom/sdxbaagha.dtsi           | 1 +
 2 files changed, 8 insertions(+)
 create mode 100644 qcom/sdxbaagha-dma-heaps.dtsi

diff --git a/qcom/sdxbaagha-dma-heaps.dtsi b/qcom/sdxbaagha-dma-heaps.dtsi
new file mode 100644
index 00000000..224331fe
--- /dev/null
+++ b/qcom/sdxbaagha-dma-heaps.dtsi
@@ -0,0 +1,7 @@
+#include <dt-bindings/arm/msm/qcom_dma_heap_dt_constants.h>
+
+&soc {
+	qcom,dma-heaps {
+		compatible = "qcom,dma-heaps";
+	};
+};
diff --git a/qcom/sdxbaagha.dtsi b/qcom/sdxbaagha.dtsi
index dee17518..c8139ae4 100644
--- a/qcom/sdxbaagha.dtsi
+++ b/qcom/sdxbaagha.dtsi
@@ -205,3 +205,4 @@
 };
 
 #include "sdxbaagha-pinctrl.dtsi"
+#include "sdxbaagha-dma-heaps.dtsi"