summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlban Bedel <alban.bedel@avionic-design.de>2013-04-09 17:13:59 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-09 17:43:48 +0100
commitf1ca493b0b5e8f42d3b2dc8877860db2983f47b6 (patch)
tree29a5903398574eb4200ff7aab88cae7b680995ab
parent31880c37c11e28cb81c70757e38392b42e695dc6 (diff)
downloadlinux-3.10-f1ca493b0b5e8f42d3b2dc8877860db2983f47b6.tar.gz
linux-3.10-f1ca493b0b5e8f42d3b2dc8877860db2983f47b6.tar.bz2
linux-3.10-f1ca493b0b5e8f42d3b2dc8877860db2983f47b6.zip
ASoC: wm8903: Fix the bypass to HP/LINEOUT when no DAC or ADC is running
The Charge Pump needs the DSP clock to work properly, without it the bypass to HP/LINEOUT is not working properly. This requirement is not mentioned in the datasheet but has been confirmed by Mark Brown from Wolfson. Signed-off-by: Alban Bedel <alban.bedel@avionic-design.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stable@vger.kernel.org
-rw-r--r--sound/soc/codecs/wm8903.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index 134e41c870b..f8a31ad0b20 100644
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -1083,6 +1083,8 @@ static const struct snd_soc_dapm_route wm8903_intercon[] = {
{ "ROP", NULL, "Right Speaker PGA" },
{ "RON", NULL, "Right Speaker PGA" },
+ { "Charge Pump", NULL, "CLK_DSP" },
+
{ "Left Headphone Output PGA", NULL, "Charge Pump" },
{ "Right Headphone Output PGA", NULL, "Charge Pump" },
{ "Left Line Output PGA", NULL, "Charge Pump" },