Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:
  fbdev: sh_mobile_lcdc: Add YUV framebuffer support
  viafb: split pll configs up
  viafb: remove duplicated clock storage
  viafb: always return the best possible clock
  viafb: remove duplicated clock information
  fbdev: sh_mobile_lcdcfb: add backlight support
  viafb: factor lcd scaling parameters out
  viafb: strip some structures
  viafb: remove unused data_mode and device_type
  viafb: kill lcd_panel_id
  video via: make local variables static
  video via: fix iomem access
  video/via: drop deprecated (and unused) i2c_adapter.id

1 files changed, 10 insertions, 0 deletions

diff --git a/include/video/sh_mobile_lcdc.h b/include/video/sh_mobile_lcdc.h
index daabae5817c6..2c8d369190b3 100644
--- a/include/video/sh_mobile_lcdc.h
+++ b/include/video/sh_mobile_lcdc.h
@@ -59,6 +59,8 @@ struct sh_mobile_lcdc_board_cfg {
                                struct sh_mobile_lcdc_sys_bus_ops *sys_ops);
         void (*display_on)(void *board_data, struct fb_info *info);
         void (*display_off)(void *board_data);
+        int (*set_brightness)(void *board_data, int brightness);
+        int (*get_brightness)(void *board_data);
 };
 
 struct sh_mobile_lcdc_lcd_size_cfg { /* width and height of panel in mm */
@@ -66,6 +68,12 @@ struct sh_mobile_lcdc_lcd_size_cfg { /* width and height of panel in mm */
         unsigned long height;
 };
 
+/* backlight info */
+struct sh_mobile_lcdc_bl_info {
+        const char *name;
+        int max_brightness;
+};
+
 struct sh_mobile_lcdc_chan_cfg {
         int chan;
         int bpp;
@@ -76,7 +84,9 @@ struct sh_mobile_lcdc_chan_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_bl_info bl_info;
         struct sh_mobile_lcdc_sys_bus_cfg sys_bus_cfg; /* only for SYSn I/F */
+        int nonstd;
 };
 
 struct sh_mobile_lcdc_info {