From 32f8106a35f06e8a1f42c796e9b989df814095fa Mon Sep 17 00:00:00 2001
From: Shreyas K K <shrekk@qti.qualcomm.com>
Date: Wed, 7 Oct 2020 13:35:30 +0530
Subject: [PATCH] ARM: dts: msm: Remove CDP DT for SA8155

Auto targets do not use CDP boards. Remove CDP device tree
for ARCH_SA8155.

Change-Id: Ia5495f62770b5f81fb30de0993dbca66d1b897e7
---
 qcom/Makefile               |  5 +----
 qcom/sm8150-cdp-overlay.dts | 14 --------------
 qcom/sm8150-cdp.dts         | 10 ----------
 qcom/sm8150-cdp.dtsi        |  2 --
 4 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 qcom/sm8150-cdp-overlay.dts
 delete mode 100644 qcom/sm8150-cdp.dts
 delete mode 100644 qcom/sm8150-cdp.dtsi

diff --git a/qcom/Makefile b/qcom/Makefile
index 778cf0fcf1d6..572f4f02fb0c 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -133,20 +133,17 @@ endif
 
 ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
         dtbo-$(CONFIG_ARCH_SA8155) += \
-		sm8150-cdp-overlay.dtbo \
 		sa8155-adp-star-overlay.dtbo \
 		sa8155p-adp-star-overlay.dtbo \
 		sa8155-v2-adp-air-overlay.dtbo \
 		sa8155p-v2-adp-air-overlay.dtbo
 
-sm8150-cdp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb
 sa8155-adp-star-overlay.dtbo-base := sa8155.dtb sa8155-v2.dtb
 sa8155p-adp-star-overlay.dtbo-base := sa8155p.dtb sa8155p-v2.dtb
 sa8155-v2-adp-air-overlay.dtbo-base := sa8155.dtb sa8155-v2.dtb
 sa8155p-v2-adp-air-overlay.dtbo-base := sa8155p.dtb sa8155p-v2.dtb
 else
-dtb-$(CONFIG_ARCH_SA8155)       += sm8150-cdp.dtb \
-	sa8155-adp-star.dtb \
+dtb-$(CONFIG_ARCH_SA8155)       += sa8155-adp-star.dtb \
 	sa8155p-adp-star.dtb \
 	sa8155-v2-adp-star.dtb \
 	sa8155p-v2-adp-star.dtb \
diff --git a/qcom/sm8150-cdp-overlay.dts b/qcom/sm8150-cdp-overlay.dts
deleted file mode 100644
index c4665280aa59..000000000000
--- a/qcom/sm8150-cdp-overlay.dts
+++ /dev/null
@@ -1,14 +0,0 @@
-/dts-v1/;
-/plugin/;
-
-#include <dt-bindings/clock/qcom,gcc-sm8150.h>
-#include <dt-bindings/clock/qcom,rpmh.h>
-#include <dt-bindings/interrupt-controller/arm-gic.h>
-
-#include "sm8150-cdp.dtsi"
-
-/ {
-	model = "CDP";
-	compatible = "qcom,sm8150-cdp", "qcom,sm8150", "qcom,cdp";
-	qcom,board-id = <1 0>;
-};
diff --git a/qcom/sm8150-cdp.dts b/qcom/sm8150-cdp.dts
deleted file mode 100644
index ece66075cd39..000000000000
--- a/qcom/sm8150-cdp.dts
+++ /dev/null
@@ -1,10 +0,0 @@
-/dts-v1/;
-
-#include "sm8150.dtsi"
-#include "sm8150-cdp.dtsi"
-
-/ {
-	model = "Qualcomm Technologies, Inc. SM8150 CDP";
-	compatible = "qcom,sm8150-cdp", "qcom,sm8150", "qcom,cdp";
-	qcom,board-id = <1 0>;
-};
diff --git a/qcom/sm8150-cdp.dtsi b/qcom/sm8150-cdp.dtsi
deleted file mode 100644
index 44b2ac0d79b8..000000000000
--- a/qcom/sm8150-cdp.dtsi
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>