aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-21 16:24:00 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-21 23:10:41 +0000
commitf7085641eeaeaab5216bab143287d2288940d9a2 (patch)
treeff8b4e53a79f0eed058347debfe62fe8b8fdd77a /sound/soc/codecs
parentASoC: wm8996: Convert to use DAPM routes for stream connections (diff)
downloadlinux-dev-f7085641eeaeaab5216bab143287d2288940d9a2.tar.xz
linux-dev-f7085641eeaeaab5216bab143287d2288940d9a2.zip
ASoC: wm8994: Move wm_hubs callback before we start ramping VMID
Allows the generic code to set up for that. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/wm8994.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 0b1c271468af..33bc718f1649 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -784,6 +784,8 @@ static void vmid_reference(struct snd_soc_codec *codec)
WM8994_LINEOUT2_DISCH,
WM8994_LINEOUT_VMID_BUF_ENA);
+ wm_hubs_vmid_ena(codec);
+
/* Startup bias, VMID ramp & buffer */
snd_soc_update_bits(codec, WM8994_ANTIPOP_2,
WM8994_BIAS_SRC |
@@ -796,8 +798,6 @@ static void vmid_reference(struct snd_soc_codec *codec)
WM8994_VMID_BUF_ENA |
(0x2 << WM8994_VMID_RAMP_SHIFT));
- wm_hubs_vmid_ena(codec);
-
/* Main bias enable, VMID=2x40k */
snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_1,
WM8994_BIAS_ENA |