aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@nokia.com>2010-01-11 06:54:33 -0500
committerTomi Valkeinen <tomi.valkeinen@nokia.com>2010-02-24 07:31:27 -0500
commit96adceceedefff9b849d25ff582bc6f516903994 (patch)
tree5479f5a04deb0d06dc9004ae596ab95adbbb1e2d /arch/arm/plat-omap
parenta2faee84f6d8e35150d60514c6638d223509fa13 (diff)
OMAP: DSS2: move get_resolution()
Move get_resolution() 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/arm/plat-omap')
-rw-r--r--arch/arm/plat-omap/include/plat/display.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/include/plat/display.h b/arch/arm/plat-omap/include/plat/display.h
index f05098dd5d5c..70a9dd318ef9 100644
--- a/arch/arm/plat-omap/include/plat/display.h
+++ b/arch/arm/plat-omap/include/plat/display.h
@@ -470,8 +470,6 @@ struct omap_dss_device {
470 int (*suspend)(struct omap_dss_device *dssdev); 470 int (*suspend)(struct omap_dss_device *dssdev);
471 int (*resume)(struct omap_dss_device *dssdev); 471 int (*resume)(struct omap_dss_device *dssdev);
472 472
473 void (*get_resolution)(struct omap_dss_device *dssdev,
474 u16 *xres, u16 *yres);
475 int (*get_recommended_bpp)(struct omap_dss_device *dssdev); 473 int (*get_recommended_bpp)(struct omap_dss_device *dssdev);
476 474
477 int (*check_timings)(struct omap_dss_device *dssdev, 475 int (*check_timings)(struct omap_dss_device *dssdev,
@@ -529,6 +527,9 @@ struct omap_dss_driver {
529 int (*memory_read)(struct omap_dss_device *dssdev, 527 int (*memory_read)(struct omap_dss_device *dssdev,
530 void *buf, size_t size, 528 void *buf, size_t size,
531 u16 x, u16 y, u16 w, u16 h); 529 u16 x, u16 y, u16 w, u16 h);
530
531 void (*get_resolution)(struct omap_dss_device *dssdev,
532 u16 *xres, u16 *yres);
532}; 533};
533 534
534int omap_dss_register_driver(struct omap_dss_driver *); 535int omap_dss_register_driver(struct omap_dss_driver *);
@@ -553,6 +554,8 @@ struct omap_overlay_manager *omap_dss_get_overlay_manager(int num);
553int omap_dss_get_num_overlays(void); 554int omap_dss_get_num_overlays(void);
554struct omap_overlay *omap_dss_get_overlay(int num); 555struct omap_overlay *omap_dss_get_overlay(int num);
555 556
557void omapdss_default_get_resolution(struct omap_dss_device *dssdev,
558 u16 *xres, u16 *yres);
556typedef void (*omap_dispc_isr_t) (void *arg, u32 mask); 559typedef void (*omap_dispc_isr_t) (void *arg, u32 mask);
557int omap_dispc_register_isr(omap_dispc_isr_t isr, void *arg, u32 mask); 560int omap_dispc_register_isr(omap_dispc_isr_t isr, void *arg, u32 mask);
558int omap_dispc_unregister_isr(omap_dispc_isr_t isr, void *arg, u32 mask); 561int omap_dispc_unregister_isr(omap_dispc_isr_t isr, void *arg, u32 mask);