Re: [PATCH v2 3/3] arm64: dts: qcom: Only include sc7180.dtsi in sc7180-trogdor.dtsi

Doug Anderson
2022-05-20T22:16:24Z

Hi,

On Tue, Apr 26, 2022 at 7:03 PM Stephen Boyd <swboyd@chromium.org> wrote:
>
> The SoC is always present on sc7180-trogdor.dtsi and thus we should
> include it in the "generic" dtsi file for trogdor. Previously we had
> removed it from there because we had to do the spi6/spi0 swizzle, so
> each trogdor variant board had to include sc7180.dtsi and then
> sc7180-trogdor.dtsi so that the latter dtsi file could modify the right
> spi bus for EC and H1 properties that are common to all trogdor boards.
>
> Now that we're done with that we can replace sc7180.dtsi includes with
> sc7180-trogdor.dtsi and include sc7180.dtsi in sc7180-trogdor.dtsi as
> was originally intended. We still need to include sc7180-trogdor.dtsi
> before the bridge dtsi files though because those rely on the panel
> label.
>
> Cc: "Joseph S. Barrera III" <joebar@chromium.org>
> Cc: Douglas Anderson <dianders@chromium.org>
> Signed-off-by: Stephen Boyd <swboyd@chromium.org>
> ---
> arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 1 -
> arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r2.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r3.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r4.dts | 2 +-
> .../boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts | 2 +-
> .../boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r9.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts | 2 +-
> arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 1 -
> arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 1 -
> arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 3 ++-
> 19 files changed, 17 insertions(+), 19 deletions(-)

While reviewing a different change, I found something fishy and
tracked it down to ${SUBJECT} patch.

Specifically, after ${SUBJECT} patch then I run `git grep
include.*trogdor.dtsi`. When I do that, I see that
`sc7180-trogdor.dtsi` is double-included in all lazor devices. :( It's
included in the actual dts files and also in the lazor.dtsi file.

That's probably not right. I think we need to remove the one in the
lazor.dtsi file?

-Doug