From f614d8a2f5c8ed079950ed02b1612bcc969380be Mon Sep 17 00:00:00 2001
From: Xiaowen Wu <wxiaowen@qti.qualcomm.com>
Date: Mon, 8 Feb 2021 12:44:46 -0800
Subject: [PATCH] ARM: dts: msm: clean up display references for sa8155/sa8195

Clean up display references for sa8155/sa8195 and fix missing node
when shd .dtsi is included.

Change-Id: Ib7a9a559faef4f40a1ebd5f918c4da190b646e61
---
 qcom/sa8155-adp-star.dts                | 1 -
 qcom/sa8155-v2-adp-air.dts              | 4 +---
 qcom/sa8155-v2-adp-star.dts             | 1 -
 qcom/sa8155p-adp-star.dts               | 1 -
 qcom/sa8155p-v2-adp-air-lxc-overlay.dts | 3 +--
 qcom/sa8155p-v2-adp-air-overlay.dts     | 3 +--
 qcom/sa8155p-v2-adp-air.dts             | 4 +---
 qcom/sa8155p-v2-adp-star.dts            | 1 -
 qcom/sa8195p-adp-star.dts               | 3 +--
 qcom/sa8195p-v2-adp-air-lxc-overlay.dts | 3 +--
 qcom/sa8195p-v2-adp-air-overlay.dts     | 1 -
 qcom/sa8195p-v2-adp-air.dts             | 4 +---
 qcom/sa8195p-v2-adp-air.dtsi            | 1 +
 qcom/sdmshrike.dtsi                     | 6 +++---
 14 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/qcom/sa8155-adp-star.dts b/qcom/sa8155-adp-star.dts
index b6a703a985b5..1be5c92116a7 100644
--- a/qcom/sa8155-adp-star.dts
+++ b/qcom/sa8155-adp-star.dts
@@ -2,7 +2,6 @@
 
 #include "sa8155-v1.dtsi"
 #include "sa8155-adp-star.dtsi"
-#include "display/sa8155-adp-star-display-shd.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SA8155 ADP-STAR";
diff --git a/qcom/sa8155-v2-adp-air.dts b/qcom/sa8155-v2-adp-air.dts
index fb99004d2e49..9877d0ab106f 100644
--- a/qcom/sa8155-v2-adp-air.dts
+++ b/qcom/sa8155-v2-adp-air.dts
@@ -1,9 +1,7 @@
 /dts-v1/;
 
 #include "sa8155-v2.dtsi"
-#include "sa8155-adp-common.dtsi"
-#include "display/sa8155-adp-star-display.dtsi"
-#include "display/sa8155-adp-star-display-shd.dtsi"
+#include "sa8155-adp-star.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SA8155 V2 ADP AIR";
diff --git a/qcom/sa8155-v2-adp-star.dts b/qcom/sa8155-v2-adp-star.dts
index 59fd12b62ecb..bb5b257a53a3 100644
--- a/qcom/sa8155-v2-adp-star.dts
+++ b/qcom/sa8155-v2-adp-star.dts
@@ -2,7 +2,6 @@
 
 #include "sa8155-v2.dtsi"
 #include "sa8155-adp-star.dtsi"
-#include "display/sa8155-adp-star-display-shd.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SA8155 V2 ADP STAR";
diff --git a/qcom/sa8155p-adp-star.dts b/qcom/sa8155p-adp-star.dts
index a6f77a6b13e2..3472b77f72c0 100644
--- a/qcom/sa8155p-adp-star.dts
+++ b/qcom/sa8155p-adp-star.dts
@@ -2,7 +2,6 @@
 
 #include "sa8155p.dtsi"
 #include "sa8155-adp-star.dtsi"
-#include "display/sa8155-adp-star-display-shd.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SA8155P ADP-STAR";
diff --git a/qcom/sa8155p-v2-adp-air-lxc-overlay.dts b/qcom/sa8155p-v2-adp-air-lxc-overlay.dts
index 08e7c1a4b79a..3c257f42c1aa 100644
--- a/qcom/sa8155p-v2-adp-air-lxc-overlay.dts
+++ b/qcom/sa8155p-v2-adp-air-lxc-overlay.dts
@@ -1,8 +1,7 @@
 /dts-v1/;
 /plugin/;
 
-#include "sa8155-adp-common.dtsi"
-#include "display/sa8155-adp-star-display.dtsi"
+#include "sa8155-adp-star.dtsi"
 #include "display/sa8155-v2-adp-air-display-lxc-shd.dtsi"
 
 / {
diff --git a/qcom/sa8155p-v2-adp-air-overlay.dts b/qcom/sa8155p-v2-adp-air-overlay.dts
index fd881bfdaa06..91e2c7a5b513 100644
--- a/qcom/sa8155p-v2-adp-air-overlay.dts
+++ b/qcom/sa8155p-v2-adp-air-overlay.dts
@@ -1,8 +1,7 @@
 /dts-v1/;
 /plugin/;
 
-#include "sa8155-adp-common.dtsi"
-#include "display/sa8155-adp-star-display.dtsi"
+#include "sa8155-adp-star.dtsi"
 #include "display/sa8155-adp-star-display-shd.dtsi"
 
 / {
diff --git a/qcom/sa8155p-v2-adp-air.dts b/qcom/sa8155p-v2-adp-air.dts
index 56731ff9e3af..e1057725f2d5 100644
--- a/qcom/sa8155p-v2-adp-air.dts
+++ b/qcom/sa8155p-v2-adp-air.dts
@@ -1,9 +1,7 @@
 /dts-v1/;
 
 #include "sa8155p-v2.dtsi"
-#include "sa8155-adp-common.dtsi"
-#include "display/sa8155-adp-star-display.dtsi"
-#include "display/sa8155-adp-star-display-shd.dtsi"
+#include "sa8155-adp-star.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SA8155P V2 ADP AIR";
diff --git a/qcom/sa8155p-v2-adp-star.dts b/qcom/sa8155p-v2-adp-star.dts
index 4f9780a53a42..ef21fb5e1883 100644
--- a/qcom/sa8155p-v2-adp-star.dts
+++ b/qcom/sa8155p-v2-adp-star.dts
@@ -2,7 +2,6 @@
 
 #include "sa8155p-v2.dtsi"
 #include "sa8155-adp-star.dtsi"
-#include "display/sa8155-adp-star-display-shd.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SA8155P V2 ADP STAR";
diff --git a/qcom/sa8195p-adp-star.dts b/qcom/sa8195p-adp-star.dts
index 6e00a1813e86..967583803996 100644
--- a/qcom/sa8195p-adp-star.dts
+++ b/qcom/sa8195p-adp-star.dts
@@ -1,8 +1,7 @@
 /dts-v1/;
 
 #include "sa8195p.dtsi"
-#include "sa8195p-adp-common.dtsi"
-#include "display/sa8195p-adp-star-display-shd.dtsi"
+#include "sa8195p-adp-star.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SA8195P ADP-STAR";
diff --git a/qcom/sa8195p-v2-adp-air-lxc-overlay.dts b/qcom/sa8195p-v2-adp-air-lxc-overlay.dts
index 1d57b6a2338b..398eae1ad3cd 100644
--- a/qcom/sa8195p-v2-adp-air-lxc-overlay.dts
+++ b/qcom/sa8195p-v2-adp-air-lxc-overlay.dts
@@ -1,8 +1,7 @@
 /dts-v1/;
 /plugin/;
 
-#include "sa8195p-adp-common.dtsi"
-#include "display/sa8195p-adp-star-display.dtsi"
+#include "sa8195p-v2-adp-air.dtsi"
 #include "display/sa8195p-v2-adp-air-display-lxc-shd.dtsi"
 
 / {
diff --git a/qcom/sa8195p-v2-adp-air-overlay.dts b/qcom/sa8195p-v2-adp-air-overlay.dts
index 9b3cf9300f5f..99ea48278a27 100644
--- a/qcom/sa8195p-v2-adp-air-overlay.dts
+++ b/qcom/sa8195p-v2-adp-air-overlay.dts
@@ -2,7 +2,6 @@
 /plugin/;
 
 #include "sa8195p-v2-adp-air.dtsi"
-#include "display/sa8195p-adp-star-display.dtsi"
 #include "display/sa8195p-adp-star-display-shd.dtsi"
 
 / {
diff --git a/qcom/sa8195p-v2-adp-air.dts b/qcom/sa8195p-v2-adp-air.dts
index f2b96c2ca359..e128ecfdfd92 100644
--- a/qcom/sa8195p-v2-adp-air.dts
+++ b/qcom/sa8195p-v2-adp-air.dts
@@ -1,9 +1,7 @@
 /dts-v1/;
 
 #include "sa8195p.dtsi"
-#include "sa8195p-adp-common.dtsi"
-#include "display/sa8195p-adp-star-display.dtsi"
-#include "display/sa8195p-adp-star-display-shd.dtsi"
+#include "sa8195p-v2-adp-air.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SA8195P V2 ADP AIR";
diff --git a/qcom/sa8195p-v2-adp-air.dtsi b/qcom/sa8195p-v2-adp-air.dtsi
index ec4afde21db4..91b92282255e 100644
--- a/qcom/sa8195p-v2-adp-air.dtsi
+++ b/qcom/sa8195p-v2-adp-air.dtsi
@@ -1 +1,2 @@
 #include "sa8195p-adp-common.dtsi"
+#include "display/sa8195p-adp-star-display.dtsi"
diff --git a/qcom/sdmshrike.dtsi b/qcom/sdmshrike.dtsi
index 7d54e7b22864..dfacdb101182 100644
--- a/qcom/sdmshrike.dtsi
+++ b/qcom/sdmshrike.dtsi
@@ -439,9 +439,6 @@
 	soc: soc { };
 };
 
-#include "display/sdmshrike-sde-pll.dtsi"
-#include "display/sdmshrike-sde.dtsi"
-
 &soc {
 	#address-cells = <1>;
 	#size-cells = <1>;
@@ -2022,6 +2019,9 @@
 #include "sdmshrike-gpu.dtsi"
 #include "sa8195-vidc.dtsi"
 
+#include "display/sdmshrike-sde-pll.dtsi"
+#include "display/sdmshrike-sde.dtsi"
+
 &firmware {
 	scm {
 		compatible = "qcom,scm";