lkml.org 
[lkml]   [2013]   [May]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 115/115] mfd: adp5520: Restore mode bits on resume
    Date
    3.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Lars-Peter Clausen <lars@metafoo.de>

    commit c6cc25fda58da8685ecef3f179adc7b99c8253b2 upstream.

    The adp5520 unfortunately also clears the BL_EN bit when the nSTNDBY bit is
    cleared. So we need to make sure to restore it during resume if it was set
    before suspend.

    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    Acked-by: Michael Hennerich <michael.hennerich@analog.com>
    Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/mfd/adp5520.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    --- a/drivers/mfd/adp5520.c
    +++ b/drivers/mfd/adp5520.c
    @@ -36,6 +36,7 @@ struct adp5520_chip {
    struct blocking_notifier_head notifier_list;
    int irq;
    unsigned long id;
    + uint8_t mode;
    };

    static int __adp5520_read(struct i2c_client *client,
    @@ -326,7 +327,10 @@ static int adp5520_suspend(struct device
    struct i2c_client *client = to_i2c_client(dev);
    struct adp5520_chip *chip = dev_get_drvdata(&client->dev);

    - adp5520_clr_bits(chip->dev, ADP5520_MODE_STATUS, ADP5520_nSTNBY);
    + adp5520_read(chip->dev, ADP5520_MODE_STATUS, &chip->mode);
    + /* All other bits are W1C */
    + chip->mode &= ADP5520_BL_EN | ADP5520_DIM_EN | ADP5520_nSTNBY;
    + adp5520_write(chip->dev, ADP5520_MODE_STATUS, 0);
    return 0;
    }

    @@ -335,7 +339,7 @@ static int adp5520_resume(struct device
    struct i2c_client *client = to_i2c_client(dev);
    struct adp5520_chip *chip = dev_get_drvdata(&client->dev);

    - adp5520_set_bits(chip->dev, ADP5520_MODE_STATUS, ADP5520_nSTNBY);
    + adp5520_write(chip->dev, ADP5520_MODE_STATUS, chip->mode);
    return 0;
    }
    #endif



    \
     
     \ /
      Last update: 2013-05-06 23:41    [W:5.468 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site