Hi,
On Fri, May 20, 2022 at 4:14 PM Stephen Boyd <swboyd@xxxxxxxxxxxx> wrote:
>
> The sc7180-trogdor-lazor-*.dtsi files all include sc7180-trogdor.dtsi
> and sc7180-trogdor-lazor.dtsi, so including it here in the
> sc7180-trogdor-lazor.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.
>
> Fix this by dropping the include and making a note that the
> sc7180-trogdor-lazor.dtsi file must be included after
> sc7180-trogdor.dtsi
>
> Reported-by: Douglas Anderson <dianders@xxxxxxxxxxxx>
> Cc: "Joseph S. Barrera III" <joebar@xxxxxxxxxxxx>
> Cc: Matthias Kaehlcke <mka@xxxxxxxxxxxx>
> Fixes: 19794489fa24 ("arm64: dts: qcom: Only include sc7180.dtsi in sc7180-trogdor.dtsi")
> Signed-off-by: Stephen Boyd <swboyd@xxxxxxxxxxxx>
> ---
> arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Douglas Anderson <dianders@xxxxxxxxxxxx>
