From ce7280c09f9fce381719cd1ae693882e97945d9c Mon Sep 17 00:00:00 2001
From: Faiz Nabi Kuchay <fkuchay@qti.qualcomm.com>
Date: Tue, 1 Sep 2020 00:31:56 +0530
Subject: [PATCH] ARM: dts: msm: Add support of cma heap

Add support of cma heap for shima.

Change-Id: Iaff7c9fb651d1a99511696f6ce3d9f11e6516c7a
---
 qcom/shima-audio.dtsi | 10 ++++++++--
 qcom/shima-ion.dtsi   |  5 +++++
 qcom/shima.dtsi       |  8 ++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/qcom/shima-audio.dtsi b/qcom/shima-audio.dtsi
index 6360c8443b37..752938f13ecf 100644
--- a/qcom/shima-audio.dtsi
+++ b/qcom/shima-audio.dtsi
@@ -7,6 +7,10 @@
 };
 
 &audio_apr {
+	msm_audio_ion_cma: qcom,msm-audio-ion-cma {
+		compatible = "qcom,msm-audio-ion-cma";
+	};
+
 	q6core: qcom,q6core-audio {
 		compatible = "qcom,q6core-audio";
 		#address-cells = <1>;
@@ -47,8 +51,10 @@
 						   <0x00000000>, <0x00000000>,
 						   <0x00000006>;
 
-			clock-names = "lpass_core_hw_vote";
-			clocks = <&lpass_core_hw_vote 0>;
+			clock-names = "lpass_core_hw_vote",
+					"lpass_audio_hw_vote";
+			clocks = <&lpass_core_hw_vote 0>,
+					<&lpass_audio_hw_vote 0>;
 		};
 
 		bolero: bolero-cdc {
diff --git a/qcom/shima-ion.dtsi b/qcom/shima-ion.dtsi
index cadb13713077..bd38e570d59b 100644
--- a/qcom/shima-ion.dtsi
+++ b/qcom/shima-ion.dtsi
@@ -39,5 +39,10 @@
 			memory-region = <&qseecom_mem>;
 			qcom,ion-heap-type = "DMA";
 		};
+		qcom,ion-heap@5 { /* AUDIO ML HEAP */
+			reg = <ION_AUDIO_ML_HEAP_ID>;
+			memory-region = <&audio_cma_mem>;
+			qcom,ion-heap-type = "DMA";
+		};
 	};
 };
diff --git a/qcom/shima.dtsi b/qcom/shima.dtsi
index 4af7105c1cbf..12ed39eac4cd 100644
--- a/qcom/shima.dtsi
+++ b/qcom/shima.dtsi
@@ -428,6 +428,14 @@
 			size = <0 0x2c00000>;
 		};
 
+		audio_cma_mem: audio_cma_region {
+			compatible = "shared-dma-pool";
+			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
+			reusable;
+			alignment = <0x0 0x400000>;
+			size = <0x0 0x1C00000>;
+		};
+
 	};
 
 	chosen {