renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-01 00:54:15 +08:00
Code

ASoC: wm8994: Tune VMID power down sequence

Browse Source 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown 2012-08-22 17:25:37 +01:00
parent a3a1d9d21d
commit f95be9d616
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sound/soc/codecs/wm8994.c
View File

@ -939,16 +939,10 @@ static void vmid_dereference(struct snd_soc_codec *codec)
WM8994_BIAS_SRC | WM8994_BIAS_SRC |
WM8994_VMID_DISCH); WM8994_VMID_DISCH);
switch (wm8994->vmid_mode) { snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_1,
case WM8994_VMID_FORCE: WM8994_VMID_SEL_MASK, 0);
msleep(350);
break;
default:
break;
}
snd_soc_update_bits(codec, WM8994_ADDITIONAL_CONTROL, msleep(400);
WM8994_VROI, WM8994_VROI);
/* Active discharge */ /* Active discharge */
snd_soc_update_bits(codec, WM8994_ANTIPOP_1, snd_soc_update_bits(codec, WM8994_ANTIPOP_1,
@ -957,17 +951,12 @@ static void vmid_dereference(struct snd_soc_codec *codec)
WM8994_LINEOUT1_DISCH | WM8994_LINEOUT1_DISCH |
WM8994_LINEOUT2_DISCH); WM8994_LINEOUT2_DISCH);
msleep(150);
snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_3, snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_3,
WM8994_LINEOUT1N_ENA | WM8994_LINEOUT1N_ENA |
WM8994_LINEOUT1P_ENA | WM8994_LINEOUT1P_ENA |
WM8994_LINEOUT2N_ENA | WM8994_LINEOUT2N_ENA |
WM8994_LINEOUT2P_ENA, 0); WM8994_LINEOUT2P_ENA, 0);
snd_soc_update_bits(codec, WM8994_ADDITIONAL_CONTROL,
WM8994_VROI, 0);
/* Switch off startup biases */ /* Switch off startup biases */
snd_soc_update_bits(codec, WM8994_ANTIPOP_2, snd_soc_update_bits(codec, WM8994_ANTIPOP_2,
WM8994_BIAS_SRC | WM8994_BIAS_SRC |
@ -976,10 +965,7 @@ static void vmid_dereference(struct snd_soc_codec *codec)
WM8994_VMID_RAMP_MASK, 0); WM8994_VMID_RAMP_MASK, 0);
snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_1, snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_1,
WM8994_BIAS_ENA | WM8994_VMID_SEL_MASK, 0); WM8994_VMID_SEL_MASK, 0);
snd_soc_update_bits(codec, WM8994_ANTIPOP_2,
WM8994_VMID_RAMP_MASK, 0);
} }
pm_runtime_put(codec->dev); pm_runtime_put(codec->dev);