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

Commit 7ebcf5d6 authored by Dimitris Papastamos's avatar Dimitris Papastamos Committed by Mark Brown
Browse files

ASoC: WM8990: msleep() takes milliseconds not jiffies 



Signed-off-by: default avatarDimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
parent 228dd545

sound/soc/codecs/wm8990.c

+5 −5
Original line number Diff line number Diff line
@@ -1183,7 +1183,7 @@ static int wm8990_set_bias_level(struct snd_soc_codec *codec, 
				     WM8990_VMIDTOG);



			/* Delay to allow output caps to discharge */

			msleep(msecs_to_jiffies(300));

			msleep(300);



			/* Disable VMIDTOG */

			snd_soc_write(codec, WM8990_ANTIPOP2, WM8990_SOFTST |
@@ -1195,17 +1195,17 @@ static int wm8990_set_bias_level(struct snd_soc_codec *codec, 
			/* Enable outputs */

			snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1b00);



			msleep(msecs_to_jiffies(50));

			msleep(50);



			/* Enable VMID at 2x50k */

			snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f02);



			msleep(msecs_to_jiffies(100));

			msleep(100);



			/* Enable VREF */

			snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f03);



			msleep(msecs_to_jiffies(600));

			msleep(600);



			/* Enable BUFIOEN */

			snd_soc_write(codec, WM8990_ANTIPOP2, WM8990_SOFTST |
@@ -1250,7 +1250,7 @@ static int wm8990_set_bias_level(struct snd_soc_codec *codec, 
		/* Disable VMID */

		snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f01);



		msleep(msecs_to_jiffies(300));

		msleep(300);



		/* Enable all output discharge bits */

		snd_soc_write(codec, WM8990_ANTIPOP1, WM8990_DIS_LLINE |