aboutsummaryrefslogtreecommitdiff
path: root/drivers/video/display
diff options
context:
space:
mode:
authorAndy Green <andy@openmoko.com>2008-11-19 17:11:17 +0000
committerAndy Green <andy@openmoko.com>2008-11-19 17:11:17 +0000
commit2c10eff0891ac43dcd9f79f7d136e1c6f621ed59 (patch)
tree83215e3f942fa9343afd51ac3bea21af01547ada /drivers/video/display
parente4f706d9d0731bf59df12e8685289bee7d11ffc9 (diff)
revert-jbt6k74-resume-changes.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/video/display')
-rw-r--r--drivers/video/display/jbt6k74.c18
1 files changed, 2 insertions, 16 deletions
diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c
index 56a6c955482..77f9528ff5a 100644
--- a/drivers/video/display/jbt6k74.c
+++ b/drivers/video/display/jbt6k74.c
@@ -674,7 +674,6 @@ static int __devexit jbt_remove(struct spi_device *spi)
static int jbt_suspend(struct spi_device *spi, pm_message_t state)
{
struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-// struct jbt6k74_platform_data *jbt6k74_pdata = spi->dev.platform_data;
/* Save mode for resume */
jbt->last_state = jbt->state;
@@ -683,7 +682,7 @@ static int jbt_suspend(struct spi_device *spi, pm_message_t state)
jbt->have_resumed = 0;
-// (jbt6k74_pdata->reset)(0, 0);
+/* (jbt6k74_pdata->reset)(0, 0); */
return 0;
}
@@ -693,19 +692,6 @@ int jbt6k74_resume(struct spi_device *spi)
struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
struct jbt6k74_platform_data *jbt6k74_pdata = spi->dev.platform_data;
- printk(KERN_ERR "****** jbt6k74_resume\n");
-
- /* software reset */
- jbt_reg_write_nodata(jbt, 1);
-
- msleep(120);
-
- sleep_to_normal(jbt);
- sleep_to_normal(jbt);
-
-/*
- jbt6k74_display_onoff(jbt, 1);
-
switch (jbt->last_state) {
case JBT_STATE_QVGA_NORMAL:
jbt6k74_enter_state(jbt, JBT_STATE_QVGA_NORMAL);
@@ -715,7 +701,7 @@ int jbt6k74_resume(struct spi_device *spi)
break;
}
jbt6k74_display_onoff(jbt, 1);
-*/
+
if (jbt6k74_pdata->resuming)
(jbt6k74_pdata->resuming)(0);