X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-arm%2Farch-omap%2Fomapfb.h;h=4ba2622cc142803422a20cda69f4bad5076ebfd6;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=fccdb3db025ff0dc79fd08dc4c5d7a0a27f0d1d3;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git diff --git a/include/asm-arm/arch-omap/omapfb.h b/include/asm-arm/arch-omap/omapfb.h index fccdb3db0..4ba2622cc 100644 --- a/include/asm-arm/arch-omap/omapfb.h +++ b/include/asm-arm/arch-omap/omapfb.h @@ -34,10 +34,9 @@ #define OMAPFB_MIRROR OMAP_IOW(31, int) #define OMAPFB_SYNC_GFX OMAP_IO(37) #define OMAPFB_VSYNC OMAP_IO(38) -#define OMAPFB_SET_UPDATE_MODE OMAP_IOW(40, int) -#define OMAPFB_UPDATE_WINDOW_OLD OMAP_IOW(41, struct omapfb_update_window_old) +#define OMAPFB_SET_UPDATE_MODE OMAP_IOW(40, enum omapfb_update_mode) #define OMAPFB_GET_CAPS OMAP_IOR(42, unsigned long) -#define OMAPFB_GET_UPDATE_MODE OMAP_IOW(43, int) +#define OMAPFB_GET_UPDATE_MODE OMAP_IOW(43, enum omapfb_update_mode) #define OMAPFB_LCD_TEST OMAP_IOW(45, int) #define OMAPFB_CTRL_TEST OMAP_IOW(46, int) #define OMAPFB_UPDATE_WINDOW OMAP_IOW(47, struct omapfb_update_window) @@ -67,14 +66,9 @@ enum omapfb_color_format { }; struct omapfb_update_window { - __u32 x, y; - __u32 width, height; - __u32 format; -}; - -struct omapfb_update_window_old { - __u32 x, y; - __u32 width, height; + u32 x, y; + u32 width, height; + u32 format; }; enum omapfb_plane { @@ -89,17 +83,17 @@ enum omapfb_channel_out { }; struct omapfb_setup_plane { - __u8 plane; - __u8 channel_out; - __u32 offset; - __u32 pos_x, pos_y; - __u32 width, height; - __u32 color_mode; + u8 plane; + u8 channel_out; + u32 offset; + u32 pos_x, pos_y; + u32 width, height; + u32 color_mode; }; struct omapfb_enable_plane { - __u8 plane; - __u8 enable; + u8 plane; + u8 enable; }; enum omapfb_color_key_type { @@ -109,10 +103,10 @@ enum omapfb_color_key_type { }; struct omapfb_color_key { - __u8 channel_out; - __u32 background; - __u32 trans_key; - __u8 key_type; + u8 channel_out; + u32 background; + u32 trans_key; + u8 key_type; }; enum omapfb_update_mode { @@ -126,9 +120,6 @@ enum omapfb_update_mode { #include #include #include -#include - -#include #define OMAP_LCDC_INV_VSYNC 0x0001 #define OMAP_LCDC_INV_HSYNC 0x0002 @@ -193,38 +184,19 @@ struct extif_timings { int re_cycle_time; int cs_pulse_width; int access_time; - - int clk_div; - - u32 tim[5]; /* set by extif->convert_timings */ - - int converted; }; struct lcd_ctrl_extif { int (*init) (void); void (*cleanup) (void); - void (*get_clk_info) (u32 *clk_period, u32 *max_clk_div); - int (*convert_timings) (struct extif_timings *timings); void (*set_timings) (const struct extif_timings *timings); - void (*set_bits_per_cycle)(int bpc); - void (*write_command) (const void *buf, unsigned int len); - void (*read_data) (void *buf, unsigned int len); - void (*write_data) (const void *buf, unsigned int len); + void (*write_command) (u32 cmd); + u32 (*read_data) (void); + void (*write_data) (u32 data); void (*transfer_area) (int width, int height, void (callback)(void * data), void *data); - unsigned long max_transmit_size; }; -struct omapfb_notifier_block { - struct notifier_block nb; - void *data; -}; - -typedef int (*omapfb_notifier_callback_t)(struct omapfb_notifier_block *, - unsigned long event, - struct omapfb_device *fbdev); - struct lcd_ctrl { const char *name; void *data; @@ -232,11 +204,9 @@ struct lcd_ctrl { int (*init) (struct omapfb_device *fbdev, int ext_mode, int req_vram_size); void (*cleanup) (void); - void (*bind_client) (struct omapfb_notifier_block *nb); void (*get_vram_layout)(unsigned long *size, void **virt_base, dma_addr_t *phys_base); - int (*mmap) (struct vm_area_struct *vma); unsigned long (*get_caps) (void); int (*set_update_mode)(enum omapfb_update_mode mode); enum omapfb_update_mode (*get_update_mode)(void); @@ -270,7 +240,7 @@ struct omapfb_device { int state; int ext_lcdc; /* Using external LCD controller */ - struct mutex rqueue_mutex; + struct semaphore rqueue_sema; void *vram_virt_base; dma_addr_t vram_phys_base; @@ -291,13 +261,12 @@ struct omapfb_device { struct device *dev; }; -struct omapfb_platform_data { - struct omap_lcd_config lcd; - struct omap_fbmem_config fbmem; -}; - -#define OMAPFB_EVENT_READY 1 -#define OMAPFB_EVENT_DISABLED 2 +extern struct lcd_panel h3_panel; +extern struct lcd_panel h2_panel; +extern struct lcd_panel p2_panel; +extern struct lcd_panel osk_panel; +extern struct lcd_panel innovator1610_panel; +extern struct lcd_panel innovator1510_panel; #ifdef CONFIG_ARCH_OMAP1 extern struct lcd_ctrl omap1_lcd_ctrl; @@ -305,20 +274,7 @@ extern struct lcd_ctrl omap1_lcd_ctrl; extern struct lcd_ctrl omap2_disp_ctrl; #endif -extern void omapfb_register_panel(struct lcd_panel *panel); extern void omapfb_write_first_pixel(struct omapfb_device *fbdev, u16 pixval); -extern void omapfb_notify_clients(struct omapfb_device *fbdev, - unsigned long event); -extern int omapfb_register_client(struct omapfb_notifier_block *nb, - omapfb_notifier_callback_t callback, - void *callback_data); -extern int omapfb_unregister_client(struct omapfb_notifier_block *nb); -extern int omapfb_update_window_async(struct omapfb_update_window *win, - void (*callback)(void *), - void *callback_data); - -/* in arch/arm/plat-omap/devices.c */ -extern void omapfb_reserve_mem(void); #endif /* __KERNEL__ */