summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-04 13:23:38 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-14 19:18:37 +0900
commita115c72802c37351b6d87dfb62938d2ad440eef4 (patch)
treef0fdfd7579a86db7ab9b81efd2b0fae0e8e60344 /sound
parentf6b864a9071e21186476910613ec9913b56067a2 (diff)
downloadlinux-3.10-a115c72802c37351b6d87dfb62938d2ad440eef4.tar.gz
linux-3.10-a115c72802c37351b6d87dfb62938d2ad440eef4.tar.bz2
linux-3.10-a115c72802c37351b6d87dfb62938d2ad440eef4.zip
ASoC: Move WM8962 CLKREG_OVD earlier
When the clocking registers are not overriden some of the registers are not writable. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com> Cc: stable@kernel.org
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8962.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 60d740ebeb5..28650edfdeb 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -2927,10 +2927,6 @@ static int wm8962_set_bias_level(struct snd_soc_codec *codec,
WM8962_BIAS_ENA | 0x180);
msleep(5);
-
- snd_soc_update_bits(codec, WM8962_CLOCKING2,
- WM8962_CLKREG_OVD,
- WM8962_CLKREG_OVD);
}
/* VMID 2*250k */
@@ -3868,6 +3864,10 @@ static int wm8962_probe(struct snd_soc_codec *codec)
*/
snd_soc_update_bits(codec, WM8962_CLOCKING2, WM8962_SYSCLK_ENA, 0);
+ /* Ensure we have soft control over all registers */
+ snd_soc_update_bits(codec, WM8962_CLOCKING2,
+ WM8962_CLKREG_OVD, WM8962_CLKREG_OVD);
+
regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies);
if (pdata) {