samsung_sm8750/android_kernel_samsung_sm8750-devicetrees
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge aebcf7088a on remote branch

Browse Source 
Change-Id: Ic1069711e379f50e5eac1e95485c5f42971f4b26
This commit is contained in:
Linux Build Service Account
2025-02-12 09:12:47 -08:00
parent a8350fd860 aebcf7088a
commit 8c83e45f49
4 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kera-audio-mtp.dtsi
View File

@@ -157,7 +157,6 @@
"wcd939x_codec", "wsa-codec1", "wcd939x_codec", "wsa-codec1",
"wsa-codec2"; "wsa-codec2";
qcom,wsa-max-devs = <2>; 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; qcom,wcd-disable-legacy-surge;
wcd939x-i2c-handle = <&wcd_usbss>; wcd939x-i2c-handle = <&wcd_usbss>;

3
kera-audio-qrd.dtsi
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-3-Clause // 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-overlay.dtsi"
#include "kera-audio-lpass-reg.dtsi" #include "kera-audio-lpass-reg.dtsi"
@@ -77,7 +77,6 @@
&kera_snd { &kera_snd {
qcom,model = "kera-qrd-snd-card"; qcom,model = "kera-qrd-snd-card";
swr-haptics-unsupported;
asoc-codec = <&stub_codec>, <&lpass_cdc>, asoc-codec = <&stub_codec>, <&lpass_cdc>,
<&wcd9378_codec>, <&wsa884x_0220>; <&wcd9378_codec>, <&wsa884x_0220>;
asoc-codec-names = "msm-stub-codec.1", "lpass-cdc", asoc-codec-names = "msm-stub-codec.1", "lpass-cdc",

17
kera-iot-audio-cdp.dtsi
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-3-Clause // 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-overlay.dtsi"
@@ -30,6 +30,10 @@
status = "disabled"; status = "disabled";
}; };
&cdc_dmic67_gpios {
status = "okay";
};
&wcd9378_codec { &wcd9378_codec {
status = "okay"; status = "okay";
cdc-vdd-io-supply = <&L7B>; cdc-vdd-io-supply = <&L7B>;
@@ -99,6 +103,10 @@
"TX DMIC2", "MIC BIAS1", "TX DMIC2", "MIC BIAS1",
"TX DMIC3", "Digital Mic3", "TX DMIC3", "Digital Mic3",
"TX DMIC3", "MIC BIAS1", "TX DMIC3", "MIC BIAS1",
"TX DMIC6", "Digital Mic6",
"TX DMIC6", "MIC BIAS1",
"TX DMIC7", "Digital Mic7",
"TX DMIC7", "MIC BIAS1",
"IN1_HPHL", "HPHL_OUT", "IN1_HPHL", "HPHL_OUT",
"IN2_HPHR", "HPHR_OUT", "IN2_HPHR", "HPHR_OUT",
"IN3_AUX", "AUX_OUT", "IN3_AUX", "AUX_OUT",
@@ -119,10 +127,14 @@
"VA DMIC1", "Digital Mic1", "VA DMIC1", "Digital Mic1",
"VA DMIC2", "Digital Mic2", "VA DMIC2", "Digital Mic2",
"VA DMIC3", "Digital Mic3", "VA DMIC3", "Digital Mic3",
"VA DMIC6", "Digital Mic6",
"VA DMIC7", "Digital Mic7",
"VA DMIC0", "VA MIC BIAS3", "VA DMIC0", "VA MIC BIAS3",
"VA DMIC1", "VA MIC BIAS3", "VA DMIC1", "VA MIC BIAS3",
"VA DMIC2", "VA MIC BIAS1", "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>, asoc-codec = <&stub_codec>, <&lpass_cdc>,
<&wcd9378_codec>, <&wcd9378_codec>,
<&wsa884x_0220>, <&wsa884x_0221>; <&wsa884x_0220>, <&wsa884x_0221>;
@@ -135,6 +147,7 @@
qcom,quin-mi2s-gpios = <&cdc_quin_mi2s_gpios>; qcom,quin-mi2s-gpios = <&cdc_quin_mi2s_gpios>;
qcom,sen-mi2s-gpios = <&cdc_sen_mi2s_gpios>; qcom,sen-mi2s-gpios = <&cdc_sen_mi2s_gpios>;
qcom,sep-mi2s-gpios = <&cdc_sep_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-usbc-audio-supported = <0>;
qcom,msm-mbhc-hphl-swh = <1>; qcom,msm-mbhc-hphl-swh = <1>;
qcom,msm-mbhc-gnd-swh = <1>; qcom,msm-mbhc-gnd-swh = <1>;

5
tuna-audio-qrd.dtsi
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-3-Clause // 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" #include "tuna-audio-overlay.dtsi"
&tx_swr_clk_active { &tx_swr_clk_active {
@@ -116,6 +116,7 @@
"IN1_HPHL", "HPHL_OUT", "IN1_HPHL", "HPHL_OUT",
"IN2_HPHR", "HPHR_OUT", "IN2_HPHR", "HPHR_OUT",
"IN3_EAR", "AUX_OUT", "IN3_EAR", "AUX_OUT",
"HAP_IN", "PCM_OUT",
"WSA SRC0_INP", "SRC0", "WSA SRC0_INP", "SRC0",
"WSA_TX DEC0_INP", "TX DEC0 MUX", "WSA_TX DEC0_INP", "TX DEC0 MUX",
"WSA_TX DEC1_INP", "TX DEC1 MUX", "WSA_TX DEC1_INP", "TX DEC1 MUX",
@@ -132,7 +133,7 @@
"VA_AIF3 CAP", "VA_SWR_CLK"; "VA_AIF3 CAP", "VA_SWR_CLK";
asoc-codec = <&stub_codec>, <&lpass_cdc>, <&swr_haptics>, asoc-codec = <&stub_codec>, <&lpass_cdc>, <&swr_haptics>,
<&wcd939x_codec>, <&wsa884x_0220>; <&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"; "wcd939x_codec", "wsa-codec1";
qcom,ext-disp-audio-rx = <1>; qcom,ext-disp-audio-rx = <1>;
qcom,wsa-max-devs = <1>; qcom,wsa-max-devs = <1>;