| Message ID | 20211028151022.1.Ie56f55924f5c7706fe3194e710bbef6fdb8b5bc6@changeid (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] arm64: dts: sc7180: Support Lazor/Limozeen rev9 | expand |
Hi, On Thu, Oct 28, 2021 at 3:11 PM Philip Chen <philipchen@chromium.org> wrote: > > Support Lazor/Limozeen rev9 board where Parade ps8640 is added as the > second source edp bridge. It probably wouldn't hurt to at least mention in the commit message why the include of "sc7180.dtsi" was moved out of "sc7180-trogdor-lazor.dtsi" so that people reviewing the change aren't confused. Otherwise it just looks arbitrary. > Signed-off-by: Philip Chen <philipchen@chromium.org> > ... > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts > new file mode 100644 > index 000000000000..a2a6e2515ee6 > --- /dev/null > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts > @@ -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-sku6", "google,lazor-rev6-sku6", > + "google,lazor-rev7-sku6", "google,lazor-rev8-sku6", > + "google,rev5-sku5", "qcom,sc7180"; Two issues. 1. "google,rev5-sku5" should probably be "google,lazor-rev5-sku5" 2. rev5-sku5 should sort to the start of the list, not to the end. > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots.dts > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts > @@ -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 without Touchscreen"; > + model = "Google Lazor Limozeen without Touchscreen (rev9+)"; > compatible = "google,lazor-sku6", "google,lazor-sku5", "qcom,sc7180"; Earlier you said "sku5" doesn't exist past -rev5. So it doesn't need to be here, right? > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts > new file mode 100644 > index 000000000000..10f48f4b429a > --- /dev/null > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts > @@ -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-rev6-sku4", -rev6 is listed twice and -rev7 is missing. > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts > new file mode 100644 > index 000000000000..326ba9f88394 > --- /dev/null > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts > @@ -0,0 +1,26 @@ > +// 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"; > +}; > + > +&panel { > + compatible = "boe,nv133fhm-n62"; > +}; Why do you need the "panel" here? > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts > new file mode 100644 > index 000000000000..a705c956f62b > --- /dev/null > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts > @@ -0,0 +1,34 @@ > +// 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"; > +}; > + > +&panel { > + compatible = "boe,nv133fhm-n62"; > +}; Why do you need the "panel" hre? > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts > new file mode 100644 > index 000000000000..13ff9a851613 > --- /dev/null > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts > @@ -0,0 +1,22 @@ > +// 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"; > +}; > + > +&panel { > + compatible = "boe,nv133fhm-n62"; > +}; Why do you need the "panel" here? > diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi > index faf8b807d0ff..286d3594b6ae 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi > @@ -11,6 +11,7 @@ > #include <dt-bindings/clock/qcom,lpasscorecc-sc7180.h> > #include <dt-bindings/clock/qcom,rpmh.h> > #include <dt-bindings/clock/qcom,videocc-sc7180.h> > +#include <dt-bindings/gpio/gpio.h> I don't think you should be adding this to sc7180.dtsi. If you need it in the bridge chip "fragments" you should add the includes to those. -Doug
Quoting Philip Chen (2021-10-28 15:11:31) > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi > index 8b79fbb75756..69666f92176a 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi > @@ -5,13 +5,10 @@ > * Copyright 2020 Google LLC. > */ > > -#include "sc7180.dtsi" > - > ap_ec_spi: &spi6 {}; > ap_h1_spi: &spi0 {}; Can we get rid of this node swap now? I think it is only around because early on we swapped the EC and H1 spi interfaces and then we had to swap it every time we made a new board. $ git grep ap_ec_spi arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi:ap_ec_spi: &spi6 {}; arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi:ap_ec_spi: &spi6 {}; arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi:ap_ec_spi: &spi6 {}; arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts:ap_ec_spi: &spi6 {}; It feels like we'd be better off leaving that quirk in trogdor-r0, which conveniently isn't upstream, and then relabel the spi nodes in sc7180-trogdor.dtsi now. Otherwise I look at this and have to remember that whenever this dtsi file is included, we've already included the sc7180.dtsi file before it, so that the relabel actually works. > > #include "sc7180-trogdor.dtsi" > -#include "sc7180-trogdor-ti-sn65dsi86.dtsi" > > &ap_sar_sensor { > semtech,cs0-ground;
Hi, On Thu, Oct 28, 2021 at 3:53 PM Doug Anderson <dianders@chromium.org> wrote: > > Hi, > > On Thu, Oct 28, 2021 at 3:11 PM Philip Chen <philipchen@chromium.org> wrote: > > > > Support Lazor/Limozeen rev9 board where Parade ps8640 is added as the > > second source edp bridge. > > It probably wouldn't hurt to at least mention in the commit message > why the include of "sc7180.dtsi" was moved out of > "sc7180-trogdor-lazor.dtsi" so that people reviewing the change aren't > confused. Otherwise it just looks arbitrary. Sure, I updated the commit message in v2. > > > > Signed-off-by: Philip Chen <philipchen@chromium.org> > > ... > > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts > > new file mode 100644 > > index 000000000000..a2a6e2515ee6 > > --- /dev/null > > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts > > @@ -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-sku6", "google,lazor-rev6-sku6", > > + "google,lazor-rev7-sku6", "google,lazor-rev8-sku6", > > + "google,rev5-sku5", "qcom,sc7180"; > > Two issues. > > 1. "google,rev5-sku5" should probably be "google,lazor-rev5-sku5" Thanks for the catch. I fixed it in v2. > > 2. rev5-sku5 should sort to the start of the list, not to the end. Thanks. I fixed it in v2. > > > > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots.dts > > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts > > @@ -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 without Touchscreen"; > > + model = "Google Lazor Limozeen without Touchscreen (rev9+)"; > > compatible = "google,lazor-sku6", "google,lazor-sku5", "qcom,sc7180"; > > Earlier you said "sku5" doesn't exist past -rev5. So it doesn't need > to be here, right? Correct. I removed "sku5" support here in v2. > > > > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts > > new file mode 100644 > > index 000000000000..10f48f4b429a > > --- /dev/null > > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts > > @@ -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-rev6-sku4", > > -rev6 is listed twice and -rev7 is missing. Thanks for the catch. I fixed it in v2. > > > > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts > > new file mode 100644 > > index 000000000000..326ba9f88394 > > --- /dev/null > > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts > > @@ -0,0 +1,26 @@ > > +// 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"; > > +}; > > + > > +&panel { > > + compatible = "boe,nv133fhm-n62"; > > +}; > > Why do you need the "panel" here? Oops, I forgot it's been added in the lazor dtsi file. I removed it in v2. > > > > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts > > new file mode 100644 > > index 000000000000..a705c956f62b > > --- /dev/null > > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts > > @@ -0,0 +1,34 @@ > > +// 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"; > > +}; > > + > > +&panel { > > + compatible = "boe,nv133fhm-n62"; > > +}; > > Why do you need the "panel" hre? Oops, I removed it in v2. > > > > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts > > new file mode 100644 > > index 000000000000..13ff9a851613 > > --- /dev/null > > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts > > @@ -0,0 +1,22 @@ > > +// 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"; > > +}; > > + > > +&panel { > > + compatible = "boe,nv133fhm-n62"; > > +}; > > Why do you need the "panel" here? Oops, I removed it in v2. > > > > diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi > > index faf8b807d0ff..286d3594b6ae 100644 > > --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi > > +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi > > @@ -11,6 +11,7 @@ > > #include <dt-bindings/clock/qcom,lpasscorecc-sc7180.h> > > #include <dt-bindings/clock/qcom,rpmh.h> > > #include <dt-bindings/clock/qcom,videocc-sc7180.h> > > +#include <dt-bindings/gpio/gpio.h> > > I don't think you should be adding this to sc7180.dtsi. If you need it > in the bridge chip "fragments" you should add the includes to those. > > -Doug
Hi Stephen, On Thu, Oct 28, 2021 at 4:00 PM Stephen Boyd <swboyd@chromium.org> wrote: > > Quoting Philip Chen (2021-10-28 15:11:31) > > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi > > index 8b79fbb75756..69666f92176a 100644 > > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi > > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi > > @@ -5,13 +5,10 @@ > > * Copyright 2020 Google LLC. > > */ > > > > -#include "sc7180.dtsi" > > - > > ap_ec_spi: &spi6 {}; > > ap_h1_spi: &spi0 {}; > > Can we get rid of this node swap now? I think it is only around because > early on we swapped the EC and H1 spi interfaces and then we had to swap > it every time we made a new board. > > $ git grep ap_ec_spi > arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi:ap_ec_spi: &spi6 {}; > arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi:ap_ec_spi: &spi6 {}; > arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi:ap_ec_spi: &spi6 {}; > arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts:ap_ec_spi: &spi6 {}; > > It feels like we'd be better off leaving that quirk in trogdor-r0, which > conveniently isn't upstream, and then relabel the spi nodes in > sc7180-trogdor.dtsi now. Otherwise I look at this and have to remember > that whenever this dtsi file is included, we've already included the > sc7180.dtsi file before it, so that the relabel actually works. I agree it'll be great if we can get rid of the node swap. It's out of the scope of this patch series though. We should probably send a separate patch for this change later? > > > > > #include "sc7180-trogdor.dtsi" > > -#include "sc7180-trogdor-ti-sn65dsi86.dtsi" > > > > &ap_sar_sensor { > > semtech,cs0-ground;
Quoting Philip Chen (2021-10-28 17:48:39) > Hi Stephen, > > On Thu, Oct 28, 2021 at 4:00 PM Stephen Boyd <swboyd@chromium.org> wrote: > > > > Quoting Philip Chen (2021-10-28 15:11:31) > > > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi > > > index 8b79fbb75756..69666f92176a 100644 > > > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi > > > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi > > > @@ -5,13 +5,10 @@ > > > * Copyright 2020 Google LLC. > > > */ > > > > > > -#include "sc7180.dtsi" > > > - > > > ap_ec_spi: &spi6 {}; > > > ap_h1_spi: &spi0 {}; > > > > Can we get rid of this node swap now? I think it is only around because > > early on we swapped the EC and H1 spi interfaces and then we had to swap > > it every time we made a new board. > > > > $ git grep ap_ec_spi > > arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi:ap_ec_spi: &spi6 {}; > > arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi:ap_ec_spi: &spi6 {}; > > arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi:ap_ec_spi: &spi6 {}; > > arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts:ap_ec_spi: &spi6 {}; > > > > It feels like we'd be better off leaving that quirk in trogdor-r0, which > > conveniently isn't upstream, and then relabel the spi nodes in > > sc7180-trogdor.dtsi now. Otherwise I look at this and have to remember > > that whenever this dtsi file is included, we've already included the > > sc7180.dtsi file before it, so that the relabel actually works. > > I agree it'll be great if we can get rid of the node swap. > It's out of the scope of this patch series though. > We should probably send a separate patch for this change later? > Ok.
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index 6b816eb33309..f637c4d3729f 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -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 diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts index 6ebde0828550..850776c5323d 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts @@ -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)"; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts new file mode 100644 index 000000000000..a2a6e2515ee6 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts @@ -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-sku6", "google,lazor-rev6-sku6", + "google,lazor-rev7-sku6", "google,lazor-rev8-sku6", + "google,rev5-sku5", "qcom,sc7180"; +}; + +/delete-node/&ap_ts; + +&panel { + compatible = "innolux,n116bca-ea1", "innolux,n116bge"; +}; + +&sdhc_2 { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts similarity index 71% rename from arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots.dts rename to arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts index 0456c7e05d00..9460659fe63c 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts @@ -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 without Touchscreen"; + model = "Google Lazor Limozeen without Touchscreen (rev9+)"; compatible = "google,lazor-sku6", "google,lazor-sku5", "qcom,sc7180"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts new file mode 100644 index 000000000000..10f48f4b429a --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts @@ -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-rev6-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"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r9.dts similarity index 82% rename from arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen.dts rename to arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r9.dts index e6ad6dae4e60..dc47842bc662 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r9.dts @@ -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"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts index 30e3e769d2b4..b142006478ea 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts @@ -7,6 +7,8 @@ /dts-v1/; +#include "sc7180.dtsi" +#include "sc7180-trogdor-ti-sn65dsi86.dtsi" #include "sc7180-trogdor-lazor.dtsi" / { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts index c2ef06367baf..59740799fa3a 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts @@ -7,6 +7,8 @@ /dts-v1/; +#include "sc7180.dtsi" +#include "sc7180-trogdor-ti-sn65dsi86.dtsi" #include "sc7180-trogdor-lazor.dtsi" / { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts index dcb41afdc82a..18ef9da71998 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts @@ -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 { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts index be44900602d7..c5c9feff41b8 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts @@ -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 { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts index b474df47cd70..7adcedbf080d 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts @@ -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"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts new file mode 100644 index 000000000000..326ba9f88394 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts @@ -0,0 +1,26 @@ +// 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"; +}; + +&panel { + compatible = "boe,nv133fhm-n62"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts new file mode 100644 index 000000000000..a705c956f62b --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts @@ -0,0 +1,34 @@ +// 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"; +}; + +&panel { + compatible = "boe,nv133fhm-n62"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts new file mode 100644 index 000000000000..13ff9a851613 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts @@ -0,0 +1,22 @@ +// 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"; +}; + +&panel { + compatible = "boe,nv133fhm-n62"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi index 8b79fbb75756..69666f92176a 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi @@ -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; diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index faf8b807d0ff..286d3594b6ae 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -11,6 +11,7 @@ #include <dt-bindings/clock/qcom,lpasscorecc-sc7180.h> #include <dt-bindings/clock/qcom,rpmh.h> #include <dt-bindings/clock/qcom,videocc-sc7180.h> +#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/interconnect/qcom,osm-l3.h> #include <dt-bindings/interconnect/qcom,sc7180.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
Support Lazor/Limozeen rev9 board where Parade ps8640 is added as the second source edp bridge. Signed-off-by: Philip Chen <philipchen@chromium.org> --- arch/arm64/boot/dts/qcom/Makefile | 9 +++- .../sc7180-trogdor-lazor-limozeen-nots-r4.dts | 2 +- .../sc7180-trogdor-lazor-limozeen-nots-r5.dts | 31 +++++++++++++ ...sc7180-trogdor-lazor-limozeen-nots-r9.dts} | 6 ++- .../qcom/sc7180-trogdor-lazor-limozeen-r4.dts | 46 +++++++++++++++++++ ...s => sc7180-trogdor-lazor-limozeen-r9.dts} | 6 ++- .../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 2 + .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 2 + .../dts/qcom/sc7180-trogdor-lazor-r3-kb.dts | 9 +++- .../dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 9 +++- .../boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 8 +++- .../dts/qcom/sc7180-trogdor-lazor-r9-kb.dts | 26 +++++++++++ .../dts/qcom/sc7180-trogdor-lazor-r9-lte.dts | 34 ++++++++++++++ .../boot/dts/qcom/sc7180-trogdor-lazor-r9.dts | 22 +++++++++ .../boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 3 -- arch/arm64/boot/dts/qcom/sc7180.dtsi | 1 + 16 files changed, 200 insertions(+), 16 deletions(-) create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts rename arch/arm64/boot/dts/qcom/{sc7180-trogdor-lazor-limozeen-nots.dts => sc7180-trogdor-lazor-limozeen-nots-r9.dts} (71%) create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts rename arch/arm64/boot/dts/qcom/{sc7180-trogdor-lazor-limozeen.dts => sc7180-trogdor-lazor-limozeen-r9.dts} (82%) create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts