| From ca19ab211c0992be58b5c56a985de3c6d2c76f28 Mon Sep 17 00:00:00 2001 |
| From: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| Date: Fri, 8 Apr 2011 16:32:16 +0900 |
| Subject: [PATCH] ASoC: Fix output PGA enabling in wm_hubs CODECs |
| |
| commit 39cca168bdfaef9d0c496ec27f292445d6184946 upstream. |
| |
| The output PGA was not being powered up in headphone and speaker paths, |
| removing the ability to offer volume control and mute with the output |
| PGA. |
| |
| Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c |
| index e1f225a..db6122f 100644 |
| --- a/sound/soc/codecs/wm_hubs.c |
| +++ b/sound/soc/codecs/wm_hubs.c |
| @@ -701,12 +701,12 @@ static const struct snd_soc_dapm_route analogue_routes[] = { |
| |
| { "SPKL", "Input Switch", "MIXINL" }, |
| { "SPKL", "IN1LP Switch", "IN1LP" }, |
| - { "SPKL", "Output Switch", "Left Output Mixer" }, |
| + { "SPKL", "Output Switch", "Left Output PGA" }, |
| { "SPKL", NULL, "TOCLK" }, |
| |
| { "SPKR", "Input Switch", "MIXINR" }, |
| { "SPKR", "IN1RP Switch", "IN1RP" }, |
| - { "SPKR", "Output Switch", "Right Output Mixer" }, |
| + { "SPKR", "Output Switch", "Right Output PGA" }, |
| { "SPKR", NULL, "TOCLK" }, |
| |
| { "SPKL Boost", "Direct Voice Switch", "Direct Voice" }, |
| @@ -728,8 +728,8 @@ static const struct snd_soc_dapm_route analogue_routes[] = { |
| { "SPKOUTRP", NULL, "SPKR Driver" }, |
| { "SPKOUTRN", NULL, "SPKR Driver" }, |
| |
| - { "Left Headphone Mux", "Mixer", "Left Output Mixer" }, |
| - { "Right Headphone Mux", "Mixer", "Right Output Mixer" }, |
| + { "Left Headphone Mux", "Mixer", "Left Output PGA" }, |
| + { "Right Headphone Mux", "Mixer", "Right Output PGA" }, |
| |
| { "Headphone PGA", NULL, "Left Headphone Mux" }, |
| { "Headphone PGA", NULL, "Right Headphone Mux" }, |
| -- |
| 1.7.7 |
| |
