Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=771af222eb98a60629aa1437901c7f266ff4dc89
Commit: 771af222eb98a60629aa1437901c7f266ff4dc89
Parent: 0ce3356394dadc4704d42beb3788d7d78bda8ff2
Author: Imre Deak <[EMAIL PROTECTED]>
AuthorDate: Wed Dec 6 17:13:50 2006 -0800
Committer: Russell King <[EMAIL PROTECTED]>
CommitDate: Tue May 8 20:35:08 2007 +0100
ARM: OMAP: FB: add controller platform data
Add controller platform data
Signed-off-by: Imre Deak <[EMAIL PROTECTED]>
Signed-off-by: Juha Yrjola <[EMAIL PROTECTED]>
Signed-off-by: Tony Lindgren <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
arch/arm/plat-omap/fb.c | 5 +++++
include/asm-arm/arch-omap/omapfb.h | 8 +++++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c
index 56acb87..91ebdaf 100644
--- 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 fccdb3d..ce80a71 100644
--- 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__ */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
