diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-07-23 17:15:27 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-07-23 17:15:27 -0700 |
| commit | 74d71e3bbccfdb208dd4385df5a636f889b3cd05 (patch) | |
| tree | 1da3047144075bed53290b018a675d9686c4fb69 /drivers/video/omap2/displays/panel-ili9342.c | |
| parent | 5d1c09eedec0cf5fd486d240b4ede1c476ed6adf (diff) | |
| parent | cd0f92406cc231fda66c30312f48d12fab5ac614 (diff) | |
| download | olio-linux-3.10-74d71e3bbccfdb208dd4385df5a636f889b3cd05.tar.xz olio-linux-3.10-74d71e3bbccfdb208dd4385df5a636f889b3cd05.zip | |
Merged bluetooth and ST mods from mattis_bt_work.
Change-Id: Ic904469eae89e5678a502e78309b30ab9715cd41
Diffstat (limited to 'drivers/video/omap2/displays/panel-ili9342.c')
| -rw-r--r-- | drivers/video/omap2/displays/panel-ili9342.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/omap2/displays/panel-ili9342.c b/drivers/video/omap2/displays/panel-ili9342.c index c9890b8a653..42f23fdb4ff 100644 --- a/drivers/video/omap2/displays/panel-ili9342.c +++ b/drivers/video/omap2/displays/panel-ili9342.c @@ -76,6 +76,8 @@ static struct panel_config ili9342_panels[] = { .sync_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE, }, .name = "olio_h1_panel", + .power_on_delay = 25, + .power_off_delay = 25, }, }; @@ -593,7 +595,8 @@ static int ili9342_resume(struct device *dev) { return ret; } - ili9342_init_seq(spi); /* init_ili9342_hw (spi); */ + /* ili9342_init_seq(spi); */ + init_ili9342_hw (spi); return 0; } |