From 64fc30eb08eee393cb7d583ef76b125fb5271147 Mon Sep 17 00:00:00 2001
From: Salendarsingh Gaud <sgaud@qti.qualcomm.com>
Date: Sat, 18 Mar 2023 02:20:06 -0700
Subject: [PATCH] Revert "ARM: dts: msm: Create a new dtsi file"

This reverts commit 9da955b8d27e2ca6b858dfe19278c77ff241a5f2.

Change-Id: Id1e8a835d4acad30c4256ef4ccabc0e3aa8cb365
---
 qcom/Makefile          | 4 ++--
 qcom/waipio-cdp-xr.dts | 2 +-
 qcom/waipio-le.dts     | 7 -------
 qcom/waipio-le.dtsi    | 5 -----
 qcom/waipio-mtp-xr.dts | 2 +-
 5 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 100644 qcom/waipio-le.dts
 delete mode 100644 qcom/waipio-le.dtsi

diff --git a/qcom/Makefile b/qcom/Makefile
index 754f9aa1..ae5bb426 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -121,8 +121,8 @@ waipio-kiwi-mtp-pm8008-overlay.dtbo-base := waipio.dtb waipio-v2.dtb waipio-lte.
 waipio-kiwi-mtp-pm8010-overlay.dtbo-base := waipio.dtb waipio-v2.dtb waipio-lte.dtb
 waipio-kiwi-cdp-pm8008-overlay.dtbo-base := waipio.dtb waipio-v2.dtb waipio-lte.dtb
 waipio-kiwi-cdp-pm8010-overlay.dtbo-base := waipio.dtb waipio-v2.dtb waipio-lte.dtb
-waipio-cdp-xr-overlay.dtbo-base := waipio.dtb waipio-v2.dtb waipio-le.dtb
-waipio-mtp-xr-overlay.dtbo-base := waipio.dtb waipio-v2.dtb waipio-le.dtb
+waipio-cdp-xr-overlay.dtbo-base := waipio.dtb waipio-v2.dtb
+waipio-mtp-xr-overlay.dtbo-base := waipio.dtb waipio-v2.dtb
 else
 dtb-$(CONFIG_ARCH_WAIPIO) += waipio-rumi.dtb \
 	waipio-mtp-pm8008.dtb \
diff --git a/qcom/waipio-cdp-xr.dts b/qcom/waipio-cdp-xr.dts
index 14a019c0..00a4e855 100644
--- a/qcom/waipio-cdp-xr.dts
+++ b/qcom/waipio-cdp-xr.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "waipio-le.dtsi"
+#include "waipio-v2.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. Waipio CDP with XR";
diff --git a/qcom/waipio-le.dts b/qcom/waipio-le.dts
deleted file mode 100644
index df6bf1c6..00000000
--- a/qcom/waipio-le.dts
+++ /dev/null
@@ -1,7 +0,0 @@
-/dts-v1/;
-
-#include "waipio-le.dtsi"
-
-/ {
-	model = "Qualcomm Technologies, Inc. Waipio LE";
-};
diff --git a/qcom/waipio-le.dtsi b/qcom/waipio-le.dtsi
deleted file mode 100644
index b2615a59..00000000
--- a/qcom/waipio-le.dtsi
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "waipio-v2.dtsi"
-
-/ {
-	model = "Qualcomm Technologies, Inc. Waipio LE";
-};
diff --git a/qcom/waipio-mtp-xr.dts b/qcom/waipio-mtp-xr.dts
index e7b4bdcf..dfae2c01 100644
--- a/qcom/waipio-mtp-xr.dts
+++ b/qcom/waipio-mtp-xr.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-#include "waipio-le.dtsi"
+#include "waipio-v2.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. Waipio MTP with XR";