Messages in this thread | | | From | Doug Anderson <> | Date | Mon, 13 Jun 2022 15:19:38 -0700 | Subject | Re: [PATCH v2] arm64: dts: qcom: Remove duplicate sc7180-trogdor include on lazor/homestar |
| |
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
| |