diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-03-28 10:53:42 -0400 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-09-27 02:26:19 -0400 |
| commit | 8af2c2869fd129bce0d0dfd86c6364c1096f9eff (patch) | |
| tree | dd04bfc8f8be291b947fb37e8c19dc3e30bf72a5 /include/video | |
| parent | 090fd59308c9d50b8eabf71cd28b5513250a7b79 (diff) | |
video: atmel_lcdfb: fix platform data struct
Today we mix pdata and drivers data in the struct atmel_lcdfb_info
Fix it and introduce a new struct atmel_lcdfb_pdata for platform data only
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'include/video')
| -rw-r--r-- | include/video/atmel_lcdc.h | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/include/video/atmel_lcdc.h b/include/video/atmel_lcdc.h index 0f5a2fc69af9..f197c54712b0 100644 --- a/include/video/atmel_lcdc.h +++ b/include/video/atmel_lcdc.h | |||
| @@ -31,39 +31,18 @@ | |||
| 31 | #define ATMEL_LCDC_WIRING_BGR 0 | 31 | #define ATMEL_LCDC_WIRING_BGR 0 |
| 32 | #define ATMEL_LCDC_WIRING_RGB 1 | 32 | #define ATMEL_LCDC_WIRING_RGB 1 |
| 33 | 33 | ||
| 34 | struct atmel_lcdfb_config; | ||
| 35 | 34 | ||
| 36 | /* LCD Controller info data structure, stored in device platform_data */ | 35 | /* LCD Controller info data structure, stored in device platform_data */ |
| 37 | struct atmel_lcdfb_info { | 36 | struct atmel_lcdfb_pdata { |
| 38 | spinlock_t lock; | ||
| 39 | struct fb_info *info; | ||
| 40 | void __iomem *mmio; | ||
| 41 | int irq_base; | ||
| 42 | struct work_struct task; | ||
| 43 | |||
| 44 | unsigned int guard_time; | 37 | unsigned int guard_time; |
| 45 | unsigned int smem_len; | ||
| 46 | struct platform_device *pdev; | ||
| 47 | struct clk *bus_clk; | ||
| 48 | struct clk *lcdc_clk; | ||
| 49 | |||
| 50 | #ifdef CONFIG_BACKLIGHT_ATMEL_LCDC | ||
| 51 | struct backlight_device *backlight; | ||
| 52 | u8 bl_power; | ||
| 53 | #endif | ||
| 54 | bool lcdcon_is_backlight; | 38 | bool lcdcon_is_backlight; |
| 55 | bool lcdcon_pol_negative; | 39 | bool lcdcon_pol_negative; |
| 56 | u8 saved_lcdcon; | ||
| 57 | |||
| 58 | u8 default_bpp; | 40 | u8 default_bpp; |
| 59 | u8 lcd_wiring_mode; | 41 | u8 lcd_wiring_mode; |
| 60 | unsigned int default_lcdcon2; | 42 | unsigned int default_lcdcon2; |
| 61 | unsigned int default_dmacon; | 43 | unsigned int default_dmacon; |
| 62 | void (*atmel_lcdfb_power_control)(int on); | 44 | void (*atmel_lcdfb_power_control)(int on); |
| 63 | struct fb_monspecs *default_monspecs; | 45 | struct fb_monspecs *default_monspecs; |
| 64 | u32 pseudo_palette[16]; | ||
| 65 | |||
| 66 | struct atmel_lcdfb_config *config; | ||
| 67 | }; | 46 | }; |
| 68 | 47 | ||
| 69 | #define ATMEL_LCDC_DMABADDR1 0x00 | 48 | #define ATMEL_LCDC_DMABADDR1 0x00 |
