From 40fb3c8793fb83c19d2dd6eaee32cae2ed2b31c7 Mon Sep 17 00:00:00 2001
From: "Isaac J. Manjarres" <isaacm@quicinc.com>
Date: Wed, 28 Apr 2021 13:43:04 -0700
Subject: [PATCH] ARM: dts: msm: Add a carveout heap for audio usecases on
 sdxlemur

Define a carveout heap for audio usecases on 1 GB variants of
sdxlemur.

Change-Id: I71e1904b68b85a16da7f9d95ca60363dffaf51a7
---
 qcom/sdxlemur-audio.dtsi |  5 +++++
 qcom/sdxlemur-ion.dtsi   | 10 ++++++++++
 2 files changed, 15 insertions(+)

diff --git a/qcom/sdxlemur-audio.dtsi b/qcom/sdxlemur-audio.dtsi
index 4f3cae1c280c..189ec72a5c12 100644
--- a/qcom/sdxlemur-audio.dtsi
+++ b/qcom/sdxlemur-audio.dtsi
@@ -38,3 +38,8 @@
 				"msm-dai-q6-auxpcm.2";
 	};
 };
+
+&audio_co_heap {
+	status = "okay";
+	memory-region = <&audio_heap_mem>;
+};
diff --git a/qcom/sdxlemur-ion.dtsi b/qcom/sdxlemur-ion.dtsi
index dbf4220881a9..8fb6e0abb786 100644
--- a/qcom/sdxlemur-ion.dtsi
+++ b/qcom/sdxlemur-ion.dtsi
@@ -17,6 +17,16 @@
 			qcom,ion-heap-type = "DMA";
 		};
 
+		audio_co_heap: qcom,ion-heap@17 { /* AUDIO CARVEOUT HEAP */
+			reg = <ION_AUDIO_CARVEOUT_HEAP_ID>;
+			qcom,ion-heap-type = "MSM_CARVEOUT";
+			/*
+			 * memory-region must be specified when enabled here or
+			 * when the node is overridden to be enabled elsewhere.
+			 */
+			status = "disabled";
+		};
+
 		qcom,ion-heap@27 { /* QSEECOM HEAP */
 			reg = <ION_QSECOM_HEAP_ID>;
 			memory-region = <&qseecom_mem>;