summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorPascal Huerst <pascal.huerst@gmail.com>2015-04-02 10:17:40 +0200
committerSasha Levin <sasha.levin@oracle.com>2015-05-17 19:12:14 -0400
commit8003c8f02736ffb3625f66c91a5ad1e5b4ead4a2 (patch)
treedce4bc106863ec3b859c875bc573fba09161301e /sound
parent11a0c1eff6269d98bf31b6bb10a7fe4c3d4244d9 (diff)
ASoC: cs4271: Increase delay time after reset
[ Upstream commit 74ff960222d90999508b4ba0d3449f796695b6d5 ] The delay time after a reset in the codec probe callback was too short, and did not work on certain hw because the codec needs more time to power on. This increases the delay time from 1us to 1ms. Signed-off-by: Pascal Huerst <pascal.huerst@gmail.com> Acked-by: Brian Austin <brian.austin@cirrus.com> Signed-off-by: Mark Brown <broonie@kernel.org> Cc: stable@vger.kernel.org Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/cs4271.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c
index 6ec074fec068..38c2adc99770 100644
--- a/sound/soc/codecs/cs4271.c
+++ b/sound/soc/codecs/cs4271.c
@@ -561,10 +561,10 @@ static int cs4271_probe(struct snd_soc_codec *codec)
if (gpio_is_valid(cs4271->gpio_nreset)) {
/* Reset codec */
gpio_direction_output(cs4271->gpio_nreset, 0);
- udelay(1);
+ mdelay(1);
gpio_set_value(cs4271->gpio_nreset, 1);
/* Give the codec time to wake up */
- udelay(1);
+ mdelay(1);
}
ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2,