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

Merge "asoc: codecs: Set EAR compander if mixer ctl set"

Browse Source
This commit is contained in:
qctecmdr
2020-04-26 23:42:50 -07:00
committed by Gerrit - the friendly Code Review server
parent b221915dc1 2e025248a2
commit e63542d6b7
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
asoc/codecs/wcd937x/wcd937x.c
View File

@@ -579,6 +579,7 @@ static int wcd937x_codec_ear_dac_event(struct snd_soc_dapm_widget *w,
snd_soc_component_update_bits(component,
WCD937X_HPH_NEW_INT_RDAC_HD2_CTL_L,
0x0F, 0x06);
if (wcd937x->comp1_enable)
snd_soc_component_update_bits(component,
WCD937X_DIGITAL_CDC_COMP_CTL_0,
0x02, 0x02);
@@ -597,6 +598,10 @@ static int wcd937x_codec_ear_dac_event(struct snd_soc_dapm_widget *w,
snd_soc_component_update_bits(component,
WCD937X_HPH_NEW_INT_RDAC_HD2_CTL_L,
0x0F, 0x01);
if (wcd937x->comp1_enable)
snd_soc_component_update_bits(component,
WCD937X_DIGITAL_CDC_COMP_CTL_0,
0x02, 0x00);
break;
};
return 0;

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

@@ -681,8 +681,10 @@ static int wcd938x_codec_ear_dac_event(struct snd_soc_dapm_widget *w,
WCD938X_DIGITAL_CDC_HPH_GAIN_CTL, 0x04, 0x04);
snd_soc_component_update_bits(component,
WCD938X_DIGITAL_CDC_DIG_CLK_CTL, 0x01, 0x01);
if (wcd938x->comp1_enable)
snd_soc_component_update_bits(component,
WCD938X_DIGITAL_CDC_COMP_CTL_0, 0x02, 0x02);
WCD938X_DIGITAL_CDC_COMP_CTL_0,
0x02, 0x02);
}
/* 5 msec delay as per HW requirement */
usleep_range(5000, 5010);
@@ -707,8 +709,10 @@ static int wcd938x_codec_ear_dac_event(struct snd_soc_dapm_widget *w,
WCD938X_DIGITAL_CDC_HPH_GAIN_CTL, 0x04, 0x00);
snd_soc_component_update_bits(component,
WCD938X_DIGITAL_CDC_DIG_CLK_CTL, 0x01, 0x00);
if (wcd938x->comp1_enable)
snd_soc_component_update_bits(component,
WCD938X_DIGITAL_CDC_COMP_CTL_0, 0x02, 0x00);
WCD938X_DIGITAL_CDC_COMP_CTL_0,
0x02, 0x00);
}
snd_soc_component_update_bits(component,
WCD938X_ANA_EAR_COMPANDER_CTL, 0x80, 0x00);