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@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>
---
 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
index fe2369c29aad..88f6a7d4d020 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
@@ -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;

base-commit: 19794489fa2474a55c00848e00ca3d15ea01d36c
-- 
https://chromeos.dev

Hi,

On Fri, May 20, 2022 at 4:14 PM Stephen Boyd <swboyd@chromium.org> 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@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>
> ---
>  arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Douglas Anderson <dianders@chromium.org>