summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/sdi.c
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2012-09-10 09:18:03 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-09-10 09:18:08 +0300
commit6cd05430eeab0668c55ff4693ab79ff559b2b5c7 (patch)
tree47f6de06e649c2fefaddf85c681a0d7e33b2a07a /drivers/video/omap2/dss/sdi.c
parentc50e86ce7c2961a41f2f7aa6e4fd6c99229ba205 (diff)
parentb2f5976c109350977104f27211a7029ec67cd488 (diff)
Merge miscellaneous omapdss changes
Most important changes: * Remove OMAP4 HDMI gpio handling from board files * Add vdda_hdmi_dac supply for HDMI to twl-common.c * Calculate DSI clocks dynamically * Remove DSS clock dividers from 4430sdp board file * vram.c no longer uses OMAP's sDMA to clear the memory * Fifomerge has been reverted * Swap GFX and WB fifos to avoid underflows
Diffstat (limited to 'drivers/video/omap2/dss/sdi.c')
-rw-r--r--drivers/video/omap2/dss/sdi.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c
index 3bf1bfe2958..c87e07ebb16 100644
--- a/drivers/video/omap2/dss/sdi.c
+++ b/drivers/video/omap2/dss/sdi.c
@@ -152,17 +152,7 @@ EXPORT_SYMBOL(omapdss_sdi_display_disable);
void omapdss_sdi_set_timings(struct omap_dss_device *dssdev,
struct omap_video_timings *timings)
{
- int r;
-
sdi.timings = *timings;
-
- if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) {
- omapdss_sdi_display_disable(dssdev);
-
- r = omapdss_sdi_display_enable(dssdev);
- if (r)
- DSSERR("failed to set new timings\n");
- }
}
EXPORT_SYMBOL(omapdss_sdi_set_timings);