diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-24 16:52:15 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-24 16:52:15 -0700 |
commit | 01e77706cdde7c0b47e5ca1f4284a795504c7c40 (patch) | |
tree | 07d2574b13974669a6fcfccd276630754724553f /drivers/video/omap2/displays | |
parent | 1ff31056fb044a47cdda462bdef0dcacefbf6856 (diff) | |
parent | 8871d54b5e1558bd59baad02eb7a80f86d49f4a1 (diff) | |
download | linux-01e77706cdde7c0b47e5ca1f4284a795504c7c40.tar.gz linux-01e77706cdde7c0b47e5ca1f4284a795504c7c40.tar.bz2 linux-01e77706cdde7c0b47e5ca1f4284a795504c7c40.zip |
Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux:
OMAP: DSS2: panel-generic: re-implement mode changing
OMAP: DSS2: initialize dss clk sources properly
OMAP: DSS2: VRAM: Fix early_param for vram
Diffstat (limited to 'drivers/video/omap2/displays')
-rw-r--r-- | drivers/video/omap2/displays/panel-generic.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/drivers/video/omap2/displays/panel-generic.c b/drivers/video/omap2/displays/panel-generic.c index c59e4baed8b2..300eff5de1b4 100644 --- a/drivers/video/omap2/displays/panel-generic.c +++ b/drivers/video/omap2/displays/panel-generic.c @@ -116,6 +116,24 @@ static int generic_panel_resume(struct omap_dss_device *dssdev) return 0; } +static void generic_panel_set_timings(struct omap_dss_device *dssdev, + struct omap_video_timings *timings) +{ + dpi_set_timings(dssdev, timings); +} + +static void generic_panel_get_timings(struct omap_dss_device *dssdev, + struct omap_video_timings *timings) +{ + *timings = dssdev->panel.timings; +} + +static int generic_panel_check_timings(struct omap_dss_device *dssdev, + struct omap_video_timings *timings) +{ + return dpi_check_timings(dssdev, timings); +} + static struct omap_dss_driver generic_driver = { .probe = generic_panel_probe, .remove = generic_panel_remove, @@ -125,6 +143,10 @@ static struct omap_dss_driver generic_driver = { .suspend = generic_panel_suspend, .resume = generic_panel_resume, + .set_timings = generic_panel_set_timings, + .get_timings = generic_panel_get_timings, + .check_timings = generic_panel_check_timings, + .driver = { .name = "generic_panel", .owner = THIS_MODULE, |