diff options
author | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-01-12 08:12:07 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-02-24 07:31:28 -0500 |
commit | 37ac60e414052f1d9301368437db8f0cb9e323fe (patch) | |
tree | d6b30b58deae82a6d5f2ac2f4d9cf18ed3bc57da /arch | |
parent | 18946f62c6cc8cf051bafca8b7fa72309e8a1067 (diff) |
OMAP: DSS2: move enable/disable/suspend/resume
Move enable/disable/suspend/resume from omap_dss_device to
omap_dss_driver.
This is part of a larger patch-set, which moves the control from omapdss
driver to the display driver.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/plat-omap/include/plat/display.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/arch/arm/plat-omap/include/plat/display.h b/arch/arm/plat-omap/include/plat/display.h index e124f11e9bba..5221951350cd 100644 --- a/arch/arm/plat-omap/include/plat/display.h +++ b/arch/arm/plat-omap/include/plat/display.h | |||
@@ -462,12 +462,6 @@ struct omap_dss_device { | |||
462 | 462 | ||
463 | enum omap_dss_display_state state; | 463 | enum omap_dss_display_state state; |
464 | 464 | ||
465 | int (*enable)(struct omap_dss_device *dssdev); | ||
466 | void (*disable)(struct omap_dss_device *dssdev); | ||
467 | |||
468 | int (*suspend)(struct omap_dss_device *dssdev); | ||
469 | int (*resume)(struct omap_dss_device *dssdev); | ||
470 | |||
471 | int (*check_timings)(struct omap_dss_device *dssdev, | 465 | int (*check_timings)(struct omap_dss_device *dssdev, |
472 | struct omap_video_timings *timings); | 466 | struct omap_video_timings *timings); |
473 | void (*set_timings)(struct omap_dss_device *dssdev, | 467 | void (*set_timings)(struct omap_dss_device *dssdev, |
@@ -571,11 +565,21 @@ int omap_dsi_update(struct omap_dss_device *dssdev, | |||
571 | u16 x, u16 y, u16 w, u16 h, | 565 | u16 x, u16 y, u16 w, u16 h, |
572 | void (*callback)(int, void *), void *data); | 566 | void (*callback)(int, void *), void *data); |
573 | 567 | ||
568 | int omapdss_dsi_display_enable(struct omap_dss_device *dssdev); | ||
569 | void omapdss_dsi_display_disable(struct omap_dss_device *dssdev); | ||
570 | |||
571 | int omapdss_dpi_display_enable(struct omap_dss_device *dssdev); | ||
572 | void omapdss_dpi_display_disable(struct omap_dss_device *dssdev); | ||
573 | |||
574 | int omapdss_sdi_display_enable(struct omap_dss_device *dssdev); | ||
575 | void omapdss_sdi_display_disable(struct omap_dss_device *dssdev); | ||
576 | |||
577 | int omapdss_rfbi_display_enable(struct omap_dss_device *dssdev); | ||
578 | void omapdss_rfbi_display_disable(struct omap_dss_device *dssdev); | ||
574 | int omap_rfbi_prepare_update(struct omap_dss_device *dssdev, | 579 | int omap_rfbi_prepare_update(struct omap_dss_device *dssdev, |
575 | u16 *x, u16 *y, u16 *w, u16 *h); | 580 | u16 *x, u16 *y, u16 *w, u16 *h); |
576 | int omap_rfbi_update(struct omap_dss_device *dssdev, | 581 | int omap_rfbi_update(struct omap_dss_device *dssdev, |
577 | u16 x, u16 y, u16 w, u16 h, | 582 | u16 x, u16 y, u16 w, u16 h, |
578 | void (*callback)(void *), void *data); | 583 | void (*callback)(void *), void *data); |
579 | 584 | ||
580 | |||
581 | #endif | 585 | #endif |