From 2d7a72572a11137b686f22f120e4f542f611710e Mon Sep 17 00:00:00 2001 From: Yuhui Zhao Date: Mon, 9 Dec 2024 19:07:39 +0800 Subject: [PATCH 1/3] ARM: dts: msm: correct the config of tx_swr_data0 for kera Correct the config of tx_swr_data0 for kera, the bias type should be same with tx_swr_data1. Change-Id: I021a0c69db50437d1c825b018ace533d24047096 Signed-off-by: Yuhui Zhao --- kera-lpi.dtsi | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kera-lpi.dtsi b/kera-lpi.dtsi index 70127681..e1b4151e 100644 --- a/kera-lpi.dtsi +++ b/kera-lpi.dtsi @@ -1735,8 +1735,7 @@ pins = "gpio1"; drive-strength = <4>; slew-rate = <1>; - bias-disable; - + bias-bus-hold; }; }; @@ -1750,7 +1749,7 @@ pins = "gpio1"; drive-strength = <2>; input-enable; - bias-bus-hold; + bias-pull-down; }; }; From a11f3c6ab7cc2929dd352488611b11ffde636e60 Mon Sep 17 00:00:00 2001 From: Kumar Anurag Singh Date: Tue, 31 Dec 2024 00:47:29 -0800 Subject: [PATCH 2/3] ARM: dts: msm: Add support for CDP platform for Kera IOT Add audio dt support for IoT CDP platform for Kera SoC. Change-Id: I1f4f07358570957ea995b66c8ecbb00faa4d9ed8 Signed-off-by: Kumar Anurag Singh --- Kbuild | 1 + kera-iot-audio-cdp.dts | 18 +++++ kera-iot-audio-cdp.dtsi | 142 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 161 insertions(+) create mode 100644 kera-iot-audio-cdp.dts create mode 100644 kera-iot-audio-cdp.dtsi diff --git a/Kbuild b/Kbuild index 7f2413b5..063f5400 100644 --- a/Kbuild +++ b/Kbuild @@ -49,6 +49,7 @@ ifeq ($(CONFIG_ARCH_KERA), y) dtbo-y += kera-audio.dtbo \ kera-audio-atp.dtbo \ kera-audio-cdp.dtbo \ + kera-iot-audio-cdp.dtbo \ kera-audio-mtp.dtbo \ kera-audio-mtp-qmp1000.dtbo \ kera-audio-qrd.dtbo \ diff --git a/kera-iot-audio-cdp.dts b/kera-iot-audio-cdp.dts new file mode 100644 index 00000000..0c405062 --- /dev/null +++ b/kera-iot-audio-cdp.dts @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "kera-iot-audio-cdp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kera CDP for IoT"; + compatible = "qcom,kera-cdp", "qcom,kera", "qcom,kerap-cdp", "qcom,kerap", + "qcom,cdp"; + qcom,msm-id = <686 0x10000>, <659 0x10000>; + qcom,board-id = <0x50001 0>; +}; + diff --git a/kera-iot-audio-cdp.dtsi b/kera-iot-audio-cdp.dtsi new file mode 100644 index 00000000..ccd3b198 --- /dev/null +++ b/kera-iot-audio-cdp.dtsi @@ -0,0 +1,142 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include "kera-audio-overlay.dtsi" +#include "kera-audio-lpass-reg.dtsi" + +&cdc_pri_mi2s_gpios { + status = "ok"; +}; + +&cdc_quat_mi2s_gpios { + status = "disabled"; +}; + +&cdc_quin_mi2s_gpios { + status = "disabled"; +}; + +&cdc_sen_mi2s_gpios { + status = "disabled"; +}; + +&cdc_sep_mi2s_gpios { + status = "disabled"; +}; + +&lpass_bt_swr { + status = "disabled"; +}; + +&wcd9378_codec { + status = "okay"; + cdc-vdd-io-supply = <&L7B>; + qcom,cdc-vdd-io-voltage = <1800000 1800000>; + qcom,cdc-vdd-io-current = <20000>; + qcom,cdc-vdd-io-lpm-supported = <1>; + + cdc-vdd-mic-bias-supply = <&BOB>; + qcom,cdc-vdd-mic-bias-voltage = <3300000 3300000>; + qcom,cdc-vdd-mic-bias-current = <40550>; +}; + +&wcd939x_rx_slave { + status = "disabled"; +}; + +&wcd939x_tx_slave { + status = "disabled"; +}; + +&wcd9378_rx_slave { + status = "okay"; +}; + +&wcd9378_tx_slave { + status = "okay"; +}; + +&swr0 { + qcom,swr-num-dev = <2>; + wsa884x_0220: wsa884x@02170220 { + status = "okay"; + }; + + wsa884x_0221: wsa884x@02170221 { + status = "okay"; + }; +}; + +&swr1 { + qcom,swr-num-dev = <2>; +}; + +&kera_snd { + qcom,model = "kera-cdp-snd-card"; + 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", + "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", + "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_AUX", "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", + "VA SWR_INPUT", "VA_SWR_CLK", + "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"; + asoc-codec = <&stub_codec>, <&lpass_cdc>, + <&wcd9378_codec>, + <&wsa884x_0220>, <&wsa884x_0221>; + asoc-codec-names = "msm-stub-codec.1", "lpass-cdc", + "wcd9378_codec", + "wsa-codec1", "wsa-codec2"; + qcom,wsa-max-devs = <2>; + qcom,pri-mi2s-gpios = <&cdc_pri_mi2s_gpios>; + qcom,quat-mi2s-gpios = <&cdc_quat_mi2s_gpios>; + 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,msm-mbhc-usbc-audio-supported = <0>; + qcom,msm-mbhc-hphl-swh = <1>; + qcom,msm-mbhc-gnd-swh = <1>; + qcom,msm-mbhc-hs-mic-max-threshold-mv = <1680>; +}; From 3f6551b70a0648e416f891b4df1d56f79da92c36 Mon Sep 17 00:00:00 2001 From: Ravulapati Vishnu Vardhan Rao Date: Wed, 8 Jan 2025 16:16:06 +0530 Subject: [PATCH 3/3] ARM: dts: msm: update of I2S node Correct I2S mode for primary i2s interface. Change-Id: Icba866fdcc86c717cc1b03af1ca998d641129475 Signed-off-by: Ravulapati Vishnu Vardhan Rao --- kera-audio-mtp.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kera-audio-mtp.dtsi b/kera-audio-mtp.dtsi index 517e349e..16451826 100644 --- a/kera-audio-mtp.dtsi +++ b/kera-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 "kera-audio-overlay.dtsi" @@ -158,7 +158,7 @@ "wsa-codec2"; qcom,wsa-max-devs = <2>; swr-haptics-unsupported; - qcom,pri_mi2s_gpios = <&cdc_pri_mi2s_gpios>; + qcom,pri-mi2s-gpios = <&cdc_pri_mi2s_gpios>; qcom,wcd-disable-legacy-surge; wcd939x-i2c-handle = <&wcd_usbss>; qcom,msm-mbhc-usbc-audio-supported = <0>;