aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorJorge Eduardo Candelaria <jorge.candelaria@ti.com>2010-12-10 21:06:30 -0600
committerLiam Girdwood <lrg@slimlogic.co.uk>2010-12-14 20:36:59 +0000
commitcbd9cb5de3182d688544611c019b06bf04e2ad06 (patch)
tree297100bc89e4553ae41d310ab246419df4238dfd /sound
parent4f44ee1f494edef1fea3db20565b2e209bef6280 (diff)
downloadkernel_samsung_smdk4412-cbd9cb5de3182d688544611c019b06bf04e2ad06.zip
kernel_samsung_smdk4412-cbd9cb5de3182d688544611c019b06bf04e2ad06.tar.gz
kernel_samsung_smdk4412-cbd9cb5de3182d688544611c019b06bf04e2ad06.tar.bz2
ASoC: twl6040: Increase timeout for power up
After coming back from suspend, the timeout waiting for Phoenix chip to complete its power up sequence is not enough, which leaves the codec cache value for some registers in an outdated state. Increase the timeout value to wait for the power up sequence to correclty complete. Signed-off-by: Jorge Eduardo Candelaria <jorge.candelaria@ti.com> Signed-off-by: Margarita Olaya Cabrera <magi.olaya@ti.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/twl6040.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index a8ec911..39f0bc5 100644
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -752,7 +752,7 @@ static int twl6040_power_up_completion(struct snd_soc_codec *codec,
u8 intid;
time_left = wait_for_completion_timeout(&priv->ready,
- msecs_to_jiffies(48));
+ msecs_to_jiffies(144));
if (!time_left) {
twl_i2c_read_u8(TWL_MODULE_AUDIO_VOICE, &intid,