From 9bf11d954fef3696aabd4096a311b4e2a8346edf Mon Sep 17 00:00:00 2001
From: nishant chaubey <chaubey@qti.qualcomm.com>
Date: Thu, 17 Feb 2022 10:53:26 +0530
Subject: [PATCH] ARM: dts: msm: Add CMA instead of carveout for secure dsp
 usecase

Allocate memory from CMA instead of secure carveout for secure
use case.

Change-Id: Ifd8abd86d0757615a0c085be2483abe9b6113cf2
---
 qcom/parrot-dma-heaps.dtsi | 7 +++----
 qcom/parrot.dtsi           | 8 ++++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/qcom/parrot-dma-heaps.dtsi b/qcom/parrot-dma-heaps.dtsi
index 00537858..9addd7df 100644
--- a/qcom/parrot-dma-heaps.dtsi
+++ b/qcom/parrot-dma-heaps.dtsi
@@ -4,10 +4,9 @@
 	qcom,dma-heaps {
 		compatible = "qcom,dma-heaps";
 		qcom,secure_cdsp {
-			qcom,dma-heap-name = "qcom,secure-cdsp";
-			qcom,dma-heap-type = <HEAP_TYPE_SECURE_CARVEOUT>;
-			memory-region = <&cdsp_secure_heap_mem>;
-			qcom,token = <0x20000000>;
+			qcom,dma-heap-name = "qcom,cma-secure-cdsp";
+			qcom,dma-heap-type = <HEAP_TYPE_CMA>;
+			memory-region = <&cdsp_secure_heap>;
 		};
 
 		qcom,adsp {
diff --git a/qcom/parrot.dtsi b/qcom/parrot.dtsi
index 598634e7..c5bd3cff 100644
--- a/qcom/parrot.dtsi
+++ b/qcom/parrot.dtsi
@@ -351,6 +351,14 @@
 		size = <0x0 0x400000>;
 	};
 
+	cdsp_secure_heap: secure_cdsp_region { /* Secure DSP */
+		compatible = "shared-dma-pool";
+		alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
+		reusable;
+		alignment = <0x0 0x400000>;
+		size = <0x0 0x4800000>;
+	};
+
 };
 
 &soc {