Here's a couple patches to simplify sc7180-trogdor dtsi files further.
There will be logical conflicts with the wormdingler patch because it
will need to have similar changes done for the swizzle and include, but
that can be cleaned up later or I can resend if the wormdingler patch
gets merged first. Either way nothing will be broken from what I can
tell.

I compiled these and diffed the dtbs before and after and found no
changes.

Changes from v1 (https://lore.kernel.org/r/20220325234344.199841-1-swboyd@chromium.org):
 * Another patch to move around sc7180.dtsi includes
 * Fixed trackpad for trogdor-r1 and pompom
 * Made spi0/spi6 patch not as aggressive

Stephen Boyd (3):
  arm64: dts: qcom: sc7180-trogdor: Simplify trackpad enabling
  arm64: dts: qcom: sc7180-trogdor: Simplify spi0/spi6 labeling
  arm64: dts: qcom: Only include sc7180.dtsi in sc7180-trogdor.dtsi

 arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi   | 11 +----------
 .../boot/dts/qcom/sc7180-trogdor-homestar-r2.dts      |  2 +-
 .../boot/dts/qcom/sc7180-trogdor-homestar-r3.dts      |  2 +-
 .../boot/dts/qcom/sc7180-trogdor-homestar-r4.dts      |  2 +-
 arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi |  7 -------
 .../qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts    |  2 +-
 .../qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts    |  2 +-
 .../dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts     |  2 +-
 .../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 +-
 .../boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts      |  2 +-
 .../boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts     |  2 +-
 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts  |  2 +-
 .../boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts      |  2 +-
 .../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-lazor.dtsi    |  7 ++++---
 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi   |  9 ++++-----
 arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts        |  9 ++++-----
 arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi          |  8 ++++----
 21 files changed, 32 insertions(+), 49 deletions(-)

Cc: "Joseph S. Barrera III" <joebar@chromium.org>
Cc: Douglas Anderson <dianders@chromium.org>

base-commit: f238ff81e8946540e1a7c1496aa92fa2386893dc
-- 
https://chromeos.dev

On Tue, 26 Apr 2022 19:03:36 -0700, Stephen Boyd wrote:
> Here's a couple patches to simplify sc7180-trogdor dtsi files further.
> There will be logical conflicts with the wormdingler patch because it
> will need to have similar changes done for the swizzle and include, but
> that can be cleaned up later or I can resend if the wormdingler patch
> gets merged first. Either way nothing will be broken from what I can
> tell.
> 
> [...]

Applied, thanks!

[1/3] arm64: dts: qcom: sc7180-trogdor: Simplify trackpad enabling
      commit: 51d30402be7506db007af6d29c6bc7c1cefcc82f
[2/3] arm64: dts: qcom: sc7180-trogdor: Simplify spi0/spi6 labeling
      commit: d277cab7afc7b54ea91808c0895d78c2021af534
[3/3] arm64: dts: qcom: Only include sc7180.dtsi in sc7180-trogdor.dtsi
      commit: 19794489fa2474a55c00848e00ca3d15ea01d36c

Best regards,
-- 
Bjorn Andersson <bjorn.andersson@linaro.org>