Commit e5b8c082 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Bjorn Andersson
Browse files

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: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221210115704.97614-4-krzysztof.kozlowski@linaro.org
parent d0b014a7

arch/arm64/boot/dts/qcom/sm8250-mtp.dts

+19 −21
Original line number Diff line number Diff line
@@ -27,6 +27,25 @@ chosen { 
		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 @@ &slpi { 
	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";

arch/arm64/boot/dts/qcom/sm8250.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -3323,9 +3323,6 @@ compute-cb@8 { 
			};

		};



		sound: sound {

		};



		usb_1_hsphy: phy@88e3000 {

			compatible = "qcom,sm8250-usb-hs-phy",

				     "qcom,usb-snps-hs-7nm-phy";
@@ -5468,6 +5465,9 @@ cpufreq_hw: cpufreq@18591000 { 
		};

	};



	sound: sound {

	};



	timer {

		compatible = "arm,armv8-timer";

		interrupts = <GIC_PPI 13