Merge changes I0d3159a6,If41125b6 into audio-kernel-handset.lnx.10.0.r1-rel

* changes:
  ARM: dts: msm: Remove amic5 entries from tuna overlay
  ARM: dts: msm: Add WCD tx rx slaves
This commit is contained in:
Linux Build Service Account
2024-11-24 06:03:39 -08:00
committed by Gerrit - the friendly Code Review server
3 changed files with 36 additions and 8 deletions

View File

@@ -33,10 +33,26 @@
status = "disabled";
};
&wcd9378_rx_slave {
status = "disabled";
};
&wcd9378_tx_slave {
status = "disabled";
};
&wcd939x_codec {
status = "okay";
};
&wcd939x_tx_slave {
status = "okay";
};
&wcd939x_rx_slave {
status = "okay";
};
&swr0 {
wsa884x_0220: wsa884x@02170220 {
status = "okay";

View File

@@ -440,8 +440,6 @@
"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",
@@ -450,8 +448,6 @@
"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",

View File

@@ -39,14 +39,30 @@
};
};
&wsa_macro {
qcom,wsa-bat-cfgs = <1>, <1>;
};
&wcd9378_codec {
status = "disabled";
};
&wcd9378_rx_slave {
status = "disabled";
};
&wcd9378_tx_slave {
status = "disabled";
};
&wcd939x_tx_slave {
status = "okay";
};
&wcd939x_rx_slave {
status = "okay";
};
&wsa_macro {
qcom,wsa-bat-cfgs = <1>, <1>;
};
&wcd939x_codec {
status = "okay";
/* 0 for digital crosstalk disabled,