From 737887d9b5b164a01bec37e52fe9d79b8a09ae31 Mon Sep 17 00:00:00 2001
From: Anurag Chouhan <achouhan@qti.qualcomm.com>
Date: Wed, 23 Dec 2020 17:15:21 +0530
Subject: [PATCH] ARM: dts: msm: Update ion heap for scuba

Update ION heap for scuba.

Change-Id: I47d3f202d5e3380e4ce0b4d57d0133d2d24a15b7
---
 qcom/scuba-ion.dtsi     | 13 +++++++------
 qcom/scuba-iot-idp.dtsi |  1 +
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/qcom/scuba-ion.dtsi b/qcom/scuba-ion.dtsi
index cba6f834d9d9..c19c0bf75298 100644
--- a/qcom/scuba-ion.dtsi
+++ b/qcom/scuba-ion.dtsi
@@ -1,3 +1,4 @@
+#include <dt-bindings/arm/msm/msm_ion_ids.h>
 &soc {
 	qcom,ion {
 		compatible = "qcom,msm-ion";
@@ -5,29 +6,29 @@
 		#size-cells = <0>;
 
 		system_heap: qcom,ion-heap@25 {
-			reg = <25>;
-			qcom,ion-heap-type = "SYSTEM";
+			reg = <ION_SYSTEM_HEAP_ID>;
+			qcom,ion-heap-type = "MSM_SYSTEM";
 		};
 
 		system_secure_heap: qcom,ion-heap@9 {
-			reg = <9>;
+			reg = <ION_SECURE_HEAP_ID>;
 			qcom,ion-heap-type = "SYSTEM_SECURE";
 		};
 
 		qcom,ion-heap@10 { /* SECURE DISPLAY HEAP */
-			reg = <10>;
+			reg = <ION_SECURE_DISPLAY_HEAP_ID>;
 			memory-region = <&secure_display_memory>;
 			qcom,ion-heap-type = "HYP_CMA";
 		};
 
 		qcom,ion-heap@27 { /* QSEECOM HEAP */
-			reg = <27>;
+			reg = <ION_QSECOM_HEAP_ID>;
 			memory-region = <&qseecom_mem>;
 			qcom,ion-heap-type = "DMA";
 		};
 
 		qcom,ion-heap@19 { /* QSEECOM HEAP */
-			reg = <19>;
+			reg = <ION_QSECOM_TA_HEAP_ID>;
 			memory-region = <&qseecom_ta_mem>;
 			qcom,ion-heap-type = "DMA";
 		};
diff --git a/qcom/scuba-iot-idp.dtsi b/qcom/scuba-iot-idp.dtsi
index d0b147079ba0..91456469df2f 100644
--- a/qcom/scuba-iot-idp.dtsi
+++ b/qcom/scuba-iot-idp.dtsi
@@ -1,5 +1,6 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/iio/qcom,spmi-vadc.h>
+#include "scuba-ion.dtsi"
 
 &soc {
 	scuba_batterydata: qcom,battery-data {