2012-02-20 21:33:00

by Mark Brown

Subject: [PATCH 3.3] mfd: Test for jack detection when deciding if wm8994 should suspend

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]>
Cc: [email protected]
---

Samuel, could you please add this to your for-linus branch? It's been
sitting around unloved for some considerable time now...

drivers/mfd/wm8994-core.c | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index f117e7f..a04b3c1 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -256,6 +256,20 @@ static int wm8994_suspend(struct device *dev)
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)
--
1.7.9

2012-02-21 10:50:40

by Samuel Ortiz

Subject: Re: [PATCH 3.3] mfd: Test for jack detection when deciding if wm8994 should suspend

Hi Mark,

On Mon, Feb 20, 2012 at 09:32:32PM +0000, Mark Brown wrote:
> 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]>
> Cc: [email protected]
> ---
>
> Samuel, could you please add this to your for-linus branch? It's been
> sitting around unloved for some considerable time now...
Sure. For some reason I misunderstood that you already pushed it.
Applied to my for-linus branch now.

Cheers,
Samuel.

--
Intel Open Source Technology Centre
http://oss.intel.com/