diff options
author | 2009-05-14 20:52:46 +0100 | |
---|---|---|
committer | 2009-05-14 20:52:46 +0100 | |
commit | 63c26baa2aa624b023892d66ed696525fc787560 (patch) | |
tree | 1430f0c2f124b46cadb3edd898202e7c5a9e756e /sound/soc/codecs | |
parent | Merge branch 'pxa2xx-i2s' into for-2.6.31 (diff) | |
download | linux-63c26baa2aa624b023892d66ed696525fc787560.tar.gz linux-63c26baa2aa624b023892d66ed696525fc787560.tar.bz2 linux-63c26baa2aa624b023892d66ed696525fc787560.zip |
ASoC: Support AC97 link off by default on WM9712
The WM9712 can be configured by resistor strapping GPIO4 to behave like
the WM9713 and default to leaving the AC97 link disabled after cold
reset until a warm reset occurs. In this configuration we need to issue
a warm reset after cold to bring the link up so do so. The warm reset
will be harmless on systems that don't need it.
[Changelog rewritten to document the reasoning. -- broonie]
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r-- | sound/soc/codecs/wm9712.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 550c903f23bf..1fd4e88f50cf 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -585,6 +585,8 @@ static int wm9712_reset(struct snd_soc_codec *codec, int try_warm) } soc_ac97_ops.reset(codec->ac97); + if (soc_ac97_ops.warm_reset) + soc_ac97_ops.warm_reset(codec->ac97); if (ac97_read(codec, 0) != wm9712_reg[0]) goto err; return 0; |