Commit 7624b41b authored by Philip Chen's avatar Philip Chen Committed by Bjorn Andersson
Browse files

arm64: dts: qcom: sc7180: Support Lazor/Limozeen rev9 



Support Lazor/Limozeen rev9 board where Parade ps8640 is added as the
second source edp bridge.

To 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-lazor.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-lazor.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 avatarStephen Boyd <swboyd@chromium.org>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20211029152647.v3.3.Ie56f55924f5c7706fe3194e710bbef6fdb8b5bc6@changeid
parent 0417a86b

arch/arm64/boot/dts/qcom/Makefile

+7 −2
Original line number Diff line number Diff line
@@ -64,9 +64,14 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r1-lte.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-r3.dtb

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

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

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

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

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

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

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

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

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

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-limozeen-nots-r4.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-limozeen-nots-r5.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-lazor-limozeen-nots-r9.dtb

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

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

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

arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * Copyright 2020 Google LLC.

 */



#include "sc7180-trogdor-lazor-limozeen-nots.dts"

#include "sc7180-trogdor-lazor-limozeen-nots-r5.dts"



/ {

	model = "Google Lazor Limozeen without Touchscreen (rev4)";

arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts

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

/*

 * Google Lazor Limozeen board device tree source

 *

 * Copyright 2021 Google LLC.

 */



/dts-v1/;



#include "sc7180.dtsi"

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

#include "sc7180-trogdor-lazor.dtsi"

#include "sc7180-trogdor-lte-sku.dtsi"



/ {

	model = "Google Lazor Limozeen without Touchscreen (rev5 - rev8)";

	/* No sku5 post-rev5 */

	compatible = "google,lazor-rev5-sku5", "google,lazor-rev5-sku6",

		"google,lazor-rev6-sku6", "google,lazor-rev7-sku6",

		"google,lazor-rev8-sku6", "qcom,sc7180";

};



/delete-node/&ap_ts;



&panel {

	compatible = "innolux,n116bca-ea1", "innolux,n116bge";

};



&sdhc_2 {

	status = "okay";

};

arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots.dts→arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts

+5 −3
Original line number Diff line number Diff line
@@ -2,17 +2,19 @@ 
/*

 * Google Lazor Limozeen board device tree source

 *

 * Copyright 2020 Google LLC.

 * Copyright 2021 Google LLC.

 */



/dts-v1/;



#include "sc7180.dtsi"

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

#include "sc7180-trogdor-lazor.dtsi"

#include "sc7180-trogdor-lte-sku.dtsi"



/ {

	model = "Google Lazor Limozeen without Touchscreen";

	compatible = "google,lazor-sku6", "google,lazor-sku5", "qcom,sc7180";

	model = "Google Lazor Limozeen without Touchscreen (rev9+)";

	compatible = "google,lazor-sku6", "qcom,sc7180";

};



/delete-node/&ap_ts;

arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts

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

/*

 * Google Lazor Limozeen board device tree source

 *

 * Copyright 2021 Google LLC.

 */



/dts-v1/;



#include "sc7180.dtsi"

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

#include "sc7180-trogdor-lazor.dtsi"

#include "sc7180-trogdor-lte-sku.dtsi"



/ {

	model = "Google Lazor Limozeen (rev4 - rev8)";

	compatible = "google,lazor-rev4-sku4", "google,lazor-rev5-sku4",

		"google,lazor-rev6-sku4", "google,lazor-rev7-sku4",

		"google,lazor-rev8-sku4", "qcom,sc7180";

};



/delete-node/&ap_ts;



&ap_ts_pen_1v8 {

	ap_ts: touchscreen@10 {

		compatible = "elan,ekth3500";

		reg = <0x10>;

		pinctrl-names = "default";

		pinctrl-0 = <&ts_int_l>, <&ts_reset_l>;



		interrupt-parent = <&tlmm>;

		interrupts = <9 IRQ_TYPE_LEVEL_LOW>;



		vcc33-supply = <&pp3300_ts>;



		reset-gpios = <&tlmm 8 GPIO_ACTIVE_LOW>;

	};

};



&panel {

	compatible = "auo,b116xa01";

};



&sdhc_2 {

	status = "okay";

};