Revert "Import chipcode provided patch for devicetree includes"

This reverts commit 87a3ec4aa69e9bb0700582d54104aeadf42f3408.

Reason for revert: No longer used, so no need to apply

Bug: 263902929
Change-Id: I5a6e713175e3dd1d1e970f0abc0d47c8cbea6825

10 files changed, 0 insertions, 25 deletions

diff --git a/Makefile b/Makefile
index 7e474d67..855132a4 100755
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,4 @@ vendor := $(srctree)/$(src)
 
 ifneq "$(wildcard $(vendor)/qcom)" ""
 	subdir-y += qcom
-	subdir-y += ../graphics-devicetree
-	subdir-y += ../display-devicetree
-	subdir-y += ../video-devicetree
-	subdir-y += ../nfc-devicetree
-	subdir-y += ../wlan-devicetree
-	subdir-y += ../audio-devicetree
 endif
diff --git a/qcom/monaco-idp-v1-overlay.dts b/qcom/monaco-idp-v1-overlay.dts
index 838c150d..2d46bdbd 100755
--- a/qcom/monaco-idp-v1-overlay.dts
+++ b/qcom/monaco-idp-v1-overlay.dts
@@ -2,7 +2,6 @@
 /plugin/;
 
 #include "monaco-idp-v1.dtsi"
-#include "../../display-devicetree/display/monaco-sde-display-idp.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. Monaco IDP V1.0";
diff --git a/qcom/monaco-idp-v2-overlay.dts b/qcom/monaco-idp-v2-overlay.dts
index bf61e1a2..24f7976e 100755
--- a/qcom/monaco-idp-v2-overlay.dts
+++ b/qcom/monaco-idp-v2-overlay.dts
@@ -2,7 +2,6 @@
 /plugin/;
 
 #include "monaco-idp-v2.dtsi"
-#include "../../display-devicetree/display/monaco-sde-display-idp.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. Monaco IDP V2.0";
diff --git a/qcom/monaco-idp-v3-overlay.dts b/qcom/monaco-idp-v3-overlay.dts
index b31e135b..b0b0726b 100755
--- a/qcom/monaco-idp-v3-overlay.dts
+++ b/qcom/monaco-idp-v3-overlay.dts
@@ -2,8 +2,6 @@
 /plugin/;
 
 #include "monaco-idp-v3.dtsi"
-#include "../../display-devicetree/display/monaco-sde-display-idp.dtsi"
-
 / {
 	model = "Qualcomm Technologies, Inc. Monaco IDP V3.0";
 	qcom,board-id = <0x030022 0x0>;
diff --git a/qcom/monaco-standalone-idp-v1-overlay.dts b/qcom/monaco-standalone-idp-v1-overlay.dts
index bf790a4e..22c69bed 100755
--- a/qcom/monaco-standalone-idp-v1-overlay.dts
+++ b/qcom/monaco-standalone-idp-v1-overlay.dts
@@ -2,7 +2,6 @@
 /plugin/;
 
 #include "monaco-standalone-idp-v1.dtsi"
-#include "../../display-devicetree/display/monaco-sde-display-idp.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. Monaco standalone IDP V1.0";
diff --git a/qcom/monaco-standalone-idp-v2-overlay.dts b/qcom/monaco-standalone-idp-v2-overlay.dts
index 0f579d85..a3d1a924 100755
--- a/qcom/monaco-standalone-idp-v2-overlay.dts
+++ b/qcom/monaco-standalone-idp-v2-overlay.dts
@@ -2,7 +2,6 @@
 /plugin/;
 
 #include "monaco-standalone-idp-v2.dtsi"
-#include "../../display-devicetree/display/monaco-sde-display-idp.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. Monaco standalone IDP V2.0";
diff --git a/qcom/monaco-standalone-idp-v3-overlay.dts b/qcom/monaco-standalone-idp-v3-overlay.dts
index af44ab25..253330f8 100755
--- a/qcom/monaco-standalone-idp-v3-overlay.dts
+++ b/qcom/monaco-standalone-idp-v3-overlay.dts
@@ -2,7 +2,6 @@
 /plugin/;
 
 #include "monaco-standalone-idp-v3.dtsi"
-#include "../../display-devicetree/display/monaco-sde-display-idp.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. Monaco standalone IDP V3.0";
diff --git a/qcom/monaco-standalone-wdp-v1-overlay.dts b/qcom/monaco-standalone-wdp-v1-overlay.dts
index 33b521d0..66f93312 100755
--- a/qcom/monaco-standalone-wdp-v1-overlay.dts
+++ b/qcom/monaco-standalone-wdp-v1-overlay.dts
@@ -2,7 +2,6 @@
 /plugin/;
 
 #include "monaco-standalone-wdp-v1.dtsi"
-#include "../../display-devicetree/display/monaco-sde-display-wdp.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. Monaco standalone WDP V1.0";
diff --git a/qcom/monaco-wdp-v1-overlay.dts b/qcom/monaco-wdp-v1-overlay.dts
index 03ea2d7b..f146b0b7 100755
--- a/qcom/monaco-wdp-v1-overlay.dts
+++ b/qcom/monaco-wdp-v1-overlay.dts
@@ -2,7 +2,6 @@
 /plugin/;
 
 #include "monaco-wdp-v1.dtsi"
-#include "../../display-devicetree/display/monaco-sde-display-wdp.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. Monaco WDP V1.0";
diff --git a/qcom/monaco.dtsi b/qcom/monaco.dtsi
index 77a167ed..a7b4a2a8 100755
--- a/qcom/monaco.dtsi
+++ b/qcom/monaco.dtsi
@@ -2070,16 +2070,6 @@
 #include "monaco-gdsc.dtsi"
 #include "monaco-usb.dtsi"
 #include "monaco-thermal.dtsi"
-#include "../../graphics-devicetree/gpu/monaco-gpu.dtsi"
-#include "../../video-devicetree/monaco-vidc.dtsi"
-#include "../../bt-devicetree/monaco-bt-standalone-idp-v1.dtsi"
-#include "../../wlan-devicetree/monaco-cnss.dtsi"
-#include "../../nfc-devicetree/nxp/monaco-nfc-common.dtsi"
-#include "../../nfc-devicetree/nxp/monaco-pinctrl.dtsi"
-#include "../../audio-devicetree/monaco-audio.dtsi"
-#include "../../audio-devicetree/monaco-audio-overlay.dtsi"
-#include "../../audio-devicetree/monaco-dmic-audio.dtsi"
-#include "../../audio-devicetree/monaco-lpi.dtsi"
 
 &gcc_camss_top_gdsc {
 	parent-supply = <&VDD_CX_LEVEL>;