arm64: dts: qcom: sm8250: move sound and codec nodes out of soc

The sound and codec nodes are not a property of a soc, but rather board
as it describes the sound configuration.  It also does not have unit
address:

  sm8250-hdk.dtb: soc@0: sound: {} should not be valid under {'type': 'object'}

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221210115704.97614-4-krzysztof.kozlowski@linaro.org

diff --git a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
index 3ed8c84..b741b7d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
@@ -27,6 +27,25 @@
                stdout-path = "serial0:115200n8";
        };
 
+       wcd938x: codec {
+               compatible = "qcom,wcd9380-codec";
+               #sound-dai-cells = <1>;
+               reset-gpios = <&tlmm 32 GPIO_ACTIVE_LOW>;
+               vdd-buck-supply = <&vreg_s4a_1p8>;
+               vdd-rxtx-supply = <&vreg_s4a_1p8>;
+               vdd-io-supply = <&vreg_s4a_1p8>;
+               vdd-mic-bias-supply = <&vreg_bob>;
+               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>;
+       };
+
        thermal-zones {
                camera-thermal {
                        polling-delay-passive = <0>;
@@ -631,27 +650,6 @@
        firmware-name = "qcom/sm8250/slpi.mbn";
 };
 
-&soc {
-       wcd938x: codec {
-               compatible = "qcom,wcd9380-codec";
-               #sound-dai-cells = <1>;
-               reset-gpios = <&tlmm 32 GPIO_ACTIVE_LOW>;
-               vdd-buck-supply = <&vreg_s4a_1p8>;
-               vdd-rxtx-supply = <&vreg_s4a_1p8>;
-               vdd-io-supply = <&vreg_s4a_1p8>;
-               vdd-mic-bias-supply = <&vreg_bob>;
-               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>;
-       };
-};
-
 &sound {
        compatible = "qcom,sm8250-sndcard";
        model = "SM8250-MTP-WCD9380-WSA8810-VA-DMIC";

diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
index dab5579..72727ec 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
@@ -3323,9 +3323,6 @@
                        };
                };
 
-               sound: sound {
-               };
-
                usb_1_hsphy: phy@88e3000 {
                        compatible = "qcom,sm8250-usb-hs-phy",
                                     "qcom,usb-snps-hs-7nm-phy";
@@ -5468,6 +5465,9 @@
                };
        };
 
+       sound: sound {
+       };
+
        timer {
                compatible = "arm,armv8-timer";
                interrupts = <GIC_PPI 13