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", 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>; 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>;