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
This commit is contained in:
Xiaowen Wu 2021-02-08 12:44:46 -08:00
commit f614d8a2f5
14 changed files with 11 additions and 25 deletions

View file

@ -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";

View file

@ -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";

View file

@ -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";

View file

@ -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";

View file

@ -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"
/ {

View file

@ -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"
/ {

View file

@ -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";

View file

@ -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";

View file

@ -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";

View file

@ -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"
/ {

View file

@ -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"
/ {

View file

@ -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";

View file

@ -1 +1,2 @@
#include "sa8195p-adp-common.dtsi"
#include "display/sa8195p-adp-star-display.dtsi"

View file

@ -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";