diff options
| author | Oder Chiou <oder_chiou@realtek.com> | 2015-09-10 13:40:16 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-09-11 12:26:51 +0100 |
| commit | f17b329b73a0393dc9d5fc5b4457189f92e5bbef (patch) | |
| tree | 96defc959a229a4f60408b6e9073735cdcd1e37f /sound | |
| parent | 91931320cfbbcc1dd874c2d0aef62e7d90f07f70 (diff) | |
| download | linux-f17b329b73a0393dc9d5fc5b4457189f92e5bbef.tar.gz linux-f17b329b73a0393dc9d5fc5b4457189f92e5bbef.tar.bz2 linux-f17b329b73a0393dc9d5fc5b4457189f92e5bbef.zip | |
ASoC: rt5645: Remove incorrect settings
The patch removes the incorrect settings to avoid the pop sound in the
first playback with headphone after boot.
Signed-off-by: Oder Chiou <oder_chiou@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/rt5645.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 4972bf3efa91..595ace9bcf58 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -2829,10 +2829,6 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec, int jack_insert) snd_soc_dapm_sync(dapm); 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 */ rt5645->jack_type = 0; @@ -2880,8 +2876,6 @@ int rt5645_set_jack_detect(struct snd_soc_codec *codec, rt5645->en_button_func = true; regmap_update_bits(rt5645->regmap, RT5645_GPIO_CTRL1, RT5645_GP1_PIN_IRQ, RT5645_GP1_PIN_IRQ); - regmap_update_bits(rt5645->regmap, RT5645_DEPOP_M1, - RT5645_HP_CB_MASK, RT5645_HP_CB_PU); regmap_update_bits(rt5645->regmap, RT5645_GEN_CTRL1, RT5645_DIG_GATE_CTRL, RT5645_DIG_GATE_CTRL); } |