From 6353e4f77fba3a5b3c13ea8350410d18ee8a6024 Mon Sep 17 00:00:00 2001
From: Naina Mehta <nainmeht@qti.qualcomm.com>
Date: Wed, 1 Sep 2021 15:29:50 +0530
Subject: [PATCH] ARM: dts: msm: Remove separate DT for digital mics for Yupik

Remove separate DT support for digital mics for Yupik, YupikP and
Yupik LTE on IDPS.

Change-Id: Ic2b527efa014078bcd13279d9570dcfc6be41166
---
 qcom/Makefile                             |  6 ------
 qcom/yupik-idps-digital-mics-overlay.dts  | 11 -----------
 qcom/yupik-idps-digital-mics.dts          | 10 ----------
 qcom/yupik-idps-digital-mics.dtsi         |  4 ----
 qcom/yupikp-idps-digital-mics-overlay.dts | 11 -----------
 qcom/yupikp-idps-digital-mics.dts         | 10 ----------
 qcom/yupikp-idps-digital-mics.dtsi        |  1 -
 7 files changed, 53 deletions(-)
 delete mode 100644 qcom/yupik-idps-digital-mics-overlay.dts
 delete mode 100644 qcom/yupik-idps-digital-mics.dts
 delete mode 100644 qcom/yupik-idps-digital-mics.dtsi
 delete mode 100644 qcom/yupikp-idps-digital-mics-overlay.dts
 delete mode 100644 qcom/yupikp-idps-digital-mics.dts
 delete mode 100644 qcom/yupikp-idps-digital-mics.dtsi

diff --git a/qcom/Makefile b/qcom/Makefile
index 0e4c4c177b6a..c556c7a8e8dc 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -204,13 +204,11 @@ dtbo-$(CONFIG_ARCH_YUPIK) +=    \
 	yupik-idp-overlay.dtbo \
 	yupik-atp-overlay.dtbo \
 	yupik-qrd-overlay.dtbo \
-	yupik-idps-digital-mics-overlay.dtbo \
 	yupik-idps-amoled-overlay.dtbo \
 	yupik-idp-pm7250b-overlay.dtbo \
 	yupikp-idp-overlay.dtbo \
 	yupikp-atp-overlay.dtbo \
 	yupikp-qrd-overlay.dtbo \
-	yupikp-idps-digital-mics-overlay.dtbo \
 	yupikp-idps-amoled-overlay.dtbo \
 	yupik-iot-idp-overlay.dtbo \
 	yupik-iot-qrd-overlay.dtbo \
@@ -226,13 +224,11 @@ yupik-rumi-overlay.dtbo-base := yupik.dtb
 yupik-idp-overlay.dtbo-base := yupik.dtb
 yupik-atp-overlay.dtbo-base := yupik.dtb
 yupik-qrd-overlay.dtbo-base := yupik.dtb
-yupik-idps-digital-mics-overlay.dtbo-base := yupik.dtb
 yupik-idps-amoled-overlay.dtbo-base := yupik.dtb
 yupik-idp-pm7250b-overlay.dtbo-base := yupik.dtb
 yupikp-idp-overlay.dtbo-base := yupikp.dtb
 yupikp-atp-overlay.dtbo-base := yupikp.dtb
 yupikp-qrd-overlay.dtbo-base := yupikp.dtb
-yupikp-idps-digital-mics-overlay.dtbo-base := yupikp.dtb
 yupikp-idps-amoled-overlay.dtbo-base := yupikp.dtb
 yupik-iot-idp-overlay.dtbo-base := yupik-iot.dtb
 yupik-iot-qrd-overlay.dtbo-base := yupik-iot.dtb
@@ -247,13 +243,11 @@ dtb-$(CONFIG_ARCH_YUPIK) += yupik-rumi.dtb \
 	yupik-idp.dtb \
 	yupik-atp.dtb \
 	yupik-qrd.dtb \
-	yupik-idps-digital-mics.dtb \
 	yupik-idps-amoled.dtb \
 	yupik-idp-pm7250b.dtb \
 	yupikp-idp.dtb \
 	yupikp-atp.dtb \
 	yupikp-qrd.dtb \
-	yupikp-idps-digital-mics.dtb \
 	yupikp-idps-amoled.dtb \
 	yupik-iot-idp.dtb \
 	yupik-iot-qrd.dtb \
diff --git a/qcom/yupik-idps-digital-mics-overlay.dts b/qcom/yupik-idps-digital-mics-overlay.dts
deleted file mode 100644
index 4f1b65e661ff..000000000000
--- a/qcom/yupik-idps-digital-mics-overlay.dts
+++ /dev/null
@@ -1,11 +0,0 @@
-/dts-v1/;
-/plugin/;
-
-#include "yupik-idps-digital-mics.dtsi"
-
-/ {
-	model = "Qualcomm Technologies, Inc. Yupik IDPS + DIGITAL MICS";
-	compatible = "qcom,yupik-idp", "qcom,yupik", "qcom,idp";
-	qcom,msm-id = <475 0x10000>, <515 0x10000>;
-	qcom,board-id = <34 1>;
-};
diff --git a/qcom/yupik-idps-digital-mics.dts b/qcom/yupik-idps-digital-mics.dts
deleted file mode 100644
index 0adab7cdd2c4..000000000000
--- a/qcom/yupik-idps-digital-mics.dts
+++ /dev/null
@@ -1,10 +0,0 @@
-/dts-v1/;
-
-#include "yupik.dtsi"
-#include "yupik-idps-digital-mics.dtsi"
-
-/ {
-	model = "Qualcomm Technologies, Inc. Yupik IDPS + DIGITAL MICS";
-	compatible = "qcom,yupik-idp", "qcom,yupik", "qcom,idp";
-	qcom,board-id = <34 1>;
-};
diff --git a/qcom/yupik-idps-digital-mics.dtsi b/qcom/yupik-idps-digital-mics.dtsi
deleted file mode 100644
index 885e5af51402..000000000000
--- a/qcom/yupik-idps-digital-mics.dtsi
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "yupik-idp.dtsi"
-
-&soc {
-};
diff --git a/qcom/yupikp-idps-digital-mics-overlay.dts b/qcom/yupikp-idps-digital-mics-overlay.dts
deleted file mode 100644
index ede5df06f0b6..000000000000
--- a/qcom/yupikp-idps-digital-mics-overlay.dts
+++ /dev/null
@@ -1,11 +0,0 @@
-/dts-v1/;
-/plugin/;
-
-#include "yupikp-idps-digital-mics.dtsi"
-
-/ {
-	model = "Qualcomm Technologies, Inc. YupikP IDPS + DIGITAL MICS";
-	compatible = "qcom,yupikp-idp", "qcom,yupikp", "qcom,idp";
-	qcom,msm-id = <499 0x10000>;
-	qcom,board-id = <34 1>;
-};
diff --git a/qcom/yupikp-idps-digital-mics.dts b/qcom/yupikp-idps-digital-mics.dts
deleted file mode 100644
index d798a6a6a2d0..000000000000
--- a/qcom/yupikp-idps-digital-mics.dts
+++ /dev/null
@@ -1,10 +0,0 @@
-/dts-v1/;
-
-#include "yupikp.dtsi"
-#include "yupikp-idps-digital-mics.dtsi"
-
-/ {
-	model = "Qualcomm Technologies, Inc. YupikP IDPS + DIGITAL MICS";
-	compatible = "qcom,yupikp-idp", "qcom,yupikp", "qcom,idp";
-	qcom,board-id = <34 1>;
-};
diff --git a/qcom/yupikp-idps-digital-mics.dtsi b/qcom/yupikp-idps-digital-mics.dtsi
deleted file mode 100644
index 12c906256483..000000000000
--- a/qcom/yupikp-idps-digital-mics.dtsi
+++ /dev/null
@@ -1 +0,0 @@
-#include "yupik-idps-digital-mics.dtsi"