Skip to content

Commit

Permalink
ASoC: Move WM8962 CLKREG_OVD earlier
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Mark Brown committed Aug 14, 2011
1 parent f6b864a commit a115c72
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions sound/soc/codecs/wm8962.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit a115c72

Please sign in to comment.