tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ASoC: WM8990: msleep() takes milliseconds not jiffies

Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org

authored by Dimitris Papastamos and committed by Mark Brown 7ebcf5d6 228dd545

+5 -5
unified split
+5 -5
sound/soc/codecs/wm8990.c
··· 1183 WM8990_VMIDTOG); 1184 1185 /* Delay to allow output caps to discharge */ 1186 - msleep(msecs_to_jiffies(300)); 1187 1188 /* Disable VMIDTOG */ 1189 snd_soc_write(codec, WM8990_ANTIPOP2, WM8990_SOFTST | ··· 1195 /* Enable outputs */ 1196 snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1b00); 1197 1198 - msleep(msecs_to_jiffies(50)); 1199 1200 /* Enable VMID at 2x50k */ 1201 snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f02); 1202 1203 - msleep(msecs_to_jiffies(100)); 1204 1205 /* Enable VREF */ 1206 snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f03); 1207 1208 - msleep(msecs_to_jiffies(600)); 1209 1210 /* Enable BUFIOEN */ 1211 snd_soc_write(codec, WM8990_ANTIPOP2, WM8990_SOFTST | ··· 1250 /* Disable VMID */ 1251 snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f01); 1252 1253 - msleep(msecs_to_jiffies(300)); 1254 1255 /* Enable all output discharge bits */ 1256 snd_soc_write(codec, WM8990_ANTIPOP1, WM8990_DIS_LLINE |
··· 1183 WM8990_VMIDTOG); 1184 1185 /* Delay to allow output caps to discharge */ 1186 + msleep(300); 1187 1188 /* Disable VMIDTOG */ 1189 snd_soc_write(codec, WM8990_ANTIPOP2, WM8990_SOFTST | ··· 1195 /* Enable outputs */ 1196 snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1b00); 1197 1198 + msleep(50); 1199 1200 /* Enable VMID at 2x50k */ 1201 snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f02); 1202 1203 + msleep(100); 1204 1205 /* Enable VREF */ 1206 snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f03); 1207 1208 + msleep(600); 1209 1210 /* Enable BUFIOEN */ 1211 snd_soc_write(codec, WM8990_ANTIPOP2, WM8990_SOFTST | ··· 1250 /* Disable VMID */ 1251 snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f01); 1252 1253 + msleep(300); 1254 1255 /* Enable all output discharge bits */ 1256 snd_soc_write(codec, WM8990_ANTIPOP1, WM8990_DIS_LLINE |