summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorPascal Huerst <pascal.huerst@gmail.com>2015-04-02 10:17:40 +0200
committerLuis Henriques <luis.henriques@canonical.com>2015-05-05 11:09:41 +0100
commitbce552d3e75cdb09e2f7f092606525165a22842c (patch)
treefcff3571f99545a5e7bc43de3fd9561af512851a /sound
parentad43dc433b21285ae2441d93691f0a594bf59dce (diff)
downloadlinux-stable-bce552d3e75cdb09e2f7f092606525165a22842c.tar.gz
linux-stable-bce552d3e75cdb09e2f7f092606525165a22842c.tar.bz2
linux-stable-bce552d3e75cdb09e2f7f092606525165a22842c.zip
ASoC: cs4271: Increase delay time after reset
commit 74ff960222d90999508b4ba0d3449f796695b6d5 upstream. 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> Signed-off-by: Luis Henriques <luis.henriques@canonical.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,