diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-09-11 22:59:04 +0200 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2012-03-12 22:40:50 +0100 |
| commit | afaad83b9c0d24eac88535cc5a8c6019f0c45bcb (patch) | |
| tree | 8f96bd7ac14c07f89178372782c7707f625bb193 /include/video/sh_mobile_lcdc.h | |
| parent | 43059b0f46f814b4152f327c701d079253904540 (diff) | |
| download | linux-afaad83b9c0d24eac88535cc5a8c6019f0c45bcb.tar.bz2 | |
fbdev: sh_mobile_lcdc: Merge board_cfg and lcd_size_cfg into panel_cfg
Update board code accordingly.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'include/video/sh_mobile_lcdc.h')
| -rw-r--r-- | include/video/sh_mobile_lcdc.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/include/video/sh_mobile_lcdc.h b/include/video/sh_mobile_lcdc.h index ecde6aad6f29..4f0fb559ea87 100644 --- a/include/video/sh_mobile_lcdc.h +++ b/include/video/sh_mobile_lcdc.h @@ -147,7 +147,9 @@ struct sh_mobile_lcdc_sys_bus_ops { unsigned long (*read_data)(void *handle); }; -struct sh_mobile_lcdc_board_cfg { +struct sh_mobile_lcdc_panel_cfg { + unsigned long width; /* Panel width in mm */ + unsigned long height; /* Panel height in mm */ int (*setup_sys)(void *sys_ops_handle, struct sh_mobile_lcdc_sys_bus_ops *sys_ops); void (*start_transfer)(void *sys_ops_handle, @@ -156,11 +158,6 @@ struct sh_mobile_lcdc_board_cfg { void (*display_off)(void); }; -struct sh_mobile_lcdc_lcd_size_cfg { /* width and height of panel in mm */ - unsigned long width; - unsigned long height; -}; - /* backlight info */ struct sh_mobile_lcdc_bl_info { const char *name; @@ -178,8 +175,7 @@ struct sh_mobile_lcdc_chan_cfg { unsigned long flags; /* LCDC_FLAGS_... */ const struct fb_videomode *lcd_cfg; int num_cfg; - struct sh_mobile_lcdc_lcd_size_cfg lcd_size_cfg; - struct sh_mobile_lcdc_board_cfg board_cfg; + struct sh_mobile_lcdc_panel_cfg panel_cfg; struct sh_mobile_lcdc_bl_info bl_info; struct sh_mobile_lcdc_sys_bus_cfg sys_bus_cfg; /* only for SYSn I/F */ struct sh_mobile_meram_cfg *meram_cfg; |