lkml.org 
[lkml]   [2012]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 56/86] ASoC: wm_hubs: Fix routing of input PGAs to line output mixer
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Mark Brown <broonie@opensource.wolfsonmicro.com>

    commit ee76744c51ec342df9822b4a85dbbfc3887b6d60 upstream.

    IN1L/R is routed to both line output mixers, we don't route IN1 to LINEOUT1
    and IN2 to LINEOUT2.

    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/soc/codecs/wm_hubs.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- a/sound/soc/codecs/wm_hubs.c
    +++ b/sound/soc/codecs/wm_hubs.c
    @@ -587,8 +587,8 @@ SOC_DAPM_SINGLE("Left Output Switch", WM
    };

    static const struct snd_kcontrol_new line2_mix[] = {
    -SOC_DAPM_SINGLE("IN2R Switch", WM8993_LINE_MIXER2, 2, 1, 0),
    -SOC_DAPM_SINGLE("IN2L Switch", WM8993_LINE_MIXER2, 1, 1, 0),
    +SOC_DAPM_SINGLE("IN1R Switch", WM8993_LINE_MIXER2, 2, 1, 0),
    +SOC_DAPM_SINGLE("IN1L Switch", WM8993_LINE_MIXER2, 1, 1, 0),
    SOC_DAPM_SINGLE("Output Switch", WM8993_LINE_MIXER2, 0, 1, 0),
    };

    @@ -846,8 +846,8 @@ 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", "IN1L Switch", "IN1L PGA" },
    + { "LINEOUT2 Mixer", "IN1R Switch", "IN1R PGA" },
    { "LINEOUT2 Mixer", "Output Switch", "Right Output PGA" },

    { "LINEOUT2N Driver", NULL, "LINEOUT2 Mixer" },



    \
     
     \ /
      Last update: 2012-02-11 00:15    [W:0.024 / U:88.792 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site