[ 146/175] mfd: Test for jack detection when deciding if wm8994 should suspend
From: Greg KH <gregkh@linuxfoundation.org>
Date: 2012-03-30 21:32:07
Also in:
lkml
3.3-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mark Brown <redacted> 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 <redacted> Signed-off-by: Samuel Ortiz <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- 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)