lkml.org 
[lkml]   [2012]   [Feb]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.3] mfd: Test for jack detection when deciding if wm8994 should suspend
    Date
    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>
    Cc: stable@vger.kernel.org
    ---

    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


    \
     
     \ /
      Last update: 2012-02-20 22:35    [W:4.281 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site