summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPascal Huerst <pascal.huerst@gmail.com>2015-04-02 10:17:40 +0200
committerZefan Li <lizefan@huawei.com>2015-09-18 09:20:27 +0800
commitba115ad122eca872197ce2235caa57e0314fb370 (patch)
tree233d7b6a5a53c3fce8fa83139febb821c08c1f9c
parent971fb0e210d8ea24e453f111341724807e491f3e (diff)
downloadlwn-ba115ad122eca872197ce2235caa57e0314fb370.tar.gz
lwn-ba115ad122eca872197ce2235caa57e0314fb370.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> [lizf: Backported to 3.4: adjust context] Signed-off-by: Zefan Li <lizefan@huawei.com>
-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 f9e2bdaf91f1..54059324d942 100644
--- a/sound/soc/codecs/cs4271.c
+++ b/sound/soc/codecs/cs4271.c
@@ -475,10 +475,10 @@ static int cs4271_probe(struct snd_soc_codec *codec)
if (gpio_nreset >= 0) {
/* Reset codec */
gpio_direction_output(gpio_nreset, 0);
- udelay(1);
+ mdelay(1);
gpio_set_value(gpio_nreset, 1);
/* Give the codec time to wake up */
- udelay(1);
+ mdelay(1);
}
cs4271->gpio_nreset = gpio_nreset;