aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorPascal Huerst <pascal.huerst@gmail.com>2015-04-02 04:17:40 -0400
committerMark Brown <broonie@kernel.org>2015-04-02 13:15:48 -0400
commit74ff960222d90999508b4ba0d3449f796695b6d5 (patch)
treef88d677ffb840f02110d93d7a274414c3fdd396f /sound/soc
parentc517d838eb7d07bbe9507871fab3931deccff539 (diff)
ASoC: cs4271: Increase delay time after reset
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
Diffstat (limited to 'sound/soc')
-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 79a4efcb894c..55ca6ecf9f4d 100644
--- a/sound/soc/codecs/cs4271.c
+++ b/sound/soc/codecs/cs4271.c
@@ -561,10 +561,10 @@ static int cs4271_codec_probe(struct snd_soc_codec *codec)
561 if (gpio_is_valid(cs4271->gpio_nreset)) { 561 if (gpio_is_valid(cs4271->gpio_nreset)) {
562 /* Reset codec */ 562 /* Reset codec */
563 gpio_direction_output(cs4271->gpio_nreset, 0); 563 gpio_direction_output(cs4271->gpio_nreset, 0);
564 udelay(1); 564 mdelay(1);
565 gpio_set_value(cs4271->gpio_nreset, 1); 565 gpio_set_value(cs4271->gpio_nreset, 1);
566 /* Give the codec time to wake up */ 566 /* Give the codec time to wake up */
567 udelay(1); 567 mdelay(1);
568 } 568 }
569 569
570 ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2, 570 ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2,