| Message ID | 20220617111021.v6.6.I423a007e8c4451bd1d091fcb65d035e5dcfc9a9d@changeid (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v6,1/6] FROMLIST: arm64: dts: qcom: sc7180-trogdor: Split out keyboard node and describe detachables | expand |
Hi, On Fri, Jun 17, 2022 at 11:12 AM Joseph S. Barrera III <joebar@chromium.org> wrote: > > From: Stephen Boyd <swboyd@chromium.org> > > The sc7180-trogdor-{lazor,homestar}-*.dtsi files all include > sc7180-trogdor.dtsi and sc7180-trogdor-lazor.dtsi or > sc7180-trogdor-homestar.dtsi, so including it here in the > sc7180-trogdor-{lazor,homestar}.dtsi file means we have a duplicate > include after commit 19794489fa24 ("arm64: dts: qcom: Only include > sc7180.dtsi in sc7180-trogdor.dtsi"). We include the sc7180-trogdor.dtsi > file in a board like sc7180-trogdor-lazor-r1.dts so that we can include > the display bridge snippet (e.g. sc7180-trogdor-ti-sn65dsi86.dtsi) > instead of making ever increasing variants like > sc7180-trogdor-lazor-ti-sn65dsi86.dtsi. > > Unfortunately, having the double include like this means the display > bridge's i2c bus is left disabled instead of enabled by the bridge > snippet. Any boards that use the i2c bus for the display bridge will > have the bus disabled when we include sc7180-trogdor.dtsi the second > time, which picks up the i2c status="disabled" line from sc7180.dtsi. > This leads to the display not turning on and black screens at boot on > lazor and homestar devices. > > Fix this by dropping the include and making a note that the > sc7180-trogdor-{lazor,homestar}.dtsi file must be included after > sc7180-trogdor.dtsi > > Reported-by: Douglas Anderson <dianders@chromium.org> > Cc: "Joseph S. Barrera III" <joebar@chromium.org> > Cc: Matthias Kaehlcke <mka@chromium.org> > Fixes: 19794489fa24 ("arm64: dts: qcom: Only include sc7180.dtsi in sc7180-trogdor.dtsi") > Signed-off-by: Stephen Boyd <swboyd@chromium.org> > > Signed-off-by: Joseph S. Barrera III <joebar@chromium.org> > --- > > Changes in v6: > - First inclusion of this patch. > > arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 2 +- > arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 8 ++++++-- > 2 files changed, 7 insertions(+), 3 deletions(-) Ah, now I see that you did have this patch, but you put it last, not first. This is an important bugfix that we're hoping to land as soon as possible. It should be the first patch in the series. ...or just don't include it in your series and point to Stephen's patch. -Doug
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi index 5074014d5269..1bd6c7dcd9e9 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi @@ -5,7 +5,7 @@ * Copyright 2021 Google LLC. */ -#include "sc7180-trogdor.dtsi" +/* This file must be included after sc7180-trogdor.dtsi */ / { /* BOARD-SPECIFIC TOP LEVEL NODES */ diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi index d8839ccdcf09..f65c488dcf9d 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi @@ -5,8 +5,12 @@ * Copyright 2020 Google LLC. */ -#include "sc7180-trogdor.dtsi" -/* Must come after sc7180-trogdor.dtsi to modify cros_ec */ +ap_ec_spi: &spi6 {}; +ap_h1_spi: &spi0 {}; + +/* This file must be included after sc7180-trogdor.dtsi */ + +/* This include must come after sc7180-trogdor.dtsi to modify cros_ec */ #include <arm/cros-ec-keyboard.dtsi> &ap_sar_sensor {