From 9c2590e531c186a617c7cb1bc7bac1ddc810bd2b Mon Sep 17 00:00:00 2001 From: Soumya Managoli Date: Mon, 5 Sep 2022 16:03:44 +0530 Subject: [PATCH 1/2] ARM: dts: Add btfm support for khaje Set btfm prop to enable btfm dai register. Change-Id: I728159b55e8277491277683fab3429013efe6495 --- bengal-audio-overlay.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bengal-audio-overlay.dtsi b/bengal-audio-overlay.dtsi index 3dc0d67d..87043cfe 100644 --- a/bengal-audio-overlay.dtsi +++ b/bengal-audio-overlay.dtsi @@ -163,7 +163,7 @@ bengal_snd: sound { qcom,model = "bengal-idp-snd-card"; qcom,msm-mi2s-master = <1>, <1>, <1>, <1>; - qcom,wcn-btfm = <0>; + qcom,wcn-btfm = <1>; qcom,va-bolero-codec = <1>; qcom,rxtx-bolero-codec = <1>; qcom,audio-routing = From 98b12464daddcb1505faf0f3be7ce768011b888b Mon Sep 17 00:00:00 2001 From: Soumya Managoli Date: Fri, 9 Sep 2022 10:42:05 +0530 Subject: [PATCH 2/2] ARM: dts: Update swr port and tx ch mapping To align with swr and bolero drivers update the swr port mapping and tx ch mapping in the required format. Change-Id: I35a62b2689181cd814a9a196136b346bc30dad3e --- bengal-audio-overlay.dtsi | 42 ++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/bengal-audio-overlay.dtsi b/bengal-audio-overlay.dtsi index 3dc0d67d..54905966 100644 --- a/bengal-audio-overlay.dtsi +++ b/bengal-audio-overlay.dtsi @@ -96,12 +96,13 @@ interrupt-names = "swr_master_irq", "swr_wake_irq"; qcom,swr-wakeup-required = <1>; qcom,swr-num-ports = <3>; - qcom,swr-port-mapping = <1 ADC1 0x1>, <1 ADC2 0x2>, - <1 ADC3 0x4>, <1 ADC4 0x8>, - <2 DMIC0 0x1>, <2 DMIC1 0x2>, - <2 DMIC2 0x4>, <2 DMIC3 0x8>, - <3 DMIC4 0x1>, <3 DMIC5 0x2>, - <3 DMIC6 0x4>, <3 DMIC7 0x8>; + qcom,swr-port-mapping = <1 SWRM_TX1_CH1 0x1>, + <1 SWRM_TX1_CH2 0x2>, + <1 SWRM_TX1_CH3 0x4>, <1 SWRM_TX1_CH4 0x8>, + <2 SWRM_TX2_CH1 0x1>, <2 SWRM_TX2_CH2 0x2>, + <2 SWRM_TX2_CH3 0x4>, <2 SWRM_TX2_CH4 0x8>, + <3 SWRM_TX3_CH1 0x1>, <3 SWRM_TX3_CH2 0x2>, + <3 SWRM_TX3_CH3 0x4>, <3 SWRM_TX3_CH4 0x8>; qcom,swr-num-dev = <1>; qcom,swr-clock-stop-mode0 = <1>; qcom,swr-mstr-irq-wakeup-capable = <1>; @@ -121,17 +122,21 @@ <2 COMP_L 0x1 0 COMP_L>, <2 COMP_R 0x2 0 COMP_R>, <3 LO 0x1 0 LO>, <4 DSD_L 0x1 0 DSD_L>, <4 DSD_R 0x2 0 DSD_R>; - qcom,tx_swr_ch_map = <0 ADC1 0x1 0 ADC1>, - <1 ADC2 0x1 0 DMIC0>, <1 ADC3 0x2 0 DMIC1>, - <2 DMIC0 0x1 0 DMIC4>, <2 DMIC1 0x2 0 DMIC5>, - <2 MBHC 0x4 0 DMIC6>, <3 DMIC2 0x1 0 DMIC4>, - <3 DMIC3 0x2 0 DMIC5>, <3 DMIC4 0x4 0 DMIC6>, - <3 DMIC5 0x8 0 DMIC7>; + qcom,tx_swr_ch_map = <0 ADC1 0x1 4800000 SWRM_TX1_CH1>, + <1 ADC2 0x1 4800000 SWRM_TX2_CH1>, + <1 ADC3 0x2 4800000 SWRM_TX2_CH2>, + <2 DMIC0 0x1 0 SWRM_TX1_CH4>, + <2 DMIC1 0x2 0 SWRM_TX2_CH1>, + <2 MBHC 0x4 4800000 SWRM_TX2_CH2>, + <3 DMIC2 0x1 0 SWRM_TX2_CH3>, + <3 DMIC3 0x2 0 SWRM_TX2_CH4>, + <3 DMIC4 0x4 0 SWRM_TX3_CH1>, + <3 DMIC5 0x8 0 SWRM_TX3_CH2>; qcom,swr-tx-port-params = - , , , , - , , , , - , , , , + , , , , + , , , , + , , , , , , , ; qcom,wcd-rst-gpio-node = <&wcd937x_rst_gpio>; qcom,rx-slave = <&wcd937x_rx_slave>; @@ -192,9 +197,9 @@ "TX SWR_INPUT", "WCD_TX_OUTPUT", "VA SWR_INPUT", "VA_SWR_CLK", "VA SWR_INPUT", "WCD_TX_OUTPUT", - "TX_AIF1 CAP", "VA_TX_SWR_CLK", - "TX_AIF2 CAP", "VA_TX_SWR_CLK", - "TX_AIF3 CAP", "VA_TX_SWR_CLK", + "TX_AIF1 CAP", "VA_SWR_CLK", + "TX_AIF2 CAP", "VA_SWR_CLK", + "TX_AIF3 CAP", "VA_SWR_CLK", "VA DMIC0", "Digital Mic0", "VA DMIC1", "Digital Mic1", "VA DMIC2", "Digital Mic2", @@ -203,6 +208,7 @@ "VA DMIC1", "VA MIC BIAS1", "VA DMIC2", "VA MIC BIAS3", "VA DMIC3", "VA MIC BIAS3"; + qcom,msm-mbhc-usbc-audio-supported = <0>; qcom,msm-mbhc-hphl-swh = <1>; qcom,msm-mbhc-gnd-swh = <1>; qcom,cdc-dmic01-gpios = <&cdc_dmic01_gpios>;