Merge commit 'v2.6.27-rc1' into for-linus

5 files changed, 248 insertions, 70 deletions

diff --git a/include/video/atmel_lcdc.h b/include/video/atmel_lcdc.h
index ed64862c4e18..613173b5db69 100644
--- a/include/video/atmel_lcdc.h
+++ b/include/video/atmel_lcdc.h
@@ -22,6 +22,7 @@
 #ifndef __ATMEL_LCDC_H__
 #define __ATMEL_LCDC_H__
 
+#include <linux/workqueue.h>
 
 /* Way LCD wires are connected to the chip:
  * Some Atmel chips use BGR color mode (instead of standard RGB)
@@ -37,6 +38,7 @@ struct atmel_lcdfb_info {
         struct fb_info          *info;
         void __iomem            *mmio;
         unsigned long           irq_base;
+        struct work_struct      task;
 
         unsigned int            guard_time;
         struct platform_device  *pdev;
diff --git a/include/video/ili9320.h b/include/video/ili9320.h
new file mode 100644
index 000000000000..e5d1622e3f33
--- /dev/null
+++ b/include/video/ili9320.h
@@ -0,0 +1,201 @@
+/* include/video/ili9320.c
+ *
+ * ILI9320 LCD controller configuration control.
+ *
+ * Copyright 2007 Simtec Electronics
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * http://armlinux.simtec.co.uk/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#define ILI9320_REG(x)  (x)
+
+#define ILI9320_INDEX                   ILI9320_REG(0x00)
+
+#define ILI9320_OSCILATION              ILI9320_REG(0x00)
+#define ILI9320_DRIVER                  ILI9320_REG(0x01)
+#define ILI9320_DRIVEWAVE               ILI9320_REG(0x02)
+#define ILI9320_ENTRYMODE               ILI9320_REG(0x03)
+#define ILI9320_RESIZING                ILI9320_REG(0x04)
+#define ILI9320_DISPLAY1                ILI9320_REG(0x07)
+#define ILI9320_DISPLAY2                ILI9320_REG(0x08)
+#define ILI9320_DISPLAY3                ILI9320_REG(0x09)
+#define ILI9320_DISPLAY4                ILI9320_REG(0x0A)
+#define ILI9320_RGB_IF1                 ILI9320_REG(0x0C)
+#define ILI9320_FRAMEMAKER              ILI9320_REG(0x0D)
+#define ILI9320_RGB_IF2                 ILI9320_REG(0x0F)
+
+#define ILI9320_POWER1                  ILI9320_REG(0x10)
+#define ILI9320_POWER2                  ILI9320_REG(0x11)
+#define ILI9320_POWER3                  ILI9320_REG(0x12)
+#define ILI9320_POWER4                  ILI9320_REG(0x13)
+#define ILI9320_GRAM_HORIZ_ADDR         ILI9320_REG(0x20)
+#define ILI9320_GRAM_VERT_ADD           ILI9320_REG(0x21)
+#define ILI9320_POWER7                  ILI9320_REG(0x29)
+#define ILI9320_FRAME_RATE_COLOUR       ILI9320_REG(0x2B)
+
+#define ILI9320_GAMMA1                  ILI9320_REG(0x30)
+#define ILI9320_GAMMA2                  ILI9320_REG(0x31)
+#define ILI9320_GAMMA3                  ILI9320_REG(0x32)
+#define ILI9320_GAMMA4                  ILI9320_REG(0x35)
+#define ILI9320_GAMMA5                  ILI9320_REG(0x36)
+#define ILI9320_GAMMA6                  ILI9320_REG(0x37)
+#define ILI9320_GAMMA7                  ILI9320_REG(0x38)
+#define ILI9320_GAMMA8                  ILI9320_REG(0x39)
+#define ILI9320_GAMMA9                  ILI9320_REG(0x3C)
+#define ILI9320_GAMMA10                 ILI9320_REG(0x3D)
+
+#define ILI9320_HORIZ_START             ILI9320_REG(0x50)
+#define ILI9320_HORIZ_END               ILI9320_REG(0x51)
+#define ILI9320_VERT_START              ILI9320_REG(0x52)
+#define ILI9320_VERT_END                ILI9320_REG(0x53)
+
+#define ILI9320_DRIVER2                 ILI9320_REG(0x60)
+#define ILI9320_BASE_IMAGE              ILI9320_REG(0x61)
+#define ILI9320_VERT_SCROLL             ILI9320_REG(0x6a)
+
+#define ILI9320_PARTIAL1_POSITION       ILI9320_REG(0x80)
+#define ILI9320_PARTIAL1_START          ILI9320_REG(0x81)
+#define ILI9320_PARTIAL1_END            ILI9320_REG(0x82)
+#define ILI9320_PARTIAL2_POSITION       ILI9320_REG(0x83)
+#define ILI9320_PARTIAL2_START          ILI9320_REG(0x84)
+#define ILI9320_PARTIAL2_END            ILI9320_REG(0x85)
+
+#define ILI9320_INTERFACE1              ILI9320_REG(0x90)
+#define ILI9320_INTERFACE2              ILI9320_REG(0x92)
+#define ILI9320_INTERFACE3              ILI9320_REG(0x93)
+#define ILI9320_INTERFACE4              ILI9320_REG(0x95)
+#define ILI9320_INTERFACE5              ILI9320_REG(0x97)
+#define ILI9320_INTERFACE6              ILI9320_REG(0x98)
+
+/* Register contents definitions. */
+
+#define ILI9320_OSCILATION_OSC          (1 << 0)
+
+#define ILI9320_DRIVER_SS               (1 << 8)
+#define ILI9320_DRIVER_SM               (1 << 10)
+
+#define ILI9320_DRIVEWAVE_EOR           (1 << 8)
+#define ILI9320_DRIVEWAVE_BC            (1 << 9)
+#define ILI9320_DRIVEWAVE_MUSTSET       (1 << 10)
+
+#define ILI9320_ENTRYMODE_AM            (1 << 3)
+#define ILI9320_ENTRYMODE_ID(x)         ((x) << 4)
+#define ILI9320_ENTRYMODE_ORG           (1 << 7)
+#define ILI9320_ENTRYMODE_HWM           (1 << 8)
+#define ILI9320_ENTRYMODE_BGR           (1 << 12)
+#define ILI9320_ENTRYMODE_DFM           (1 << 14)
+#define ILI9320_ENTRYMODE_TRI           (1 << 15)
+
+
+#define ILI9320_RESIZING_RSZ(x)         ((x) << 0)
+#define ILI9320_RESIZING_RCH(x)         ((x) << 4)
+#define ILI9320_RESIZING_RCV(x)         ((x) << 8)
+
+
+#define ILI9320_DISPLAY1_D(x)           ((x) << 0)
+#define ILI9320_DISPLAY1_CL             (1 << 3)
+#define ILI9320_DISPLAY1_DTE            (1 << 4)
+#define ILI9320_DISPLAY1_GON            (1 << 5)
+#define ILI9320_DISPLAY1_BASEE          (1 << 8)
+#define ILI9320_DISPLAY1_PTDE(x)        ((x) << 12)
+
+
+#define ILI9320_DISPLAY2_BP(x)          ((x) << 0)
+#define ILI9320_DISPLAY2_FP(x)          ((x) << 8)
+
+
+#define ILI9320_RGBIF1_RIM_RGB18        (0 << 0)
+#define ILI9320_RGBIF1_RIM_RGB16        (1 << 0)
+#define ILI9320_RGBIF1_RIM_RGB6         (2 << 0)
+
+#define ILI9320_RGBIF1_CLK_INT          (0 << 4)
+#define ILI9320_RGBIF1_CLK_RGBIF        (1 << 4)
+#define ILI9320_RGBIF1_CLK_VSYNC        (2 << 4)
+
+#define ILI9320_RGBIF1_RM               (1 << 8)
+
+#define ILI9320_RGBIF1_ENC_FRAMES(x)    (((x) - 1)<< 13)
+
+#define ILI9320_RGBIF2_DPL              (1 << 0)
+#define ILI9320_RGBIF2_EPL              (1 << 1)
+#define ILI9320_RGBIF2_HSPL             (1 << 3)
+#define ILI9320_RGBIF2_VSPL             (1 << 4)
+
+
+#define ILI9320_POWER1_SLP              (1 << 1)
+#define ILI9320_POWER1_DSTB             (1 << 2)
+#define ILI9320_POWER1_AP(x)            ((x) << 4)
+#define ILI9320_POWER1_APE              (1 << 7)
+#define ILI9320_POWER1_BT(x)            ((x) << 8)
+#define ILI9320_POWER1_SAP              (1 << 12)
+
+
+#define ILI9320_POWER2_VC(x)            ((x) << 0)
+#define ILI9320_POWER2_DC0(x)           ((x) << 4)
+#define ILI9320_POWER2_DC1(x)           ((x) << 8)
+
+
+#define ILI9320_POWER3_VRH(x)           ((x) << 0)
+#define ILI9320_POWER3_PON              (1 << 4)
+#define ILI9320_POWER3_VCMR             (1 << 8)
+
+
+#define ILI9320_POWER4_VREOUT(x)        ((x) << 8)
+
+
+#define ILI9320_DRIVER2_SCNL(x)         ((x) << 0)
+#define ILI9320_DRIVER2_NL(x)           ((x) << 8)
+#define ILI9320_DRIVER2_GS              (1 << 15)
+
+
+#define ILI9320_BASEIMAGE_REV           (1 << 0)
+#define ILI9320_BASEIMAGE_VLE           (1 << 1)
+#define ILI9320_BASEIMAGE_NDL           (1 << 2)
+
+
+#define ILI9320_INTERFACE4_RTNE(x)      (x)
+#define ILI9320_INTERFACE4_DIVE(x)      ((x) << 8)
+
+/* SPI interface definitions */
+
+#define ILI9320_SPI_IDCODE              (0x70)
+#define ILI9320_SPI_ID(x)               ((x) << 2)
+#define ILI9320_SPI_READ                (0x01)
+#define ILI9320_SPI_WRITE               (0x00)
+#define ILI9320_SPI_DATA                (0x02)
+#define ILI9320_SPI_INDEX               (0x00)
+
+/* platform data to pass configuration from lcd */
+
+enum ili9320_suspend {
+        ILI9320_SUSPEND_OFF,
+        ILI9320_SUSPEND_DEEP,
+};
+
+struct ili9320_platdata {
+        unsigned short  hsize;
+        unsigned short  vsize;
+
+        enum ili9320_suspend suspend;
+
+        /* set the reset line, 0 = reset asserted, 1 = normal */
+        void            (*reset)(unsigned int val);
+
+        unsigned short  entry_mode;
+        unsigned short  display2;
+        unsigned short  display3;
+        unsigned short  display4;
+        unsigned short  rgb_if1;
+        unsigned short  rgb_if2;
+        unsigned short  interface2;
+        unsigned short  interface3;
+        unsigned short  interface4;
+        unsigned short  interface5;
+        unsigned short  interface6;
+};
+
diff --git a/include/video/neomagic.h b/include/video/neomagic.h
index a9e118a1cd16..38910da0ae59 100644
--- a/include/video/neomagic.h
+++ b/include/video/neomagic.h
@@ -90,23 +90,6 @@
 #define PCI_CHIP_NM2360 0x0006
 #define PCI_CHIP_NM2380 0x0016
 
-
-struct xtimings {
-        unsigned int pixclock;
-        unsigned int HDisplay;
-        unsigned int HSyncStart;
-        unsigned int HSyncEnd;
-        unsigned int HTotal;
-        unsigned int VDisplay;
-        unsigned int VSyncStart;
-        unsigned int VSyncEnd;
-        unsigned int VTotal;
-        unsigned int sync;
-        int dblscan;
-        int interlaced;
-};
-
-
 /* --------------------------------------------------------------------- */
 
 typedef volatile struct {
diff --git a/include/video/platform_lcd.h b/include/video/platform_lcd.h
new file mode 100644
index 000000000000..ad3bdfe743b2
--- /dev/null
+++ b/include/video/platform_lcd.h
@@ -0,0 +1,21 @@
+/* include/video/platform_lcd.h
+ *
+ * Copyright 2008 Simtec Electronics
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * Generic platform-device LCD power control interface.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+*/
+
+struct plat_lcd_data;
+struct fb_info;
+
+struct plat_lcd_data {
+        void    (*set_power)(struct plat_lcd_data *, unsigned int power);
+        int     (*match_fb)(struct plat_lcd_data *, struct fb_info *);
+};
+
diff --git a/include/video/trident.h b/include/video/trident.h
index 200be2551681..b6ce19d1b61b 100644
--- a/include/video/trident.h
+++ b/include/video/trident.h
@@ -4,9 +4,9 @@
 #endif
 
 #if TRIDENTFB_DEBUG
-#define debug(f,a...)   printk("%s:" f,  __FUNCTION__ , ## a);mdelay(1000);
+#define debug(f, a...)  printk("%s:" f,  __func__ , ## a);
 #else
-#define debug(f,a...)
+#define debug(f, a...)
 #endif
 
 #define output(f, a...) pr_info("tridentfb: " f, ## a)
@@ -24,7 +24,9 @@
 #define CYBER9397DVD    0x939A
 #define CYBER9520       0x9520
 #define CYBER9525DVD    0x9525
+#define TGUI9440        0x9440
 #define TGUI9660        0x9660
+#define PROVIDIA9685    0x9685
 #define IMAGE975        0x9750
 #define IMAGE985        0x9850
 #define BLADE3D         0x9880
@@ -39,36 +41,11 @@
 #define CYBERBLADEXPm8  0x9910
 #define CYBERBLADEXPm16 0x9930
 
-/* acceleration families */
-#define IMAGE   0
-#define BLADE   1
-#define XP      2
-
-#define is_image(id)    
-#define is_xp(id)       ((id == CYBERBLADEXPAi1) ||\
-                         (id == CYBERBLADEXPm8) ||\
-                         (id == CYBERBLADEXPm16)) 
-
-#define is_blade(id)    ((id == BLADE3D) ||\
-                         (id == CYBERBLADEE4) ||\
-                         (id == CYBERBLADEi7) ||\
-                         (id == CYBERBLADEi7D) ||\
-                         (id == CYBERBLADEi1) ||\
-                         (id == CYBERBLADEi1D) ||\
-                         (id == CYBERBLADEAi1) ||\
-                         (id == CYBERBLADEAi1D))
-
 /* these defines are for 'lcd' variable */
 #define LCD_STRETCH     0
 #define LCD_CENTER      1
 #define LCD_BIOS        2
 
-/* display types */
-#define DISPLAY_CRT     0
-#define DISPLAY_FP      1
-
-#define flatpanel (displaytype == DISPLAY_FP)
-
 /* General Registers */
 #define SPR     0x1F            /* Software Programming Register (videoram) */
 
@@ -88,33 +65,7 @@
 #define SKey 0x37
 #define SPKey 0x57
 
-/* 0x3x4 */
-#define CRTHTotal       0x00
-#define CRTHDispEnd     0x01
-#define CRTHBlankStart  0x02
-#define CRTHBlankEnd    0x03
-#define CRTHSyncStart   0x04
-#define CRTHSyncEnd     0x05
-
-#define CRTVTotal       0x06
-#define CRTVDispEnd     0x12
-#define CRTVBlankStart  0x15
-#define CRTVBlankEnd    0x16
-#define CRTVSyncStart   0x10
-#define CRTVSyncEnd     0x11
-
-#define CRTOverflow     0x07
-#define CRTPRowScan     0x08
-#define CRTMaxScanLine  0x09
-#define CRTModeControl  0x17
-#define CRTLineCompare  0x18
-
 /* 3x4 */
-#define StartAddrHigh 0x0C
-#define StartAddrLow 0x0D
-#define Offset 0x13
-#define Underline 0x14
-#define CRTCMode 0x17
 #define CRTCModuleTest 0x1E
 #define FIFOControl 0x20
 #define LinearAddReg 0x21
@@ -173,3 +124,23 @@
 #define BiosMode     0x5c
 #define BiosReg      0x5d
 
+/* Graphics Engine */
+#define STATUS  0x2120
+#define OLDCMD  0x2124
+#define DRAWFL  0x2128
+#define OLDCLR  0x212C
+#define OLDDST  0x2138
+#define OLDSRC  0x213C
+#define OLDDIM  0x2140
+#define CMD     0x2144
+#define ROP     0x2148
+#define COLOR   0x2160
+#define BGCOLOR 0x2164
+#define SRC1    0x2100
+#define SRC2    0x2104
+#define DST1    0x2108
+#define DST2    0x210C
+
+#define ROP_S   0xCC
+#define ROP_P   0xF0
+#define ROP_X   0x66