aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8994.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-21 11:24:00 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-21 18:10:41 -0500
commitf7085641eeaeaab5216bab143287d2288940d9a2 (patch)
treeff8b4e53a79f0eed058347debfe62fe8b8fdd77a /sound/soc/codecs/wm8994.c
parent1ec1cdfbb37add5af839d50ae8729961a8a307c1 (diff)
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/wm8994.c')
-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)
784 WM8994_LINEOUT2_DISCH, 784 WM8994_LINEOUT2_DISCH,
785 WM8994_LINEOUT_VMID_BUF_ENA); 785 WM8994_LINEOUT_VMID_BUF_ENA);
786 786
787 wm_hubs_vmid_ena(codec);
788
787 /* Startup bias, VMID ramp & buffer */ 789 /* Startup bias, VMID ramp & buffer */
788 snd_soc_update_bits(codec, WM8994_ANTIPOP_2, 790 snd_soc_update_bits(codec, WM8994_ANTIPOP_2,
789 WM8994_BIAS_SRC | 791 WM8994_BIAS_SRC |
@@ -796,8 +798,6 @@ static void vmid_reference(struct snd_soc_codec *codec)
796 WM8994_VMID_BUF_ENA | 798 WM8994_VMID_BUF_ENA |
797 (0x2 << WM8994_VMID_RAMP_SHIFT)); 799 (0x2 << WM8994_VMID_RAMP_SHIFT));
798 800
799 wm_hubs_vmid_ena(codec);
800
801 /* Main bias enable, VMID=2x40k */ 801 /* Main bias enable, VMID=2x40k */
802 snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_1, 802 snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_1,
803 WM8994_BIAS_ENA | 803 WM8994_BIAS_ENA |