[PATCH] mfd:adp5520: Restore mode bits on resume

[PATCH] mfd:adp5520: Restore mode bits on resume

[Lars-Peter Clausen]

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.

Cc: stable@vger.kernel.org
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 drivers/mfd/adp5520.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/adp5520.c b/drivers/mfd/adp5520.c
index 210dd03..6b40e0c 100644
--- 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 *dev)
 	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 *dev)
 	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
-- 
1.8.0

Re: [PATCH] mfd:adp5520: Restore mode bits on resume

[Michael Hennerich]

On 02/19/2013 11:51 AM, Lars-Peter Clausen wrote:
> 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.
>
> Cc: stable@vger.kernel.org
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
> ---
>   drivers/mfd/adp5520.c | 8 ++++++--
>   1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mfd/adp5520.c b/drivers/mfd/adp5520.c
> index 210dd03..6b40e0c 100644
> --- 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 *dev)
>   	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 *dev)
>   	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


-- 
Greetings,
Michael

--
Analog Devices GmbH      Wilhelm-Wagenfeld-Str. 6      80807 Muenchen
Sitz der Gesellschaft: Muenchen; Registergericht: Muenchen HRB 40368;
Geschaeftsfuehrer:Dr.Carsten Suckrow, Thomas Wessel, William A. Martin,
Margaret Seif

Re: [PATCH] mfd:adp5520: Restore mode bits on resume

[Samuel Ortiz]

Hi Michael, Lars,

On Tue, Feb 19, 2013 at 02:10:04PM +0100, Michael Hennerich wrote:
> On 02/19/2013 11:51 AM, Lars-Peter Clausen wrote:
> >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.
> >
> >Cc: stable@vger.kernel.org
> >Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
> Acked-by: Michael Hennerich <michael.hennerich@analog.com>
> >---
> >  drivers/mfd/adp5520.c | 8 ++++++--
> >  1 file changed, 6 insertions(+), 2 deletions(-)
Patch applied, thanks.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/