Merge 166f67d8f4 on remote branch

Change-Id: Iefe4db131698b825ccb8f814607171e4a83b3c8f
This commit is contained in:
Linux Build Service Account
2025-01-28 11:21:54 -08:00
4 changed files with 163 additions and 3 deletions

1
Kbuild
View File

@@ -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 \

18
kera-iot-audio-cdp.dts Normal file
View File

@@ -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>;
};

142
kera-iot-audio-cdp.dtsi Normal file
View File

@@ -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>;
};

View File

@@ -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;
};
};