mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-27 12:57:53 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
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: Philip Chen <philipchen@chromium.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20211029152647.v3.3.Ie56f55924f5c7706fe3194e710bbef6fdb8b5bc6@changeid
This commit is contained in:
Philip Chen 2021-10-29 15:27:42 -07:00 committed by Bjorn Andersson
parent 0417a86b20
commit 7624b41b33
15 changed files with 188 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/arm64/boot/dts/qcom/Makefile
View file

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

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

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

31
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts Normal file
View file

@ -0,0 +1,31 @@
// 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";
};

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

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

46
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts Normal file
View file

@ -0,0 +1,46 @@
// 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";
};

6
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen.dts → arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r9.dts
View file

@ -2,16 +2,18 @@
/*
* 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";
model = "Google Lazor Limozeen (rev9+)";
compatible = "google,lazor-sku4", "qcom,sc7180";
};

2
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts
View file

@ -7,6 +7,8 @@
/dts-v1/;
#include "sc7180.dtsi"
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
#include "sc7180-trogdor-lazor.dtsi"
/ {

2
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts
View file

@ -7,6 +7,8 @@
/dts-v1/;
#include "sc7180.dtsi"
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
#include "sc7180-trogdor-lazor.dtsi"
/ {

9
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts
View file

@ -7,12 +7,17 @@
/dts-v1/;
#include "sc7180.dtsi"
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
#include "sc7180-trogdor-lazor.dtsi"
#include "sc7180-lite.dtsi"
/ {
model = "Google Lazor (rev3+) with KB Backlight";
compatible = "google,lazor-sku2", "qcom,sc7180";
model = "Google Lazor (rev3 - 8) with KB Backlight";
compatible = "google,lazor-rev3-sku2", "google,lazor-rev4-sku2",
"google,lazor-rev5-sku2", "google,lazor-rev6-sku2",
"google,lazor-rev7-sku2", "google,lazor-rev8-sku2",
"qcom,sc7180";
};
&keyboard_backlight {

9
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts
View file

@ -7,12 +7,17 @@
/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 (rev3+) with LTE";
compatible = "google,lazor-sku0", "qcom,sc7180";
model = "Google Lazor (rev3 - 8) with LTE";
compatible = "google,lazor-rev3-sku0", "google,lazor-rev4-sku0",
"google,lazor-rev5-sku0", "google,lazor-rev6-sku0",
"google,lazor-rev7-sku0", "google,lazor-rev8-sku0",
"qcom,sc7180";
};
&ap_sar_sensor {

8
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts
View file

@ -7,10 +7,14 @@
/dts-v1/;
#include "sc7180.dtsi"
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
#include "sc7180-trogdor-lazor.dtsi"
#include "sc7180-lite.dtsi"
/ {
model = "Google Lazor (rev3+)";
compatible = "google,lazor", "qcom,sc7180";
model = "Google Lazor (rev3 - 8)";
compatible = "google,lazor-rev3", "google,lazor-rev4",
"google,lazor-rev5", "google,lazor-rev6", "google,lazor-rev7",
"google,lazor-rev8", "qcom,sc7180";
};

22
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts Normal file
View file

@ -0,0 +1,22 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Google Lazor board device tree source
*
* Copyright 2020 Google LLC.
*/
/dts-v1/;
#include "sc7180.dtsi"
#include "sc7180-trogdor-parade-ps8640.dtsi"
#include "sc7180-trogdor-lazor.dtsi"
#include "sc7180-lite.dtsi"
/ {
model = "Google Lazor (rev9+) with KB Backlight";
compatible = "google,lazor-sku2", "qcom,sc7180";
};
&keyboard_backlight {
status = "okay";
};

30
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts Normal file
View file

@ -0,0 +1,30 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Google Lazor board device tree source
*
* 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 (rev9+) with LTE";
compatible = "google,lazor-sku0", "qcom,sc7180";
};
&ap_sar_sensor {
status = "okay";
};
&ap_sar_sensor_i2c {
status = "okay";
};
&keyboard_backlight {
status = "okay";
};

18
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts Normal file
View file

@ -0,0 +1,18 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Google Lazor board device tree source
*
* Copyright 2021 Google LLC.
*/
/dts-v1/;
#include "sc7180.dtsi"
#include "sc7180-trogdor-parade-ps8640.dtsi"
#include "sc7180-trogdor-lazor.dtsi"
#include "sc7180-lite.dtsi"
/ {
model = "Google Lazor (rev9+)";
compatible = "google,lazor", "qcom,sc7180";
};

3
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
View file

@ -5,13 +5,10 @@
* Copyright 2020 Google LLC.
*/
#include "sc7180.dtsi"
ap_ec_spi: &spi6 {};
ap_h1_spi: &spi0 {};
#include "sc7180-trogdor.dtsi"
#include "sc7180-trogdor-ti-sn65dsi86.dtsi"
&ap_sar_sensor {
semtech,cs0-ground;