summaryrefslogtreecommitdiff
path: root/drivers/video/omap2/displays/panel-ili9342.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/omap2/displays/panel-ili9342.c')
-rw-r--r--drivers/video/omap2/displays/panel-ili9342.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/video/omap2/displays/panel-ili9342.c b/drivers/video/omap2/displays/panel-ili9342.c
index 228a69b7688..d79284e7326 100644
--- a/drivers/video/omap2/displays/panel-ili9342.c
+++ b/drivers/video/omap2/displays/panel-ili9342.c
@@ -155,9 +155,9 @@ static void set_sleep_mode(struct panel_drv_data *drv_data, int on)
* We have to keep 120msec between sleep in/out commands.
* (8.2.11, 8.2.12).
*/
- hw_guard_wait(drv_data);
+ //hw_guard_wait(drv_data);
ili9342_write_cmd(drv_data->spi, cmd);
- hw_guard_start(drv_data, 120);
+ //hw_guard_start(drv_data, 120);
}
static void set_display_state(struct panel_drv_data *drv_data, int enabled)
@@ -183,6 +183,7 @@ static int ili9342_panel_power_on(struct omap_dss_device *dssdev)
if (r)
return r;
+ printk ("OLIO %s entered\n", __FUNCTION__);
/* wait couple of vsyncs until enabling the LCD */
msleep(panel_config->power_on_delay);
@@ -194,7 +195,7 @@ static int ili9342_panel_power_on(struct omap_dss_device *dssdev)
set_sleep_mode(drv_data, 0);
usleep_range(5000, 10000);
- set_display_state(drv_data, 1);
+ //set_display_state(drv_data, 1);
return 0;
err1:
@@ -210,16 +211,15 @@ static void ili9342_panel_power_off(struct omap_dss_device *dssdev)
if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
return;
- set_display_state(drv_data, 0);
+ //set_display_state(drv_data, 0);
set_sleep_mode(drv_data, 1);
- msleep(100);
+ printk ("OLIO %s entered\n", __FUNCTION__);
+ /* wait couple of vsyncs after disabling the LCD */
+ msleep(panel_config->power_off_delay);
if (dssdev->platform_disable)
dssdev->platform_disable(dssdev);
- /* wait couple of vsyncs after disabling the LCD */
- msleep(panel_config->power_off_delay);
-
omapdss_dpi_display_disable(dssdev);
}