diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-07 14:18:29 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-08 19:52:00 +0000 |
| commit | a7c4183be2d6a7da8c97a9b671b5f3aed321127e (patch) | |
| tree | 9871ccc14d458e33f4b18cbdfdb20557fd4d0d72 /sound | |
| parent | f647e1526fd6c7c8ab720781c40d11e11f930e93 (diff) | |
| download | linux-stable-a7c4183be2d6a7da8c97a9b671b5f3aed321127e.tar.gz linux-stable-a7c4183be2d6a7da8c97a9b671b5f3aed321127e.tar.bz2 linux-stable-a7c4183be2d6a7da8c97a9b671b5f3aed321127e.zip | |
ASoC: wm8994: Disable line output discharge prior to ramping VMID
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index b75a65273dab..ec69a6c152fe 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -787,6 +787,11 @@ static void vmid_reference(struct snd_soc_codec *codec) WM8994_VMID_BUF_ENA | (0x3 << WM8994_VMID_RAMP_SHIFT)); + /* Remove discharge for line out */ + snd_soc_update_bits(codec, WM8994_ANTIPOP_1, + WM8994_LINEOUT1_DISCH | + WM8994_LINEOUT2_DISCH, 0); + /* Main bias enable, VMID=2x40k */ snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_1, WM8994_BIAS_ENA | |