• Stephen Boyd's avatar
    arm64: dts: qcom: Remove duplicate sc7180-trogdor include on lazor/homestar · 372b2aee
    Stephen Boyd authored
    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 19794489 ("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: default avatarDouglas Anderson <dianders@chromium.org>
    Cc: "Joseph S. Barrera III" <joebar@chromium.org>
    Cc: Matthias Kaehlcke <mka@chromium.org>
    Fixes: 19794489 ("arm64: dts: qcom: Only include sc7180.dtsi in sc7180-trogdor.dtsi")
    Signed-off-by: default avatarStephen Boyd <swboyd@chromium.org>
    Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
    Tested-by: default avatarDouglas Anderson <dianders@chromium.org>
    Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
    Link: https://lore.kernel.org/r/20220602190621.1646679-1-swboyd@chromium.org
    372b2aee
sc7180-trogdor-lazor.dtsi 3.66 KB