51 lines
1.9 KiB
Diff
51 lines
1.9 KiB
Diff
|
From 50ea11a2a5397c72427a153a1327c6c433754df8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Sean McNeil <sean@mcneil.com>
|
||
|
|
Date: Wed, 2 Jul 2008 22:38:54 +0100
|
||
|
|
Subject: [PATCH] The following is a minor cleanup of backlight resume:
|
||
|
|
|
||
|
|
---
|
||
|
|
drivers/i2c/chips/pcf50633.c | 13 ++++---------
|
||
|
|
1 files changed, 4 insertions(+), 9 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
|
||
|
|
index 2f9b9e1..aabf412 100644
|
||
|
|
--- a/drivers/i2c/chips/pcf50633.c
|
||
|
|
+++ b/drivers/i2c/chips/pcf50633.c
|
||
|
|
@@ -2239,8 +2239,8 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
|
||
|
|
void pcf50633_backlight_resume(struct pcf50633_data *pcf)
|
||
|
|
{
|
||
|
|
/* we force the backlight on in fact */
|
||
|
|
- __reg_write(pcf, PCF50633_REG_LEDOUT, 0x3f);
|
||
|
|
- __reg_write(pcf, PCF50633_REG_LEDENA, 0x21);
|
||
|
|
+ __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.ledout);
|
||
|
|
+ __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.ledena | 0x01);
|
||
|
|
__reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.leddim);
|
||
|
|
}
|
||
|
|
EXPORT_SYMBOL_GPL(pcf50633_backlight_resume);
|
||
|
|
@@ -2254,8 +2254,6 @@ static int pcf50633_resume(struct device *dev)
|
||
|
|
|
||
|
|
mutex_lock(&pcf->lock);
|
||
|
|
|
||
|
|
- __reg_write(pcf, PCF50633_REG_LEDENA, 0x01);
|
||
|
|
-
|
||
|
|
/* Resume all saved registers that don't "survive" standby state */
|
||
|
|
__reg_write(pcf, PCF50633_REG_INT1M, pcf->standby_regs.int1m);
|
||
|
|
__reg_write(pcf, PCF50633_REG_INT2M, pcf->standby_regs.int2m);
|
||
|
|
@@ -2274,11 +2272,8 @@ static int pcf50633_resume(struct device *dev)
|
||
|
|
__reg_write(pcf, PCF50633_REG_MEMLDOENA, pcf->standby_regs.memldoena);
|
||
|
|
|
||
|
|
/* platform can choose to defer backlight bringup */
|
||
|
|
- if (!pcf->pdata->defer_resume_backlight) {
|
||
|
|
- __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.ledout);
|
||
|
|
- __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.ledena);
|
||
|
|
- __reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.leddim);
|
||
|
|
- }
|
||
|
|
+ if (!pcf->pdata->defer_resume_backlight)
|
||
|
|
+ pcf50633_backlight_resume(pcf);
|
||
|
|
|
||
|
|
/* FIXME: one big read? */
|
||
|
|
for (i = 0; i < 7; i++) {
|
||
|
|
--
|
||
|
|
1.5.6.5
|
||
|
|
|