Re: [PATCH 2/2] arm64: dts: qcom: sc7180: Reorganize trogdor rt5682 audio codec dts

[Sheng-Liang Pan]

Hi

> 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@xxxxxxxxxx>
> Signed-off-by: Douglas Anderson <dianders@xxxxxxxxxxxx>
> ---
> I'm pretty on the fence about this change. I wrote it up at
> Krzysztof's request. While I don't hate it, I'm not convinced that
> this is truly more understandable and it does cause a bit of extra
> duplication. Happy to let others/Bjorn decide.
>
>   .../boot/dts/qcom/sc7180-trogdor-coachz.dtsi  |  1 -
>   .../dts/qcom/sc7180-trogdor-homestar.dtsi     |  2 +
>   .../sc7180-trogdor-lazor-limozeen-nots-r5.dts |  1 +
>   .../sc7180-trogdor-lazor-limozeen-nots-r9.dts |  1 +
>   .../qcom/sc7180-trogdor-lazor-limozeen-r4.dts |  2 +
>   .../qcom/sc7180-trogdor-lazor-limozeen-r9.dts |  1 +
>   .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts |  1 +
>   .../dts/qcom/sc7180-trogdor-lazor-r3-kb.dts   |  1 +
>   .../dts/qcom/sc7180-trogdor-lazor-r3-lte.dts  |  1 +
>   .../boot/dts/qcom/sc7180-trogdor-lazor-r3.dts |  1 +
>   .../dts/qcom/sc7180-trogdor-lazor-r9-kb.dts   |  1 +
>   .../dts/qcom/sc7180-trogdor-lazor-r9-lte.dts  |  1 +
>   .../boot/dts/qcom/sc7180-trogdor-lazor-r9.dts |  1 +
>   .../sc7180-trogdor-pazquel-lte-parade.dts     |  1 +
>   .../qcom/sc7180-trogdor-pazquel-lte-ti.dts    |  1 +
>   .../qcom/sc7180-trogdor-pazquel-parade.dts    |  1 +
>   .../dts/qcom/sc7180-trogdor-pazquel-ti.dts    |  1 +
>   .../boot/dts/qcom/sc7180-trogdor-pompom.dtsi  |  1 +
>   .../qcom/sc7180-trogdor-quackingstick.dtsi    |  1 +
>   .../arm64/boot/dts/qcom/sc7180-trogdor-r1.dts |  1 +
>   .../dts/qcom/sc7180-trogdor-rt5682i-sku.dtsi  | 38 +++++++++++++++++++
>   .../dts/qcom/sc7180-trogdor-rt5682s-sku.dtsi  | 33 +++++++++++++---
>   ...0-trogdor-wormdingler-rev1-boe-rt5682s.dts | 12 +++++-
>   .../sc7180-trogdor-wormdingler-rev1-boe.dts   |  1 +
>   ...0-trogdor-wormdingler-rev1-inx-rt5682s.dts |  6 ++-
>   .../sc7180-trogdor-wormdingler-rev1-inx.dts   |  1 +
>   arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi  | 27 -------------
>   27 files changed, 104 insertions(+), 36 deletions(-)
>   create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-rt5682i-sku.dtsi
Reviewed-by: Sheng-Liang Pan <sheng-liang.pan@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>