This is a note to let you know that I've just added the patch titled
mfd: Test for jack detection when deciding if wm8994 should suspend
to the 3.3-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:
mfd-test-for-jack-detection-when-deciding-if-wm8994-should-suspend.patch
and it can be found in the queue-3.3 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From d2cb87c23e8514ca49c85adc5924999927bb9494 Mon Sep 17 00:00:00 2001
From: Mark Brown <[email protected]>
Date: Mon, 20 Feb 2012 21:32:32 +0000
Subject: mfd: Test for jack detection when deciding if wm8994 should suspend
From: Mark Brown <[email protected]>
commit d2cb87c23e8514ca49c85adc5924999927bb9494 upstream.
The jack detection on WM1811 is often required during system suspend, add
it as another check when deciding if we should suspend.
Signed-off-by: Mark Brown <[email protected]>
Signed-off-by: Samuel Ortiz <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/mfd/wm8994-core.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -270,6 +270,20 @@ static int wm8994_suspend(struct device
break;
}
+ switch (wm8994->type) {
+ case WM1811:
+ ret = wm8994_reg_read(wm8994, WM8994_ANTIPOP_2);
+ if (ret < 0) {
+ dev_err(dev, "Failed to read jackdet: %d\n", ret);
+ } else if (ret & WM1811_JACKDET_MODE_MASK) {
+ dev_dbg(dev, "CODEC still active, ignoring suspend\n");
+ return 0;
+ }
+ break;
+ default:
+ break;
+ }
+
/* Disable LDO pulldowns while the device is suspended if we
* don't know that something will be driving them. */
if (!wm8994->ldo_ena_always_driven)
Patches currently in stable-queue which might be from
[email protected] are
queue-3.3/asoc-fsl-p1022ds-tell-the-wm8776-codec-driver-that-it-s-the-master.patch
queue-3.3/mfd-test-for-jack-detection-when-deciding-if-wm8994-should-suspend.patch
queue-3.3/asoc-pxa-ssp-atomically-set-stream-active-masks.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
