From 223de31fb47f788f88a9cd242497ef75efb01140 Mon Sep 17 00:00:00 2001
From: Nishant Pandey <nishpand@qti.qualcomm.com>
Date: Thu, 6 Oct 2022 22:48:28 -0700
Subject: [PATCH 1/2] ARM: dts: msm: Add the dma-buf heaps device node for
 sa410m

Add the dma-buf heaps device node for the dma-buf heaps driver
on sa410m.

Change-Id: If2730989080b9b79391215163d8a169fc6df8edf
---
 qcom/sa410m-dma-heap.dtsi | 26 ++++++++++++++++++++++++++
 qcom/sa410m.dtsi          |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 qcom/sa410m-dma-heap.dtsi

diff --git a/qcom/sa410m-dma-heap.dtsi b/qcom/sa410m-dma-heap.dtsi
new file mode 100644
index 00000000..527e869e
--- /dev/null
+++ b/qcom/sa410m-dma-heap.dtsi
@@ -0,0 +1,26 @@
+
+#include <dt-bindings/arm/msm/qcom_dma_heap_dt_constants.h>
+
+&soc {
+	qcom,dma-heaps {
+		compatible = "qcom,dma-heaps";
+
+		qcom,qseecom {
+			qcom,dma-heap-name = "qcom,qseecom";
+			qcom,dma-heap-type = <HEAP_TYPE_CMA>;
+			memory-region = <&qseecom_mem>;
+		};
+
+		qcom,qseecom_ta {
+			qcom,dma-heap-name = "qcom,qseecom-ta";
+			qcom,dma-heap-type = <HEAP_TYPE_CMA>;
+			memory-region = <&qseecom_ta_mem>;
+		};
+
+		qcom,user_contig {
+			qcom,dma-heap-name = "qcom,user-contig";
+			qcom,dma-heap-type = <HEAP_TYPE_CMA>;
+			memory-region = <&user_contig_mem>;
+		};
+	};
+};
diff --git a/qcom/sa410m.dtsi b/qcom/sa410m.dtsi
index 8362ac06..28354d71 100644
--- a/qcom/sa410m.dtsi
+++ b/qcom/sa410m.dtsi
@@ -575,6 +575,7 @@
 #include "sa410m-pinctrl.dtsi"
 #include "monaco-gdsc.dtsi"
 #include "sa410m-qupv3.dtsi"
+#include "sa410m-dma-heap.dtsi"
 
 &gcc_emac0_gdsc {
 	status = "ok";

From a82ebd53fc0d3fd421ad9082eca6aae0cb0b477e Mon Sep 17 00:00:00 2001
From: Nishant Pandey <nishpand@qti.qualcomm.com>
Date: Sun, 9 Oct 2022 23:40:07 -0700
Subject: [PATCH 2/2] ARM: dts: msm: Add the dma-buf heaps device node for
 scuba_auto

Add the dma-buf heaps device node for the dma-buf heaps driver
on scuba_auto.

Change-Id: I24ab890c9d5cccee4ece1b934bdd0a93cb96da80
---
 qcom/scuba_auto-dma-heap.dtsi | 26 ++++++++++++++++++++++++++
 qcom/scuba_auto.dtsi          |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 qcom/scuba_auto-dma-heap.dtsi

diff --git a/qcom/scuba_auto-dma-heap.dtsi b/qcom/scuba_auto-dma-heap.dtsi
new file mode 100644
index 00000000..527e869e
--- /dev/null
+++ b/qcom/scuba_auto-dma-heap.dtsi
@@ -0,0 +1,26 @@
+
+#include <dt-bindings/arm/msm/qcom_dma_heap_dt_constants.h>
+
+&soc {
+	qcom,dma-heaps {
+		compatible = "qcom,dma-heaps";
+
+		qcom,qseecom {
+			qcom,dma-heap-name = "qcom,qseecom";
+			qcom,dma-heap-type = <HEAP_TYPE_CMA>;
+			memory-region = <&qseecom_mem>;
+		};
+
+		qcom,qseecom_ta {
+			qcom,dma-heap-name = "qcom,qseecom-ta";
+			qcom,dma-heap-type = <HEAP_TYPE_CMA>;
+			memory-region = <&qseecom_ta_mem>;
+		};
+
+		qcom,user_contig {
+			qcom,dma-heap-name = "qcom,user-contig";
+			qcom,dma-heap-type = <HEAP_TYPE_CMA>;
+			memory-region = <&user_contig_mem>;
+		};
+	};
+};
diff --git a/qcom/scuba_auto.dtsi b/qcom/scuba_auto.dtsi
index 26278591..6ff28f5a 100644
--- a/qcom/scuba_auto.dtsi
+++ b/qcom/scuba_auto.dtsi
@@ -1132,6 +1132,7 @@
 
 #include "msm-arm-smmu-scuba_auto.dtsi"
 #include "scuba_auto-qupv3.dtsi"
+#include "scuba_auto-dma-heap.dtsi"
 
 &sdhc_1 {
 	vdd-supply = <&L20A>;