diff options
| author | Evan Wilson <evan@oliodevices.com> | 2015-07-31 11:30:09 -0700 |
|---|---|---|
| committer | Evan Wilson <evan@oliodevices.com> | 2015-07-31 11:36:32 -0700 |
| commit | 96c073888c2a35f6133b109b333cedec6da4910b (patch) | |
| tree | 114e10c66740c7ab6f3583edcb9e4bcc19857451 | |
| parent | 8792368f07601d6079875dabe4b6bba1031ca88e (diff) | |
| download | olio-linux-3.10-96c073888c2a35f6133b109b333cedec6da4910b.tar.xz olio-linux-3.10-96c073888c2a35f6133b109b333cedec6da4910b.zip | |
Temporary fixes to the display driver, so that the kernel will sleep
WARNING: It takes several attempts before a successful suspend, so this commit is not power efficient
Change-Id: I1825e1fcf12185181c060b635eef57ec63f4ef52
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 4 | ||||
| -rw-r--r-- | drivers/video/omap2/displays/panel-ili9342.c | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c index 7eaceb7fd10..6f089952c8f 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -204,8 +204,8 @@ static struct lm3530_platform_data omap3h1_backlight_platform_data = { //.pwm_pol_hi = true, //.als_avrg_time = LM3530_ALS_AVRG_TIME_512ms, .brt_ramp_law = 0, - .brt_ramp_fall = LM3530_RAMP_TIME_1s, /* LM3530_RAMP_TIME_1s, */ - .brt_ramp_rise = LM3530_RAMP_TIME_1s, /* LM3530_RAMP_TIME_1s, */ + .brt_ramp_fall = LM3530_RAMP_TIME_1ms, /* LM3530_RAMP_TIME_1s, */ + .brt_ramp_rise = LM3530_RAMP_TIME_1ms, /* LM3530_RAMP_TIME_1s, */ //.als1_resistor_sel = LM3530_ALS_IMPD_13_53kOhm, //.als2_resistor_sel = LM3530_ALS_IMPD_Z, //.als_vmin = 730, /* mV */ 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); } |