releases/2.6.38.8/asoc-ensure-output-pga-is-enabled-for-line-outputs-in.patch

   1 From d0b48af6c2b887354d0893e598d92911ce52620e Mon Sep 17 00:00:00 2001
   2 From: Mark Brown <broonie@opensource.wolfsonmicro.com>
   3 Date: Sat, 14 May 2011 17:21:28 -0700
   4 Subject: ASoC: Ensure output PGA is enabled for line outputs in
   5  wm_hubs
   6
   7 From: Mark Brown <broonie@opensource.wolfsonmicro.com>
   8
   9 commit d0b48af6c2b887354d0893e598d92911ce52620e upstream.
  10
  11 Also fix a left/right typo while we're at it.
  12
  13 Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  14 Acked-by: Liam Girdwood <lrg@ti.com>
  15 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  16
  17 ---
  18  sound/soc/codecs/wm_hubs.c |   16 ++++++++--------
  19  1 file changed, 8 insertions(+), 8 deletions(-)
  20
  21 --- a/sound/soc/codecs/wm_hubs.c
  22 +++ b/sound/soc/codecs/wm_hubs.c
  23 @@ -786,17 +786,17 @@ static const struct snd_soc_dapm_route a
  24  static const struct snd_soc_dapm_route lineout1_diff_routes[] = {
  25         { "LINEOUT1 Mixer", "IN1L Switch", "IN1L PGA" },
  26         { "LINEOUT1 Mixer", "IN1R Switch", "IN1R PGA" },
  27 -       { "LINEOUT1 Mixer", "Output Switch", "Left Output Mixer" },
  28 +       { "LINEOUT1 Mixer", "Output Switch", "Left Output PGA" },
  29
  30         { "LINEOUT1N Driver", NULL, "LINEOUT1 Mixer" },
  31         { "LINEOUT1P Driver", NULL, "LINEOUT1 Mixer" },
  32  };
  33
  34  static const struct snd_soc_dapm_route lineout1_se_routes[] = {
  35 -       { "LINEOUT1N Mixer", "Left Output Switch", "Left Output Mixer" },
  36 -       { "LINEOUT1N Mixer", "Right Output Switch", "Left Output Mixer" },
  37 +       { "LINEOUT1N Mixer", "Left Output Switch", "Left Output PGA" },
  38 +       { "LINEOUT1N Mixer", "Right Output Switch", "Right Output PGA" },
  39
  40 -       { "LINEOUT1P Mixer", "Left Output Switch", "Left Output Mixer" },
  41 +       { "LINEOUT1P Mixer", "Left Output Switch", "Left Output PGA" },
  42
  43         { "LINEOUT1N Driver", NULL, "LINEOUT1N Mixer" },
  44         { "LINEOUT1P Driver", NULL, "LINEOUT1P Mixer" },
  45 @@ -805,17 +805,17 @@ static const struct snd_soc_dapm_route l
  46  static const struct snd_soc_dapm_route lineout2_diff_routes[] = {
  47         { "LINEOUT2 Mixer", "IN2L Switch", "IN2L PGA" },
  48         { "LINEOUT2 Mixer", "IN2R Switch", "IN2R PGA" },
  49 -       { "LINEOUT2 Mixer", "Output Switch", "Right Output Mixer" },
  50 +       { "LINEOUT2 Mixer", "Output Switch", "Right Output PGA" },
  51
  52         { "LINEOUT2N Driver", NULL, "LINEOUT2 Mixer" },
  53         { "LINEOUT2P Driver", NULL, "LINEOUT2 Mixer" },
  54  };
  55
  56  static const struct snd_soc_dapm_route lineout2_se_routes[] = {
  57 -       { "LINEOUT2N Mixer", "Left Output Switch", "Left Output Mixer" },
  58 -       { "LINEOUT2N Mixer", "Right Output Switch", "Left Output Mixer" },
  59 +       { "LINEOUT2N Mixer", "Left Output Switch", "Left Output PGA" },
  60 +       { "LINEOUT2N Mixer", "Right Output Switch", "Right Output PGA" },
  61
  62 -       { "LINEOUT2P Mixer", "Right Output Switch", "Right Output Mixer" },
  63 +       { "LINEOUT2P Mixer", "Right Output Switch", "Right Output PGA" },
  64
  65         { "LINEOUT2N Driver", NULL, "LINEOUT2N Mixer" },
  66         { "LINEOUT2P Driver", NULL, "LINEOUT2P Mixer" },