Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

5 files changed, 29 insertions, 12 deletions

diff --git a/include/video/broadsheetfb.h b/include/video/broadsheetfb.h
index a758534c0272..548d28f4ec67 100644
--- a/include/video/broadsheetfb.h
+++ b/include/video/broadsheetfb.h
@@ -29,11 +29,19 @@
 #define BS_CMD_UPD_FULL         0x33
 #define BS_CMD_UPD_GDRV_CLR     0x37
 
+/* Broadsheet register interface defines */
+#define BS_REG_REV              0x00
+#define BS_REG_PRC              0x02
+
 /* Broadsheet pin interface specific defines */
 #define BS_CS   0x01
 #define BS_DC   0x02
 #define BS_WR   0x03
 
+/* Broadsheet IO interface specific defines */
+#define BS_MMIO_CMD     0x01
+#define BS_MMIO_DATA    0x02
+
 /* struct used by broadsheet. board specific stuff comes from *board */
 struct broadsheetfb_par {
         struct fb_info *info;
@@ -41,6 +49,8 @@ struct broadsheetfb_par {
         void (*write_reg)(struct broadsheetfb_par *, u16 reg, u16 val);
         u16 (*read_reg)(struct broadsheetfb_par *, u16 reg);
         wait_queue_head_t waitq;
+        int panel_index;
+        struct mutex io_lock;
 };
 
 /* board specific routines */
@@ -48,12 +58,17 @@ struct broadsheet_board {
         struct module *owner;
         int (*init)(struct broadsheetfb_par *);
         int (*wait_for_rdy)(struct broadsheetfb_par *);
-        void (*set_ctl)(struct broadsheetfb_par *, unsigned char, u8);
-        void (*set_hdb)(struct broadsheetfb_par *, u16);
-        u16 (*get_hdb)(struct broadsheetfb_par *);
         void (*cleanup)(struct broadsheetfb_par *);
         int (*get_panel_type)(void);
         int (*setup_irq)(struct fb_info *);
-};
 
+        /* Functions for boards that use GPIO */
+        void (*set_ctl)(struct broadsheetfb_par *, unsigned char, u8);
+        void (*set_hdb)(struct broadsheetfb_par *, u16);
+        u16 (*get_hdb)(struct broadsheetfb_par *);
+
+        /* Functions for boards that have specialized MMIO */
+        void (*mmio_write)(struct broadsheetfb_par *, int type, u16);
+        u16 (*mmio_read)(struct broadsheetfb_par *);
+};
 #endif
diff --git a/include/video/da8xx-fb.h b/include/video/da8xx-fb.h
index c051a50ed528..89d43b3d4cb9 100644
--- a/include/video/da8xx-fb.h
+++ b/include/video/da8xx-fb.h
@@ -38,6 +38,7 @@ struct da8xx_lcdc_platform_data {
         const char manu_name[10];
         void *controller_data;
         const char type[25];
+        void (*panel_power_ctrl)(int);
 };
 
 struct lcd_ctrl_config {
diff --git a/include/video/pxa168fb.h b/include/video/pxa168fb.h
index b5cc72fe0461..8c2f385a90ea 100644
--- a/include/video/pxa168fb.h
+++ b/include/video/pxa168fb.h
@@ -117,8 +117,6 @@ struct pxa168fb_mach_info {
         unsigned        invert_composite_blank:1;
         unsigned        invert_pix_val_ena:1;
         unsigned        invert_pixclock:1;
-        unsigned        invert_vsync:1;
-        unsigned        invert_hsync:1;
         unsigned        panel_rbswap:1;
         unsigned        active:1;
         unsigned        enable_lcd:1;
diff --git a/include/video/sgivw.h b/include/video/sgivw.h
index 55f2a7c024af..f6aa5692e74b 100644
--- a/include/video/sgivw.h
+++ b/include/video/sgivw.h
@@ -351,7 +351,7 @@ typedef enum {
 struct dbe_timing_info
 {
   dbe_timing_t type;
-  int flags;                            
+  int flags;
   short width;              /* Monitor resolution               */
   short height;
   int fields_sec;           /* fields/sec  (Hz -3 dec. places */
@@ -389,11 +389,11 @@ struct dbe_timing_info dbeVTimings[] = {
   {
     DBE_VT_640_480_60,
     /*  flags,  width,                  height,         fields_sec,             cfreq */
-    0,          640,                    480,            59940,                  25175,
+    0,          640,                    480,            59940,                  25175,
     /*  htotal, hblank_start,   hblank_end,     hsync_start,    hsync_end */
-    800,        640,                800,                656,            752,
+    800,        640,                    800,            656,            752,
     /*  vtotal, vblank_start,   vblank_end,     vsync_start,    vsync_end */
-    525,        480,                525,                490,                492,
+    525,        480,                    525,            490,                492,
     /*  pll_m,  pll_n,                  pll_p */
     15,     2,                          3
   },
@@ -650,7 +650,7 @@ struct dbe_timing_info dbeVTimings[] = {
     /* pll_m,  pll_n,          pll_p */
     6,      1,              0
   },
-        
+
   {
     DBE_VT_1920_1200_60,
     /* flags,  width,          height,         fields_sec,     cfreq */
@@ -676,7 +676,6 @@ struct dbe_timing_info dbeVTimings[] = {
   }
 };
 
-#define DBE_VT_SIZE  (sizeof(dbeVTimings)/sizeof(dbeVTimings[0]))
 #endif // INCLUDE_TIMING_TABLE_DATA
 
 #endif // ! __SGIVWFB_H__
diff --git a/include/video/sh_mobile_lcdc.h b/include/video/sh_mobile_lcdc.h
index 25144ab22b95..2cc893fc1f85 100644
--- a/include/video/sh_mobile_lcdc.h
+++ b/include/video/sh_mobile_lcdc.h
@@ -34,6 +34,8 @@ enum { LCDC_CLK_BUS, LCDC_CLK_PERIPHERAL, LCDC_CLK_EXTERNAL };
 #define LCDC_FLAGS_HSCNT (1 << 3) /* Disable HSYNC during VBLANK */
 #define LCDC_FLAGS_DWCNT (1 << 4) /* Disable dotclock during blanking */
 
+#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)
+
 struct sh_mobile_lcdc_sys_bus_cfg {
         unsigned long ldmt2r;
         unsigned long ldmt3r;
@@ -50,6 +52,8 @@ struct sh_mobile_lcdc_board_cfg {
         void *board_data;
         int (*setup_sys)(void *board_data, void *sys_ops_handle,
                          struct sh_mobile_lcdc_sys_bus_ops *sys_ops);
+        void (*start_transfer)(void *board_data, void *sys_ops_handle,
+                               struct sh_mobile_lcdc_sys_bus_ops *sys_ops);
         void (*display_on)(void *board_data);
         void (*display_off)(void *board_data);
 };