From afc0f64f633cef02b5c14b874fe5a6d5f9bdaa5a Mon Sep 17 00:00:00 2001
From: Faiyaz Mohammed <faiyazm@qti.qualcomm.com>
Date: Thu, 3 Sep 2020 09:33:32 +0530
Subject: [PATCH] ARM: dts: msm: updates the shima VM ION same as lahaina

Update the shima VM ION same as lahiana because tui mem-buf feature
of shima is same as lahaina.

Change-Id: Ic1fb0ade5f5b7e6cf1590d0856f51730d36db064
---
 qcom/shima-vm-ion.dtsi | 15 ---------------
 qcom/shima-vm.dtsi     |  2 +-
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 qcom/shima-vm-ion.dtsi

diff --git a/qcom/shima-vm-ion.dtsi b/qcom/shima-vm-ion.dtsi
deleted file mode 100644
index 010dec0a5607..000000000000
--- a/qcom/shima-vm-ion.dtsi
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <dt-bindings/arm/msm/msm_ion_ids.h>
-
-/ {
-	qcom,ion {
-		compatible = "qcom,msm-ion";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		tui_heap: qcom,ion-heap-tui { /* TRUSTED UI CARVEOUT HEAP */
-			reg = <ION_TUI_CARVEOUT_HEAP_ID>;
-			qcom,dynamic-heap;
-			qcom,ion-heap-type = "MSM_CARVEOUT";
-		};
-	};
-};
diff --git a/qcom/shima-vm.dtsi b/qcom/shima-vm.dtsi
index 360c435790da..8a1fb3b5d52c 100644
--- a/qcom/shima-vm.dtsi
+++ b/qcom/shima-vm.dtsi
@@ -225,4 +225,4 @@
 			     <GIC_PPI 12 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>;
 	};
 };
-#include "shima-vm-ion.dtsi"
+#include "lahaina-vm-ion.dtsi"