diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-20 21:32:32 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-12 12:31:24 -0700 |
| commit | 315e73b400c9a287a53efb5f857d308589674ac5 (patch) | |
| tree | 3086e4ca39257499fa01aec67ea794279f88feac /drivers/mfd | |
| parent | 5e39bbafe82bbb12ed307af97c929627e0f9499a (diff) | |
| download | kernel_samsung_smdk4412-315e73b400c9a287a53efb5f857d308589674ac5.zip kernel_samsung_smdk4412-315e73b400c9a287a53efb5f857d308589674ac5.tar.gz kernel_samsung_smdk4412-315e73b400c9a287a53efb5f857d308589674ac5.tar.bz2 | |
mfd: Test for jack detection when deciding if wm8994 should suspend
commit e7c248a049c2aac21bded0b0722caee6f0e57256 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 <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | 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 61894fc..9302d21 100644 --- a/drivers/mfd/wm8994-core.c +++ b/drivers/mfd/wm8994-core.c @@ -252,6 +252,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) |