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

Merge 36ebcc2dce on remote branch

Browse Source 
Change-Id: I90427649ae39d5e9e513dd50eace838597feff6b
This commit is contained in:
Linux Build Service Account
2024-02-15 16:31:10 -08:00
parent acf36be224 36ebcc2dce
commit 0273a9a60d
5 changed files with 30 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sun-audio-atp.dts
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-3-Clause
/*
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/
/dts-v1/;
@@ -9,7 +9,8 @@
#include "sun-audio-atp.dtsi"
/ {
model = "Qualcomm Technologies, Inc. Sun ATP";
compatible = "qcom,sun-atp", "qcom,sun", "qcom,atp";
compatible = "qcom,sun-atp", "qcom,sun", "qcom,sunp-atp", "qcom,sunp",
"qcom,atp";
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
qcom,board-id = <0x10021 0>;
};

76
sun-audio-atp.dtsi
View File

@@ -1,77 +1,9 @@
// SPDX-License-Identifier: BSD-3-Clause
/*
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include "sun-audio-mtp.dtsi"
&swr_haptics {
status = "disabled";
};
&sun_snd {
asoc-codec = <&stub_codec>, <&lpass_cdc>,
<&wcd939x_codec>, <&wsa884x_0220>,
<&wsa884x_0221>;
asoc-codec-names = "msm-stub-codec.1", "lpass-cdc",
"wcd939x_codec", "wsa-codec1", "wsa-codec2";
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",
"AMIC4", "MIC BIAS3",
"AMIC5", "Analog Mic5",
"AMIC5", "MIC BIAS4",
"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",
"VA AMIC4", "VA MIC BIAS3",
"VA AMIC5", "Analog Mic5",
"VA AMIC5", "VA MIC BIAS4",
"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_EAR", "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",
"TX SWR_INPUT", "WCD_TX_OUTPUT",
"VA SWR_INPUT", "VA_SWR_CLK",
"VA SWR_INPUT", "WCD_TX_OUTPUT",
"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";
};
#include "sun-audio-cdp.dtsi"
&wsa_macro {
qcom,wsa-bat-cfgs= <4>, <4>;
@@ -80,3 +12,7 @@
&wsa2_macro {
qcom,wsa-bat-cfgs= <4>, <4>;
};
&swr_haptics {
status = "disabled";
};

3
sun-audio-cdp.dtsi
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-3-Clause
/*
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include "sun-audio-overlay.dtsi"
@@ -130,4 +130,5 @@
qcom,sen-mi2s-gpios = <&cdc_sen_mi2s_gpios>;
qcom,sep-mi2s-gpios = <&cdc_sep_mi2s_gpios>;
qcom,usbss-hsj-connect-enabled;
qcom,msm-mbhc-hs-mic-max-threshold-mv = <1680>;
};

35
sun-audio-overlay.dtsi
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-3-Clause
/*
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include <bindings/qcom,audio-ext-clk.h>
@@ -116,7 +116,11 @@
<7 GPPO 0x03>, <8 HAPT 0x03>,
<9 HIFI_PCM_L 0x01>, <9 HIFI_PCM_R 0x2>,
<10 HPTH 0x03>, <11 CMPT 0x03>, <12 IPCM 0x03>;
qcom,swr-num-dev = <2>;
/* num-dev is 2 if WCD RX and PMIC SWR Slaves are connected */
/* num-dev is 1 if only WCD RX slave is connected */
qcom,swr-num-dev = <1>;
qcom,swr-clock-stop-mode0 = <1>;
wcd939x_rx_slave: wcd939x-rx-slave {
compatible = "qcom,wcd939x-slave";
@@ -234,10 +238,10 @@
<2 SPKR_L_COMP 0xF>, <3 SPKR_L_BOOST 0x3>,
<4 SPKR_R 0x1>, <5 SPKR_R_COMP 0xF>,
<6 SPKR_R_BOOST 0x3>, <7 PBR 0x3>,
<8 SPKR_HAPT 0x3>, <9 OCPM 0x3>,
<8 SPKR_HAPT 0x1>, <9 OCPM 0x3>,
<10 SPKR_L_VI 0x3>, <11 SPKR_R_VI 0x3>,
<12 SPKR_IPCM 0x3>, <13 CPS 0x3>;
qcom,swr-num-dev = <2>;
qcom,swr-num-dev = <3>;
qcom,dynamic-port-map-supported = <0>;
wsa884x_2_0220: wsa884x@02170220 {
status = "disabled";
@@ -280,12 +284,10 @@
};
swr_haptics: swr_haptics@f0170220 {
status = "disabled";
compatible = "qcom,pm8750b-swr-haptics";
reg = <0x02 0xf0170220>;
// Temporarily commented out to avoid compilation error
// swr-slave-supply = <&hap_swr_slave_reg>;
qcom,rx_swr_ch_map = <0 0x01 0x01 0 PCM_OUT1>;
compatible = "qcom,pmih010x-swr-haptics";
reg = <0x03 0xf0170220>;
swr-slave-supply = <&hap_swr_slave_reg>;
qcom,rx_swr_ch_map = <0 0x01 0x01 0 SPKR_HAPT>;
};
};
};
@@ -385,14 +387,12 @@
<5 BT_AUDIO_TX1 0x3>, <6 BT_AUDIO_TX2 0x3>,
<7 BT_AUDIO_TX3 0x3>, <8 FM_AUDIO_TX1 0x3>;
qcom,swr-num-dev = <1>;
qcom,swr-clock-stop-mode0 = <1>;
};
};
&spf_core_platform {
sun_snd: sound {
qcom,model = "sun-mtp-snd-card";
swr-haptics-unsupported;
qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>, <1>, <1>;
qcom,mi2s-tdm-is-hw-vote-needed = <1>, <0>, <1>, <0>, <1>, <0>, <0>;
qcom,wcn-bt = <1>;
@@ -423,16 +423,17 @@
"VA AMIC5", "Analog Mic5",
"VA AMIC5", "VA MIC BIAS4",
"TX DMIC0", "Digital Mic0",
"TX DMIC0", "MIC BIAS3",
"TX DMIC0", "MIC BIAS1",
"TX DMIC1", "Digital Mic1",
"TX DMIC1", "MIC BIAS3",
"TX DMIC2", "Digital Mic2",
"TX DMIC2", "MIC BIAS1",
"TX DMIC2", "MIC BIAS3",
"TX DMIC3", "Digital Mic3",
"TX DMIC3", "MIC BIAS1",
"IN1_HPHL", "HPHL_OUT",
"IN2_HPHR", "HPHR_OUT",
"IN3_EAR", "AUX_OUT",
"HAP_IN", "WSA_HAPT OUT",
"WSA SRC0_INP", "SRC0",
"WSA_TX DEC0_INP", "TX DEC0 MUX",
"WSA_TX DEC1_INP", "TX DEC1 MUX",
@@ -452,9 +453,9 @@
"VA DMIC1", "Digital Mic1",
"VA DMIC2", "Digital Mic2",
"VA DMIC3", "Digital Mic3",
"VA DMIC0", "VA MIC BIAS3",
"VA DMIC0", "VA MIC BIAS1",
"VA DMIC1", "VA MIC BIAS3",
"VA DMIC2", "VA MIC BIAS1",
"VA DMIC2", "VA MIC BIAS3",
"VA DMIC3", "VA MIC BIAS1";
qcom,msm-mbhc-usbc-audio-supported = <0>;
qcom,msm-mbhc-hphl-swh = <1>;
@@ -471,7 +472,7 @@
"wsa-codec1", "wsa-codec2";
qcom,wsa-max-devs = <2>;
qcom,msm_audio_ssr_devs = <&audio_gpr>, <&lpi_tlmm>,
<&lpass_cdc>;
<&lpass_cdc>, <&lpass_bt_swr>;
/*
* ====================

2
sun-audio.dtsi
View File

@@ -25,7 +25,7 @@
};
};
&glink_edge {
&remoteproc_adsp_glink {
audio_gpr: qcom,gpr {
compatible = "qcom,gpr";
qcom,glink-channels = "adsp_apps";