From bcb84f73afaf97fbfd26a4dc0d01cee08151dab5 Mon Sep 17 00:00:00 2001 From: Yuhui Zhao Date: Thu, 17 Nov 2022 13:53:58 +0800 Subject: [PATCH] audio: dts: add QRD support for ravelin. Add QRD support for ravelin. Change-Id: If33ccd5285685df4f5baf23c0539fa62bdb6421a --- ravelin-audio-overlay.dtsi | 15 ++++++++ ravelin-audio-qrd.dts | 2 +- ravelin-audio-qrd.dtsi | 72 +++++++++++++++++++++++++++----------- 3 files changed, 67 insertions(+), 22 deletions(-) diff --git a/ravelin-audio-overlay.dtsi b/ravelin-audio-overlay.dtsi index 26b38f83..8cf8fb66 100644 --- a/ravelin-audio-overlay.dtsi +++ b/ravelin-audio-overlay.dtsi @@ -177,6 +177,21 @@ qcom,cdc-static-supplies = "cdc-vdd-1p8"; sound-name-prefix = "SpkrRight"; }; + + wsa881x_0213: wsa881x@21170213 { + status = "disabled"; + compatible = "qcom,wsa881x"; + reg = <0x10 0x21170213>; + qcom,spkr-sd-n-node = <&wsa_spkr_en1>; + qcom,lpass-cdc-handle = <&lpass_cdc>; + wsa_dev_index = <1>; + + cdc-vdd-1p8-supply = <&L21B>; + qcom,cdc-vdd-1p8-voltage = <1800000 1800000>; + qcom,cdc-vdd-1p8-current = <20000>; + qcom,cdc-static-supplies = "cdc-vdd-1p8"; + sound-name-prefix = "SpkrLeft"; + }; }; }; diff --git a/ravelin-audio-qrd.dts b/ravelin-audio-qrd.dts index feb0bba1..84588272 100644 --- a/ravelin-audio-qrd.dts +++ b/ravelin-audio-qrd.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. Ravelin QRD"; compatible = "qcom,ravelin-qrd", "qcom,ravelin", "qcom,qrd"; - qcom,msm-id = <568 0x10000>; + qcom,msm-id = <568 0x10000>, <602 0x10000>; qcom,board-id = <0x1000B 0>; }; diff --git a/ravelin-audio-qrd.dtsi b/ravelin-audio-qrd.dtsi index 7171b531..7c3e9b35 100644 --- a/ravelin-audio-qrd.dtsi +++ b/ravelin-audio-qrd.dtsi @@ -1,11 +1,28 @@ #include "ravelin-audio-overlay.dtsi" +&swr0 { + qcom,swr-clock-stop-mode0 = <0>; + qcom,swr-num-dev = <1>; + + wsa883x_0221: wsa883x@02170221 { + status = "disabled"; + }; + + wsa883x_0222: wsa883x@02170222 { + status = "disabled"; + }; + + wsa881x_0213: wsa881x@21170213 { + status = "okay"; + }; +}; + &waipio_snd { - qcom,model = "parrot-qrd-snd-card"; - qcom,sku-model = "parrot-qrd-sku1-snd-card"; - qcom,msm-mbhc-usbc-audio-supported = <1>; - qcom,msm-mbhc-hphl-swh = <0>; - qcom,msm-mbhc-gnd-swh = <0>; + qcom,model = "ravelin-qrd-snd-card"; + qcom,wsa881x-support = <1>; + qcom,msm-mbhc-usbc-audio-supported = <0>; + qcom,msm-mbhc-hphl-swh = <1>; + qcom,msm-mbhc-gnd-swh = <1>; qcom,audio-routing = "AMIC1", "Analog Mic1", "AMIC1", "MIC BIAS1", @@ -13,20 +30,6 @@ "AMIC2", "MIC BIAS2", "AMIC3", "Analog Mic3", "AMIC3", "MIC BIAS3", - "AMIC4", "Analog Mic4", - "AMIC4", "MIC BIAS1", - "AMIC5", "Analog Mic5", - "AMIC5", "MIC BIAS1", - "VA AMIC1", "Analog Mic1", - "VA AMIC1", "VA MIC BIAS1", - "VA AMIC2", "Analog Mic2", - "VA AMIC2", "VA MIC BIAS2", - "VA AMIC3", "Analog Mic3", - "VA AMIC3", "VA MIC BIAS3", - "VA AMIC4", "Analog Mic4", - "VA AMIC4", "VA MIC BIAS1", - "VA AMIC5", "Analog Mic5", - "VA AMIC5", "VA MIC BIAS1", "TX DMIC0", "Digital Mic0", "TX DMIC0", "MIC BIAS3", "TX DMIC1", "Digital Mic1", @@ -40,17 +43,44 @@ "IN3_AUX", "AUX_OUT", "WSA SRC0_INP", "SRC0", "WSA_TX DEC0_INP", "TX DEC0 MUX", - "WSA_TX DEC1_INP", "TX DEC1 MUX", "RX_TX DEC0_INP", "TX DEC0 MUX", "RX_TX DEC1_INP", "TX DEC1 MUX", "RX_TX DEC2_INP", "TX DEC2 MUX", "RX_TX DEC3_INP", "TX DEC3 MUX", "SpkrLeft IN", "WSA_SPK1 OUT", - "SpkrRight IN", "WSA_SPK2 OUT", "TX SWR_INPUT", "WCD_TX_OUTPUT", "VA SWR_INPUT", "VA_SWR_CLK", "VA SWR_INPUT", "WCD_TX_OUTPUT", "VA_AIF1 CAP", "VA_SWR_CLK", "VA_AIF2 CAP", "VA_SWR_CLK", "VA_AIF3 CAP", "VA_SWR_CLK"; + asoc-codec = <&stub_codec>, <&lpass_cdc>, + <&wcd937x_codec>, <&wsa881x_0213>; + asoc-codec-names = "msm-stub-codec.1", "lpass-cdc", + "wcd937x_codec", "wsa-codec1"; + qcom,wsa-max-devs = <1>; +}; + +&wcd938x_codec { + status = "disabled"; +}; + +&wcd938x_tx_slave { + status = "disabled"; +}; + +&wcd938x_rx_slave { + status = "disabled"; +}; + +&wcd937x_codec { + status = "okay"; +}; + +&wcd937x_tx_slave { + status = "okay"; +}; + +&wcd937x_rx_slave { + status = "okay"; };