ARM: OMAP: FB: add controller platform data

Add controller platform data

Signed-off-by: Imre Deak <imre.deak@solidboot.com>
Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c
index 56acb8720f789ad7047daef09ba4ec6717e70d5b..91ebdafcca3918011553e11a1e6cc061656309d0 100644 (file)
--- a/arch/arm/plat-omap/fb.c
+++ b/arch/arm/plat-omap/fb.c
@@ -55,6 +55,11 @@ void omapfb_reserve_mem(void)
        }
 }
 
+void omapfb_set_ctrl_platform_data(void *data)
+{
+       omapfb_config.ctrl_platform_data = data;
+}
+
 static inline int omap_init_fb(void)
 {
        const struct omap_lcd_config *conf;

diff --git a/include/asm-arm/arch-omap/omapfb.h b/include/asm-arm/arch-omap/omapfb.h
index fccdb3db025ff0dc79fd08dc4c5d7a0a27f0d1d3..ce80a71ce8f7eea59c897964e3b1b56d238811c3 100644 (file)
--- a/include/asm-arm/arch-omap/omapfb.h
+++ b/include/asm-arm/arch-omap/omapfb.h
@@ -292,8 +292,9 @@ struct omapfb_device {
 };
 
 struct omapfb_platform_data {
-       struct omap_lcd_config   lcd;
-       struct omap_fbmem_config fbmem;
+       struct omap_lcd_config  lcd;
+       struct omapfb_mem_desc  mem_desc;
+       void                    *ctrl_platform_data;
 };
 
 #define OMAPFB_EVENT_READY     1
@@ -317,8 +318,9 @@ extern int  omapfb_update_window_async(struct omapfb_update_window *win,
                                        void (*callback)(void *),
                                        void *callback_data);
 
-/* in arch/arm/plat-omap/devices.c */
+/* in arch/arm/plat-omap/fb.c */
 extern void omapfb_reserve_mem(void);
+extern void omapfb_set_ctrl_platform_data(void *pdata);
 
 #endif /* __KERNEL__ */