Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

audio: asoc: wcd9310: fix headset mic recording fail.

Browse source 
Headset mic fail in case of inserting headset while dmic is recording.
Keep LDO_H always on while headset is inserted.

Bug: 11506684
Change-Id: I8516d537d2c72d6f71236219e5d3e610e25ecf24
Signed-off-by: sam_chen <sam_chen@asus.com>
This commit is contained in:
sam_chen 2013-11-05 13:03:34 +08:00 committed by Ed Tam
parent 9c7966d444
commit 6fa1fe7eb4
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sound/soc/codecs/wcd9310.c
View file

@ -2887,9 +2887,25 @@ static int tabla_codec_reset_interpolator(struct snd_soc_dapm_widget *w,
static int tabla_codec_enable_ldo_h(struct snd_soc_dapm_widget *w, static int tabla_codec_enable_ldo_h(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
struct snd_soc_codec *codec = w->codec;
struct tabla_priv *tabla = NULL;
if (codec != NULL)
tabla = snd_soc_codec_get_drvdata(codec);
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
usleep_range(1000, 1000);
break;
case SND_SOC_DAPM_POST_PMD: case SND_SOC_DAPM_POST_PMD:
/*
* Don't disable LDO_H while headset is inserted.
* Headset need LDO_H always on.
*/
if (tabla->h2w_state == H2W_HEADSET) {
snd_soc_update_bits(codec, TABLA_A_LDO_H_MODE_1,
0x80, 0x80);
} else
usleep_range(1000, 1000); usleep_range(1000, 1000);
break; break;
} }
@ -5164,7 +5180,8 @@ static const struct snd_soc_dapm_widget tabla_dapm_widgets[] = {
0), 0),
SND_SOC_DAPM_SUPPLY("LDO_H", TABLA_A_LDO_H_MODE_1, 7, 0, SND_SOC_DAPM_SUPPLY("LDO_H", TABLA_A_LDO_H_MODE_1, 7, 0,
tabla_codec_enable_ldo_h, SND_SOC_DAPM_POST_PMU), tabla_codec_enable_ldo_h, SND_SOC_DAPM_POST_PMU |
SND_SOC_DAPM_POST_PMD),
SND_SOC_DAPM_SUPPLY("COMP1_CLK", SND_SOC_NOPM, 0, 0, SND_SOC_DAPM_SUPPLY("COMP1_CLK", SND_SOC_NOPM, 0, 0,
tabla_config_compander, SND_SOC_DAPM_PRE_PMU | tabla_config_compander, SND_SOC_DAPM_PRE_PMU |