Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a115c728 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Move WM8962 CLKREG_OVD earlier 



When the clocking registers are not overriden some of the registers are
not writable.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Cc: stable@kernel.org
parent f6b864a9

sound/soc/codecs/wm8962.c

+4 −4
Original line number Diff line number Diff line
@@ -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) {