Skip to content

Commit 372b2ae

Browse files
bebarinoandersson
authored andcommitted
arm64: dts: qcom: Remove duplicate sc7180-trogdor include on lazor/homestar
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 <[email protected]> Cc: "Joseph S. Barrera III" <[email protected]> Cc: Matthias Kaehlcke <[email protected]> Fixes: 1979448 ("arm64: dts: qcom: Only include sc7180.dtsi in sc7180-trogdor.dtsi") Signed-off-by: Stephen Boyd <[email protected]> Reviewed-by: Douglas Anderson <[email protected]> Tested-by: Douglas Anderson <[email protected]> Signed-off-by: Bjorn Andersson <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent f2906aa commit 372b2ae

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Copyright 2021 Google LLC.
66
*/
77

8-
#include "sc7180-trogdor.dtsi"
8+
/* This file must be included after sc7180-trogdor.dtsi */
99

1010
/ {
1111
/* BOARD-SPECIFIC TOP LEVEL NODES */

arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Copyright 2020 Google LLC.
66
*/
77

8-
#include "sc7180-trogdor.dtsi"
8+
/* This file must be included after sc7180-trogdor.dtsi */
99

1010
&ap_sar_sensor {
1111
semtech,cs0-ground;

0 commit comments

Comments
 (0)