| From d0b48af6c2b887354d0893e598d92911ce52620e Mon Sep 17 00:00:00 2001 |
| From: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| Date: Sat, 14 May 2011 17:21:28 -0700 |
| Subject: ASoC: Ensure output PGA is enabled for line outputs in |
| wm_hubs |
| |
| From: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| |
| commit d0b48af6c2b887354d0893e598d92911ce52620e upstream. |
| |
| Also fix a left/right typo while we're at it. |
| |
| Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| Acked-by: Liam Girdwood <lrg@ti.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| sound/soc/codecs/wm_hubs.c | 16 ++++++++-------- |
| 1 file changed, 8 insertions(+), 8 deletions(-) |
| |
| --- a/sound/soc/codecs/wm_hubs.c |
| +++ b/sound/soc/codecs/wm_hubs.c |
| @@ -639,17 +639,17 @@ static const struct snd_soc_dapm_route a |
| static const struct snd_soc_dapm_route lineout1_diff_routes[] = { |
| { "LINEOUT1 Mixer", "IN1L Switch", "IN1L PGA" }, |
| { "LINEOUT1 Mixer", "IN1R Switch", "IN1R PGA" }, |
| - { "LINEOUT1 Mixer", "Output Switch", "Left Output Mixer" }, |
| + { "LINEOUT1 Mixer", "Output Switch", "Left Output PGA" }, |
| |
| { "LINEOUT1N Driver", NULL, "LINEOUT1 Mixer" }, |
| { "LINEOUT1P Driver", NULL, "LINEOUT1 Mixer" }, |
| }; |
| |
| static const struct snd_soc_dapm_route lineout1_se_routes[] = { |
| - { "LINEOUT1N Mixer", "Left Output Switch", "Left Output Mixer" }, |
| - { "LINEOUT1N Mixer", "Right Output Switch", "Left Output Mixer" }, |
| + { "LINEOUT1N Mixer", "Left Output Switch", "Left Output PGA" }, |
| + { "LINEOUT1N Mixer", "Right Output Switch", "Right Output PGA" }, |
| |
| - { "LINEOUT1P Mixer", "Left Output Switch", "Left Output Mixer" }, |
| + { "LINEOUT1P Mixer", "Left Output Switch", "Left Output PGA" }, |
| |
| { "LINEOUT1N Driver", NULL, "LINEOUT1N Mixer" }, |
| { "LINEOUT1P Driver", NULL, "LINEOUT1P Mixer" }, |
| @@ -658,17 +658,17 @@ static const struct snd_soc_dapm_route l |
| static const struct snd_soc_dapm_route lineout2_diff_routes[] = { |
| { "LINEOUT2 Mixer", "IN2L Switch", "IN2L PGA" }, |
| { "LINEOUT2 Mixer", "IN2R Switch", "IN2R PGA" }, |
| - { "LINEOUT2 Mixer", "Output Switch", "Right Output Mixer" }, |
| + { "LINEOUT2 Mixer", "Output Switch", "Right Output PGA" }, |
| |
| { "LINEOUT2N Driver", NULL, "LINEOUT2 Mixer" }, |
| { "LINEOUT2P Driver", NULL, "LINEOUT2 Mixer" }, |
| }; |
| |
| static const struct snd_soc_dapm_route lineout2_se_routes[] = { |
| - { "LINEOUT2N Mixer", "Left Output Switch", "Left Output Mixer" }, |
| - { "LINEOUT2N Mixer", "Right Output Switch", "Left Output Mixer" }, |
| + { "LINEOUT2N Mixer", "Left Output Switch", "Left Output PGA" }, |
| + { "LINEOUT2N Mixer", "Right Output Switch", "Right Output PGA" }, |
| |
| - { "LINEOUT2P Mixer", "Right Output Switch", "Right Output Mixer" }, |
| + { "LINEOUT2P Mixer", "Right Output Switch", "Right Output PGA" }, |
| |
| { "LINEOUT2N Driver", NULL, "LINEOUT2N Mixer" }, |
| { "LINEOUT2P Driver", NULL, "LINEOUT2P Mixer" }, |
