aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2008-10-28 11:04:35 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2008-10-30 11:54:10 -0400
commite775f6c0fb6ac25ab8845d4ad1e17b4b015487f0 (patch)
treee0a69b7bd4996e4aa51567868cc2da370bd1501a /sound/soc/codecs
parent1b340bd7e444f20eb2df88c65fa34960c4736ee9 (diff)
ASoC: Do a warm reset after cold when resetting the WM9713
The WM9713 comes out of cold reset in low power mode so always requires a warm reset to bring up the AC97 link after a cold reset. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/wm9713.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c
index aba402b3c999..3214aa503ead 100644
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
@@ -1097,6 +1097,8 @@ int wm9713_reset(struct snd_soc_codec *codec, int try_warm)
1097 } 1097 }
1098 1098
1099 soc_ac97_ops.reset(codec->ac97); 1099 soc_ac97_ops.reset(codec->ac97);
1100 if (soc_ac97_ops.warm_reset)
1101 soc_ac97_ops.warm_reset(codec->ac97);
1100 if (ac97_read(codec, 0) != wm9713_reg[0]) 1102 if (ac97_read(codec, 0) != wm9713_reg[0])
1101 return -EIO; 1103 return -EIO;
1102 return 0; 1104 return 0;