diff options
| author | Alban Bedel <alban.bedel@avionic-design.de> | 2013-04-09 17:13:59 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-16 21:02:30 -0700 |
| commit | da60065417ee775999fd05d2a4ea0c268e4ec30b (patch) | |
| tree | 080fc51e538779fcd7a78e5eba4b4ccced37a4c5 /sound/soc | |
| parent | facbcede9edd28f9f3290a83fdb6ea4b781ffcd6 (diff) | |
| download | kernel_samsung_aries-da60065417ee775999fd05d2a4ea0c268e4ec30b.zip kernel_samsung_aries-da60065417ee775999fd05d2a4ea0c268e4ec30b.tar.gz kernel_samsung_aries-da60065417ee775999fd05d2a4ea0c268e4ec30b.tar.bz2 | |
ASoC: wm8903: Fix the bypass to HP/LINEOUT when no DAC or ADC is running
commit f1ca493b0b5e8f42d3b2dc8877860db2983f47b6 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm8903.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index 43e3d76..fea5b7a 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c @@ -1101,6 +1101,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" }, |