diff options
| author | Andy Green <andy@openmoko.com> | 2008-11-19 17:11:16 +0000 |
|---|---|---|
| committer | Andy Green <andy@openmoko.com> | 2008-11-19 17:11:16 +0000 |
| commit | 870784bf1f7a8e2269f2384867a651fce101757f (patch) | |
| tree | d1bd5ff577cc697c3d7fa0cae511ab14dc829967 /drivers/video | |
| parent | 27460b673fa446babd4d35ca8eb5f66c42cb99a3 (diff) | |
tracking-glamo-suspend-even-more-meddling.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/display/jbt6k74.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c index 77f9528ff5a..56a6c955482 100644 --- a/drivers/video/display/jbt6k74.c +++ b/drivers/video/display/jbt6k74.c @@ -674,6 +674,7 @@ 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; @@ -682,7 +683,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; } @@ -692,6 +693,19 @@ 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); @@ -701,7 +715,7 @@ int jbt6k74_resume(struct spi_device *spi) break; } jbt6k74_display_onoff(jbt, 1); - +*/ if (jbt6k74_pdata->resuming) (jbt6k74_pdata->resuming)(0); |