diff mbox series

[v2] arm64: dts: qcom: Remove duplicate sc7180-trogdor include on lazor/homestar

Message ID 20220602190621.1646679-1-swboyd@chromium.org (mailing list archive)
State Queued
Headers show
Series [v2] arm64: dts: qcom: Remove duplicate sc7180-trogdor include on lazor/homestar | expand

Commit Message

Stephen Boyd June 2, 2022, 7:06 p.m. UTC
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>
---

It would be great to get this into -rc1 if possible to fix broken
display.

Changes from v1 (https://lore.kernel.org/r/20220520231355.1559104-1-swboyd@chromium.org):
 * Also do the same on homestar

I found that my script to check differences wasn't printing any
differences because of a typo, so I thought everything was fine when it
wasn't! Now I've checked and for boards using parade bridge chips quite
a few phandles are renumbered but they're the same logically as before
whereas as boards using the ti bridge chip only have a few lines
reordered.

 arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 2 +-
 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


base-commit: 19794489fa2474a55c00848e00ca3d15ea01d36c

Comments

Doug Anderson June 2, 2022, 8:08 p.m. UTC | #1
Hi,

On Thu, Jun 2, 2022 at 12:06 PM Stephen Boyd <swboyd@chromium.org> wrote:
>
> 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>
> ---
>
> It would be great to get this into -rc1 if possible to fix broken
> display.

Reviewed-by: Douglas Anderson <dianders@chromium.org>

I tested and this fixes the "no display" problem on Linus's tree on
both homestar and lazor.

Tested-by: Douglas Anderson <dianders@chromium.org>
Doug Anderson June 13, 2022, 10:19 p.m. UTC | #2
Hi,

On Thu, Jun 2, 2022 at 1:08 PM Doug Anderson <dianders@chromium.org> wrote:
>
> Hi,
>
> On Thu, Jun 2, 2022 at 12:06 PM Stephen Boyd <swboyd@chromium.org> wrote:
> >
> > 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>
> > ---
> >
> > It would be great to get this into -rc1 if possible to fix broken
> > display.
>
> Reviewed-by: Douglas Anderson <dianders@chromium.org>
>
> I tested and this fixes the "no display" problem on Linus's tree on
> both homestar and lazor.
>
> Tested-by: Douglas Anderson <dianders@chromium.org>

Given that this fixes problems in mainline, it would be keen to see it
land sooner rather than later. Is it blocked on anything?

Thanks!

-Doug
Bjorn Andersson June 27, 2022, 8:03 p.m. UTC | #3
On Thu, 2 Jun 2022 12:06:21 -0700, Stephen Boyd wrote:
> 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.
> 
> [...]

Applied, thanks!

[1/1] arm64: dts: qcom: Remove duplicate sc7180-trogdor include on lazor/homestar
      commit: 372b2aee97028c75a6e12d205a2e5f0c8626efc6

Best regards,
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
index 9b3e3d13c165..d1e2df5164ea 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 fe2369c29aad..88f6a7d4d020 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
@@ -5,7 +5,7 @@ 
  * Copyright 2020 Google LLC.
  */
 
-#include "sc7180-trogdor.dtsi"
+/* This file must be included after sc7180-trogdor.dtsi */
 
 &ap_sar_sensor {
 	semtech,cs0-ground;