From 6651b0ea9202541091f6c23ec8715122ea8cc1b0 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Tue, 20 Sep 2011 12:23:58 +0300 Subject: OAMPFB: remove unused omapfb_set_ctrl_platform_data() omapfb_set_ctrl_platform_data() is no longer used, so it can be removed. Signed-off-by: Tomi Valkeinen Acked-by: Tony Lindgren --- include/linux/omapfb.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include/linux') diff --git a/include/linux/omapfb.h b/include/linux/omapfb.h index c0b018790f07..85cad31ca3d9 100644 --- a/include/linux/omapfb.h +++ b/include/linux/omapfb.h @@ -250,12 +250,10 @@ struct omapfb_mem_desc { struct omapfb_platform_data { struct omap_lcd_config lcd; struct omapfb_mem_desc mem_desc; - void *ctrl_platform_data; }; /* in arch/arm/plat-omap/fb.c */ extern void omapfb_set_platform_data(struct omapfb_platform_data *data); -extern void omapfb_set_ctrl_platform_data(void *pdata); extern void omapfb_reserve_sdram_memblock(void); #endif -- cgit v1.2.3 From 1e434f9318efc3dddc0c0b8d2071712668154c2b Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Tue, 20 Sep 2011 14:12:43 +0300 Subject: OMAPFB: remove early mem alloc from old omapfb arch/arm/plat-omap/fb.c contains code to alloc omapfb buffers at early boot time according to information given from the bootloader or board file. This code isn't currently used by any board, and is anyway something that the newer vram.c could handle. So remove the alloc code and in later patches make old omapfb driver use vram.c. Signed-off-by: Tomi Valkeinen Acked-by: Tony Lindgren --- include/linux/omapfb.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/linux') diff --git a/include/linux/omapfb.h b/include/linux/omapfb.h index 85cad31ca3d9..7ab9cebf9164 100644 --- a/include/linux/omapfb.h +++ b/include/linux/omapfb.h @@ -254,7 +254,6 @@ struct omapfb_platform_data { /* in arch/arm/plat-omap/fb.c */ extern void omapfb_set_platform_data(struct omapfb_platform_data *data); -extern void omapfb_reserve_sdram_memblock(void); #endif -- cgit v1.2.3 From 80277566d0d85b3430548ba87ad28b0585ef06a6 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Tue, 20 Sep 2011 14:27:44 +0300 Subject: OMAPFB: remove mem info from platform_data omapfb driver used platform_data to get fb memory areas and formats defined by the board file. This patch removes omapfb's (both old and new omapfb) use of the memory data in platform_data, because: - No board uses them currently - It's not board file's job to define things like amount of default framebuffer memory. These should come from the bootloader via command line parameters. Signed-off-by: Tomi Valkeinen --- include/linux/omapfb.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/linux') diff --git a/include/linux/omapfb.h b/include/linux/omapfb.h index 7ab9cebf9164..03f52555ce63 100644 --- a/include/linux/omapfb.h +++ b/include/linux/omapfb.h @@ -249,7 +249,6 @@ struct omapfb_mem_desc { struct omapfb_platform_data { struct omap_lcd_config lcd; - struct omapfb_mem_desc mem_desc; }; /* in arch/arm/plat-omap/fb.c */ -- cgit v1.2.3 From 8f5e35a7942afe70eb0ba0d8193801b7989ae03a Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Tue, 20 Sep 2011 14:43:14 +0300 Subject: OMAPFB: Move old omapfb private structs to a private include file include/linux/omapfb.h contains structs that are used only by the omapfb driver. Move the structs into drivers/video/omap/omapfb.h. Signed-off-by: Tomi Valkeinen --- include/linux/omapfb.h | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'include/linux') diff --git a/include/linux/omapfb.h b/include/linux/omapfb.h index 03f52555ce63..7a8e0ea345eb 100644 --- a/include/linux/omapfb.h +++ b/include/linux/omapfb.h @@ -222,31 +222,6 @@ struct omapfb_display_info { #include -#ifdef CONFIG_ARCH_OMAP1 -#define OMAPFB_PLANE_NUM 1 -#else -#define OMAPFB_PLANE_NUM 3 -#endif - -struct omapfb_mem_region { - u32 paddr; - void __iomem *vaddr; - unsigned long size; - u8 type; /* OMAPFB_PLANE_MEM_* */ - enum omapfb_color_format format;/* OMAPFB_COLOR_* */ - unsigned format_used:1; /* Must be set when format is set. - * Needed b/c of the badly chosen 0 - * base for OMAPFB_COLOR_* values - */ - unsigned alloc:1; /* allocated by the driver */ - unsigned map:1; /* kernel mapped by the driver */ -}; - -struct omapfb_mem_desc { - int region_cnt; - struct omapfb_mem_region region[OMAPFB_PLANE_NUM]; -}; - struct omapfb_platform_data { struct omap_lcd_config lcd; }; -- cgit v1.2.3 From f060f95365ce71acbf29ef5dac580ab067600f4c Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Tue, 20 Sep 2011 14:49:50 +0300 Subject: OMAPFB: remove omapfb_set_platform_data() omapfb_set_platform_data() is no longer used, so remove it. Signed-off-by: Tomi Valkeinen Acked-by: Tony Lindgren --- include/linux/omapfb.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'include/linux') diff --git a/include/linux/omapfb.h b/include/linux/omapfb.h index 7a8e0ea345eb..a575706a83c3 100644 --- a/include/linux/omapfb.h +++ b/include/linux/omapfb.h @@ -226,9 +226,6 @@ struct omapfb_platform_data { struct omap_lcd_config lcd; }; -/* in arch/arm/plat-omap/fb.c */ -extern void omapfb_set_platform_data(struct omapfb_platform_data *data); - #endif #endif /* __OMAPFB_H */ -- cgit v1.2.3 From ddba6c7f7ec6a82ccbce4126d615e73e00b4be12 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Tue, 20 Sep 2011 15:23:13 +0300 Subject: OMAP1: pass LCD config with omapfb_set_lcd_config() LCD config for old omapfb driver is passed with OMAP_TAG_LCD from board files or from the bootloader. In an effort to remove OMAP_TAG_LCD, this patch adds omapfb_set_lcd_config() function that the board files can call to set the LCD config. This has the drawback that configuration can no longer come from the bootloader. Of the boards supported by the kernel, this should only affect N770 which depends on the data from the bootloader. This patch adds an LCD config for N770 to its board files, but that is most probably broken. Fixing this would need information about the HW setup in N770 boards. Signed-off-by: Tomi Valkeinen Acked-by: Tony Lindgren --- include/linux/omapfb.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/linux') diff --git a/include/linux/omapfb.h b/include/linux/omapfb.h index a575706a83c3..4ff57e81051d 100644 --- a/include/linux/omapfb.h +++ b/include/linux/omapfb.h @@ -226,6 +226,8 @@ struct omapfb_platform_data { struct omap_lcd_config lcd; }; +void __init omapfb_set_lcd_config(const struct omap_lcd_config *config); + #endif #endif /* __OMAPFB_H */ -- cgit v1.2.3