From: Imre Deak <imre.deak@solidboot.com>
Date: Mon, 25 Sep 2006 23:34:40 +0000 (-0400)
Subject: ARM: OMAP: FB: add controller platform data
X-Git-Tag: v2.6.18-omap1~24
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b87347f7b8eb1fee591bd9cbd19be72da44f776c;p=linux-2.6-omap-h63xx.git

ARM: OMAP: FB: add controller platform data

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

diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c
index 220ede7f94c..a302d9194f5 100644
--- a/arch/arm/plat-omap/fb.c
+++ b/arch/arm/plat-omap/fb.c
@@ -95,6 +95,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 de1ded5677b..adf1d81f22d 100644
--- a/include/asm-arm/arch-omap/omapfb.h
+++ b/include/asm-arm/arch-omap/omapfb.h
@@ -323,6 +323,7 @@ struct omapfb_device {
 struct omapfb_platform_data {
 	struct omap_lcd_config		lcd;
 	struct omapfb_mem_desc		mem_desc;
+	void				*ctrl_platform_data;
 };
 
 #ifdef CONFIG_ARCH_OMAP1
@@ -344,8 +345,9 @@ extern int  omapfb_update_window_async(struct fb_info *fbi,
 				       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__ */