From 282fe44609e8f019e818dd8b3c5941afc5682065 Mon Sep 17 00:00:00 2001 From: Satish Babu Patakokila Date: Wed, 10 Jan 2024 23:19:28 +0530 Subject: [PATCH 1/8] ARM: dts: qcom: sun: Update glink labels as per upstream Update glink labels as per upstream Change-Id: I6b25e89bc012aecaee714a9d6b8eac706e71bd85 Signed-off-by: Satish Babu Patakokila --- sun-audio.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sun-audio.dtsi b/sun-audio.dtsi index a4be2e58..a96e4b4e 100644 --- a/sun-audio.dtsi +++ b/sun-audio.dtsi @@ -25,7 +25,7 @@ }; }; -&glink_edge { +&remoteproc_adsp_glink { audio_gpr: qcom,gpr { compatible = "qcom,gpr"; qcom,glink-channels = "adsp_apps"; From 06a66940b7d0536892091c9644c5411f4e074ab0 Mon Sep 17 00:00:00 2001 From: "Vangala, Amarnath" Date: Wed, 10 Jan 2024 22:35:25 +0530 Subject: [PATCH 2/8] ARM: dts: qcom: disable clock stop mode for bt soundwire Disable the clk stop mode sequence for BT soundwire master. BT soundwire master doesn't have retention policy and hence clock stop mode cannot be implemented. Also the behaviour is consistent with BT Slimbus implementation with clock stop mode disabled. Change-Id: I2417dcba3c679d44e44f157f4ba8b03d7eeb64e2 Signed-off-by: Vangala, Amarnath --- sun-audio-overlay.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sun-audio-overlay.dtsi b/sun-audio-overlay.dtsi index ea1d448b..ec77ede4 100644 --- a/sun-audio-overlay.dtsi +++ b/sun-audio-overlay.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -385,7 +385,6 @@ <5 BT_AUDIO_TX1 0x3>, <6 BT_AUDIO_TX2 0x3>, <7 BT_AUDIO_TX3 0x3>, <8 FM_AUDIO_TX1 0x3>; qcom,swr-num-dev = <1>; - qcom,swr-clock-stop-mode0 = <1>; }; }; From 9f4fefd6bb7ff7afb4713d1ffb9d0357caa72b07 Mon Sep 17 00:00:00 2001 From: "Vangala, Amarnath" Date: Fri, 22 Dec 2023 14:47:55 +0530 Subject: [PATCH 3/8] ARM: dts: msm: add ssr and pdr support for bt soundwire Add support for SSR and PDR for BT soundwire. Change-Id: I731b90589030857ab75895c491940f97c02cf794 Signed-off-by: Vangala, Amarnath --- sun-audio-overlay.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sun-audio-overlay.dtsi b/sun-audio-overlay.dtsi index ec77ede4..cd9cf16b 100644 --- a/sun-audio-overlay.dtsi +++ b/sun-audio-overlay.dtsi @@ -470,7 +470,7 @@ "wsa-codec1", "wsa-codec2"; qcom,wsa-max-devs = <2>; qcom,msm_audio_ssr_devs = <&audio_gpr>, <&lpi_tlmm>, - <&lpass_cdc>; + <&lpass_cdc>, <&lpass_bt_swr>; /* * ==================== From ecafa819c24ebdcc13b3c128afd5a4ea91b7b08c Mon Sep 17 00:00:00 2001 From: "Vangala, Amarnath" Date: Mon, 29 Jan 2024 19:15:05 +0530 Subject: [PATCH 4/8] ARM: dts: qcom: sun: update mic bias for sun mtp Update mic bias for Sun MTP reworked hardware. Change-Id: I079ad6d2b79b4f278df2f5625e6ed756a4fcc0d2 Signed-off-by: Vangala, Amarnath --- sun-audio-overlay.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sun-audio-overlay.dtsi b/sun-audio-overlay.dtsi index ec77ede4..865e68b7 100644 --- a/sun-audio-overlay.dtsi +++ b/sun-audio-overlay.dtsi @@ -422,11 +422,11 @@ "VA AMIC5", "Analog Mic5", "VA AMIC5", "VA MIC BIAS4", "TX DMIC0", "Digital Mic0", - "TX DMIC0", "MIC BIAS3", + "TX DMIC0", "MIC BIAS1", "TX DMIC1", "Digital Mic1", "TX DMIC1", "MIC BIAS3", "TX DMIC2", "Digital Mic2", - "TX DMIC2", "MIC BIAS1", + "TX DMIC2", "MIC BIAS3", "TX DMIC3", "Digital Mic3", "TX DMIC3", "MIC BIAS1", "IN1_HPHL", "HPHL_OUT", @@ -451,9 +451,9 @@ "VA DMIC1", "Digital Mic1", "VA DMIC2", "Digital Mic2", "VA DMIC3", "Digital Mic3", - "VA DMIC0", "VA MIC BIAS3", + "VA DMIC0", "VA MIC BIAS1", "VA DMIC1", "VA MIC BIAS3", - "VA DMIC2", "VA MIC BIAS1", + "VA DMIC2", "VA MIC BIAS3", "VA DMIC3", "VA MIC BIAS1"; qcom,msm-mbhc-usbc-audio-supported = <0>; qcom,msm-mbhc-hphl-swh = <1>; From 183a4a76626bb90fa55ad21be012a5acebfa14b0 Mon Sep 17 00:00:00 2001 From: Ravulapati Vishnu Vardhan Rao Date: Thu, 25 Jan 2024 15:32:36 +0530 Subject: [PATCH 5/8] ARM: dts: msm: Add support for Sun SoC ATP Power Support for SUN ATP variant V8. Change-Id: Iaef2eef0889ee04eb975a8d4465c5bfb2064bccd Signed-off-by: Ravulapati Vishnu Vardhan Rao --- sun-audio-atp.dts | 5 +-- sun-audio-atp.dtsi | 76 ++++------------------------------------------ 2 files changed, 9 insertions(+), 72 deletions(-) diff --git a/sun-audio-atp.dts b/sun-audio-atp.dts index b498be6b..575dbb4a 100644 --- a/sun-audio-atp.dts +++ b/sun-audio-atp.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -9,7 +9,8 @@ #include "sun-audio-atp.dtsi" / { model = "Qualcomm Technologies, Inc. Sun ATP"; - compatible = "qcom,sun-atp", "qcom,sun", "qcom,atp"; + compatible = "qcom,sun-atp", "qcom,sun", "qcom,sunp-atp", "qcom,sunp", + "qcom,atp"; qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x10021 0>; }; diff --git a/sun-audio-atp.dtsi b/sun-audio-atp.dtsi index 5d5ca97b..bcbfa830 100644 --- a/sun-audio-atp.dtsi +++ b/sun-audio-atp.dtsi @@ -1,77 +1,9 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ -#include "sun-audio-mtp.dtsi" - -&swr_haptics { - status = "disabled"; -}; - -&sun_snd { - asoc-codec = <&stub_codec>, <&lpass_cdc>, - <&wcd939x_codec>, <&wsa884x_0220>, - <&wsa884x_0221>; - asoc-codec-names = "msm-stub-codec.1", "lpass-cdc", - "wcd939x_codec", "wsa-codec1", "wsa-codec2"; - swr-haptics-unsupported; - qcom,audio-routing = - "AMIC1", "Analog Mic1", - "AMIC1", "MIC BIAS1", - "AMIC2", "Analog Mic2", - "AMIC2", "MIC BIAS2", - "AMIC3", "Analog Mic3", - "AMIC3", "MIC BIAS3", - "AMIC4", "Analog Mic4", - "AMIC4", "MIC BIAS3", - "AMIC5", "Analog Mic5", - "AMIC5", "MIC BIAS4", - "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 BIAS3", - "VA AMIC5", "Analog Mic5", - "VA AMIC5", "VA MIC BIAS4", - "TX DMIC0", "Digital Mic0", - "TX DMIC0", "MIC BIAS3", - "TX DMIC1", "Digital Mic1", - "TX DMIC1", "MIC BIAS3", - "TX DMIC2", "Digital Mic2", - "TX DMIC2", "MIC BIAS1", - "TX DMIC3", "Digital Mic3", - "TX DMIC3", "MIC BIAS1", - "IN1_HPHL", "HPHL_OUT", - "IN2_HPHR", "HPHR_OUT", - "IN3_EAR", "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", - "VA DMIC0", "Digital Mic0", - "VA DMIC1", "Digital Mic1", - "VA DMIC2", "Digital Mic2", - "VA DMIC3", "Digital Mic3", - "VA DMIC0", "VA MIC BIAS3", - "VA DMIC1", "VA MIC BIAS3", - "VA DMIC2", "VA MIC BIAS1", - "VA DMIC3", "VA MIC BIAS1"; -}; +#include "sun-audio-cdp.dtsi" &wsa_macro { qcom,wsa-bat-cfgs= <4>, <4>; @@ -80,3 +12,7 @@ &wsa2_macro { qcom,wsa-bat-cfgs= <4>, <4>; }; + +&swr_haptics { + status = "disabled"; +}; From fad4269bdac0d9d49bd126197052fefd4628356b Mon Sep 17 00:00:00 2001 From: Anjelique Melendez Date: Wed, 15 Nov 2023 11:18:36 -0800 Subject: [PATCH 6/8] ARM: dts: msm: Update SWR haptics device-ID for Sun Update the SWR haptics device ID for Sun boards. Change-Id: I8cc38e669e3260c63027954d64ca696528f7bdf8 Signed-off-by: Anjelique Melendez --- sun-audio-overlay.dtsi | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sun-audio-overlay.dtsi b/sun-audio-overlay.dtsi index c87c1a12..6766af98 100644 --- a/sun-audio-overlay.dtsi +++ b/sun-audio-overlay.dtsi @@ -281,10 +281,9 @@ swr_haptics: swr_haptics@f0170220 { status = "disabled"; - compatible = "qcom,pm8750b-swr-haptics"; - reg = <0x02 0xf0170220>; - // Temporarily commented out to avoid compilation error - // swr-slave-supply = <&hap_swr_slave_reg>; + compatible = "qcom,pmih010x-swr-haptics"; + reg = <0x03 0xf0170220>; + swr-slave-supply = <&hap_swr_slave_reg>; qcom,rx_swr_ch_map = <0 0x01 0x01 0 PCM_OUT1>; }; }; From addae2b4d33fadb50ba2ab67c142ee4f2fe8ede7 Mon Sep 17 00:00:00 2001 From: Deepali Jindal Date: Thu, 7 Dec 2023 19:28:37 +0530 Subject: [PATCH 7/8] ARM: dts: msm: Add support for SWR Haptics through WSA for Sun Add changes to support swr haptics connected to WSA macro. Change-Id: Iddb4fd17f86fb60a48c6828fc004b83ae6787d96 Signed-off-by: Deepali Jindal --- sun-audio-overlay.dtsi | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/sun-audio-overlay.dtsi b/sun-audio-overlay.dtsi index 6766af98..bb2dc6a5 100644 --- a/sun-audio-overlay.dtsi +++ b/sun-audio-overlay.dtsi @@ -116,7 +116,11 @@ <7 GPPO 0x03>, <8 HAPT 0x03>, <9 HIFI_PCM_L 0x01>, <9 HIFI_PCM_R 0x2>, <10 HPTH 0x03>, <11 CMPT 0x03>, <12 IPCM 0x03>; - qcom,swr-num-dev = <2>; + + /* num-dev is 2 if WCD RX and PMIC SWR Slaves are connected */ + /* num-dev is 1 if only WCD RX slave is connected */ + qcom,swr-num-dev = <1>; + qcom,swr-clock-stop-mode0 = <1>; wcd939x_rx_slave: wcd939x-rx-slave { compatible = "qcom,wcd939x-slave"; @@ -234,10 +238,10 @@ <2 SPKR_L_COMP 0xF>, <3 SPKR_L_BOOST 0x3>, <4 SPKR_R 0x1>, <5 SPKR_R_COMP 0xF>, <6 SPKR_R_BOOST 0x3>, <7 PBR 0x3>, - <8 SPKR_HAPT 0x3>, <9 OCPM 0x3>, + <8 SPKR_HAPT 0x1>, <9 OCPM 0x3>, <10 SPKR_L_VI 0x3>, <11 SPKR_R_VI 0x3>, <12 SPKR_IPCM 0x3>, <13 CPS 0x3>; - qcom,swr-num-dev = <2>; + qcom,swr-num-dev = <3>; qcom,dynamic-port-map-supported = <0>; wsa884x_2_0220: wsa884x@02170220 { status = "disabled"; @@ -280,11 +284,10 @@ }; swr_haptics: swr_haptics@f0170220 { - status = "disabled"; compatible = "qcom,pmih010x-swr-haptics"; reg = <0x03 0xf0170220>; swr-slave-supply = <&hap_swr_slave_reg>; - qcom,rx_swr_ch_map = <0 0x01 0x01 0 PCM_OUT1>; + qcom,rx_swr_ch_map = <0 0x01 0x01 0 SPKR_HAPT>; }; }; }; @@ -390,7 +393,6 @@ &spf_core_platform { sun_snd: sound { qcom,model = "sun-mtp-snd-card"; - swr-haptics-unsupported; qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>, <1>, <1>; qcom,mi2s-tdm-is-hw-vote-needed = <1>, <0>, <1>, <0>, <1>, <0>, <0>; qcom,wcn-bt = <1>; @@ -431,6 +433,7 @@ "IN1_HPHL", "HPHL_OUT", "IN2_HPHR", "HPHR_OUT", "IN3_EAR", "AUX_OUT", + "HAP_IN", "WSA_HAPT OUT", "WSA SRC0_INP", "SRC0", "WSA_TX DEC0_INP", "TX DEC0 MUX", "WSA_TX DEC1_INP", "TX DEC1 MUX", From 36ebcc2dce7d5f9dd606361dee030d6938972c00 Mon Sep 17 00:00:00 2001 From: "Vangala, Amarnath" Date: Mon, 12 Feb 2024 20:52:08 +0530 Subject: [PATCH 8/8] ARM: dts: qcom: sun: update headset threshold voltage Update the headset threshold voltage for sun platform. Change-Id: I034c1a08615663fd712d4eccfe6311256f37a1bb Signed-off-by: Vangala, Amarnath --- 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 4ed55370..b25f4300 100644 --- a/sun-audio-cdp.dtsi +++ b/sun-audio-cdp.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "sun-audio-overlay.dtsi" @@ -130,4 +130,5 @@ qcom,sen-mi2s-gpios = <&cdc_sen_mi2s_gpios>; qcom,sep-mi2s-gpios = <&cdc_sep_mi2s_gpios>; qcom,usbss-hsj-connect-enabled; + qcom,msm-mbhc-hs-mic-max-threshold-mv = <1680>; };