Commit 3922ccae authored by Philip Chen's avatar Philip Chen Committed by Bjorn Andersson
Browse files

arm64: dts: qcom: sc7180: Support Homestar rev4 



Support Homestar rev4 board where Parade ps8640 is added as the
second source edp bridge.

Support different edp bridge chips in different board revisions,
now we move the #incldue line of the edp bridge dts fragment (e.g.
sc7180-trogdor-ti-sn65dsi86.dtsi) from "sc7180-trogdor-homestar.dtsi"
to per-board-rev dts files.

Since the edp bridge dts fragment overrides 'dsi0_out', which is
defined in "sc7180.dtsi", move the #incldue line of "sc7180.dtsi" from
"sc7180-trogdor-homestar.dtsi" to per-board-rev dts files too, before
the #include line of the edp bridge dts fragment.

Signed-off-by: default avatarPhilip Chen <philipchen@chromium.org>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Reviewed-by: default avatarStephen Boyd <swboyd@chromium.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20211029152647.v3.4.If7aaa8e36f1269acae5488035bd62ce543756bf8@changeid
parent 7624b41b

arch/arm64/boot/dts/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r3.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-coachz-r3-lte.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-homestar-r2.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-homestar-r3.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-homestar-r4.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-r0.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-r1.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-r1-kb.dtb

arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r2.dts

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 


/dts-v1/;



#include "sc7180.dtsi"

#include "sc7180-trogdor-ti-sn65dsi86.dtsi"

#include "sc7180-trogdor-homestar.dtsi"



/ {

arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r3.dts

+4 −2
Original line number Diff line number Diff line
@@ -7,9 +7,11 @@ 


/dts-v1/;



#include "sc7180.dtsi"

#include "sc7180-trogdor-ti-sn65dsi86.dtsi"

#include "sc7180-trogdor-homestar.dtsi"



/ {

	model = "Google Homestar (rev3+)";

	compatible = "google,homestar", "qcom,sc7180";

	model = "Google Homestar (rev3)";

	compatible = "google,homestar-rev3", "qcom,sc7180";

};

arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r4.dts

0 → 100644
+17 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * Google Homestar board device tree source

 *

 * Copyright 2021 Google LLC.

 */



/dts-v1/;



#include "sc7180.dtsi"

#include "sc7180-trogdor-parade-ps8640.dtsi"

#include "sc7180-trogdor-homestar.dtsi"



/ {

	model = "Google Homestar (rev4+)";

	compatible = "google,homestar", "qcom,sc7180";

};

arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi

+0 −3
Original line number Diff line number Diff line
@@ -5,13 +5,10 @@ 
 * Copyright 2021 Google LLC.

 */



#include "sc7180.dtsi"



ap_ec_spi: &spi6 {};

ap_h1_spi: &spi0 {};



#include "sc7180-trogdor.dtsi"

#include "sc7180-trogdor-ti-sn65dsi86.dtsi"



/ {

	/* BOARD-SPECIFIC TOP LEVEL NODES */