From 904d4e888aa735b20251141e3d940e2c05fa9ce1 Mon Sep 17 00:00:00 2001 From: Ravulapati Vishnu Vardhan Rao Date: Mon, 6 Jan 2025 16:02:36 +0530 Subject: [PATCH 1/5] ARM: dts: msm: Enable external display on Kera Ebnable external display on all the Kera variants. Change-Id: I1448b3144f6cecf4282d9f87fd9c00c59f67328f Signed-off-by: Ravulapati Vishnu Vardhan Rao --- kera-audio-overlay.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kera-audio-overlay.dtsi b/kera-audio-overlay.dtsi index 85df504e..ceea5f64 100644 --- a/kera-audio-overlay.dtsi +++ b/kera-audio-overlay.dtsi @@ -1,6 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause /* * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -418,7 +419,7 @@ 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,ext-disp-audio-rx = <0>; + qcom,ext-disp-audio-rx = <1>; qcom,tdm-max-slots = <8>; qcom,tdm-clk-attribute = <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>; qcom,mi2s-clk-attribute = <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>; From ffcf1fed07303202ed9e3ace2d29eb63bd2b4a61 Mon Sep 17 00:00:00 2001 From: Kumar Anurag Singh Date: Mon, 6 Jan 2025 01:16:35 -0800 Subject: [PATCH 2/5] ARM: dts: msm: Add support for extra 2DMICS on CDP platform for Kera IOT Add support for extra 2DMICS on CDP platform for Kera IOT SoC. Change-Id: Ibb33c899593b0d52e1a2ce9c26f249ee97faa5a4 Signed-off-by: Kumar Anurag Singh --- kera-iot-audio-cdp.dtsi | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/kera-iot-audio-cdp.dtsi b/kera-iot-audio-cdp.dtsi index ccd3b198..eb015128 100644 --- a/kera-iot-audio-cdp.dtsi +++ b/kera-iot-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" @@ -30,6 +30,10 @@ status = "disabled"; }; +&cdc_dmic67_gpios { + status = "okay"; +}; + &wcd9378_codec { status = "okay"; cdc-vdd-io-supply = <&L7B>; @@ -99,6 +103,10 @@ "TX DMIC2", "MIC BIAS1", "TX DMIC3", "Digital Mic3", "TX DMIC3", "MIC BIAS1", + "TX DMIC6", "Digital Mic6", + "TX DMIC6", "MIC BIAS1", + "TX DMIC7", "Digital Mic7", + "TX DMIC7", "MIC BIAS1", "IN1_HPHL", "HPHL_OUT", "IN2_HPHR", "HPHR_OUT", "IN3_AUX", "AUX_OUT", @@ -119,10 +127,14 @@ "VA DMIC1", "Digital Mic1", "VA DMIC2", "Digital Mic2", "VA DMIC3", "Digital Mic3", + "VA DMIC6", "Digital Mic6", + "VA DMIC7", "Digital Mic7", "VA DMIC0", "VA MIC BIAS3", "VA DMIC1", "VA MIC BIAS3", "VA DMIC2", "VA MIC BIAS1", - "VA DMIC3", "VA MIC BIAS1"; + "VA DMIC3", "VA MIC BIAS1", + "VA DMIC6", "VA MIC BIAS1", + "VA DMIC7", "VA MIC BIAS1"; asoc-codec = <&stub_codec>, <&lpass_cdc>, <&wcd9378_codec>, <&wsa884x_0220>, <&wsa884x_0221>; @@ -135,6 +147,7 @@ qcom,quin-mi2s-gpios = <&cdc_quin_mi2s_gpios>; qcom,sen-mi2s-gpios = <&cdc_sen_mi2s_gpios>; qcom,sep-mi2s-gpios = <&cdc_sep_mi2s_gpios>; + qcom,cdc-dmic67-gpios = <&cdc_dmic67_gpios>; qcom,msm-mbhc-usbc-audio-supported = <0>; qcom,msm-mbhc-hphl-swh = <1>; qcom,msm-mbhc-gnd-swh = <1>; From e853d1ca1ef483e916510de5f057d6effde44874 Mon Sep 17 00:00:00 2001 From: Kisan Yadav Date: Wed, 15 Jan 2025 18:22:07 +0530 Subject: [PATCH 3/5] ARM: dts: msm: Update board id for MTP_4.1.0 platform -MTP_4.1.0 platform board ID was added in tuna7 but it seems to be a tuna device due to which wcd enumeration is failing. -Remove the board id from tuna7 dts file and adding in tuna dts. Change-Id: I4c729f6c8ef99fbd8cd7985dba22ac284ff4b989 Signed-off-by: Kisan Yadav --- tuna-audio-mtp.dts | 4 ++-- tuna7-audio-mtp.dts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tuna-audio-mtp.dts b/tuna-audio-mtp.dts index fef29692..0a75ab34 100644 --- a/tuna-audio-mtp.dts +++ b/tuna-audio-mtp.dts @@ -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. */ /dts-v1/; @@ -13,6 +13,6 @@ compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,tunap-mtp", "qcom,tunap", "qcom,mtp"; qcom,msm-id = <681 0x10000>, <655 0x10000>, <694 0x10000>; - qcom,board-id = <8 0>; + qcom,board-id = <8 0>, <8 4>; }; diff --git a/tuna7-audio-mtp.dts b/tuna7-audio-mtp.dts index 746c8187..4cd9ea8a 100644 --- a/tuna7-audio-mtp.dts +++ b/tuna7-audio-mtp.dts @@ -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,5 +13,5 @@ compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,tunap-mtp", "qcom,tunap", "qcom,mtp"; qcom,msm-id = <681 0x10000>, <655 0x10000>; - qcom,board-id = <8 3>, <8 4>; + qcom,board-id = <8 3>; }; From 540cde9334466610ae0dd6b950e63e32045b0e45 Mon Sep 17 00:00:00 2001 From: Kisan Yadav Date: Thu, 23 Jan 2025 10:40:44 +0530 Subject: [PATCH 4/5] ARM: dts: msm: Add haptics route for QRD -Haptics route is not present in audio routing of qrd device tree and eventually ringtone haptics is not working. -Add haptics routing and also update haptics codec name to swr-haptics. Change-Id: Ie4078c410cf593edd990dd49020f6d0cde7c1a26 Signed-off-by: Kisan Yadav --- tuna-audio-qrd.dtsi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tuna-audio-qrd.dtsi b/tuna-audio-qrd.dtsi index 87ed7cf6..8e5df1ba 100644 --- a/tuna-audio-qrd.dtsi +++ b/tuna-audio-qrd.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 "tuna-audio-overlay.dtsi" &tx_swr_clk_active { @@ -116,6 +116,7 @@ "IN1_HPHL", "HPHL_OUT", "IN2_HPHR", "HPHR_OUT", "IN3_EAR", "AUX_OUT", + "HAP_IN", "PCM_OUT", "WSA SRC0_INP", "SRC0", "WSA_TX DEC0_INP", "TX DEC0 MUX", "WSA_TX DEC1_INP", "TX DEC1 MUX", @@ -132,7 +133,7 @@ "VA_AIF3 CAP", "VA_SWR_CLK"; asoc-codec = <&stub_codec>, <&lpass_cdc>, <&swr_haptics>, <&wcd939x_codec>, <&wsa884x_0220>; - asoc-codec-names = "msm-stub-codec.1", "lpass-cdc","swr_haptics", + asoc-codec-names = "msm-stub-codec.1", "lpass-cdc","swr-haptics", "wcd939x_codec", "wsa-codec1"; qcom,ext-disp-audio-rx = <1>; qcom,wsa-max-devs = <1>; From 900b5f59d4e5b9ccc01ed0a7d5dc2b73c972a58a Mon Sep 17 00:00:00 2001 From: Ravulapati Vishnu Vardhan Rao Date: Mon, 27 Jan 2025 15:25:54 +0530 Subject: [PATCH 5/5] ARM: dts: msm: enable swr haptics dailinks in Kera Enable swr haptics dailink on Kera variants. Even though kera does not support SWR haptics, as there is no LRA connected, creating the haptics dailink to run haptics usecase cleanly during andorid vts tests. Change-Id: Ia2415a69260612be03f0e26515f91074a156702d Signed-off-by: Ravulapati Vishnu Vardhan Rao --- kera-audio-mtp.dtsi | 1 - kera-audio-qrd.dtsi | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/kera-audio-mtp.dtsi b/kera-audio-mtp.dtsi index 16451826..d0c73437 100644 --- a/kera-audio-mtp.dtsi +++ b/kera-audio-mtp.dtsi @@ -157,7 +157,6 @@ "wcd939x_codec", "wsa-codec1", "wsa-codec2"; qcom,wsa-max-devs = <2>; - swr-haptics-unsupported; qcom,pri-mi2s-gpios = <&cdc_pri_mi2s_gpios>; qcom,wcd-disable-legacy-surge; wcd939x-i2c-handle = <&wcd_usbss>; diff --git a/kera-audio-qrd.dtsi b/kera-audio-qrd.dtsi index 4efa6288..2f30bdd2 100644 --- a/kera-audio-qrd.dtsi +++ b/kera-audio-qrd.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" #include "kera-audio-lpass-reg.dtsi" @@ -77,7 +77,6 @@ &kera_snd { qcom,model = "kera-qrd-snd-card"; - swr-haptics-unsupported; asoc-codec = <&stub_codec>, <&lpass_cdc>, <&wcd9378_codec>, <&wsa884x_0220>; asoc-codec-names = "msm-stub-codec.1", "lpass-cdc",