aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-21 16:24:00 +0000
committerAndreas Blaesius <skate4life@gmx.de>2016-04-30 11:03:52 +0200
commit5ba89e9f3e297a29671082119a43130e702b3dc2 (patch)
treeb62dfaa145fb4cfde0f239be927aea8c6fc9c3ab /sound
parent8cc4f6d8498b45d6de4cf2e106299a81364de315 (diff)
downloadkernel_samsung_espresso10-5ba89e9f3e297a29671082119a43130e702b3dc2.zip
kernel_samsung_espresso10-5ba89e9f3e297a29671082119a43130e702b3dc2.tar.gz
kernel_samsung_espresso10-5ba89e9f3e297a29671082119a43130e702b3dc2.tar.bz2
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')
-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 bbf0fa7..d950345 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -883,6 +883,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 |
@@ -895,8 +897,6 @@ static void vmid_reference(struct snd_soc_codec *codec)
WM8994_VMID_BUF_ENA |
(0x3 << 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 |