ASoC: wm8994: Move wm_hubs callback before we start ramping VMID
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 21 Feb 2012 16:24:00 +0000 (16:24 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 21 Feb 2012 23:10:41 +0000 (23:10 +0000)
Allows the generic code to set up for that.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm8994.c

index 0b1c271468af7ac0b806cd2d079496eeb30fe3a8..33bc718f16493dc67c5e2d5b8d4c84bee8190ca0 100644 (file)
@@ -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 |