summaryrefslogtreecommitdiff
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-02-19 17:29:49 +0300
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-02-19 17:30:57 +0300
commitce3bdaa8710c10eec5a6dae67aaf73088d0ced4f (patch)
treec6d6c286b36c01e202bedc47eeeb25272158bcb5 /sound/soc/codecs
parentc6f2981170272cce2c192087a16dd74dbde25ed2 (diff)
downloadlinux-ce3bdaa8710c10eec5a6dae67aaf73088d0ced4f.tar.xz
ASoC: Disable WM8731 line bypass by default
This avoids temporarily enabling the ouput stages during startup which can cause audible effets in the output stages. Reported-by: Fredrik RedgÄrd <rik@svep.se> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/wm8731.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index 4cac3195bfa3..9e7ebcc2c491 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -594,6 +594,10 @@ static int wm8731_register(struct wm8731_priv *wm8731)
reg = wm8731_read_reg_cache(codec, WM8731_RINVOL);
wm8731_write(codec, WM8731_RINVOL, reg & ~0x0100);
+ /* Disable bypass path by default */
+ reg = wm8731_read_reg_cache(codec, WM8731_APANA);
+ wm8731_write(codec, WM8731_APANA, reg & ~0x4);
+
wm8731_codec = codec;
ret = snd_soc_register_codec(codec);