Skip to content

Commit

Permalink
arm64: dts: qcom: Remove duplicate sc7180-trogdor include on lazor/ho…
Browse files Browse the repository at this point in the history
…mestar

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 1979448 ("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: 1979448 ("arm64: dts: qcom: Only include sc7180.dtsi in sc7180-trogdor.dtsi")
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Tested-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220602190621.1646679-1-swboyd@chromium.org
  • Loading branch information
Stephen Boyd authored and Bjorn Andersson committed Jun 21, 2022
1 parent f2906aa commit 372b2ae
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 372b2ae

Please sign in to comment.