aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorPascal Huerst <pascal.huerst@gmail.com>2015-04-02 10:17:40 +0200
committerBen Hutchings <ben@decadent.org.uk>2015-08-07 00:32:02 +0100
commit738f1509ae86591d59092f9942b059ce09716504 (patch)
tree1fcd745ee162f9c10bd60157459009b6187473cc /sound
parentc72fbde01bc60208d3a0c1cc985a5457ea8e0ee0 (diff)
downloadkernel_samsung_smdk4412-738f1509ae86591d59092f9942b059ce09716504.zip
kernel_samsung_smdk4412-738f1509ae86591d59092f9942b059ce09716504.tar.gz
kernel_samsung_smdk4412-738f1509ae86591d59092f9942b059ce09716504.tar.bz2
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> [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
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 561d5e0..e99c10b 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;