korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-20 18:54:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: rt5645: Modify the jack detection function to prevent the pop sound while the jack plug in

Browse Source 
The patch corrects the sequence of the jack detection. It will prevent the
pop sound while the jack plug in.

Signed-off-by: Oder Chiou <oder_chiou@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Oder Chiou 2015-08-24 20:32:57 +08:00 committed by Mark Brown
parent 588cd850f5
commit 8db7f56ddf
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sound/soc/codecs/rt5645.c
View File

@ -2805,14 +2805,15 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert)
} }
regmap_write(rt5645->regmap, RT5645_JD_CTRL3, 0x00f0); regmap_write(rt5645->regmap, RT5645_JD_CTRL3, 0x00f0);
regmap_write(rt5645->regmap, RT5645_IN1_CTRL1, 0x0006);
regmap_update_bits(rt5645->regmap, regmap_update_bits(rt5645->regmap,
RT5645_IN1_CTRL2, 0x1000, 0x1000); RT5645_IN1_CTRL2, 0x1000, 0x1000);
regmap_update_bits(rt5645->regmap, RT5645_IN1_CTRL1, 0x0004,
0x0004);
msleep(100); msleep(100);
regmap_update_bits(rt5645->regmap, regmap_update_bits(rt5645->regmap,
RT5645_IN1_CTRL2, 0x1000, 0x0000); RT5645_IN1_CTRL2, 0x1000, 0x0000);
msleep(450); msleep(600);
regmap_read(rt5645->regmap, RT5645_IN1_CTRL3, &val); regmap_read(rt5645->regmap, RT5645_IN1_CTRL3, &val);
val &= 0x7; val &= 0x7;
dev_dbg(codec->dev, "val = %d\n", val); dev_dbg(codec->dev, "val = %d\n", val);
@ -2828,9 +2829,17 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert)
rt5645->jack_type = SND_JACK_HEADPHONE; rt5645->jack_type = SND_JACK_HEADPHONE;
} }
snd_soc_update_bits(codec, RT5645_CHARGE_PUMP, 0x0300, 0x0200);
snd_soc_write(codec, RT5645_DEPOP_M1, 0x001d);
snd_soc_write(codec, RT5645_DEPOP_M1, 0x0001);
} else { /* jack out */ } else { /* jack out */
rt5645->jack_type = 0; rt5645->jack_type = 0;
regmap_update_bits(rt5645->regmap, RT5645_IN1_CTRL2, 0x1000,
0x1000);
regmap_update_bits(rt5645->regmap, RT5645_IN1_CTRL1, 0x0004,
0x0000);
if (rt5645->en_button_func) if (rt5645->en_button_func)
rt5645_enable_push_button_irq(codec, false); rt5645_enable_push_button_irq(codec, false);