arm64: dts: qcom: sc7180: Reorganize trogdor rt5682 audio codec dts
authorDouglas Anderson <dianders@chromium.org>
Wed, 16 Aug 2023 18:21:54 +0000 (11:21 -0700)
committerBjorn Andersson <andersson@kernel.org>
Wed, 20 Sep 2023 01:12:52 +0000 (18:12 -0700)
commit214945cbf375cc27d684f4cd2abb569e8c888688
tree5a2eef03dcb24df57d39e16462f355080e43edaa
parent8ff1aaba032dd00e71aadeafa0ef2f79d3693c99
arm64: dts: qcom: sc7180: Reorganize trogdor rt5682 audio codec dts

It was asserted that the "/delete-property/ VBAT-supply;" that we
needed to do in the rt5682s dts fragment was ugly. Let's change up all
the trogdor device trees to make it explicit which version of "rt5682"
we have and avoid the need for the "delete-property".

As a side effect, this nicely gets rid of the need for a delete-node
in coachz, which doesn't use "rt5682" at all.

A few notes:
- This doesn't get rid of every "/delete-node/" in trogdor, just the
  one that was used for rt5682s.
- Though we no longer have any "/delete-node/", we do still override
  the "model" in the "sound" node in one case (in pompom) since that
  uses the "2mic" sound setup.

This is validated to produce the same result (other than a few
properties being reordered) when taking the dtbs generated by the
kernel build and then doing:

  for dtb in *trogdor*.dtb; do
    dtc -I dtb -O dts $dtb -o out/$dtb.dts;
  done

Suggested-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Sheng-Liang Pan <sheng-liang.pan@quanta.corp-partner.google.com>
Link: https://lore.kernel.org/r/20230816112143.2.I29a5a330b6994afca81871f74bbacaf55b155937@changeid
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
27 files changed:
arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r9.dts
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts
arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel-lte-parade.dts
arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel-lte-ti.dts
arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel-parade.dts
arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel-ti.dts
arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi
arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi
arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
arch/arm64/boot/dts/qcom/sc7180-trogdor-rt5682i-sku.dtsi [new file with mode: 0644]
arch/arm64/boot/dts/qcom/sc7180-trogdor-rt5682s-sku.dtsi
arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-boe-rt5682s.dts
arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-boe.dts
arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-inx-rt5682s.dts
arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-inx.dts
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi