From 567dcfd90f682d2e80e149a22b207ed33fe87d50 Mon Sep 17 00:00:00 2001
From: Qingqing Zhou <qqzhou@qti.qualcomm.com>
Date: Wed, 24 Mar 2021 11:56:08 +0800
Subject: [PATCH 1/3] ARM: dts: msm: Add common CMA region for sdxnightjar

Add a 12MB CMA region for common use.

Change-Id: Id7b8fbe888d345086cbf18cd48c88659260e2893
---
 qcom/sdxnightjar.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/qcom/sdxnightjar.dtsi b/qcom/sdxnightjar.dtsi
index 38817f15fe7e..4e4ba8339ff5 100644
--- a/qcom/sdxnightjar.dtsi
+++ b/qcom/sdxnightjar.dtsi
@@ -53,6 +53,15 @@
 			label = "mss_mem";
 		};
 
+		common_cma: linux,cma {
+			compatible = "shared-dma-pool";
+			alloc-ranges = <0x00000000 0xffffffff>;
+			reusable;
+			alignment = <0x400000>;
+			size = <0xc00000>;
+			linux,cma-default;
+		};
+
 		qseecom_mem: qseecom_region {
 			compatible = "shared-dma-pool";
 			alloc-ranges = <0x00000000 0xffffffff>;

From a102f9d7dd5bc4bd7ed9b0b61001fbc8a80763cd Mon Sep 17 00:00:00 2001
From: Yuanfang Zhang <yuanfang@qti.qualcomm.com>
Date: Tue, 30 Mar 2021 12:06:12 +0800
Subject: [PATCH 2/3] ARM: dts: msm: remove mem_dump region

Remove the mem_dump_region cma region and change "memory-region"
of mem_dump reference to common cma node on sdxnightjar.

Change-Id: I620ff826fb78b555c711471e1dac4f5ed6daadf4
---
 qcom/sdxnightjar.dtsi | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/qcom/sdxnightjar.dtsi b/qcom/sdxnightjar.dtsi
index 4e4ba8339ff5..b819eb181b32 100644
--- a/qcom/sdxnightjar.dtsi
+++ b/qcom/sdxnightjar.dtsi
@@ -70,13 +70,6 @@
 			size = <0x400000>;
 		};
 
-		dump_mem: mem_dump_region {
-			compatible = "shared-dma-pool";
-			alloc-ranges = <0x00000000 0xffffffff>;
-			reusable;
-			size = <0x400000>;
-		};
-
 	};
 
 	aliases { };
@@ -440,7 +433,7 @@
 
 	mem_dump {
 		compatible = "qcom,mem-dump";
-		memory-region = <&dump_mem>;
+		memory-region = <&common_cma>;
 
 		c0_context {
 			qcom,dump-size = <0x800>;

From 2c5b6f396824a8138f8983e88bcda54ef63cf84a Mon Sep 17 00:00:00 2001
From: Raymon Sang <csang@qti.qualcomm.com>
Date: Tue, 30 Mar 2021 12:06:46 +0800
Subject: [PATCH 3/3] ARM: dts: msm: remove wlan section of mem_dump

Remove cnss_wlan section in mem_dump on sdxnightjar.

Change-Id: I9d18a20aa9dc4d5d83a174378977c9de515d7526
---
 qcom/sdxnightjar.dtsi | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/qcom/sdxnightjar.dtsi b/qcom/sdxnightjar.dtsi
index b819eb181b32..ff431030199e 100644
--- a/qcom/sdxnightjar.dtsi
+++ b/qcom/sdxnightjar.dtsi
@@ -440,11 +440,6 @@
 			qcom,dump-id = <0x0>;
 		};
 
-		cnss_wlan {
-			qcom,dump-size = <0x200000>;
-			qcom,dump-id = <0xe1>;
-		};
-
 		etr_reg {
 			qcom,dump-size = <0x1000>;
 			qcom,dump-id = <0x100>;