This is a note to let you know that I've just added the patch titled
ASoC: Correct WM8994 MICBIAS supply widget hookup
to the 2.6.39-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-correct-wm8994-micbias-supply-widget-hookup.patch
and it can be found in the queue-2.6.39 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <sta...@kernel.org> know about it.
>From b793eb60a01d5b5e4aaeb2fbc2b036dec0d9f84d Mon Sep 17 00:00:00 2001
From: Mark Brown <broo...@opensource.wolfsonmicro.com>
Date: Thu, 14 Jul 2011 18:21:37 +0900
Subject: ASoC: Correct WM8994 MICBIAS supply widget hookup
From: Mark Brown <broo...@opensource.wolfsonmicro.com>
commit b793eb60a01d5b5e4aaeb2fbc2b036dec0d9f84d upstream.
The WM8994 and WM8958 series of devices have two MICBIAS supplies rather
than one, the current widget actually manages the microphone detection
control register bit (which is managed separately by the relevant API).
Fix this, hooking the relevant supplies up to the MICBIAS1 and MICBIAS2
widgets.
Signed-off-by: Mark Brown <broo...@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>
---
sound/soc/codecs/wm8994.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -1446,7 +1446,6 @@ SND_SOC_DAPM_INPUT("DMIC1DAT"),
SND_SOC_DAPM_INPUT("DMIC2DAT"),
SND_SOC_DAPM_INPUT("Clock"),
-SND_SOC_DAPM_MICBIAS("MICBIAS", WM8994_MICBIAS, 2, 0),
SND_SOC_DAPM_SUPPLY_S("MICBIAS Supply", 1, SND_SOC_NOPM, 0, 0, micbias_ev,
SND_SOC_DAPM_PRE_PMU),
@@ -1765,8 +1764,10 @@ static const struct snd_soc_dapm_route w
{ "AIF2DACDAT", NULL, "AIF1DACDAT" },
{ "AIF1ADCDAT", NULL, "AIF2ADCDAT" },
{ "AIF2ADCDAT", NULL, "AIF1ADCDAT" },
- { "MICBIAS", NULL, "CLK_SYS" },
- { "MICBIAS", NULL, "MICBIAS Supply" },
+ { "MICBIAS1", NULL, "CLK_SYS" },
+ { "MICBIAS1", NULL, "MICBIAS Supply" },
+ { "MICBIAS2", NULL, "CLK_SYS" },
+ { "MICBIAS2", NULL, "MICBIAS Supply" },
};
static const struct snd_soc_dapm_route wm8994_intercon[] = {
Patches currently in stable-queue which might be from
broo...@opensource.wolfsonmicro.com are
queue-2.6.39/asoc-fix-blackfin-i2s-_pointer-implementation-return-in.patch
queue-2.6.39/asoc-ensure-we-delay-long-enough-for-wm8994-fll-to-lock.patch
queue-2.6.39/asoc-correct-wm8994-micbias-supply-widget-hookup.patch
queue-2.6.39/asoc-ak4642-fixup-snd_soc_update_bits-mask-for-pw_mgmt2.patch
queue-2.6.39/asoc-fix-shift-in-wm8958-accessory-detection-default.patch
_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable
