From 942e166cdcf9f827036c087b89862e007fc89515 Mon Sep 17 00:00:00 2001 From: Ravulapati Vishnu Vardhan Rao Date: Thu, 13 Mar 2025 11:10:10 +0530 Subject: [PATCH 1/4] ARM: dts: msm: remove lpass_bt_swr dev from ssr Remove lpass_bt_swr in ssr devs as bt_swr is disabled in Kera cdp variant. Change-Id: Idd149e79b09c1cd3db57100887c3e187bd8420c8 Signed-off-by: Ravulapati Vishnu Vardhan Rao --- kera-audio-cdp.dtsi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kera-audio-cdp.dtsi b/kera-audio-cdp.dtsi index ccd3b198..82a121a7 100644 --- a/kera-audio-cdp.dtsi +++ b/kera-audio-cdp.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "kera-audio-overlay.dtsi" @@ -129,6 +129,8 @@ asoc-codec-names = "msm-stub-codec.1", "lpass-cdc", "wcd9378_codec", "wsa-codec1", "wsa-codec2"; + qcom,msm_audio_ssr_devs = <&audio_gpr>, <&lpi_tlmm>, + <&lpass_cdc>; qcom,wsa-max-devs = <2>; qcom,pri-mi2s-gpios = <&cdc_pri_mi2s_gpios>; qcom,quat-mi2s-gpios = <&cdc_quat_mi2s_gpios>; From f9f100f5ca80cc66eeb41162164c1ce58b2e6d25 Mon Sep 17 00:00:00 2001 From: Prasad Kumpatla Date: Tue, 11 Mar 2025 21:48:20 +0530 Subject: [PATCH 2/4] ARM: dts: qcom: add wcd usbss node on cdp to support HSJ Add wcd usbss node for CDP to detect mic from wcd usbss driver. Change-Id: Ic7fbab156a2dda2185a80c96d6589764ca66b57d Signed-off-by: Prasad Kumpatla --- sun-audio-cdp.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sun-audio-cdp.dtsi b/sun-audio-cdp.dtsi index e76cd14a..27aaea4c 100644 --- a/sun-audio-cdp.dtsi +++ b/sun-audio-cdp.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "sun-audio-overlay.dtsi" @@ -135,4 +135,5 @@ qcom,sep-mi2s-gpios = <&cdc_sep_mi2s_gpios>; qcom,usbss-hsj-connect-enabled; qcom,msm-mbhc-hs-mic-max-threshold-mv = <1680>; + wcd939x-i2c-handle = <&wcd_usbss>; }; From 06436f8a3b1d50003e44182f21d4289f9561ee2b Mon Sep 17 00:00:00 2001 From: MingShu Pang Date: Tue, 18 Mar 2025 10:38:23 +0800 Subject: [PATCH 3/4] =?UTF-8?q?ARM:=20dts:=20msm:=20add=20wcn-bt-ext=20for?= =?UTF-8?q?=20enabling=20second=20bt=20backend=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only add wcn-bt-ext for enabling second bt backend for needed dtsi file. Change-Id: I42ca1840019a9db7d02ac39092f15dd438ea334f Signed-off-by: MingShu Pang --- sun-audio-cdp-nfc.dtsi | 6 +++++- sun-audio-cdp.dtsi | 1 + sun-audio-hamilton-cdp.dtsi | 6 +++++- sun-audio-hamilton-mtp-3.5mm.dtsi | 3 ++- sun-audio-hamilton-mtp.dtsi | 3 ++- sun-audio-hamilton-qmp-mtp.dtsi | 3 ++- sun-audio-hdk.dtsi | 3 ++- sun-audio-mtp.dtsi | 3 ++- sun-audio-overlay.dtsi | 3 +-- sun-audio-qrd-sku2.dtsi | 3 ++- sun-audio-qrd.dtsi | 3 ++- sun-audio-rumi.dtsi | 5 +++-- 12 files changed, 29 insertions(+), 13 deletions(-) diff --git a/sun-audio-cdp-nfc.dtsi b/sun-audio-cdp-nfc.dtsi index 943b3c1c..d7eb7d03 100644 --- a/sun-audio-cdp-nfc.dtsi +++ b/sun-audio-cdp-nfc.dtsi @@ -1,6 +1,10 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "sun-audio-cdp.dtsi" + +&sun_snd { + qcom,wcn-bt-ext = <0>; +}; diff --git a/sun-audio-cdp.dtsi b/sun-audio-cdp.dtsi index 27aaea4c..b4c80d7b 100644 --- a/sun-audio-cdp.dtsi +++ b/sun-audio-cdp.dtsi @@ -136,4 +136,5 @@ qcom,usbss-hsj-connect-enabled; qcom,msm-mbhc-hs-mic-max-threshold-mv = <1680>; wcd939x-i2c-handle = <&wcd_usbss>; + qcom,wcn-bt-ext = <1>; }; diff --git a/sun-audio-hamilton-cdp.dtsi b/sun-audio-hamilton-cdp.dtsi index f903de43..71818ecc 100644 --- a/sun-audio-hamilton-cdp.dtsi +++ b/sun-audio-hamilton-cdp.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ /*This is CDP with Hamilton wlan*/ @@ -8,3 +8,7 @@ &lpass_bt_swr { status = "disabled"; }; + +&sun_snd { + qcom,wcn-bt-ext = <0>; +}; diff --git a/sun-audio-hamilton-mtp-3.5mm.dtsi b/sun-audio-hamilton-mtp-3.5mm.dtsi index d1b51c57..12838993 100644 --- a/sun-audio-hamilton-mtp-3.5mm.dtsi +++ b/sun-audio-hamilton-mtp-3.5mm.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -13,4 +13,5 @@ qcom,msm-mbhc-usbc-audio-supported = <0>; qcom,msm-mbhc-hphl-swh = <1>; qcom,msm-mbhc-gnd-swh = <1>; + qcom,wcn-bt-ext = <0>; }; diff --git a/sun-audio-hamilton-mtp.dtsi b/sun-audio-hamilton-mtp.dtsi index 0137bc09..9ce78ef4 100644 --- a/sun-audio-hamilton-mtp.dtsi +++ b/sun-audio-hamilton-mtp.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "sun-audio-mtp.dtsi" @@ -13,5 +13,6 @@ qcom,model = "sun-mtp-wsa883x-snd-card"; qcom,msm_audio_ssr_devs = <&audio_gpr>, <&lpi_tlmm>, <&lpass_cdc>; + qcom,wcn-bt-ext = <0>; }; diff --git a/sun-audio-hamilton-qmp-mtp.dtsi b/sun-audio-hamilton-qmp-mtp.dtsi index d5f99035..773363b8 100644 --- a/sun-audio-hamilton-qmp-mtp.dtsi +++ b/sun-audio-hamilton-qmp-mtp.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "sun-audio-mtp-qmp.dtsi" @@ -13,5 +13,6 @@ qcom,model = "sun-mtp-wsa883x_qmp-snd-card"; qcom,msm_audio_ssr_devs = <&audio_gpr>, <&lpi_tlmm>, <&lpass_cdc>; + qcom,wcn-bt-ext = <0>; }; diff --git a/sun-audio-hdk.dtsi b/sun-audio-hdk.dtsi index 0a46c1af..9a695347 100644 --- a/sun-audio-hdk.dtsi +++ b/sun-audio-hdk.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "sun-audio-qrd.dtsi" @@ -11,4 +11,5 @@ qcom,msm-mbhc-usbc-audio-supported = <0>; qcom,msm-mbhc-hphl-swh = <1>; qcom,msm-mbhc-gnd-swh = <1>; + qcom,wcn-bt-ext = <0>; }; diff --git a/sun-audio-mtp.dtsi b/sun-audio-mtp.dtsi index 82af8e21..d49adc3d 100644 --- a/sun-audio-mtp.dtsi +++ b/sun-audio-mtp.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "sun-audio-overlay.dtsi" @@ -91,6 +91,7 @@ qcom,msm-mbhc-usbc-audio-supported = <1>; qcom,msm-mbhc-hphl-swh = <0>; qcom,msm-mbhc-gnd-swh = <0>; + qcom,wcn-bt-ext = <1>; qcom,wcd-disable-legacy-surge; wcd939x-i2c-handle = <&wcd_usbss>; }; diff --git a/sun-audio-overlay.dtsi b/sun-audio-overlay.dtsi index e6ba7752..5d1759a9 100644 --- a/sun-audio-overlay.dtsi +++ b/sun-audio-overlay.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -439,7 +439,6 @@ 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 = <1>; - qcom,wcn-bt-ext = <1>; qcom,ext-disp-audio-rx = <1>; qcom,tdm-max-slots = <8>; qcom,tdm-clk-attribute = <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>; diff --git a/sun-audio-qrd-sku2.dtsi b/sun-audio-qrd-sku2.dtsi index 46093e90..c464c5ba 100644 --- a/sun-audio-qrd-sku2.dtsi +++ b/sun-audio-qrd-sku2.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "sun-audio-qrd.dtsi" @@ -14,4 +14,5 @@ &sun_snd { qcom,model = "sun-qrd-sku2-snd-card"; + qcom,wcn-bt-ext = <1>; }; diff --git a/sun-audio-qrd.dtsi b/sun-audio-qrd.dtsi index 40fce6ca..d0fcfabd 100644 --- a/sun-audio-qrd.dtsi +++ b/sun-audio-qrd.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "sun-audio-overlay.dtsi" @@ -104,6 +104,7 @@ qcom,msm-mbhc-hphl-swh = <0>; qcom,msm-mbhc-gnd-swh = <0>; qcom,msm-mbhc-hs-mic-max-threshold-mv = <1670>; + qcom,wcn-bt-ext = <1>; qcom,wcd-disable-legacy-surge; wcd939x-i2c-handle = <&wcd_usbss>; }; diff --git a/sun-audio-rumi.dtsi b/sun-audio-rumi.dtsi index 474cd810..95f02530 100644 --- a/sun-audio-rumi.dtsi +++ b/sun-audio-rumi.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "sun-audio-overlay.dtsi" @@ -14,4 +14,5 @@ compatible = "qcom,sun-asoc-snd-stub"; asoc-codec = <&stub_codec>; asoc-codec-names = "msm-stub-codec.1"; - }; + qcom,wcn-bt-ext = <1>; +}; From 0256b7783c704b280e04218e82c7243b275ec8be Mon Sep 17 00:00:00 2001 From: Ravulapati Vishnu Vardhan Rao Date: Tue, 25 Feb 2025 19:02:39 +0530 Subject: [PATCH 4/4] ARM: dts: msm: 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: Iecc4f684aaf90dc671ed850c0c159e0b7eeaa42c Signed-off-by: Ravulapati Vishnu Vardhan Rao --- tuna-audio-overlay.dtsi | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/tuna-audio-overlay.dtsi b/tuna-audio-overlay.dtsi index 66bcccf9..2ae45331 100644 --- a/tuna-audio-overlay.dtsi +++ b/tuna-audio-overlay.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -32,7 +32,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 = ; @@ -84,7 +96,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>; };