lkml.org 
[lkml]   [2012]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 22/95] mfd: Test for jack detection when deciding if wm8994 should suspend
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Mark Brown <broonie@opensource.wolfsonmicro.com>

    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>

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

    --- a/drivers/mfd/wm8994-core.c
    +++ b/drivers/mfd/wm8994-core.c
    @@ -252,6 +252,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)



    \
     
     \ /
      Last update: 2012-03-09 21:27    [W:2.678 / U:0.400 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site