From da99ab8300b9169751817465c4700695d16d9110 Mon Sep 17 00:00:00 2001 From: "Vangala, Amarnath" Date: Mon, 2 Sep 2024 23:19:10 +0530 Subject: [PATCH 01/10] ARM: dts: qcom: update clk div factor entry for TX and VA macros Update clk div factor entries for TX and VA macros to reflect proper HW configuration. Change-Id: I29d5d4fb0fbbae4b2bd3c121f1b6f7a6d34e9cd2 Signed-off-by: Vangala, Amarnath --- sun-audio-overlay.dtsi | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/sun-audio-overlay.dtsi b/sun-audio-overlay.dtsi index dc9c7340..ed513359 100644 --- a/sun-audio-overlay.dtsi +++ b/sun-audio-overlay.dtsi @@ -35,7 +35,19 @@ reg = <0x7660000 0x0>; clock-names = "lpass_audio_hw_vote"; clocks = <&lpass_audio_hw_vote 0>; - qcom,va-dmic-sample-rate = <600000>; + /* + * Clk divding factors for each DMIC pair. + * Valid entries for each DMIC pair: + * 2, 3, 4, 6, 8, 16 + * + * These factors are translated to corresponding config values + * for the following registers, + * -- LPASS_VA_TOP_CSR_DMIC0_CTL, + * -- LPASS_VA_TOP_CSR_DMIC1_CTL, + * -- LPASS_VA_TOP_CSR_DMIC2_CTL, + * -- LPASS_VA_TOP_CSR_DMIC3_CTL, + */ + qcom,va-dmic-clk-div-factor = <16 16 16 16>; qcom,va-clk-mux-select = <1>; qcom,default-clk-id = ; qcom,use-clk-id = ; @@ -81,7 +93,19 @@ compatible = "qcom,lpass-cdc-tx-macro"; reg = <0x6AE0000 0x0>; qcom,default-clk-id = ; - qcom,tx-dmic-sample-rate = <2400000>; + /* + * Clk divding factors for each DMIC pair. + * Valid entries for each DMIC pair: + * 2, 3, 4, 6, 8, 16 + * + * These factors are translated to corresponding config values + * for the following registers, + * -- LPASS_VA_TOP_CSR_DMIC0_CTL, + * -- LPASS_VA_TOP_CSR_DMIC1_CTL, + * -- LPASS_VA_TOP_CSR_DMIC2_CTL, + * -- LPASS_VA_TOP_CSR_DMIC3_CTL, + */ + qcom,tx-dmic-clk-div-factor = <4 4 4 4>; qcom,is-used-swr-gpio = <0>; }; From 595a3edf8ce6a5ce6b5695b34c35b518f3e54304 Mon Sep 17 00:00:00 2001 From: Yuhui Zhao Date: Tue, 26 Nov 2024 19:55:29 +0800 Subject: [PATCH 02/10] ARM: dts: msm: Configuration to set thread priority In LL use-case GPR callback thread was in unable state. In normal thread and not in RT thread. Which causes pop noise issue. It needs to set glink-adsp_apps thread priority to be RT. This Configuration enables Client to set the configuration thread to be in RT. Change-Id: I2e25ad8755d48a8b4869360a7abe0249dd21ccf0 Signed-off-by: Yuhui Zhao --- tuna-audio.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/tuna-audio.dtsi b/tuna-audio.dtsi index dfe2a8b0..7cea0247 100644 --- a/tuna-audio.dtsi +++ b/tuna-audio.dtsi @@ -30,6 +30,7 @@ compatible = "qcom,gpr"; qcom,glink-channels = "adsp_apps"; qcom,intents = <0x200 20>; + qcom,ch-sched-rt; reg = ; spf_core { From 1e1bad36cfb13ef0ea838ff110cc85a07394524a Mon Sep 17 00:00:00 2001 From: Ravulapati Vishnu Vardhan Rao Date: Sun, 24 Nov 2024 20:45:20 +0530 Subject: [PATCH 03/10] ARM: dts: msm: Tuna and Tuna7 external Display support -Add Ext Display support for Tuna QRD and Tuna7 MTP. Change-Id: I6ed42b4359e61ae5f31d8e0d2c4f5694f32e7094 Signed-off-by: Ravulapati Vishnu Vardhan Rao --- tuna-audio-qrd.dtsi | 1 + tuna7-audio-mtp.dtsi | 1 + 2 files changed, 2 insertions(+) diff --git a/tuna-audio-qrd.dtsi b/tuna-audio-qrd.dtsi index 4c238157..880b49be 100644 --- a/tuna-audio-qrd.dtsi +++ b/tuna-audio-qrd.dtsi @@ -130,6 +130,7 @@ <&wcd939x_codec>, <&wsa884x_0220>; asoc-codec-names = "msm-stub-codec.1", "lpass-cdc", "wcd939x_codec", "wsa-codec1"; + qcom,ext-disp-audio-rx = <1>; qcom,wsa-max-devs = <1>; qcom,wcd-disable-legacy-surge; wcd939x-i2c-handle = <&wcd_usbss>; diff --git a/tuna7-audio-mtp.dtsi b/tuna7-audio-mtp.dtsi index befa7f72..b1252908 100644 --- a/tuna7-audio-mtp.dtsi +++ b/tuna7-audio-mtp.dtsi @@ -111,6 +111,7 @@ asoc-codec-names = "msm-stub-codec.1", "lpass-cdc", "wcd939x_codec", "wsa-codec1", "wsa-codec2"; + qcom,ext-disp-audio-rx = <1>; qcom,wsa-max-devs = <2>; qcom,wcd-disable-legacy-surge; wcd939x-i2c-handle = <&wcd_usbss>; From 51b78bec7fabdfa7bf2c6c29f670826523bbd10b Mon Sep 17 00:00:00 2001 From: "Vangala, Amarnath" Date: Wed, 27 Nov 2024 14:25:46 +0530 Subject: [PATCH 04/10] ARM: dts: msm: Enable BT audio for tuna hmt variant Enable BT audio DAI links for tuna HMT variant. Change-Id: I5690ef59886048c7e6aef649077f1c143946076a Signed-off-by: Vangala, Amarnath --- tuna-audio-hamilton-mtp.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tuna-audio-hamilton-mtp.dtsi b/tuna-audio-hamilton-mtp.dtsi index c286d3b2..35b0c67f 100644 --- a/tuna-audio-hamilton-mtp.dtsi +++ b/tuna-audio-hamilton-mtp.dtsi @@ -12,7 +12,7 @@ &tuna_snd { qcom,model = "tuna-mtp-snd-card"; - qcom,wcn-bt = <0>; + qcom,wcn-bt = <1>; qcom,msm_audio_ssr_devs = <&audio_gpr>, <&lpi_tlmm>, <&lpass_cdc>; }; From b19ed5b15e88c48cbd9ff139dc4ca59998abff20 Mon Sep 17 00:00:00 2001 From: "Vangala, Amarnath" Date: Wed, 27 Nov 2024 14:20:03 +0530 Subject: [PATCH 05/10] ARM: dts: msm: enable BT audio for tuna7 MTP Enable BT Audio DAI links for tuna7 MTP. Change-Id: If18dba0a0cf9081ce499cc58ac7b12a9d747b762 Signed-off-by: Vangala, Amarnath --- tuna7-audio-mtp.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tuna7-audio-mtp.dtsi b/tuna7-audio-mtp.dtsi index befa7f72..4ca84dcc 100644 --- a/tuna7-audio-mtp.dtsi +++ b/tuna7-audio-mtp.dtsi @@ -118,5 +118,5 @@ qcom,msm-mbhc-hphl-swh = <0>; qcom,msm-mbhc-gnd-swh = <0>; qcom,msm-mbhc-hs-mic-max-threshold-mv = <1670>; - qcom,wcn-bt = <0>; + qcom,wcn-bt = <1>; }; From 1f9c246241b327ba190f242b2472ee0e028235bf Mon Sep 17 00:00:00 2001 From: Ravulapati Vishnu Vardhan Rao Date: Fri, 27 Dec 2024 13:05:45 +0530 Subject: [PATCH 06/10] ARM: dts: msm: update primary i2s pin - As in IPCAT there is a conflicting info about PIN configuration, Corrected as per discussion with IPS. - Removal of I2S0_DATA1 pin, as GPIO_63 is not used internally for I2S purpose and it is being used by other subsystem. Change-Id: Ie1788565e7a4f47a167108de2e3ada3ac099da7e Signed-off-by: Ravulapati Vishnu Vardhan Rao --- kera-audio-mtp.dtsi | 4 ++++ kera-audio-overlay.dtsi | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/kera-audio-mtp.dtsi b/kera-audio-mtp.dtsi index 16da7bbb..517e349e 100644 --- a/kera-audio-mtp.dtsi +++ b/kera-audio-mtp.dtsi @@ -30,6 +30,10 @@ }; }; +&cdc_pri_mi2s_gpios { + status = "okay"; +}; + &swr1 { qcom,swr-num-dev = <2>; }; diff --git a/kera-audio-overlay.dtsi b/kera-audio-overlay.dtsi index 0c8b8f90..f4847ae1 100644 --- a/kera-audio-overlay.dtsi +++ b/kera-audio-overlay.dtsi @@ -489,9 +489,9 @@ compatible = "qcom,msm-cdc-pinctrl"; pinctrl-names = "aud_active", "aud_sleep"; pinctrl-0 = <&i2s0_sck_active &i2s0_ws_active - &i2s0_sd0_active &i2s0_sd1_active>; + &i2s0_sd0_active>; pinctrl-1 = <&i2s0_sck_sleep &i2s0_ws_sleep - &i2s0_sd0_sleep &i2s0_sd1_sleep>; + &i2s0_sd0_sleep>; #gpio-cells = <0>; }; From f0adcad997644eb704939ed7fe19d251f7943246 Mon Sep 17 00:00:00 2001 From: Ravulapati Vishnu Vardhan Rao Date: Mon, 30 Dec 2024 11:32:36 +0530 Subject: [PATCH 07/10] ARM: dts: msm: Enable BT on Kera variants Enable BT for slimbus validation. Change-Id: I0d96cb75016712459878231f05072d22eee3d6bf Signed-off-by: Ravulapati Vishnu Vardhan Rao --- kera-audio-overlay.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kera-audio-overlay.dtsi b/kera-audio-overlay.dtsi index 0c8b8f90..ed74775e 100644 --- a/kera-audio-overlay.dtsi +++ b/kera-audio-overlay.dtsi @@ -417,7 +417,7 @@ qcom,model = "kera-qrd-snd-card"; qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>, <1>, <1>; qcom,mi2s-tdm-is-hw-vote-needed = <1>, <1>, <1>, <1>, <1>, <1>, <1>; - qcom,wcn-bt = <0>; + qcom,wcn-bt = <1>; qcom,ext-disp-audio-rx = <0>; qcom,tdm-max-slots = <8>; qcom,tdm-clk-attribute = <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>; From 27a63669c3cf5c90a3722599b1f36f30b5f4f082 Mon Sep 17 00:00:00 2001 From: Yuhui Zhao Date: Mon, 30 Dec 2024 10:34:22 +0800 Subject: [PATCH 08/10] ARM: dts: msm: add fsa node in qrd dts Fsa node was missing in qrd dts. raise this change to add the fsa node for qrd Change-Id: I1093c5a925c60d187d902ebf3b70291ac21cf18c Signed-off-by: Yuhui Zhao --- kera-audio-qrd.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/kera-audio-qrd.dtsi b/kera-audio-qrd.dtsi index c5b51dd4..4efa6288 100644 --- a/kera-audio-qrd.dtsi +++ b/kera-audio-qrd.dtsi @@ -83,4 +83,5 @@ asoc-codec-names = "msm-stub-codec.1", "lpass-cdc", "wcd9378_codec", "wsa-codec1"; qcom,wsa-max-devs = <1>; + fsa4480-i2c-handle = <&fsa4480>; }; From 1e8205fd731adefd0b07ef20424b4ea09761f719 Mon Sep 17 00:00:00 2001 From: Kisan Yadav Date: Mon, 30 Dec 2024 15:07:15 +0530 Subject: [PATCH 09/10] ARM: dts: msm: Update kera overlay dtsi -Add cdc_dmic_gpio's in kera overlay dtsi. -As part dmic event, msm pinctrl state is checked, The node should already be parsed and cached during machine probe. Change-Id: I2cdd410274df99d463a2ba01d00f315754fd831f Signed-off-by: Kisan Yadav --- kera-audio-overlay.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kera-audio-overlay.dtsi b/kera-audio-overlay.dtsi index ed74775e..57430176 100644 --- a/kera-audio-overlay.dtsi +++ b/kera-audio-overlay.dtsi @@ -479,6 +479,8 @@ qcom,msm-mbhc-hphl-swh = <0>; qcom,msm-mbhc-gnd-swh = <0>; qcom,wsa-max-devs = <1>; + qcom,cdc-dmic01-gpios = <&cdc_dmic01_gpios>; + qcom,cdc-dmic23-gpios = <&cdc_dmic23_gpios>; qcom,msm_audio_ssr_devs = <&audio_gpr>, <&lpi_tlmm>, <&lpass_cdc>, <&lpass_bt_swr>; From f9c2c580ec231bbca0fd347d1d705222cce62905 Mon Sep 17 00:00:00 2001 From: Ravulapati Vishnu Vardhan Rao Date: Sun, 29 Dec 2024 10:41:36 +0530 Subject: [PATCH 10/10] ARM: dts: msm: update swr-num-devs and swrm-io-base update swr-num-devs and swrm-io-base for kera variants. Change-Id: I095e6fc88f69c23cb9d0facc5394169456d5e4e9 Signed-off-by: Ravulapati Vishnu Vardhan Rao --- kera-audio-cdp.dtsi | 7 +++++-- kera-audio-lpass-reg.dtsi | 6 +----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/kera-audio-cdp.dtsi b/kera-audio-cdp.dtsi index cfbe8973..ccd3b198 100644 --- a/kera-audio-cdp.dtsi +++ b/kera-audio-cdp.dtsi @@ -59,6 +59,7 @@ }; &swr0 { + qcom,swr-num-dev = <2>; wsa884x_0220: wsa884x@02170220 { status = "okay"; }; @@ -68,6 +69,10 @@ }; }; +&swr1 { + qcom,swr-num-dev = <2>; +}; + &kera_snd { qcom,model = "kera-cdp-snd-card"; swr-haptics-unsupported; @@ -79,7 +84,6 @@ "AMIC3", "Analog Mic3", "AMIC3", "MIC BIAS3", "AMIC4", "Analog Mic4", - "AMIC4", "MIC BIAS4", "VA AMIC1", "Analog Mic1", "VA AMIC1", "VA MIC BIAS1", "VA AMIC2", "Analog Mic2", @@ -87,7 +91,6 @@ "VA AMIC3", "Analog Mic3", "VA AMIC3", "VA MIC BIAS3", "VA AMIC4", "Analog Mic4", - "VA AMIC4", "VA MIC BIAS4", "TX DMIC0", "Digital Mic0", "TX DMIC0", "MIC BIAS3", "TX DMIC1", "Digital Mic1", diff --git a/kera-audio-lpass-reg.dtsi b/kera-audio-lpass-reg.dtsi index 4485f758..03380ee4 100644 --- a/kera-audio-lpass-reg.dtsi +++ b/kera-audio-lpass-reg.dtsi @@ -25,13 +25,9 @@ }; &swr2 { - reg = <0x7630000 0x0>; + swrm-io-base = <0x7630000 0x0>; }; &va_macro { reg = <0x7660000 0x0>; }; - -&tlmm { - reg = <0x7760000 0x0>; -};