On 12 December 2022 13:02:32 GMT+03:00, Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx> wrote:
>The sound and on-board WCD9380 codec nodes are not properties of the
>soc, but rather board as it describes the sound configuration. They also
>does not have unit addresses:
>
> sm8250-hdk.dtb: soc@0: sound: {} should not be valid under {'type': 'object'}
>
>Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
>Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Reviewed-by: Dmitry Baryshkov<dmitry.baryshkov@xxxxxxxxxx>
>
>---
>
>Changes since v1:
>1. Add Rb tag.
>2. Rephrase commit msg.
>---
> arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 40 ++++++++++++-------------
> arch/arm64/boot/dts/qcom/sm8250.dtsi | 6 ++--
> 2 files changed, 22 insertions(+), 24 deletions(-)
>
>diff --git a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
>index 3ed8c84e25b8..b741b7da1afc 100644
>--- a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
>+++ b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
>@@ -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";
>diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
>index d517d6a80bdc..fbbbae29e0c2 100644
>--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
>+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
>@@ -2826,9 +2826,6 @@ compute-cb@8 {
> };
> };
>
>- sound: sound {
>- };
>-
> usb_1_hsphy: phy@88e3000 {
> compatible = "qcom,sm8250-usb-hs-phy",
> "qcom,usb-snps-hs-7nm-phy";
>@@ -4910,6 +4907,9 @@ cpufreq_hw: cpufreq@18591000 {
> };
> };
>
>+ sound: sound {
>+ };
>+
> timer {
> compatible = "arm,armv8-timer";
> interrupts = <GIC_PPI 13
--
With best wishes
Dmitry
