arm64: dts: qcom: sm8450-hdk: move wcd938x codec node

The wcd938x codec is not a memory-mapped device and does not belong
under the soc node.

Move the node to the root node to avoid DT validation failures.

While at it, clean up the node somewhat by reordering properties and
renaming it 'audio-codec'.

Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230103103141.15807-6-johan+linaro@kernel.org

diff --git a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
index ddabd17..5bdc2c1 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
@@ -24,6 +24,32 @@
                serial0 = &uart7;
        };
 
+       wcd938x: audio-codec {
+               compatible = "qcom,wcd9380-codec";
+
+               pinctrl-names = "default";
+               pinctrl-0 = <&wcd_default>;
+
+               qcom,micbias1-microvolt = <1800000>;
+               qcom,micbias2-microvolt = <1800000>;
+               qcom,micbias3-microvolt = <1800000>;
+               qcom,micbias4-microvolt = <1800000>;
+               qcom,mbhc-buttons-vthreshold-microvolt = <75000 150000 237000 500000 500000 500000 500000 500000>;
+               qcom,mbhc-headset-vthreshold-microvolt = <1700000>;
+               qcom,mbhc-headphone-vthreshold-microvolt = <50000>;
+               qcom,rx-device = <&wcd_rx>;
+               qcom,tx-device = <&wcd_tx>;
+
+               reset-gpios = <&tlmm 43 GPIO_ACTIVE_LOW>;
+
+               vdd-buck-supply = <&vreg_s10b_1p8>;
+               vdd-rxtx-supply = <&vreg_s10b_1p8>;
+               vdd-io-supply = <&vreg_s10b_1p8>;
+               vdd-mic-bias-supply = <&vreg_bob>;
+
+               #sound-dai-cells = <1>;
+       };
+
        chosen {
                stdout-path = "serial0:115200n8";
        };
@@ -519,33 +545,6 @@
        status = "okay";
 };
 
-&soc {
-       wcd938x: codec {
-               compatible = "qcom,wcd9380-codec";
-
-               pinctrl-names = "default";
-               pinctrl-0 = <&wcd_default>;
-
-               qcom,micbias1-microvolt = <1800000>;
-               qcom,micbias2-microvolt = <1800000>;
-               qcom,micbias3-microvolt = <1800000>;
-               qcom,micbias4-microvolt = <1800000>;
-               qcom,mbhc-buttons-vthreshold-microvolt = <75000 150000 237000 500000 500000 500000 500000 500000>;
-               qcom,mbhc-headset-vthreshold-microvolt = <1700000>;
-               qcom,mbhc-headphone-vthreshold-microvolt = <50000>;
-               qcom,rx-device = <&wcd_rx>;
-               qcom,tx-device = <&wcd_tx>;
-
-               reset-gpios = <&tlmm 43 GPIO_ACTIVE_LOW>;
-               #sound-dai-cells = <1>;
-
-               vdd-buck-supply = <&vreg_s10b_1p8>;
-               vdd-rxtx-supply = <&vreg_s10b_1p8>;
-               vdd-io-supply = <&vreg_s10b_1p8>;
-               vdd-mic-bias-supply = <&vreg_bob>;
-       };
-};
-
 &sound {
        compatible = "qcom,sm8450-sndcard";
        model = "SM8450-HDK";