This is a note to let you know that I've just added the patch titled
ASoC: wm_hubs: Fix routing of input PGAs to line output
to the 3.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
asoc-wm_hubs-fix-routing-of-input-pgas-to-line-output.patch
and it can be found in the queue-3.2 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From ee76744c51ec342df9822b4a85dbbfc3887b6d60 Mon Sep 17 00:00:00 2001
From: Mark Brown <[email protected]>
Date: Tue, 31 Jan 2012 11:55:32 +0000
Subject: ASoC: wm_hubs: Fix routing of input PGAs to line output
mixer
From: Mark Brown <[email protected]>
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 <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
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" },
Patches currently in stable-queue which might be from
[email protected] are
queue-3.2/asoc-wm_hubs-fix-routing-of-input-pgas-to-line-output.patch
queue-3.2/asoc-wm_hubs-enable-line-out-vmid-buffer-for-single-ended-line-outputs.patch
queue-3.2/asoc-wm8962-fix-word-length-configuration.patch
queue-3.2/asoc-wm8994-fix-typo-in-vmid-ramp-setting.patch
queue-3.2/asoc-wm8994-enabling-vmid-should-take-a-runtime-pm-reference.patch
queue-3.2/asoc-wm_hubs-fix-wrong-bits-for-lineout2-n-p-mixer.patch
queue-3.2/asoc-wm_hubs-correct-line-input-to-line-output-2-paths.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
