samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "asoc: wcd938x: update logic to close BCS correctly" into audio-kernel.lnx.5.15

Browse Source
This commit is contained in:
Linux Build Service Account
2021-12-07 08:53:49 -08:00
committed by Gerrit - the friendly Code Review server
parent e898bc09d6 f48ad4780a
commit 57366b5e90
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
asoc/codecs/wcd938x/wcd938x.c
View File

@@ -1628,10 +1628,11 @@ static int wcd938x_tx_swr_ctrl(struct snd_soc_dapm_widget *w,
/* Check AMIC2 is connected to ADC2 to take an action on BCS */
if (w->shift == ADC2 && !(snd_soc_component_read(component,
WCD938X_TX_NEW_AMIC_MUX_CFG) & 0x80)) {
if (!wcd938x->bcs_dis)
if (!wcd938x->bcs_dis) {
wcd938x_tx_connect_port(component, MBHC,
SWR_CLK_RATE_4P8MHZ, true);
set_bit(AMIC2_BCS_ENABLE, &wcd938x->status_mask);
set_bit(AMIC2_BCS_ENABLE, &wcd938x->status_mask);
}
}
if (strnstr(w->name, "ADC", sizeof("ADC"))) {
set_bit(w->shift - ADC1, &wcd938x->status_mask);
@@ -1831,8 +1832,7 @@ static int wcd938x_codec_enable_adc(struct snd_soc_dapm_widget *w,
wcd938x_tx_connect_port(component, ADC1 + w->shift, 0, false);
if (w->shift + ADC1 == ADC2 &&
test_bit(AMIC2_BCS_ENABLE, &wcd938x->status_mask)) {
if (!wcd938x->bcs_dis)
wcd938x_tx_connect_port(component, MBHC, 0,
wcd938x_tx_connect_port(component, MBHC, 0,
false);
clear_bit(AMIC2_BCS_ENABLE, &wcd938x->status_mask);
}