266 files changed, 27720 insertions, 2887 deletions

diff --git a/drivers/video/68328fb.c b/drivers/video/68328fb.c
index 0b17824b0eb5..75a39eab70c3 100644
--- a/drivers/video/68328fb.c
+++ b/drivers/video/68328fb.c
@@ -32,7 +32,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -308,7 +307,7 @@ static int mc68x328fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
          * Pseudocolor:
          *    uses offset = 0 && length = RAMDAC register width.
          *    var->{color}.offset is 0
-         *    var->{color}.length contains widht of DAC
+         *    var->{color}.length contains width of DAC
          *    cmap is not used
          *    RAMDAC[X] is programmed to (red, green, blue)
          * Truecolor:
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 188e1ba3b69f..6e16244f3ed1 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -5,6 +5,9 @@
 menu "Graphics support"
         depends on HAS_IOMEM
 
+config HAVE_FB_ATMEL
+        bool
+
 source "drivers/char/agp/Kconfig"
 
 source "drivers/gpu/vga/Kconfig"
@@ -397,9 +400,12 @@ config FB_SA1100
           If you plan to use the LCD display with your SA-1100 system, say
           Y here.
 
+config HAVE_FB_IMX
+        bool
+
 config FB_IMX
         tristate "Motorola i.MX LCD support"
-        depends on FB && (ARCH_MX1 || ARCH_MX2)
+        depends on FB && (HAVE_FB_IMX || ARCH_MX1 || ARCH_MX2)
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -611,6 +617,21 @@ config FB_BFIN_T350MCQB
          This display is a QVGA 320x240 24-bit RGB display interfaced by an 8-bit wide PPI
          It uses PPI[0..7] PPI_FS1, PPI_FS2 and PPI_CLK.
 
+config FB_BFIN_LQ035Q1
+        tristate "SHARP LQ035Q1DH02 TFT LCD"
+        depends on FB && BLACKFIN && SPI
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        select BFIN_GPTIMERS
+        help
+          This is the framebuffer device driver for a SHARP LQ035Q1DH02 TFT display found on
+          the Blackfin Landscape LCD EZ-Extender Card.
+          This display is a QVGA 320x240 18-bit RGB display interfaced by an 16-bit wide PPI
+          It uses PPI[0..15] PPI_FS1, PPI_FS2 and PPI_CLK.
+
+          To compile this driver as a module, choose M here: the
+          module will be called bfin-lq035q1-fb.
 
 config FB_STI
         tristate "HP STI frame buffer device support"
@@ -891,6 +912,18 @@ config FB_XVR2500
           mostly initialized the card already.  It is treated as a
           completely dumb framebuffer device.
 
+config FB_XVR1000
+        bool "Sun XVR-1000 support"
+        depends on (FB = y) && SPARC64
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        help
+          This is the framebuffer device for the Sun XVR-1000 and similar
+          graphics cards.  The driver only works on sparc64 systems where
+          the system firmware has mostly initialized the card already.  It
+          is treated as a completely dumb framebuffer device.
+
 config FB_PVR2
         tristate "NEC PowerVR 2 display support"
         depends on FB && SH_DREAMCAST
@@ -937,7 +970,7 @@ config FB_S1D13XXX
 
 config FB_ATMEL
         tristate "AT91/AT32 LCD Controller support"
-        depends on FB && (ARCH_AT91SAM9261 || ARCH_AT91SAM9G10 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45 || ARCH_AT91CAP9 || AVR32)
+        depends on FB && HAVE_FB_ATMEL
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -1476,7 +1509,6 @@ config FB_VIA
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
-       select FB_SOFT_CURSOR
        select I2C_ALGOBIT
        select I2C
        help
@@ -1849,7 +1881,7 @@ config FB_W100
 
 config FB_SH_MOBILE_LCDC
         tristate "SuperH Mobile LCDC framebuffer support"
-        depends on FB && SUPERH && HAVE_CLK
+        depends on FB && (SUPERH || ARCH_SHMOBILE) && HAVE_CLK
         select FB_SYS_FILLRECT
         select FB_SYS_COPYAREA
         select FB_SYS_IMAGEBLIT
@@ -1927,6 +1959,27 @@ config FB_S3C2410_DEBUG
           Turn on debugging messages. Note that you can set/unset at run time
           through sysfs
 
+config FB_NUC900
+        bool "NUC900 LCD framebuffer support"
+        depends on FB && ARCH_W90X900
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        ---help---
+          Frame buffer driver for the built-in LCD controller in the Nuvoton
+          NUC900 processor
+
+config GPM1040A0_320X240
+        bool "Giantplus Technology GPM1040A0 320x240 Color TFT LCD"
+        depends on FB_NUC900
+
+config FB_NUC900_DEBUG
+        bool "NUC900 lcd debug messages"
+        depends on FB_NUC900
+        help
+          Turn on debugging messages. Note that you can set/unset at run time
+          through sysfs
+
 config FB_SM501
         tristate "Silicon Motion SM501 framebuffer support"
         depends on FB && MFD_SM501
@@ -2063,6 +2116,7 @@ config XEN_FBDEV_FRONTEND
         select FB_SYS_IMAGEBLIT
         select FB_SYS_FOPS
         select FB_DEFERRED_IO
+        select XEN_XENBUS_FRONTEND
         default y
         help
           This driver implements the front-end of the Xen virtual
@@ -2127,7 +2181,7 @@ config FB_PRE_INIT_FB
           the bootloader.
 
 config FB_MSM
-        tristate
+        tristate "MSM Framebuffer support"
         depends on FB && ARCH_MSM
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
@@ -2161,6 +2215,7 @@ config FB_BROADSHEET
           a bridge adapter.
 
 source "drivers/video/omap/Kconfig"
+source "drivers/video/omap2/Kconfig"
 
 source "drivers/video/backlight/Kconfig"
 source "drivers/video/display/Kconfig"
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 80232e124889..ddc2af2ba45b 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -79,6 +79,7 @@ obj-$(CONFIG_FB_N411)             += n411.o
 obj-$(CONFIG_FB_HGA)              += hgafb.o
 obj-$(CONFIG_FB_XVR500)           += sunxvr500.o
 obj-$(CONFIG_FB_XVR2500)          += sunxvr2500.o
+obj-$(CONFIG_FB_XVR1000)          += sunxvr1000.o
 obj-$(CONFIG_FB_IGA)              += igafb.o
 obj-$(CONFIG_FB_APOLLO)           += dnfb.o
 obj-$(CONFIG_FB_Q40)              += q40fb.o
@@ -124,10 +125,12 @@ obj-$(CONFIG_FB_SM501)            += sm501fb.o
 obj-$(CONFIG_FB_XILINX)           += xilinxfb.o
 obj-$(CONFIG_FB_SH_MOBILE_LCDC)   += sh_mobile_lcdcfb.o
 obj-$(CONFIG_FB_OMAP)             += omap/
+obj-y                             += omap2/
 obj-$(CONFIG_XEN_FBDEV_FRONTEND)  += xen-fbfront.o
 obj-$(CONFIG_FB_CARMINE)          += carminefb.o
 obj-$(CONFIG_FB_MB862XX)          += mb862xx/
 obj-$(CONFIG_FB_MSM)              += msm/
+obj-$(CONFIG_FB_NUC900)           += nuc900fb.o
 
 # Platform or fallback drivers go here
 obj-$(CONFIG_FB_UVESA)            += uvesafb.o
@@ -136,6 +139,7 @@ obj-$(CONFIG_FB_EFI)              += efifb.o
 obj-$(CONFIG_FB_VGA16)            += vga16fb.o
 obj-$(CONFIG_FB_OF)               += offb.o
 obj-$(CONFIG_FB_BF54X_LQ043)      += bf54x-lq043fb.o
+obj-$(CONFIG_FB_BFIN_LQ035Q1)     += bfin-lq035q1-fb.o
 obj-$(CONFIG_FB_BFIN_T350MCQB)    += bfin-t350mcqb-fb.o
 obj-$(CONFIG_FB_MX3)              += mx3fb.o
 obj-$(CONFIG_FB_DA8XX)            += da8xx-fb.o
diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c
index 0bcc59eb37fa..82acb8dc4aa1 100644
--- a/drivers/video/acornfb.c
+++ b/drivers/video/acornfb.c
@@ -22,13 +22,13 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/ctype.h>
-#include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/fb.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/io.h>
+#include <linux/gfp.h>
 
 #include <mach/hardware.h>
 #include <asm/irq.h>
@@ -1221,7 +1221,7 @@ free_unused_pages(unsigned int virtual_start, unsigned int virtual_end)
         printk("acornfb: freed %dK memory\n", mb_freed);
 }
 
-static int __init acornfb_probe(struct platform_device *dev)
+static int __devinit acornfb_probe(struct platform_device *dev)
 {
         unsigned long size;
         u_int h_sync, v_sync;
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c
index a21efcd10b78..afe21e6eb544 100644
--- a/drivers/video/amba-clcd.c
+++ b/drivers/video/amba-clcd.c
@@ -65,16 +65,16 @@ static void clcdfb_disable(struct clcd_fb *fb)
         if (fb->board->disable)
                 fb->board->disable(fb);
 
-        val = readl(fb->regs + CLCD_CNTL);
+        val = readl(fb->regs + fb->off_cntl);
         if (val & CNTL_LCDPWR) {
                 val &= ~CNTL_LCDPWR;
-                writel(val, fb->regs + CLCD_CNTL);
+                writel(val, fb->regs + fb->off_cntl);
 
                 clcdfb_sleep(20);
         }
         if (val & CNTL_LCDEN) {
                 val &= ~CNTL_LCDEN;
-                writel(val, fb->regs + CLCD_CNTL);
+                writel(val, fb->regs + fb->off_cntl);
         }
 
         /*
@@ -94,7 +94,7 @@ static void clcdfb_enable(struct clcd_fb *fb, u32 cntl)
          * Bring up by first enabling..
          */
         cntl |= CNTL_LCDEN;
-        writel(cntl, fb->regs + CLCD_CNTL);
+        writel(cntl, fb->regs + fb->off_cntl);
 
         clcdfb_sleep(20);
 
@@ -102,7 +102,7 @@ static void clcdfb_enable(struct clcd_fb *fb, u32 cntl)
          * and now apply power.
          */
         cntl |= CNTL_LCDPWR;
-        writel(cntl, fb->regs + CLCD_CNTL);
+        writel(cntl, fb->regs + fb->off_cntl);
 
         /*
          * finally, enable the interface.
@@ -233,7 +233,7 @@ static int clcdfb_set_par(struct fb_info *info)
                 readl(fb->regs + CLCD_TIM0), readl(fb->regs + CLCD_TIM1),
                 readl(fb->regs + CLCD_TIM2), readl(fb->regs + CLCD_TIM3),
                 readl(fb->regs + CLCD_UBAS), readl(fb->regs + CLCD_LBAS),
-                readl(fb->regs + CLCD_IENB), readl(fb->regs + CLCD_CNTL));
+                readl(fb->regs + fb->off_ienb), readl(fb->regs + fb->off_cntl));
 #endif
 
         return 0;
@@ -345,6 +345,23 @@ static int clcdfb_register(struct clcd_fb *fb)
 {
         int ret;
 
+        /*
+         * ARM PL111 always has IENB at 0x1c; it's only PL110
+         * which is reversed on some platforms.
+         */
+        if (amba_manf(fb->dev) == 0x41 && amba_part(fb->dev) == 0x111) {
+                fb->off_ienb = CLCD_PL111_IENB;
+                fb->off_cntl = CLCD_PL111_CNTL;
+        } else {
+#ifdef CONFIG_ARCH_VERSATILE
+                fb->off_ienb = CLCD_PL111_IENB;
+                fb->off_cntl = CLCD_PL111_CNTL;
+#else
+                fb->off_ienb = CLCD_PL110_IENB;
+                fb->off_cntl = CLCD_PL110_CNTL;
+#endif
+        }
+
         fb->clk = clk_get(&fb->dev->dev, NULL);
         if (IS_ERR(fb->clk)) {
                 ret = PTR_ERR(fb->clk);
@@ -416,7 +433,7 @@ static int clcdfb_register(struct clcd_fb *fb)
         /*
          * Ensure interrupts are disabled.
          */
-        writel(0, fb->regs + CLCD_IENB);
+        writel(0, fb->regs + fb->off_ienb);
 
         fb_set_var(&fb->fb, &fb->fb.var);
 
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index 82bedd7f7789..dca48df98444 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -45,7 +45,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/fb.h>
diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c
index c3431691c9f2..8d406fb689c1 100644
--- a/drivers/video/arcfb.c
+++ b/drivers/video/arcfb.c
@@ -39,7 +39,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -504,7 +503,7 @@ static struct fb_ops arcfb_ops = {
         .fb_ioctl       = arcfb_ioctl,
 };
 
-static int __init arcfb_probe(struct platform_device *dev)
+static int __devinit arcfb_probe(struct platform_device *dev)
 {
         struct fb_info *info;
         int retval = -ENOMEM;
diff --git a/drivers/video/asiliantfb.c b/drivers/video/asiliantfb.c
index 9fe90ce928fb..8cdf88e20b4b 100644
--- a/drivers/video/asiliantfb.c
+++ b/drivers/video/asiliantfb.c
@@ -34,7 +34,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -140,7 +139,7 @@ static void asiliant_calc_dclk2(u32 *ppixclock, u8 *dclk2_m, u8 *dclk2_n, u8 *dc
 
                 /* 3 <= m <= 257 */
                 if (m >= 3 && m <= 257) {
-                        unsigned new_error = ((Ftarget * n) - (Fref * m)) >= 0 ?
+                        unsigned new_error = Ftarget * n >= Fref * m ?
                                                ((Ftarget * n) - (Fref * m)) : ((Fref * m) - (Ftarget * n));
                         if (new_error < best_error) {
                                 best_n = n;
@@ -152,7 +151,7 @@ static void asiliant_calc_dclk2(u32 *ppixclock, u8 *dclk2_m, u8 *dclk2_n, u8 *dc
                 else if (m <= 1028) {
                         /* remember there are still only 8-bits of precision in m, so
                          * avoid over-optimistic error calculations */
-                        unsigned new_error = ((Ftarget * n) - (Fref * (m & ~3))) >= 0 ?
+                        unsigned new_error = Ftarget * n >= Fref * (m & ~3) ?
                                                ((Ftarget * n) - (Fref * (m & ~3))) : ((Fref * (m & ~3)) - (Ftarget * n));
                         if (new_error < best_error) {
                                 best_n = n;
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c
index 37624f74e88b..f3aada20fa02 100644
--- a/drivers/video/atafb.c
+++ b/drivers/video/atafb.c
@@ -52,7 +52,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
@@ -2242,6 +2241,9 @@ static int ext_setcolreg(unsigned int regno, unsigned int red,
         if (!external_vgaiobase)
                 return 1;
 
+        if (regno > 255)
+                return 1;
+
         switch (external_card_type) {
         case IS_VGA:
                 OUTB(0x3c8, regno);
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index d5e801076d33..8dce25126330 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -17,6 +17,7 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/backlight.h>
+#include <linux/gfp.h>
 
 #include <mach/board.h>
 #include <mach/cpu.h>
@@ -117,6 +118,7 @@ static struct backlight_ops atmel_lcdc_bl_ops = {
 
 static void init_backlight(struct atmel_lcdfb_info *sinfo)
 {
+        struct backlight_properties props;
         struct backlight_device *bl;
 
         sinfo->bl_power = FB_BLANK_UNBLANK;
@@ -124,8 +126,10 @@ static void init_backlight(struct atmel_lcdfb_info *sinfo)
         if (sinfo->backlight)
                 return;
 
-        bl = backlight_device_register("backlight", &sinfo->pdev->dev,
-                        sinfo, &atmel_lcdc_bl_ops);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = 0xff;
+        bl = backlight_device_register("backlight", &sinfo->pdev->dev, sinfo,
+                                       &atmel_lcdc_bl_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&sinfo->pdev->dev, "error %ld on backlight register\n",
                                 PTR_ERR(bl));
@@ -135,7 +139,6 @@ static void init_backlight(struct atmel_lcdfb_info *sinfo)
 
         bl->props.power = FB_BLANK_UNBLANK;
         bl->props.fb_blank = FB_BLANK_UNBLANK;
-        bl->props.max_brightness = 0xff;
         bl->props.brightness = atmel_bl_get_brightness(bl);
 }
 
@@ -964,7 +967,7 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
         if (sinfo->atmel_lcdfb_power_control)
                 sinfo->atmel_lcdfb_power_control(1);
 
-        dev_info(dev, "fb%d: Atmel LCDC at 0x%08lx (mapped at %p), irq %lu\n",
+        dev_info(dev, "fb%d: Atmel LCDC at 0x%08lx (mapped at %p), irq %d\n",
                        info->node, info->fix.mmio_start, sinfo->mmio, sinfo->irq_base);
 
         return 0;
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index e4e4d433b007..34a0851bcbfa 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -52,7 +52,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -1802,6 +1801,7 @@ static void aty128_bl_set_power(struct fb_info *info, int power)
 
 static void aty128_bl_init(struct aty128fb_par *par)
 {
+        struct backlight_properties props;
         struct fb_info *info = pci_get_drvdata(par->pdev);
         struct backlight_device *bd;
         char name[12];
@@ -1817,7 +1817,10 @@ static void aty128_bl_init(struct aty128fb_par *par)
 
         snprintf(name, sizeof(name), "aty128bl%d", info->node);
 
-        bd = backlight_device_register(name, info->dev, par, &aty128_bl_data);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
+        bd = backlight_device_register(name, info->dev, par, &aty128_bl_data,
+                                       &props);
         if (IS_ERR(bd)) {
                 info->bl_dev = NULL;
                 printk(KERN_WARNING "aty128: Backlight registration failed\n");
@@ -1829,7 +1832,6 @@ static void aty128_bl_init(struct aty128fb_par *par)
                  63 * FB_BACKLIGHT_MAX / MAX_LEVEL,
                 219 * FB_BACKLIGHT_MAX / MAX_LEVEL);
 
-        bd->props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
         bd->props.brightness = bd->props.max_brightness;
         bd->props.power = FB_BLANK_UNBLANK;
         backlight_update_status(bd);
@@ -1931,22 +1933,22 @@ static int __devinit aty128_init(struct pci_dev *pdev, const struct pci_device_i
                          * PowerMac2,2 summer 2000 iMacs
                          * PowerMac4,1 january 2001 iMacs "flower power"
                          */
-                        if (machine_is_compatible("PowerMac2,1") ||
-                            machine_is_compatible("PowerMac2,2") ||
-                            machine_is_compatible("PowerMac4,1"))
+                        if (of_machine_is_compatible("PowerMac2,1") ||
+                            of_machine_is_compatible("PowerMac2,2") ||
+                            of_machine_is_compatible("PowerMac4,1"))
                                 default_vmode = VMODE_1024_768_75;
 
                         /* iBook SE */
-                        if (machine_is_compatible("PowerBook2,2"))
+                        if (of_machine_is_compatible("PowerBook2,2"))
                                 default_vmode = VMODE_800_600_60;
 
                         /* PowerBook Firewire (Pismo), iBook Dual USB */
-                        if (machine_is_compatible("PowerBook3,1") ||
-                            machine_is_compatible("PowerBook4,1"))
+                        if (of_machine_is_compatible("PowerBook3,1") ||
+                            of_machine_is_compatible("PowerBook4,1"))
                                 default_vmode = VMODE_1024_768_60;
 
                         /* PowerBook Titanium */
-                        if (machine_is_compatible("PowerBook3,2"))
+                        if (of_machine_is_compatible("PowerBook3,2"))
                                 default_vmode = VMODE_1152_768_60;
         
                         if (default_cmode > 16) 
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 913b4a47ae52..29d72851f85b 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -2232,6 +2232,7 @@ static struct backlight_ops aty_bl_data = {
 
 static void aty_bl_init(struct atyfb_par *par)
 {
+        struct backlight_properties props;
         struct fb_info *info = pci_get_drvdata(par->pdev);
         struct backlight_device *bd;
         char name[12];
@@ -2243,7 +2244,10 @@ static void aty_bl_init(struct atyfb_par *par)
 
         snprintf(name, sizeof(name), "atybl%d", info->node);
 
-        bd = backlight_device_register(name, info->dev, par, &aty_bl_data);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
+        bd = backlight_device_register(name, info->dev, par, &aty_bl_data,
+                                       &props);
         if (IS_ERR(bd)) {
                 info->bl_dev = NULL;
                 printk(KERN_WARNING "aty: Backlight registration failed\n");
@@ -2255,7 +2259,6 @@ static void aty_bl_init(struct atyfb_par *par)
                             0x3F * FB_BACKLIGHT_MAX / MAX_LEVEL,
                             0xFF * FB_BACKLIGHT_MAX / MAX_LEVEL);
 
-        bd->props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
         bd->props.brightness = bd->props.max_brightness;
         bd->props.power = FB_BLANK_UNBLANK;
         backlight_update_status(bd);
@@ -2439,7 +2442,7 @@ static int __devinit aty_init(struct fb_info *info)
          * The Apple iBook1 uses non-standard memory frequencies.
          * We detect it and set the frequency manually.
          */
-        if (machine_is_compatible("PowerBook2,1")) {
+        if (of_machine_is_compatible("PowerBook2,1")) {
                 par->pll_limits.mclk = 70;
                 par->pll_limits.xclk = 53;
         }
@@ -2659,7 +2662,7 @@ static int __devinit aty_init(struct fb_info *info)
                       FBINFO_HWACCEL_YPAN;
 
 #ifdef CONFIG_PMAC_BACKLIGHT
-        if (M64_HAS(G3_PB_1_1) && machine_is_compatible("PowerBook1,1")) {
+        if (M64_HAS(G3_PB_1_1) && of_machine_is_compatible("PowerBook1,1")) {
                 /*
                  * these bits let the 101 powerbook
                  * wake up from sleep -- paulus
@@ -2690,9 +2693,9 @@ static int __devinit aty_init(struct fb_info *info)
                                 if (M64_HAS(G3_PB_1024x768))
                                         /* G3 PowerBook with 1024x768 LCD */
                                         default_vmode = VMODE_1024_768_60;
-                                else if (machine_is_compatible("iMac"))
+                                else if (of_machine_is_compatible("iMac"))
                                         default_vmode = VMODE_1024_768_75;
-                                else if (machine_is_compatible("PowerBook2,1"))
+                                else if (of_machine_is_compatible("PowerBook2,1"))
                                         /* iBook with 800x600 LCD */
                                         default_vmode = VMODE_800_600_60;
                                 else
@@ -3104,7 +3107,7 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
         }
 
         dp = pci_device_to_OF_node(pdev);
-        if (node == dp->node) {
+        if (node == dp->phandle) {
                 struct fb_var_screeninfo *var = &default_var;
                 unsigned int N, P, Q, M, T, R;
                 u32 v_total, h_total;
@@ -3276,7 +3279,7 @@ static void __devinit aty_init_lcd(struct atyfb_par *par, u32 bios_base)
                                 txtformat = "24 bit interface";
                                 break;
                         default:
-                                txtformat = "unkown format";
+                                txtformat = "unknown format";
                         }
                 } else {
                         switch (format & 7) {
@@ -3299,7 +3302,7 @@ static void __devinit aty_init_lcd(struct atyfb_par *par, u32 bios_base)
                                 txtformat = "262144 colours (FDPI-2 mode)";
                                 break;
                         default:
-                                txtformat = "unkown format";
+                                txtformat = "unknown format";
                         }
                 }
                 PRINTKI("%s%s %s monitor detected: %s\n",
diff --git a/drivers/video/aty/mach64_cursor.c b/drivers/video/aty/mach64_cursor.c
index 04c710804bb0..2ba8b3c421a1 100644
--- a/drivers/video/aty/mach64_cursor.c
+++ b/drivers/video/aty/mach64_cursor.c
@@ -2,7 +2,6 @@
  *  ATI Mach64 CT/VT/GT/LT Cursor Support
  */
 
-#include <linux/slab.h>
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/string.h>
diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c
index 1a056adb61c8..256966e9667d 100644
--- a/drivers/video/aty/radeon_backlight.c
+++ b/drivers/video/aty/radeon_backlight.c
@@ -12,6 +12,7 @@
 
 #include "radeonfb.h"
 #include <linux/backlight.h>
+#include <linux/slab.h>
 
 #ifdef CONFIG_PMAC_BACKLIGHT
 #include <asm/backlight.h>
@@ -134,6 +135,7 @@ static struct backlight_ops radeon_bl_data = {
 
 void radeonfb_bl_init(struct radeonfb_info *rinfo)
 {
+        struct backlight_properties props;
         struct backlight_device *bd;
         struct radeon_bl_privdata *pdata;
         char name[12];
@@ -155,7 +157,10 @@ void radeonfb_bl_init(struct radeonfb_info *rinfo)
 
         snprintf(name, sizeof(name), "radeonbl%d", rinfo->info->node);
 
-        bd = backlight_device_register(name, rinfo->info->dev, pdata, &radeon_bl_data);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
+        bd = backlight_device_register(name, rinfo->info->dev, pdata,
+                                       &radeon_bl_data, &props);
         if (IS_ERR(bd)) {
                 rinfo->info->bl_dev = NULL;
                 printk("radeonfb: Backlight registration failed\n");
@@ -175,9 +180,9 @@ void radeonfb_bl_init(struct radeonfb_info *rinfo)
 
 #ifdef CONFIG_PMAC_BACKLIGHT
         pdata->negative = pdata->negative ||
-                machine_is_compatible("PowerBook4,3") ||
-                machine_is_compatible("PowerBook6,3") ||
-                machine_is_compatible("PowerBook6,5");
+                of_machine_is_compatible("PowerBook4,3") ||
+                of_machine_is_compatible("PowerBook6,3") ||
+                of_machine_is_compatible("PowerBook6,5");
 #endif
 
         rinfo->info->bl_dev = bd;
@@ -185,7 +190,6 @@ void radeonfb_bl_init(struct radeonfb_info *rinfo)
                  63 * FB_BACKLIGHT_MAX / MAX_RADEON_LEVEL,
                 217 * FB_BACKLIGHT_MAX / MAX_RADEON_LEVEL);
 
-        bd->props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
         bd->props.brightness = bd->props.max_brightness;
         bd->props.power = FB_BLANK_UNBLANK;
         backlight_update_status(bd);
diff --git a/drivers/video/aty/radeon_monitor.c b/drivers/video/aty/radeon_monitor.c
index b4d4b88afc09..9261c918fde8 100644
--- a/drivers/video/aty/radeon_monitor.c
+++ b/drivers/video/aty/radeon_monitor.c
@@ -1,4 +1,7 @@
 #include "radeonfb.h"
+
+#include <linux/slab.h>
+
 #include "../edid.h"
 
 static struct fb_var_screeninfo radeonfb_default_var = {
diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c
index a699aab63820..40f61320ce16 100644
--- a/drivers/video/au1100fb.c
+++ b/drivers/video/au1100fb.c
@@ -52,6 +52,7 @@
 #include <linux/ctype.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
+#include <linux/slab.h>
 
 #include <asm/mach-au1x00/au1000.h>
 
diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c
index 0d96f1d2d4c5..e77e8e4280fb 100644
--- a/drivers/video/au1200fb.c
+++ b/drivers/video/au1200fb.c
@@ -41,6 +41,7 @@
 #include <linux/interrupt.h>
 #include <linux/ctype.h>
 #include <linux/dma-mapping.h>
+#include <linux/slab.h>
 
 #include <asm/mach-au1x00/au1000.h>
 #include "au1200fb.h"
diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c
new file mode 100644
index 000000000000..68d2518fadaa
--- /dev/null
+++ b/drivers/video/backlight/88pm860x_bl.c
@@ -0,0 +1,307 @@
+/*
+ * Backlight driver for Marvell Semiconductor 88PM8606
+ *
+ * Copyright (C) 2009 Marvell International Ltd.
+ *      Haojian Zhuang <haojian.zhuang@marvell.com>
+ *
+ * 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.
+ */
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/fb.h>
+#include <linux/i2c.h>
+#include <linux/backlight.h>
+#include <linux/mfd/88pm860x.h>
+#include <linux/slab.h>
+
+#define MAX_BRIGHTNESS          (0xFF)
+#define MIN_BRIGHTNESS          (0)
+
+#define CURRENT_MASK            (0x1F << 1)
+
+struct pm860x_backlight_data {
+        struct pm860x_chip *chip;
+        struct i2c_client *i2c;
+        int     current_brightness;
+        int     port;
+        int     pwm;
+        int     iset;
+};
+
+static inline int wled_a(int port)
+{
+        int ret;
+
+        ret = ((port - PM8606_BACKLIGHT1) << 1) + 2;
+        return ret;
+}
+
+static inline int wled_b(int port)
+{
+        int ret;
+
+        ret = ((port - PM8606_BACKLIGHT1) << 1) + 3;
+        return ret;
+}
+
+/* WLED2 & WLED3 share the same IDC */
+static inline int wled_idc(int port)
+{
+        int ret;
+
+        switch (port) {
+        case PM8606_BACKLIGHT1:
+        case PM8606_BACKLIGHT2:
+                ret = ((port - PM8606_BACKLIGHT1) << 1) + 3;
+                break;
+        case PM8606_BACKLIGHT3:
+        default:
+                ret = ((port - PM8606_BACKLIGHT2) << 1) + 3;
+                break;
+        }
+        return ret;
+}
+
+static int pm860x_backlight_set(struct backlight_device *bl, int brightness)
+{
+        struct pm860x_backlight_data *data = bl_get_data(bl);
+        struct pm860x_chip *chip = data->chip;
+        unsigned char value;
+        int ret;
+
+        if (brightness > MAX_BRIGHTNESS)
+                value = MAX_BRIGHTNESS;
+        else
+                value = brightness;
+
+        ret = pm860x_reg_write(data->i2c, wled_a(data->port), value);
+        if (ret < 0)
+                goto out;
+
+        if ((data->current_brightness == 0) && brightness) {
+                if (data->iset) {
+                        ret = pm860x_set_bits(data->i2c, wled_idc(data->port),
+                                              CURRENT_MASK, data->iset);
+                        if (ret < 0)
+                                goto out;
+                }
+                if (data->pwm) {
+                        ret = pm860x_set_bits(data->i2c, PM8606_PWM,
+                                              PM8606_PWM_FREQ_MASK, data->pwm);
+                        if (ret < 0)
+                                goto out;
+                }
+                if (brightness == MAX_BRIGHTNESS) {
+                        /* set WLED_ON bit as 100% */
+                        ret = pm860x_set_bits(data->i2c, wled_b(data->port),
+                                              PM8606_WLED_ON, PM8606_WLED_ON);
+                }
+        } else {
+                if (brightness == MAX_BRIGHTNESS) {
+                        /* set WLED_ON bit as 100% */
+                        ret = pm860x_set_bits(data->i2c, wled_b(data->port),
+                                              PM8606_WLED_ON, PM8606_WLED_ON);
+                } else {
+                        /* clear WLED_ON bit since it's not 100% */
+                        ret = pm860x_set_bits(data->i2c, wled_b(data->port),
+                                              PM8606_WLED_ON, 0);
+                }
+        }
+        if (ret < 0)
+                goto out;
+
+        dev_dbg(chip->dev, "set brightness %d\n", value);
+        data->current_brightness = value;
+        return 0;
+out:
+        dev_dbg(chip->dev, "set brightness %d failure with return "
+                "value:%d\n", value, ret);
+        return ret;
+}
+
+static int pm860x_backlight_update_status(struct backlight_device *bl)
+{
+        int brightness = bl->props.brightness;
+
+        if (bl->props.power != FB_BLANK_UNBLANK)
+                brightness = 0;
+
+        if (bl->props.fb_blank != FB_BLANK_UNBLANK)
+                brightness = 0;
+
+        if (bl->props.state & BL_CORE_SUSPENDED)
+                brightness = 0;
+
+        return pm860x_backlight_set(bl, brightness);
+}
+
+static int pm860x_backlight_get_brightness(struct backlight_device *bl)
+{
+        struct pm860x_backlight_data *data = bl_get_data(bl);
+        struct pm860x_chip *chip = data->chip;
+        int ret;
+
+        ret = pm860x_reg_read(data->i2c, wled_a(data->port));
+        if (ret < 0)
+                goto out;
+        data->current_brightness = ret;
+        dev_dbg(chip->dev, "get brightness %d\n", data->current_brightness);
+        return data->current_brightness;
+out:
+        return -EINVAL;
+}
+
+static struct backlight_ops pm860x_backlight_ops = {
+        .options        = BL_CORE_SUSPENDRESUME,
+        .update_status  = pm860x_backlight_update_status,
+        .get_brightness = pm860x_backlight_get_brightness,
+};
+
+static int __check_device(struct pm860x_backlight_pdata *pdata, char *name)
+{
+        struct pm860x_backlight_pdata *p = pdata;
+        int ret = -EINVAL;
+
+        while (p && p->id) {
+                if ((p->id != PM8606_ID_BACKLIGHT) || (p->flags < 0))
+                        break;
+
+                if (!strncmp(name, pm860x_backlight_name[p->flags],
+                        MFD_NAME_SIZE)) {
+                        ret = (int)p->flags;
+                        break;
+                }
+                p++;
+        }
+        return ret;
+}
+
+static int pm860x_backlight_probe(struct platform_device *pdev)
+{
+        struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);
+        struct pm860x_platform_data *pm860x_pdata;
+        struct pm860x_backlight_pdata *pdata = NULL;
+        struct pm860x_backlight_data *data;
+        struct backlight_device *bl;
+        struct resource *res;
+        struct backlight_properties props;
+        unsigned char value;
+        char name[MFD_NAME_SIZE];
+        int ret;
+
+        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        if (res == NULL) {
+                dev_err(&pdev->dev, "No I/O resource!\n");
+                return -EINVAL;
+        }
+
+        if (pdev->dev.parent->platform_data) {
+                pm860x_pdata = pdev->dev.parent->platform_data;
+                pdata = pm860x_pdata->backlight;
+        }
+        if (pdata == NULL) {
+                dev_err(&pdev->dev, "platform data isn't assigned to "
+                        "backlight\n");
+                return -EINVAL;
+        }
+
+        data = kzalloc(sizeof(struct pm860x_backlight_data), GFP_KERNEL);
+        if (data == NULL)
+                return -ENOMEM;
+        strncpy(name, res->name, MFD_NAME_SIZE);
+        data->chip = chip;
+        data->i2c = (chip->id == CHIP_PM8606) ? chip->client    \
+                        : chip->companion;
+        data->current_brightness = MAX_BRIGHTNESS;
+        data->pwm = pdata->pwm;
+        data->iset = pdata->iset;
+        data->port = __check_device(pdata, name);
+        if (data->port < 0) {
+                dev_err(&pdev->dev, "wrong platform data is assigned");
+                return -EINVAL;
+        }
+
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = MAX_BRIGHTNESS;
+        bl = backlight_device_register(name, &pdev->dev, data,
+                                        &pm860x_backlight_ops, &props);
+        if (IS_ERR(bl)) {
+                dev_err(&pdev->dev, "failed to register backlight\n");
+                kfree(data);
+                return PTR_ERR(bl);
+        }
+        bl->props.brightness = MAX_BRIGHTNESS;
+
+        platform_set_drvdata(pdev, bl);
+
+        /* Enable reference VSYS */
+        ret = pm860x_reg_read(data->i2c, PM8606_VSYS);
+        if (ret < 0)
+                goto out;
+        if ((ret & PM8606_VSYS_EN) == 0) {
+                value = ret | PM8606_VSYS_EN;
+                ret = pm860x_reg_write(data->i2c, PM8606_VSYS, value);
+                if (ret < 0)
+                        goto out;
+        }
+        /* Enable reference OSC */
+        ret = pm860x_reg_read(data->i2c, PM8606_MISC);
+        if (ret < 0)
+                goto out;
+        if ((ret & PM8606_MISC_OSC_EN) == 0) {
+                value = ret | PM8606_MISC_OSC_EN;
+                ret = pm860x_reg_write(data->i2c, PM8606_MISC, value);
+                if (ret < 0)
+                        goto out;
+        }
+        /* read current backlight */
+        ret = pm860x_backlight_get_brightness(bl);
+        if (ret < 0)
+                goto out;
+
+        backlight_update_status(bl);
+        return 0;
+out:
+        kfree(data);
+        return ret;
+}
+
+static int pm860x_backlight_remove(struct platform_device *pdev)
+{
+        struct backlight_device *bl = platform_get_drvdata(pdev);
+        struct pm860x_backlight_data *data = bl_get_data(bl);
+
+        backlight_device_unregister(bl);
+        kfree(data);
+        return 0;
+}
+
+static struct platform_driver pm860x_backlight_driver = {
+        .driver         = {
+                .name   = "88pm860x-backlight",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = pm860x_backlight_probe,
+        .remove         = pm860x_backlight_remove,
+};
+
+static int __init pm860x_backlight_init(void)
+{
+        return platform_driver_register(&pm860x_backlight_driver);
+}
+module_init(pm860x_backlight_init);
+
+static void __exit pm860x_backlight_exit(void)
+{
+        platform_driver_unregister(&pm860x_backlight_driver);
+}
+module_exit(pm860x_backlight_exit);
+
+MODULE_DESCRIPTION("Backlight Driver for Marvell Semiconductor 88PM8606");
+MODULE_AUTHOR("Haojian Zhuang <haojian.zhuang@marvell.com>");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:88pm860x-backlight");
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 09bfa9662e4d..c025c84601b0 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -31,6 +31,13 @@ config LCD_CORGI
           Say y here to support the LCD panels usually found on SHARP
           corgi (C7x0) and spitz (Cxx00) models.
 
+config LCD_L4F00242T03
+        tristate "Epson L4F00242T03 LCD"
+        depends on LCD_CLASS_DEVICE && SPI_MASTER && GENERIC_GPIO
+        help
+          SPI driver for Epson L4F00242T03. This provides basic support
+          for init and powering the LCD up/down through a sysfs interface.
+
 config LCD_LMS283GF05
         tristate "Samsung LMS283GF05 LCD"
         depends on LCD_CLASS_DEVICE && SPI_MASTER && GENERIC_GPIO
@@ -212,6 +219,13 @@ config BACKLIGHT_DA903X
           If you have a LCD backlight connected to the WLED output of DA9030
           or DA9034 WLED output, say Y here to enable this driver.
 
+config BACKLIGHT_MAX8925
+        tristate "Backlight driver for MAX8925"
+        depends on BACKLIGHT_CLASS_DEVICE && MFD_MAX8925
+        help
+          If you have a LCD backlight connected to the WLED output of MAX8925
+          WLED output, say Y here to enable this driver.
+
 config BACKLIGHT_MBP_NVIDIA
        tristate "MacBook Pro Nvidia Backlight Driver"
        depends on BACKLIGHT_CLASS_DEVICE && X86
@@ -262,3 +276,9 @@ config BACKLIGHT_ADP5520
           To compile this driver as a module, choose M here: the module will
           be called adp5520_bl.
 
+config BACKLIGHT_88PM860X
+        tristate "Backlight Driver for 88PM8606 using WLED"
+        depends on BACKLIGHT_CLASS_DEVICE && MFD_88PM860X
+        help
+          Say Y to enable the backlight driver for Marvell 88PM8606.
+
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index 9a405548874c..09d1f14d6257 100644
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@ -3,6 +3,7 @@
 obj-$(CONFIG_LCD_CLASS_DEVICE)     += lcd.o
 obj-$(CONFIG_LCD_CORGI)            += corgi_lcd.o
 obj-$(CONFIG_LCD_HP700)            += jornada720_lcd.o
+obj-$(CONFIG_LCD_L4F00242T03)      += l4f00242t03.o
 obj-$(CONFIG_LCD_LMS283GF05)       += lms283gf05.o
 obj-$(CONFIG_LCD_LTV350QV)         += ltv350qv.o
 obj-$(CONFIG_LCD_ILI9320)          += ili9320.o
@@ -22,10 +23,12 @@ obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o
 obj-$(CONFIG_BACKLIGHT_CARILLO_RANCH) += cr_bllcd.o
 obj-$(CONFIG_BACKLIGHT_PWM)     += pwm_bl.o
 obj-$(CONFIG_BACKLIGHT_DA903X)  += da903x_bl.o
+obj-$(CONFIG_BACKLIGHT_MAX8925) += max8925_bl.o
 obj-$(CONFIG_BACKLIGHT_MBP_NVIDIA) += mbp_nvidia_bl.o
 obj-$(CONFIG_BACKLIGHT_TOSA)    += tosa_bl.o
 obj-$(CONFIG_BACKLIGHT_SAHARA)  += kb3886_bl.o
 obj-$(CONFIG_BACKLIGHT_WM831X)  += wm831x_bl.o
 obj-$(CONFIG_BACKLIGHT_ADX)    += adx_bl.o
 obj-$(CONFIG_BACKLIGHT_ADP5520) += adp5520_bl.o
+obj-$(CONFIG_BACKLIGHT_88PM860X) += 88pm860x_bl.o
 
diff --git a/drivers/video/backlight/adp5520_bl.c b/drivers/video/backlight/adp5520_bl.c
index ad05da5ba3c7..9f436e014f85 100644
--- a/drivers/video/backlight/adp5520_bl.c
+++ b/drivers/video/backlight/adp5520_bl.c
@@ -12,10 +12,11 @@
 #include <linux/fb.h>
 #include <linux/backlight.h>
 #include <linux/mfd/adp5520.h>
+#include <linux/slab.h>
 
 struct adp5520_bl {
         struct device *master;
-        struct adp5520_backlight_platfrom_data *pdata;
+        struct adp5520_backlight_platform_data *pdata;
         struct mutex lock;
         unsigned long cached_daylight_max;
         int id;
@@ -31,29 +32,30 @@ static int adp5520_bl_set(struct backlight_device *bl, int brightness)
         if (data->pdata->en_ambl_sens) {
                 if ((brightness > 0) && (brightness < ADP5020_MAX_BRIGHTNESS)) {
                         /* Disable Ambient Light auto adjust */
-                        ret |= adp5520_clr_bits(master, BL_CONTROL,
-                                        BL_AUTO_ADJ);
-                        ret |= adp5520_write(master, DAYLIGHT_MAX, brightness);
+                        ret |= adp5520_clr_bits(master, ADP5520_BL_CONTROL,
+                                        ADP5520_BL_AUTO_ADJ);
+                        ret |= adp5520_write(master, ADP5520_DAYLIGHT_MAX,
+                                        brightness);
                 } else {
                         /*
                          * MAX_BRIGHTNESS -> Enable Ambient Light auto adjust
                          * restore daylight l3 sysfs brightness
                          */
-                        ret |= adp5520_write(master, DAYLIGHT_MAX,
+                        ret |= adp5520_write(master, ADP5520_DAYLIGHT_MAX,
                                          data->cached_daylight_max);
-                        ret |= adp5520_set_bits(master, BL_CONTROL,
-                                         BL_AUTO_ADJ);
+                        ret |= adp5520_set_bits(master, ADP5520_BL_CONTROL,
+                                         ADP5520_BL_AUTO_ADJ);
                 }
         } else {
-                ret |= adp5520_write(master, DAYLIGHT_MAX, brightness);
+                ret |= adp5520_write(master, ADP5520_DAYLIGHT_MAX, brightness);
         }
 
         if (data->current_brightness && brightness == 0)
                 ret |= adp5520_set_bits(master,
-                                MODE_STATUS, DIM_EN);
+                                ADP5520_MODE_STATUS, ADP5520_DIM_EN);
         else if (data->current_brightness == 0 && brightness)
                 ret |= adp5520_clr_bits(master,
-                                MODE_STATUS, DIM_EN);
+                                ADP5520_MODE_STATUS, ADP5520_DIM_EN);
 
         if (!ret)
                 data->current_brightness = brightness;
@@ -79,12 +81,12 @@ static int adp5520_bl_get_brightness(struct backlight_device *bl)
         int error;
         uint8_t reg_val;
 
-        error = adp5520_read(data->master, BL_VALUE, &reg_val);
+        error = adp5520_read(data->master, ADP5520_BL_VALUE, &reg_val);
 
         return error ? data->current_brightness : reg_val;
 }
 
-static struct backlight_ops adp5520_bl_ops = {
+static const struct backlight_ops adp5520_bl_ops = {
         .update_status  = adp5520_bl_update_status,
         .get_brightness = adp5520_bl_get_brightness,
 };
@@ -93,33 +95,46 @@ static int adp5520_bl_setup(struct backlight_device *bl)
 {
         struct adp5520_bl *data = bl_get_data(bl);
         struct device *master = data->master;
-        struct adp5520_backlight_platfrom_data *pdata = data->pdata;
+        struct adp5520_backlight_platform_data *pdata = data->pdata;
         int ret = 0;
 
-        ret |= adp5520_write(master, DAYLIGHT_MAX, pdata->l1_daylight_max);
-        ret |= adp5520_write(master, DAYLIGHT_DIM, pdata->l1_daylight_dim);
+        ret |= adp5520_write(master, ADP5520_DAYLIGHT_MAX,
+                                pdata->l1_daylight_max);
+        ret |= adp5520_write(master, ADP5520_DAYLIGHT_DIM,
+                                pdata->l1_daylight_dim);
 
         if (pdata->en_ambl_sens) {
                 data->cached_daylight_max = pdata->l1_daylight_max;
-                ret |= adp5520_write(master, OFFICE_MAX, pdata->l2_office_max);
-                ret |= adp5520_write(master, OFFICE_DIM, pdata->l2_office_dim);
-                ret |= adp5520_write(master, DARK_MAX, pdata->l3_dark_max);
-                ret |= adp5520_write(master, DARK_DIM, pdata->l3_dark_dim);
-                ret |= adp5520_write(master, L2_TRIP, pdata->l2_trip);
-                ret |= adp5520_write(master, L2_HYS, pdata->l2_hyst);
-                ret |= adp5520_write(master, L3_TRIP, pdata->l3_trip);
-                ret |= adp5520_write(master, L3_HYS, pdata->l3_hyst);
-                ret |= adp5520_write(master, ALS_CMPR_CFG,
-                        ALS_CMPR_CFG_VAL(pdata->abml_filt, L3_EN));
+                ret |= adp5520_write(master, ADP5520_OFFICE_MAX,
+                                pdata->l2_office_max);
+                ret |= adp5520_write(master, ADP5520_OFFICE_DIM,
+                                pdata->l2_office_dim);
+                ret |= adp5520_write(master, ADP5520_DARK_MAX,
+                                pdata->l3_dark_max);
+                ret |= adp5520_write(master, ADP5520_DARK_DIM,
+                                pdata->l3_dark_dim);
+                ret |= adp5520_write(master, ADP5520_L2_TRIP,
+                                pdata->l2_trip);
+                ret |= adp5520_write(master, ADP5520_L2_HYS,
+                                pdata->l2_hyst);
+                ret |= adp5520_write(master, ADP5520_L3_TRIP,
+                                 pdata->l3_trip);
+                ret |= adp5520_write(master, ADP5520_L3_HYS,
+                                pdata->l3_hyst);
+                ret |= adp5520_write(master, ADP5520_ALS_CMPR_CFG,
+                                ALS_CMPR_CFG_VAL(pdata->abml_filt,
+                                ADP5520_L3_EN));
         }
 
-        ret |= adp5520_write(master, BL_CONTROL,
-                        BL_CTRL_VAL(pdata->fade_led_law, pdata->en_ambl_sens));
+        ret |= adp5520_write(master, ADP5520_BL_CONTROL,
+                        BL_CTRL_VAL(pdata->fade_led_law,
+                                        pdata->en_ambl_sens));
 
-        ret |= adp5520_write(master, BL_FADE, FADE_VAL(pdata->fade_in,
+        ret |= adp5520_write(master, ADP5520_BL_FADE, FADE_VAL(pdata->fade_in,
                         pdata->fade_out));
 
-        ret |= adp5520_set_bits(master, MODE_STATUS, BL_EN | DIM_EN);
+        ret |= adp5520_set_bits(master, ADP5520_MODE_STATUS,
+                        ADP5520_BL_EN | ADP5520_DIM_EN);
 
         return ret;
 }
@@ -156,29 +171,31 @@ static ssize_t adp5520_store(struct device *dev, const char *buf,
 }
 
 static ssize_t adp5520_bl_dark_max_show(struct device *dev,
-                struct device_attribute *attr, char *buf)
+                        struct device_attribute *attr, char *buf)
 {
-        return adp5520_show(dev, buf, DARK_MAX);
+        return adp5520_show(dev, buf, ADP5520_DARK_MAX);
 }
 
 static ssize_t adp5520_bl_dark_max_store(struct device *dev,
-                struct device_attribute *attr, const char *buf, size_t count)
+                        struct device_attribute *attr,
+                        const char *buf, size_t count)
 {
-        return adp5520_store(dev, buf, count, DARK_MAX);
+        return adp5520_store(dev, buf, count, ADP5520_DARK_MAX);
 }
 static DEVICE_ATTR(dark_max, 0664, adp5520_bl_dark_max_show,
                         adp5520_bl_dark_max_store);
 
 static ssize_t adp5520_bl_office_max_show(struct device *dev,
-                                     struct device_attribute *attr, char *buf)
+                        struct device_attribute *attr, char *buf)
 {
-        return adp5520_show(dev, buf, OFFICE_MAX);
+        return adp5520_show(dev, buf, ADP5520_OFFICE_MAX);
 }
 
 static ssize_t adp5520_bl_office_max_store(struct device *dev,
-                struct device_attribute *attr, const char *buf, size_t count)
+                        struct device_attribute *attr,
+                        const char *buf, size_t count)
 {
-        return adp5520_store(dev, buf, count, OFFICE_MAX);
+        return adp5520_store(dev, buf, count, ADP5520_OFFICE_MAX);
 }
 static DEVICE_ATTR(office_max, 0664, adp5520_bl_office_max_show,
                         adp5520_bl_office_max_store);
@@ -186,16 +203,17 @@ static DEVICE_ATTR(office_max, 0664, adp5520_bl_office_max_show,
 static ssize_t adp5520_bl_daylight_max_show(struct device *dev,
                         struct device_attribute *attr, char *buf)
 {
-        return adp5520_show(dev, buf, DAYLIGHT_MAX);
+        return adp5520_show(dev, buf, ADP5520_DAYLIGHT_MAX);
 }
 
 static ssize_t adp5520_bl_daylight_max_store(struct device *dev,
-                struct device_attribute *attr, const char *buf, size_t count)
+                        struct device_attribute *attr,
+                        const char *buf, size_t count)
 {
         struct adp5520_bl *data = dev_get_drvdata(dev);
 
         strict_strtoul(buf, 10, &data->cached_daylight_max);
-        return adp5520_store(dev, buf, count, DAYLIGHT_MAX);
+        return adp5520_store(dev, buf, count, ADP5520_DAYLIGHT_MAX);
 }
 static DEVICE_ATTR(daylight_max, 0664, adp5520_bl_daylight_max_show,
                         adp5520_bl_daylight_max_store);
@@ -203,14 +221,14 @@ static DEVICE_ATTR(daylight_max, 0664, adp5520_bl_daylight_max_show,
 static ssize_t adp5520_bl_dark_dim_show(struct device *dev,
                         struct device_attribute *attr, char *buf)
 {
-        return adp5520_show(dev, buf, DARK_DIM);
+        return adp5520_show(dev, buf, ADP5520_DARK_DIM);
 }
 
 static ssize_t adp5520_bl_dark_dim_store(struct device *dev,
-                                     struct device_attribute *attr,
-                                     const char *buf, size_t count)
+                        struct device_attribute *attr,
+                        const char *buf, size_t count)
 {
-        return adp5520_store(dev, buf, count, DARK_DIM);
+        return adp5520_store(dev, buf, count, ADP5520_DARK_DIM);
 }
 static DEVICE_ATTR(dark_dim, 0664, adp5520_bl_dark_dim_show,
                         adp5520_bl_dark_dim_store);
@@ -218,29 +236,29 @@ static DEVICE_ATTR(dark_dim, 0664, adp5520_bl_dark_dim_show,
 static ssize_t adp5520_bl_office_dim_show(struct device *dev,
                         struct device_attribute *attr, char *buf)
 {
-        return adp5520_show(dev, buf, OFFICE_DIM);
+        return adp5520_show(dev, buf, ADP5520_OFFICE_DIM);
 }
 
 static ssize_t adp5520_bl_office_dim_store(struct device *dev,
-                                     struct device_attribute *attr,
-                                     const char *buf, size_t count)
+                        struct device_attribute *attr,
+                        const char *buf, size_t count)
 {
-        return adp5520_store(dev, buf, count, OFFICE_DIM);
+        return adp5520_store(dev, buf, count, ADP5520_OFFICE_DIM);
 }
 static DEVICE_ATTR(office_dim, 0664, adp5520_bl_office_dim_show,
                         adp5520_bl_office_dim_store);
 
 static ssize_t adp5520_bl_daylight_dim_show(struct device *dev,
-                                     struct device_attribute *attr, char *buf)
+                        struct device_attribute *attr, char *buf)
 {
-        return adp5520_show(dev, buf, DAYLIGHT_DIM);
+        return adp5520_show(dev, buf, ADP5520_DAYLIGHT_DIM);
 }
 
 static ssize_t adp5520_bl_daylight_dim_store(struct device *dev,
-                                     struct device_attribute *attr,
-                                     const char *buf, size_t count)
+                        struct device_attribute *attr,
+                        const char *buf, size_t count)
 {
-        return adp5520_store(dev, buf, count, DAYLIGHT_DIM);
+        return adp5520_store(dev, buf, count, ADP5520_DAYLIGHT_DIM);
 }
 static DEVICE_ATTR(daylight_dim, 0664, adp5520_bl_daylight_dim_show,
                         adp5520_bl_daylight_dim_store);
@@ -261,6 +279,7 @@ static const struct attribute_group adp5520_bl_attr_group = {
 
 static int __devinit adp5520_bl_probe(struct platform_device *pdev)
 {
+        struct backlight_properties props;
         struct backlight_device *bl;
         struct adp5520_bl *data;
         int ret = 0;
@@ -283,17 +302,17 @@ static int __devinit adp5520_bl_probe(struct platform_device *pdev)
 
         mutex_init(&data->lock);
 
-        bl = backlight_device_register(pdev->name, data->master,
-                        data, &adp5520_bl_ops);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = ADP5020_MAX_BRIGHTNESS;
+        bl = backlight_device_register(pdev->name, data->master, data,
+                                       &adp5520_bl_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&pdev->dev, "failed to register backlight\n");
                 kfree(data);
                 return PTR_ERR(bl);
         }
 
-        bl->props.max_brightness =
-                bl->props.brightness = ADP5020_MAX_BRIGHTNESS;
-
+        bl->props.brightness = ADP5020_MAX_BRIGHTNESS;
         if (data->pdata->en_ambl_sens)
                 ret = sysfs_create_group(&bl->dev.kobj,
                         &adp5520_bl_attr_group);
@@ -316,7 +335,7 @@ static int __devexit adp5520_bl_remove(struct platform_device *pdev)
         struct backlight_device *bl = platform_get_drvdata(pdev);
         struct adp5520_bl *data = bl_get_data(bl);
 
-        adp5520_clr_bits(data->master, MODE_STATUS, BL_EN);
+        adp5520_clr_bits(data->master, ADP5520_MODE_STATUS, ADP5520_BL_EN);
 
         if (data->pdata->en_ambl_sens)
                 sysfs_remove_group(&bl->dev.kobj,
diff --git a/drivers/video/backlight/adx_bl.c b/drivers/video/backlight/adx_bl.c
index 2c3bdfc620b7..7f4a7c30a98b 100644
--- a/drivers/video/backlight/adx_bl.c
+++ b/drivers/video/backlight/adx_bl.c
@@ -12,6 +12,7 @@
 
 #include <linux/backlight.h>
 #include <linux/fb.h>
+#include <linux/gfp.h>
 #include <linux/io.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
@@ -56,12 +57,12 @@ static int adx_backlight_get_brightness(struct backlight_device *bldev)
         return brightness & 0xff;
 }
 
-static int adx_backlight_check_fb(struct fb_info *fb)
+static int adx_backlight_check_fb(struct backlight_device *bldev, struct fb_info *fb)
 {
         return 1;
 }
 
-static struct backlight_ops adx_backlight_ops = {
+static const struct backlight_ops adx_backlight_ops = {
         .options = 0,
         .update_status = adx_backlight_update_status,
         .get_brightness = adx_backlight_get_brightness,
@@ -70,6 +71,7 @@ static struct backlight_ops adx_backlight_ops = {
 
 static int __devinit adx_backlight_probe(struct platform_device *pdev)
 {
+        struct backlight_properties props;
         struct backlight_device *bldev;
         struct resource *res;
         struct adxbl *bl;
@@ -101,14 +103,15 @@ static int __devinit adx_backlight_probe(struct platform_device *pdev)
                 goto out;
         }
 
-        bldev = backlight_device_register(dev_name(&pdev->dev), &pdev->dev, bl,
-                        &adx_backlight_ops);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = 0xff;
+        bldev = backlight_device_register(dev_name(&pdev->dev), &pdev->dev,
+                                          bl, &adx_backlight_ops, &props);
         if (!bldev) {
                 ret = -ENOMEM;
                 goto out;
         }
 
-        bldev->props.max_brightness = 0xff;
         bldev->props.brightness = 0xff;
         bldev->props.power = FB_BLANK_UNBLANK;
 
diff --git a/drivers/video/backlight/atmel-pwm-bl.c b/drivers/video/backlight/atmel-pwm-bl.c
index 505c0823a105..e6a66dab088c 100644
--- a/drivers/video/backlight/atmel-pwm-bl.c
+++ b/drivers/video/backlight/atmel-pwm-bl.c
@@ -17,6 +17,7 @@
 #include <linux/backlight.h>
 #include <linux/atmel_pwm.h>
 #include <linux/atmel-pwm-bl.h>
+#include <linux/slab.h>
 
 struct atmel_pwm_bl {
         const struct atmel_pwm_bl_platform_data *pdata;
@@ -113,13 +114,14 @@ static int atmel_pwm_bl_init_pwm(struct atmel_pwm_bl *pwmbl)
         return pwm_channel_enable(&pwmbl->pwmc);
 }
 
-static struct backlight_ops atmel_pwm_bl_ops = {
+static const struct backlight_ops atmel_pwm_bl_ops = {
         .get_brightness = atmel_pwm_bl_get_intensity,
         .update_status  = atmel_pwm_bl_set_intensity,
 };
 
 static int atmel_pwm_bl_probe(struct platform_device *pdev)
 {
+        struct backlight_properties props;
         const struct atmel_pwm_bl_platform_data *pdata;
         struct backlight_device *bldev;
         struct atmel_pwm_bl *pwmbl;
@@ -158,15 +160,17 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)
                         goto err_free_pwm;
                 }
 
-                /* Turn display off by defatult. */
+                /* Turn display off by default. */
                 retval = gpio_direction_output(pwmbl->gpio_on,
                                 0 ^ pdata->on_active_low);
                 if (retval)
                         goto err_free_gpio;
         }
 
-        bldev = backlight_device_register("atmel-pwm-bl",
-                        &pdev->dev, pwmbl, &atmel_pwm_bl_ops);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = pdata->pwm_duty_max - pdata->pwm_duty_min;
+        bldev = backlight_device_register("atmel-pwm-bl", &pdev->dev, pwmbl,
+                                          &atmel_pwm_bl_ops, &props);
         if (IS_ERR(bldev)) {
                 retval = PTR_ERR(bldev);
                 goto err_free_gpio;
@@ -178,7 +182,6 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)
 
         /* Power up the backlight by default at middle intesity. */
         bldev->props.power = FB_BLANK_UNBLANK;
-        bldev->props.max_brightness = pdata->pwm_duty_max - pdata->pwm_duty_min;
         bldev->props.brightness = bldev->props.max_brightness / 2;
 
         retval = atmel_pwm_bl_init_pwm(pwmbl);
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index 6615ac7fa60a..e207810bba3c 100644
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -13,6 +13,7 @@
 #include <linux/ctype.h>
 #include <linux/err.h>
 #include <linux/fb.h>
+#include <linux/slab.h>
 
 #ifdef CONFIG_PMAC_BACKLIGHT
 #include <asm/backlight.h>
@@ -38,7 +39,7 @@ static int fb_notifier_callback(struct notifier_block *self,
         mutex_lock(&bd->ops_lock);
         if (bd->ops)
                 if (!bd->ops->check_fb ||
-                    bd->ops->check_fb(evdata->info)) {
+                    bd->ops->check_fb(bd, evdata->info)) {
                         bd->props.fb_blank = *(int *)evdata->data;
                         if (bd->props.fb_blank == FB_BLANK_UNBLANK)
                                 bd->props.state &= ~BL_CORE_FBBLANK;
@@ -269,7 +270,8 @@ EXPORT_SYMBOL(backlight_force_update);
  * ERR_PTR() or a pointer to the newly allocated device.
  */
 struct backlight_device *backlight_device_register(const char *name,
-                struct device *parent, void *devdata, struct backlight_ops *ops)
+        struct device *parent, void *devdata, const struct backlight_ops *ops,
+        const struct backlight_properties *props)
 {
         struct backlight_device *new_bd;
         int rc;
@@ -289,6 +291,11 @@ struct backlight_device *backlight_device_register(const char *name,
         dev_set_name(&new_bd->dev, name);
         dev_set_drvdata(&new_bd->dev, devdata);
 
+        /* Set default properties */
+        if (props)
+                memcpy(&new_bd->props, props,
+                       sizeof(struct backlight_properties));
+
         rc = device_register(&new_bd->dev);
         if (rc) {
                 kfree(new_bd);
diff --git a/drivers/video/backlight/corgi_lcd.c b/drivers/video/backlight/corgi_lcd.c
index 96774949cd30..1e71c35083bb 100644
--- a/drivers/video/backlight/corgi_lcd.c
+++ b/drivers/video/backlight/corgi_lcd.c
@@ -24,6 +24,7 @@
 #include <linux/lcd.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/corgi_lcd.h>
+#include <linux/slab.h>
 #include <asm/mach/sharpsl_param.h>
 
 #define POWER_IS_ON(pwr)        ((pwr) <= FB_BLANK_NORMAL)
@@ -451,7 +452,7 @@ void corgi_lcd_limit_intensity(int limit)
 }
 EXPORT_SYMBOL(corgi_lcd_limit_intensity);
 
-static struct backlight_ops corgi_bl_ops = {
+static const struct backlight_ops corgi_bl_ops = {
         .get_brightness = corgi_bl_get_intensity,
         .update_status  = corgi_bl_update_status,
 };
@@ -533,6 +534,7 @@ err_free_backlight_on:
 
 static int __devinit corgi_lcd_probe(struct spi_device *spi)
 {
+        struct backlight_properties props;
         struct corgi_lcd_platform_data *pdata = spi->dev.platform_data;
         struct corgi_lcd *lcd;
         int ret = 0;
@@ -559,13 +561,14 @@ static int __devinit corgi_lcd_probe(struct spi_device *spi)
         lcd->power = FB_BLANK_POWERDOWN;
         lcd->mode = (pdata) ? pdata->init_mode : CORGI_LCD_MODE_VGA;
 
-        lcd->bl_dev = backlight_device_register("corgi_bl", &spi->dev,
-                                        lcd, &corgi_bl_ops);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = pdata->max_intensity;
+        lcd->bl_dev = backlight_device_register("corgi_bl", &spi->dev, lcd,
+                                                &corgi_bl_ops, &props);
         if (IS_ERR(lcd->bl_dev)) {
                 ret = PTR_ERR(lcd->bl_dev);
                 goto err_unregister_lcd;
         }
-        lcd->bl_dev->props.max_brightness = pdata->max_intensity;
         lcd->bl_dev->props.brightness = pdata->default_intensity;
         lcd->bl_dev->props.power = FB_BLANK_UNBLANK;
 
diff --git a/drivers/video/backlight/cr_bllcd.c b/drivers/video/backlight/cr_bllcd.c
index b9fe62b475c6..a4f4546f0be0 100644
--- a/drivers/video/backlight/cr_bllcd.c
+++ b/drivers/video/backlight/cr_bllcd.c
@@ -36,6 +36,7 @@
 #include <linux/backlight.h>
 #include <linux/lcd.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 
 /* The LVDS- and panel power controls sits on the
  * GPIO port of the ISA bridge.
@@ -108,7 +109,7 @@ static int cr_backlight_get_intensity(struct backlight_device *bd)
         return intensity;
 }
 
-static struct backlight_ops cr_backlight_ops = {
+static const struct backlight_ops cr_backlight_ops = {
         .get_brightness = cr_backlight_get_intensity,
         .update_status = cr_backlight_set_intensity,
 };
@@ -170,6 +171,7 @@ static struct lcd_ops cr_lcd_ops = {
 
 static int cr_backlight_probe(struct platform_device *pdev)
 {
+        struct backlight_properties props;
         struct backlight_device *bdp;
         struct lcd_device *ldp;
         struct cr_panel *crp;
@@ -190,8 +192,9 @@ static int cr_backlight_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
 
-        bdp = backlight_device_register("cr-backlight",
-                                        &pdev->dev, NULL, &cr_backlight_ops);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        bdp = backlight_device_register("cr-backlight", &pdev->dev, NULL,
+                                        &cr_backlight_ops, &props);
         if (IS_ERR(bdp)) {
                 pci_dev_put(lpc_dev);
                 return PTR_ERR(bdp);
@@ -201,7 +204,7 @@ static int cr_backlight_probe(struct platform_device *pdev)
         if (IS_ERR(ldp)) {
                 backlight_device_unregister(bdp);
                 pci_dev_put(lpc_dev);
-                return PTR_ERR(bdp);
+                return PTR_ERR(ldp);
         }
 
         pci_read_config_dword(lpc_dev, CRVML_REG_GPIOBAR,
@@ -220,9 +223,7 @@ static int cr_backlight_probe(struct platform_device *pdev)
         crp->cr_lcd_device = ldp;
         crp->cr_backlight_device->props.power = FB_BLANK_UNBLANK;
         crp->cr_backlight_device->props.brightness = 0;
-        crp->cr_backlight_device->props.max_brightness = 0;
         cr_backlight_set_intensity(crp->cr_backlight_device);
-
         cr_lcd_set_power(crp->cr_lcd_device, FB_BLANK_UNBLANK);
 
         platform_set_drvdata(pdev, crp);
diff --git a/drivers/video/backlight/da903x_bl.c b/drivers/video/backlight/da903x_bl.c
index 701a1081e199..87659ed79bd7 100644
--- a/drivers/video/backlight/da903x_bl.c
+++ b/drivers/video/backlight/da903x_bl.c
@@ -18,6 +18,7 @@
 #include <linux/fb.h>
 #include <linux/backlight.h>
 #include <linux/mfd/da903x.h>
+#include <linux/slab.h>
 
 #define DA9030_WLED_CONTROL     0x25
 #define DA9030_WLED_CP_EN       (1 << 6)
@@ -25,6 +26,7 @@
 
 #define DA9034_WLED_CONTROL1    0x3C
 #define DA9034_WLED_CONTROL2    0x3D
+#define DA9034_WLED_ISET(x)     ((x) & 0x1f)
 
 #define DA9034_WLED_BOOST_EN    (1 << 5)
 
@@ -94,15 +96,17 @@ static int da903x_backlight_get_brightness(struct backlight_device *bl)
         return data->current_brightness;
 }
 
-static struct backlight_ops da903x_backlight_ops = {
+static const struct backlight_ops da903x_backlight_ops = {
         .update_status  = da903x_backlight_update_status,
         .get_brightness = da903x_backlight_get_brightness,
 };
 
 static int da903x_backlight_probe(struct platform_device *pdev)
 {
+        struct da9034_backlight_pdata *pdata = pdev->dev.platform_data;
         struct da903x_backlight_data *data;
         struct backlight_device *bl;
+        struct backlight_properties props;
         int max_brightness;
 
         data = kzalloc(sizeof(*data), GFP_KERNEL);
@@ -127,15 +131,20 @@ static int da903x_backlight_probe(struct platform_device *pdev)
         data->da903x_dev = pdev->dev.parent;
         data->current_brightness = 0;
 
-        bl = backlight_device_register(pdev->name, data->da903x_dev,
-                        data, &da903x_backlight_ops);
+        /* adjust the WLED output current */
+        if (pdata)
+                da903x_write(data->da903x_dev, DA9034_WLED_CONTROL2,
+                                DA9034_WLED_ISET(pdata->output_current));
+
+        props.max_brightness = max_brightness;
+        bl = backlight_device_register(pdev->name, data->da903x_dev, data,
+                                       &da903x_backlight_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&pdev->dev, "failed to register backlight\n");
                 kfree(data);
                 return PTR_ERR(bl);
         }
 
-        bl->props.max_brightness = max_brightness;
         bl->props.brightness = max_brightness;
 
         platform_set_drvdata(pdev, bl);
@@ -170,7 +179,7 @@ static int da903x_backlight_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops da903x_backlight_pm_ops = {
+static const struct dev_pm_ops da903x_backlight_pm_ops = {
         .suspend        = da903x_backlight_suspend,
         .resume         = da903x_backlight_resume,
 };
diff --git a/drivers/video/backlight/generic_bl.c b/drivers/video/backlight/generic_bl.c
index 6d27f62fdcd0..312ca619735d 100644
--- a/drivers/video/backlight/generic_bl.c
+++ b/drivers/video/backlight/generic_bl.c
@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit)
 }
 EXPORT_SYMBOL(corgibl_limit_intensity);
 
-static struct backlight_ops genericbl_ops = {
+static const struct backlight_ops genericbl_ops = {
         .options = BL_CORE_SUSPENDRESUME,
         .get_brightness = genericbl_get_intensity,
         .update_status  = genericbl_send_intensity,
@@ -78,6 +78,7 @@ static struct backlight_ops genericbl_ops = {
 
 static int genericbl_probe(struct platform_device *pdev)
 {
+        struct backlight_properties props;
         struct generic_bl_info *machinfo = pdev->dev.platform_data;
         const char *name = "generic-bl";
         struct backlight_device *bd;
@@ -89,14 +90,15 @@ static int genericbl_probe(struct platform_device *pdev)
         if (machinfo->name)
                 name = machinfo->name;
 
-        bd = backlight_device_register (name,
-                &pdev->dev, NULL, &genericbl_ops);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = machinfo->max_intensity;
+        bd = backlight_device_register(name, &pdev->dev, NULL, &genericbl_ops,
+                                       &props);
         if (IS_ERR (bd))
                 return PTR_ERR (bd);
 
         platform_set_drvdata(pdev, bd);
 
-        bd->props.max_brightness = machinfo->max_intensity;
         bd->props.power = FB_BLANK_UNBLANK;
         bd->props.brightness = machinfo->default_intensity;
         backlight_update_status(bd);
diff --git a/drivers/video/backlight/hp680_bl.c b/drivers/video/backlight/hp680_bl.c
index 7fb4eefff80d..267d23f8d645 100644
--- a/drivers/video/backlight/hp680_bl.c
+++ b/drivers/video/backlight/hp680_bl.c
@@ -98,23 +98,25 @@ static int hp680bl_get_intensity(struct backlight_device *bd)
         return current_intensity;
 }
 
-static struct backlight_ops hp680bl_ops = {
+static const struct backlight_ops hp680bl_ops = {
         .get_brightness = hp680bl_get_intensity,
         .update_status  = hp680bl_set_intensity,
 };
 
 static int __devinit hp680bl_probe(struct platform_device *pdev)
 {
+        struct backlight_properties props;
         struct backlight_device *bd;
 
-        bd = backlight_device_register ("hp680-bl", &pdev->dev, NULL,
-                    &hp680bl_ops);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = HP680_MAX_INTENSITY;
+        bd = backlight_device_register("hp680-bl", &pdev->dev, NULL,
+                                       &hp680bl_ops, &props);
         if (IS_ERR(bd))
                 return PTR_ERR(bd);
 
         platform_set_drvdata(pdev, bd);
 
-        bd->props.max_brightness = HP680_MAX_INTENSITY;
         bd->props.brightness = HP680_DEFAULT_INTENSITY;
         hp680bl_send_intensity(bd);
 
diff --git a/drivers/video/backlight/ili9320.c b/drivers/video/backlight/ili9320.c
index ba89b41b639c..5118a9f029ab 100644
--- a/drivers/video/backlight/ili9320.c
+++ b/drivers/video/backlight/ili9320.c
@@ -17,6 +17,7 @@
 #include <linux/init.h>
 #include <linux/lcd.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 
 #include <linux/spi/spi.h>
 
diff --git a/drivers/video/backlight/jornada720_bl.c b/drivers/video/backlight/jornada720_bl.c
index 7aed2565c1bd..2f177b3a4885 100644
--- a/drivers/video/backlight/jornada720_bl.c
+++ b/drivers/video/backlight/jornada720_bl.c
@@ -93,7 +93,7 @@ out:
         return ret;
 }
 
-static struct backlight_ops jornada_bl_ops = {
+static const struct backlight_ops jornada_bl_ops = {
         .get_brightness = jornada_bl_get_brightness,
         .update_status = jornada_bl_update_status,
         .options = BL_CORE_SUSPENDRESUME,
@@ -101,10 +101,14 @@ static struct backlight_ops jornada_bl_ops = {
 
 static int jornada_bl_probe(struct platform_device *pdev)
 {
+        struct backlight_properties props;
         int ret;
         struct backlight_device *bd;
 
-        bd = backlight_device_register(S1D_DEVICENAME, &pdev->dev, NULL, &jornada_bl_ops);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = BL_MAX_BRIGHT;
+        bd = backlight_device_register(S1D_DEVICENAME, &pdev->dev, NULL,
+                                       &jornada_bl_ops, &props);
 
         if (IS_ERR(bd)) {
                 ret = PTR_ERR(bd);
@@ -117,7 +121,6 @@ static int jornada_bl_probe(struct platform_device *pdev)
         /* note. make sure max brightness is set otherwise
            you will get seemingly non-related errors when
            trying to change brightness */
-        bd->props.max_brightness = BL_MAX_BRIGHT;
         jornada_bl_update_status(bd);
 
         platform_set_drvdata(pdev, bd);
diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
index a38fda1742dd..f439a8632287 100644
--- a/drivers/video/backlight/kb3886_bl.c
+++ b/drivers/video/backlight/kb3886_bl.c
@@ -134,27 +134,31 @@ static int kb3886bl_get_intensity(struct backlight_device *bd)
         return kb3886bl_intensity;
 }
 
-static struct backlight_ops kb3886bl_ops = {
+static const struct backlight_ops kb3886bl_ops = {
         .get_brightness = kb3886bl_get_intensity,
         .update_status  = kb3886bl_send_intensity,
 };
 
 static int kb3886bl_probe(struct platform_device *pdev)
 {
+        struct backlight_properties props;
         struct kb3886bl_machinfo *machinfo = pdev->dev.platform_data;
 
         bl_machinfo = machinfo;
         if (!machinfo->limit_mask)
                 machinfo->limit_mask = -1;
 
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = machinfo->max_intensity;
         kb3886_backlight_device = backlight_device_register("kb3886-bl",
-                &pdev->dev, NULL, &kb3886bl_ops);
+                                                            &pdev->dev, NULL,
+                                                            &kb3886bl_ops,
+                                                            &props);
         if (IS_ERR(kb3886_backlight_device))
                 return PTR_ERR(kb3886_backlight_device);
 
         platform_set_drvdata(pdev, kb3886_backlight_device);
 
-        kb3886_backlight_device->props.max_brightness = machinfo->max_intensity;
         kb3886_backlight_device->props.power = FB_BLANK_UNBLANK;
         kb3886_backlight_device->props.brightness = machinfo->default_intensity;
         backlight_update_status(kb3886_backlight_device);
diff --git a/drivers/video/backlight/l4f00242t03.c b/drivers/video/backlight/l4f00242t03.c
new file mode 100644
index 000000000000..bcdb12c93efd
--- /dev/null
+++ b/drivers/video/backlight/l4f00242t03.c
@@ -0,0 +1,258 @@
+/*
+ * l4f00242t03.c -- support for Epson L4F00242T03 LCD
+ *
+ * Copyright 2007-2009 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * Copyright (c) 2009 Alberto Panizzo <maramaopercheseimorto@gmail.com>
+ *      Inspired by Marek Vasut work in l4f00242t03.c
+ *
+ * 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.
+ */
+
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/gpio.h>
+#include <linux/lcd.h>
+#include <linux/slab.h>
+#include <linux/regulator/consumer.h>
+
+#include <linux/spi/spi.h>
+#include <linux/spi/l4f00242t03.h>
+
+struct l4f00242t03_priv {
+        struct spi_device       *spi;
+        struct lcd_device       *ld;
+        int lcd_on:1;
+        struct regulator *io_reg;
+        struct regulator *core_reg;
+};
+
+
+static void l4f00242t03_reset(unsigned int gpio)
+{
+        pr_debug("l4f00242t03_reset.\n");
+        gpio_set_value(gpio, 1);
+        mdelay(100);
+        gpio_set_value(gpio, 0);
+        mdelay(10);     /* tRES >= 100us */
+        gpio_set_value(gpio, 1);
+        mdelay(20);
+}
+
+#define param(x) ((x) | 0x100)
+
+static void l4f00242t03_lcd_init(struct spi_device *spi)
+{
+        struct l4f00242t03_pdata *pdata = spi->dev.platform_data;
+        struct l4f00242t03_priv *priv = dev_get_drvdata(&spi->dev);
+        const u16 cmd[] = { 0x36, param(0), 0x3A, param(0x60) };
+
+        dev_dbg(&spi->dev, "initializing LCD\n");
+
+        if (priv->io_reg) {
+                regulator_set_voltage(priv->io_reg, 1800000, 1800000);
+                regulator_enable(priv->io_reg);
+        }
+
+        if (priv->core_reg) {
+                regulator_set_voltage(priv->core_reg, 2800000, 2800000);
+                regulator_enable(priv->core_reg);
+        }
+
+        gpio_set_value(pdata->data_enable_gpio, 1);
+        msleep(60);
+        spi_write(spi, (const u8 *)cmd, ARRAY_SIZE(cmd) * sizeof(u16));
+}
+
+static int l4f00242t03_lcd_power_set(struct lcd_device *ld, int power)
+{
+        struct l4f00242t03_priv *priv = lcd_get_data(ld);
+        struct spi_device *spi = priv->spi;
+
+        const u16 slpout = 0x11;
+        const u16 dison = 0x29;
+
+        const u16 slpin = 0x10;
+        const u16 disoff = 0x28;
+
+        if (power) {
+                if (priv->lcd_on)
+                        return 0;
+
+                dev_dbg(&spi->dev, "turning on LCD\n");
+
+                spi_write(spi, (const u8 *)&slpout, sizeof(u16));
+                msleep(60);
+                spi_write(spi, (const u8 *)&dison, sizeof(u16));
+
+                priv->lcd_on = 1;
+        } else {
+                if (!priv->lcd_on)
+                        return 0;
+
+                dev_dbg(&spi->dev, "turning off LCD\n");
+
+                spi_write(spi, (const u8 *)&disoff, sizeof(u16));
+                msleep(60);
+                spi_write(spi, (const u8 *)&slpin, sizeof(u16));
+
+                priv->lcd_on = 0;
+        }
+
+        return 0;
+}
+
+static struct lcd_ops l4f_ops = {
+        .set_power      = l4f00242t03_lcd_power_set,
+        .get_power      = NULL,
+};
+
+static int __devinit l4f00242t03_probe(struct spi_device *spi)
+{
+        struct l4f00242t03_priv *priv;
+        struct l4f00242t03_pdata *pdata = spi->dev.platform_data;
+        int ret;
+
+        if (pdata == NULL) {
+                dev_err(&spi->dev, "Uninitialized platform data.\n");
+                return -EINVAL;
+        }
+
+        priv = kzalloc(sizeof(struct l4f00242t03_priv), GFP_KERNEL);
+
+        if (priv == NULL) {
+                dev_err(&spi->dev, "No memory for this device.\n");
+                ret = -ENOMEM;
+                goto err;
+        }
+
+        dev_set_drvdata(&spi->dev, priv);
+        spi->bits_per_word = 9;
+        spi_setup(spi);
+
+        priv->spi = spi;
+
+        ret = gpio_request(pdata->reset_gpio, "lcd l4f00242t03 reset");
+        if (ret) {
+                dev_err(&spi->dev,
+                        "Unable to get the lcd l4f00242t03 reset gpio.\n");
+                return ret;
+        }
+
+        ret = gpio_direction_output(pdata->reset_gpio, 1);
+        if (ret)
+                goto err2;
+
+        ret = gpio_request(pdata->data_enable_gpio,
+                                "lcd l4f00242t03 data enable");
+        if (ret) {
+                dev_err(&spi->dev,
+                        "Unable to get the lcd l4f00242t03 data en gpio.\n");
+                return ret;
+        }
+
+        ret = gpio_direction_output(pdata->data_enable_gpio, 0);
+        if (ret)
+                goto err3;
+
+        if (pdata->io_supply) {
+                priv->io_reg = regulator_get(NULL, pdata->io_supply);
+
+                if (IS_ERR(priv->io_reg)) {
+                        pr_err("%s: Unable to get the IO regulator\n",
+                                                                __func__);
+                        goto err3;
+                }
+        }
+
+        if (pdata->core_supply) {
+                priv->core_reg = regulator_get(NULL, pdata->core_supply);
+
+                if (IS_ERR(priv->core_reg)) {
+                        pr_err("%s: Unable to get the core regulator\n",
+                                                                __func__);
+                        goto err4;
+                }
+        }
+
+        priv->ld = lcd_device_register("l4f00242t03",
+                                        &spi->dev, priv, &l4f_ops);
+        if (IS_ERR(priv->ld)) {
+                ret = PTR_ERR(priv->ld);
+                goto err5;
+        }
+
+        /* Init the LCD */
+        l4f00242t03_reset(pdata->reset_gpio);
+        l4f00242t03_lcd_init(spi);
+        l4f00242t03_lcd_power_set(priv->ld, 1);
+
+        dev_info(&spi->dev, "Epson l4f00242t03 lcd probed.\n");
+
+        return 0;
+
+err5:
+        if (priv->core_reg)
+                regulator_put(priv->core_reg);
+err4:
+        if (priv->io_reg)
+                regulator_put(priv->io_reg);
+err3:
+        gpio_free(pdata->data_enable_gpio);
+err2:
+        gpio_free(pdata->reset_gpio);
+err:
+        kfree(priv);
+
+        return ret;
+}
+
+static int __devexit l4f00242t03_remove(struct spi_device *spi)
+{
+        struct l4f00242t03_priv *priv = dev_get_drvdata(&spi->dev);
+        struct l4f00242t03_pdata *pdata = priv->spi->dev.platform_data;
+
+        l4f00242t03_lcd_power_set(priv->ld, 0);
+        lcd_device_unregister(priv->ld);
+
+        gpio_free(pdata->data_enable_gpio);
+        gpio_free(pdata->reset_gpio);
+
+        if (priv->io_reg)
+                regulator_put(priv->core_reg);
+        if (priv->core_reg)
+                regulator_put(priv->io_reg);
+
+        kfree(priv);
+
+        return 0;
+}
+
+static struct spi_driver l4f00242t03_driver = {
+        .driver = {
+                .name   = "l4f00242t03",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = l4f00242t03_probe,
+        .remove         = __devexit_p(l4f00242t03_remove),
+};
+
+static __init int l4f00242t03_init(void)
+{
+        return spi_register_driver(&l4f00242t03_driver);
+}
+
+static __exit void l4f00242t03_exit(void)
+{
+        spi_unregister_driver(&l4f00242t03_driver);
+}
+
+module_init(l4f00242t03_init);
+module_exit(l4f00242t03_exit);
+
+MODULE_AUTHOR("Alberto Panizzo <maramaopercheseimorto@gmail.com>");
+MODULE_DESCRIPTION("EPSON L4F00242T03 LCD");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
index a482dd7b0311..71a11cadffc4 100644
--- a/drivers/video/backlight/lcd.c
+++ b/drivers/video/backlight/lcd.c
@@ -13,6 +13,7 @@
 #include <linux/ctype.h>
 #include <linux/err.h>
 #include <linux/fb.h>
+#include <linux/slab.h>
 
 #if defined(CONFIG_FB) || (defined(CONFIG_FB_MODULE) && \
                            defined(CONFIG_LCD_CLASS_DEVICE_MODULE))
@@ -101,7 +102,7 @@ static ssize_t lcd_store_power(struct device *dev,
         int power = simple_strtoul(buf, &endp, 0);
         size_t size = endp - buf;
 
-        if (*endp && isspace(*endp))
+        if (isspace(*endp))
                 size++;
         if (size != count)
                 return -EINVAL;
@@ -140,7 +141,7 @@ static ssize_t lcd_store_contrast(struct device *dev,
         int contrast = simple_strtoul(buf, &endp, 0);
         size_t size = endp - buf;
 
-        if (*endp && isspace(*endp))
+        if (isspace(*endp))
                 size++;
         if (size != count)
                 return -EINVAL;
diff --git a/drivers/video/backlight/lms283gf05.c b/drivers/video/backlight/lms283gf05.c
index 447b542a20ca..abc43a0eb97d 100644
--- a/drivers/video/backlight/lms283gf05.c
+++ b/drivers/video/backlight/lms283gf05.c
@@ -11,6 +11,7 @@
 #include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
+#include <linux/slab.h>
 #include <linux/gpio.h>
 #include <linux/lcd.h>
 
diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c
index 6b488b8a7eee..7571bc26071e 100644
--- a/drivers/video/backlight/locomolcd.c
+++ b/drivers/video/backlight/locomolcd.c
@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struct backlight_device *bd)
         return current_intensity;
 }
 
-static struct backlight_ops locomobl_data = {
+static const struct backlight_ops locomobl_data = {
         .get_brightness = locomolcd_get_intensity,
         .update_status  = locomolcd_set_intensity,
 };
@@ -167,6 +167,7 @@ static int locomolcd_resume(struct locomo_dev *dev)
 
 static int locomolcd_probe(struct locomo_dev *ldev)
 {
+        struct backlight_properties props;
         unsigned long flags;
 
         local_irq_save(flags);
@@ -182,13 +183,16 @@ static int locomolcd_probe(struct locomo_dev *ldev)
 
         local_irq_restore(flags);
 
-        locomolcd_bl_device = backlight_device_register("locomo-bl", &ldev->dev, NULL, &locomobl_data);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = 4;
+        locomolcd_bl_device = backlight_device_register("locomo-bl",
+                                                        &ldev->dev, NULL,
+                                                        &locomobl_data, &props);
 
         if (IS_ERR (locomolcd_bl_device))
                 return PTR_ERR (locomolcd_bl_device);
 
         /* Set up frontlight so that screen is readable */
-        locomolcd_bl_device->props.max_brightness = 4,
         locomolcd_bl_device->props.brightness = 2;
         locomolcd_set_intensity(locomolcd_bl_device);
 
diff --git a/drivers/video/backlight/ltv350qv.c b/drivers/video/backlight/ltv350qv.c
index 4631ca8fa4a4..8010aaeb5adb 100644
--- a/drivers/video/backlight/ltv350qv.c
+++ b/drivers/video/backlight/ltv350qv.c
@@ -13,6 +13,7 @@
 #include <linux/init.h>
 #include <linux/lcd.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/spi/spi.h>
 
 #include "ltv350qv.h"
diff --git a/drivers/video/backlight/max8925_bl.c b/drivers/video/backlight/max8925_bl.c
new file mode 100644
index 000000000000..b5accc957ad3
--- /dev/null
+++ b/drivers/video/backlight/max8925_bl.c
@@ -0,0 +1,203 @@
+/*
+ * Backlight driver for Maxim MAX8925
+ *
+ * Copyright (C) 2009 Marvell International Ltd.
+ *      Haojian Zhuang <haojian.zhuang@marvell.com>
+ *
+ * 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.
+ */
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/fb.h>
+#include <linux/i2c.h>
+#include <linux/backlight.h>
+#include <linux/mfd/max8925.h>
+#include <linux/slab.h>
+
+#define MAX_BRIGHTNESS          (0xff)
+#define MIN_BRIGHTNESS          (0)
+
+#define LWX_FREQ(x)             (((x - 601) / 100) & 0x7)
+
+struct max8925_backlight_data {
+        struct max8925_chip     *chip;
+
+        int             current_brightness;
+};
+
+static int max8925_backlight_set(struct backlight_device *bl, int brightness)
+{
+        struct max8925_backlight_data *data = bl_get_data(bl);
+        struct max8925_chip *chip = data->chip;
+        unsigned char value;
+        int ret;
+
+        if (brightness > MAX_BRIGHTNESS)
+                value = MAX_BRIGHTNESS;
+        else
+                value = brightness;
+
+        ret = max8925_reg_write(chip->i2c, MAX8925_WLED_CNTL, value);
+        if (ret < 0)
+                goto out;
+
+        if (!data->current_brightness && brightness)
+                /* enable WLED output */
+                ret = max8925_set_bits(chip->i2c, MAX8925_WLED_MODE_CNTL, 1, 1);
+        else if (!brightness)
+                /* disable WLED output */
+                ret = max8925_set_bits(chip->i2c, MAX8925_WLED_MODE_CNTL, 1, 0);
+        if (ret < 0)
+                goto out;
+        dev_dbg(chip->dev, "set brightness %d\n", value);
+        data->current_brightness = value;
+        return 0;
+out:
+        dev_dbg(chip->dev, "set brightness %d failure with return value:%d\n",
+                value, ret);
+        return ret;
+}
+
+static int max8925_backlight_update_status(struct backlight_device *bl)
+{
+        int brightness = bl->props.brightness;
+
+        if (bl->props.power != FB_BLANK_UNBLANK)
+                brightness = 0;
+
+        if (bl->props.fb_blank != FB_BLANK_UNBLANK)
+                brightness = 0;
+
+        if (bl->props.state & BL_CORE_SUSPENDED)
+                brightness = 0;
+
+        return max8925_backlight_set(bl, brightness);
+}
+
+static int max8925_backlight_get_brightness(struct backlight_device *bl)
+{
+        struct max8925_backlight_data *data = bl_get_data(bl);
+        struct max8925_chip *chip = data->chip;
+        int ret;
+
+        ret = max8925_reg_read(chip->i2c, MAX8925_WLED_CNTL);
+        if (ret < 0)
+                return -EINVAL;
+        data->current_brightness = ret;
+        dev_dbg(chip->dev, "get brightness %d\n", data->current_brightness);
+        return ret;
+}
+
+static struct backlight_ops max8925_backlight_ops = {
+        .options        = BL_CORE_SUSPENDRESUME,
+        .update_status  = max8925_backlight_update_status,
+        .get_brightness = max8925_backlight_get_brightness,
+};
+
+static int __devinit max8925_backlight_probe(struct platform_device *pdev)
+{
+        struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
+        struct max8925_platform_data *max8925_pdata;
+        struct max8925_backlight_pdata *pdata = NULL;
+        struct max8925_backlight_data *data;
+        struct backlight_device *bl;
+        struct backlight_properties props;
+        struct resource *res;
+        char name[MAX8925_NAME_SIZE];
+        unsigned char value;
+        int ret;
+
+        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
+        if (res == NULL) {
+                dev_err(&pdev->dev, "No I/O resource!\n");
+                return -EINVAL;
+        }
+
+        if (pdev->dev.parent->platform_data) {
+                max8925_pdata = pdev->dev.parent->platform_data;
+                pdata = max8925_pdata->backlight;
+        }
+
+        if (!pdata) {
+                dev_err(&pdev->dev, "platform data isn't assigned to "
+                        "backlight\n");
+                return -EINVAL;
+        }
+
+        data = kzalloc(sizeof(struct max8925_backlight_data), GFP_KERNEL);
+        if (data == NULL)
+                return -ENOMEM;
+        strncpy(name, res->name, MAX8925_NAME_SIZE);
+        data->chip = chip;
+        data->current_brightness = 0;
+
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = MAX_BRIGHTNESS;
+        bl = backlight_device_register(name, &pdev->dev, data,
+                                        &max8925_backlight_ops, &props);
+        if (IS_ERR(bl)) {
+                dev_err(&pdev->dev, "failed to register backlight\n");
+                kfree(data);
+                return PTR_ERR(bl);
+        }
+        bl->props.brightness = MAX_BRIGHTNESS;
+
+        platform_set_drvdata(pdev, bl);
+
+        value = 0;
+        if (pdata->lxw_scl)
+                value |= (1 << 7);
+        if (pdata->lxw_freq)
+                value |= (LWX_FREQ(pdata->lxw_freq) << 4);
+        if (pdata->dual_string)
+                value |= (1 << 1);
+        ret = max8925_set_bits(chip->i2c, MAX8925_WLED_MODE_CNTL, 0xfe, value);
+        if (ret < 0)
+                goto out;
+
+        backlight_update_status(bl);
+        return 0;
+out:
+        kfree(data);
+        return ret;
+}
+
+static int __devexit max8925_backlight_remove(struct platform_device *pdev)
+{
+        struct backlight_device *bl = platform_get_drvdata(pdev);
+        struct max8925_backlight_data *data = bl_get_data(bl);
+
+        backlight_device_unregister(bl);
+        kfree(data);
+        return 0;
+}
+
+static struct platform_driver max8925_backlight_driver = {
+        .driver         = {
+                .name   = "max8925-backlight",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = max8925_backlight_probe,
+        .remove         = __devexit_p(max8925_backlight_remove),
+};
+
+static int __init max8925_backlight_init(void)
+{
+        return platform_driver_register(&max8925_backlight_driver);
+}
+module_init(max8925_backlight_init);
+
+static void __exit max8925_backlight_exit(void)
+{
+        platform_driver_unregister(&max8925_backlight_driver);
+};
+module_exit(max8925_backlight_exit);
+
+MODULE_DESCRIPTION("Backlight Driver for Maxim MAX8925");
+MODULE_AUTHOR("Haojian Zhuang <haojian.zhuang@marvell.com>");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:max8925-backlight");
diff --git a/drivers/video/backlight/mbp_nvidia_bl.c b/drivers/video/backlight/mbp_nvidia_bl.c
index 9edb8d7c295f..1b5d3fe6bbbc 100644
--- a/drivers/video/backlight/mbp_nvidia_bl.c
+++ b/drivers/video/backlight/mbp_nvidia_bl.c
@@ -33,7 +33,7 @@ struct dmi_match_data {
         unsigned long iostart;
         unsigned long iolen;
         /* Backlight operations structure. */
-        struct backlight_ops backlight_ops;
+        const struct backlight_ops backlight_ops;
 };
 
 /* Module parameters. */
@@ -139,6 +139,51 @@ static int mbp_dmi_match(const struct dmi_system_id *id)
 static const struct dmi_system_id __initdata mbp_device_table[] = {
         {
                 .callback       = mbp_dmi_match,
+                .ident          = "MacBook 1,1",
+                .matches        = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "MacBook1,1"),
+                },
+                .driver_data    = (void *)&intel_chipset_data,
+        },
+        {
+                .callback       = mbp_dmi_match,
+                .ident          = "MacBook 2,1",
+                .matches        = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "MacBook2,1"),
+                },
+                .driver_data    = (void *)&intel_chipset_data,
+        },
+        {
+                .callback       = mbp_dmi_match,
+                .ident          = "MacBook 3,1",
+                .matches        = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "MacBook3,1"),
+                },
+                .driver_data    = (void *)&intel_chipset_data,
+        },
+        {
+                .callback       = mbp_dmi_match,
+                .ident          = "MacBook 4,1",
+                .matches        = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "MacBook4,1"),
+                },
+                .driver_data    = (void *)&intel_chipset_data,
+        },
+        {
+                .callback       = mbp_dmi_match,
+                .ident          = "MacBook 4,2",
+                .matches        = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "MacBook4,2"),
+                },
+                .driver_data    = (void *)&intel_chipset_data,
+        },
+        {
+                .callback       = mbp_dmi_match,
                 .ident          = "MacBookPro 3,1",
                 .matches        = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
@@ -220,6 +265,24 @@ static const struct dmi_system_id __initdata mbp_device_table[] = {
         },
         {
                 .callback       = mbp_dmi_match,
+                .ident          = "MacBookPro 5,3",
+                .matches        = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,3"),
+                },
+                .driver_data    = (void *)&nvidia_chipset_data,
+        },
+        {
+                .callback       = mbp_dmi_match,
+                .ident          = "MacBookPro 5,4",
+                .matches        = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro5,4"),
+                },
+                .driver_data    = (void *)&nvidia_chipset_data,
+        },
+        {
+                .callback       = mbp_dmi_match,
                 .ident          = "MacBookPro 5,5",
                 .matches        = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
@@ -232,6 +295,7 @@ static const struct dmi_system_id __initdata mbp_device_table[] = {
 
 static int __init mbp_init(void)
 {
+        struct backlight_properties props;
         if (!dmi_check_system(mbp_device_table))
                 return -ENODEV;
 
@@ -239,14 +303,17 @@ static int __init mbp_init(void)
                                                 "Macbook Pro backlight"))
                 return -ENXIO;
 
-        mbp_backlight_device = backlight_device_register("mbp_backlight",
-                                        NULL, NULL, &driver_data->backlight_ops);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = 15;
+        mbp_backlight_device = backlight_device_register("mbp_backlight", NULL,
+                                                         NULL,
+                                                         &driver_data->backlight_ops,
+                                                         &props);
         if (IS_ERR(mbp_backlight_device)) {
                 release_region(driver_data->iostart, driver_data->iolen);
                 return PTR_ERR(mbp_backlight_device);
         }
 
-        mbp_backlight_device->props.max_brightness = 15;
         mbp_backlight_device->props.brightness =
                 driver_data->backlight_ops.get_brightness(mbp_backlight_device);
         backlight_update_status(mbp_backlight_device);
diff --git a/drivers/video/backlight/omap1_bl.c b/drivers/video/backlight/omap1_bl.c
index cbad67e89826..d3bc56296c8d 100644
--- a/drivers/video/backlight/omap1_bl.c
+++ b/drivers/video/backlight/omap1_bl.c
@@ -24,10 +24,11 @@
 #include <linux/platform_device.h>
 #include <linux/fb.h>
 #include <linux/backlight.h>
+#include <linux/slab.h>
 
 #include <mach/hardware.h>
-#include <mach/board.h>
-#include <mach/mux.h>
+#include <plat/board.h>
+#include <plat/mux.h>
 
 #define OMAPBL_MAX_INTENSITY            0xff
 
@@ -125,13 +126,14 @@ static int omapbl_get_intensity(struct backlight_device *dev)
         return bl->current_intensity;
 }
 
-static struct backlight_ops omapbl_ops = {
+static const struct backlight_ops omapbl_ops = {
         .get_brightness = omapbl_get_intensity,
         .update_status  = omapbl_update_status,
 };
 
 static int omapbl_probe(struct platform_device *pdev)
 {
+        struct backlight_properties props;
         struct backlight_device *dev;
         struct omap_backlight *bl;
         struct omap_backlight_config *pdata = pdev->dev.platform_data;
@@ -139,13 +141,14 @@ static int omapbl_probe(struct platform_device *pdev)
         if (!pdata)
                 return -ENXIO;
 
-        omapbl_ops.check_fb = pdata->check_fb;
-
         bl = kzalloc(sizeof(struct omap_backlight), GFP_KERNEL);
         if (unlikely(!bl))
                 return -ENOMEM;
 
-        dev = backlight_device_register("omap-bl", &pdev->dev, bl, &omapbl_ops);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = OMAPBL_MAX_INTENSITY;
+        dev = backlight_device_register("omap-bl", &pdev->dev, bl, &omapbl_ops,
+                                        &props);
         if (IS_ERR(dev)) {
                 kfree(bl);
                 return PTR_ERR(dev);
@@ -162,7 +165,6 @@ static int omapbl_probe(struct platform_device *pdev)
         omap_cfg_reg(PWL);      /* Conflicts with UART3 */
 
         dev->props.fb_blank = FB_BLANK_UNBLANK;
-        dev->props.max_brightness = OMAPBL_MAX_INTENSITY;
         dev->props.brightness = pdata->default_intensity;
         omapbl_update_status(dev);
 
diff --git a/drivers/video/backlight/platform_lcd.c b/drivers/video/backlight/platform_lcd.c
index 738694d23889..302330acf628 100644
--- a/drivers/video/backlight/platform_lcd.c
+++ b/drivers/video/backlight/platform_lcd.c
@@ -16,6 +16,7 @@
 #include <linux/fb.h>
 #include <linux/backlight.h>
 #include <linux/lcd.h>
+#include <linux/slab.h>
 
 #include <video/platform_lcd.h>
 
diff --git a/drivers/video/backlight/progear_bl.c b/drivers/video/backlight/progear_bl.c
index 9edaf24fd82d..809278c90738 100644
--- a/drivers/video/backlight/progear_bl.c
+++ b/drivers/video/backlight/progear_bl.c
@@ -54,15 +54,17 @@ static int progearbl_get_intensity(struct backlight_device *bd)
         return intensity - HW_LEVEL_MIN;
 }
 
-static struct backlight_ops progearbl_ops = {
+static const struct backlight_ops progearbl_ops = {
         .get_brightness = progearbl_get_intensity,
         .update_status = progearbl_set_intensity,
 };
 
 static int progearbl_probe(struct platform_device *pdev)
 {
+        struct backlight_properties props;
         u8 temp;
         struct backlight_device *progear_backlight_device;
+        int ret;
 
         pmu_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101, NULL);
         if (!pmu_dev) {
@@ -73,28 +75,37 @@ static int progearbl_probe(struct platform_device *pdev)
         sb_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL);
         if (!sb_dev) {
                 printk("ALI 1533 SB not found.\n");
-                pci_dev_put(pmu_dev);
-                return -ENODEV;
+                ret = -ENODEV;
+                goto put_pmu;
         }
 
         /*     Set SB_MPS1 to enable brightness control. */
         pci_read_config_byte(sb_dev, SB_MPS1, &temp);
         pci_write_config_byte(sb_dev, SB_MPS1, temp | 0x20);
 
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = HW_LEVEL_MAX - HW_LEVEL_MIN;
         progear_backlight_device = backlight_device_register("progear-bl",
                                                              &pdev->dev, NULL,
-                                                             &progearbl_ops);
-        if (IS_ERR(progear_backlight_device))
-                return PTR_ERR(progear_backlight_device);
+                                                             &progearbl_ops,
+                                                             &props);
+        if (IS_ERR(progear_backlight_device)) {
+                ret = PTR_ERR(progear_backlight_device);
+                goto put_sb;
+        }
 
         platform_set_drvdata(pdev, progear_backlight_device);
 
         progear_backlight_device->props.power = FB_BLANK_UNBLANK;
         progear_backlight_device->props.brightness = HW_LEVEL_MAX - HW_LEVEL_MIN;
-        progear_backlight_device->props.max_brightness = HW_LEVEL_MAX - HW_LEVEL_MIN;
         progearbl_set_intensity(progear_backlight_device);
 
         return 0;
+put_sb:
+        pci_dev_put(sb_dev);
+put_pmu:
+        pci_dev_put(pmu_dev);
+        return ret;
 }
 
 static int progearbl_remove(struct platform_device *pdev)
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
index 887166267443..550443518891 100644
--- a/drivers/video/backlight/pwm_bl.c
+++ b/drivers/video/backlight/pwm_bl.c
@@ -19,11 +19,14 @@
 #include <linux/err.h>
 #include <linux/pwm.h>
 #include <linux/pwm_backlight.h>
+#include <linux/slab.h>
 
 struct pwm_bl_data {
         struct pwm_device       *pwm;
+        struct device           *dev;
         unsigned int            period;
-        int                     (*notify)(int brightness);
+        int                     (*notify)(struct device *,
+                                          int brightness);
 };
 
 static int pwm_backlight_update_status(struct backlight_device *bl)
@@ -39,7 +42,7 @@ static int pwm_backlight_update_status(struct backlight_device *bl)
                 brightness = 0;
 
         if (pb->notify)
-                brightness = pb->notify(brightness);
+                brightness = pb->notify(pb->dev, brightness);
 
         if (brightness == 0) {
                 pwm_config(pb->pwm, 0, pb->period);
@@ -56,13 +59,14 @@ static int pwm_backlight_get_brightness(struct backlight_device *bl)
         return bl->props.brightness;
 }
 
-static struct backlight_ops pwm_backlight_ops = {
+static const struct backlight_ops pwm_backlight_ops = {
         .update_status  = pwm_backlight_update_status,
         .get_brightness = pwm_backlight_get_brightness,
 };
 
 static int pwm_backlight_probe(struct platform_device *pdev)
 {
+        struct backlight_properties props;
         struct platform_pwm_backlight_data *data = pdev->dev.platform_data;
         struct backlight_device *bl;
         struct pwm_bl_data *pb;
@@ -88,6 +92,7 @@ static int pwm_backlight_probe(struct platform_device *pdev)
 
         pb->period = data->pwm_period_ns;
         pb->notify = data->notify;
+        pb->dev = &pdev->dev;
 
         pb->pwm = pwm_request(data->pwm_id, "backlight");
         if (IS_ERR(pb->pwm)) {
@@ -97,15 +102,16 @@ static int pwm_backlight_probe(struct platform_device *pdev)
         } else
                 dev_dbg(&pdev->dev, "got pwm for backlight\n");
 
-        bl = backlight_device_register(dev_name(&pdev->dev), &pdev->dev,
-                        pb, &pwm_backlight_ops);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = data->max_brightness;
+        bl = backlight_device_register(dev_name(&pdev->dev), &pdev->dev, pb,
+                                       &pwm_backlight_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&pdev->dev, "failed to register backlight\n");
                 ret = PTR_ERR(bl);
                 goto err_bl;
         }
 
-        bl->props.max_brightness = data->max_brightness;
         bl->props.brightness = data->dft_brightness;
         backlight_update_status(bl);
 
@@ -146,7 +152,7 @@ static int pwm_backlight_suspend(struct platform_device *pdev,
         struct pwm_bl_data *pb = dev_get_drvdata(&bl->dev);
 
         if (pb->notify)
-                pb->notify(0);
+                pb->notify(pb->dev, 0);
         pwm_config(pb->pwm, 0, pb->period);
         pwm_disable(pb->pwm);
         return 0;
diff --git a/drivers/video/backlight/tdo24m.c b/drivers/video/backlight/tdo24m.c
index bbfb502add67..1997e12a1057 100644
--- a/drivers/video/backlight/tdo24m.c
+++ b/drivers/video/backlight/tdo24m.c
@@ -17,6 +17,7 @@
 #include <linux/spi/tdo24m.h>
 #include <linux/fb.h>
 #include <linux/lcd.h>
+#include <linux/slab.h>
 
 #define POWER_IS_ON(pwr)        ((pwr) <= FB_BLANK_NORMAL)
 
@@ -367,6 +368,7 @@ static int __devinit tdo24m_probe(struct spi_device *spi)
 
         spi_message_init(m);
 
+        x->cs_change = 1;
         x->tx_buf = &lcd->buf[0];
         spi_message_add_tail(x, m);
 
diff --git a/drivers/video/backlight/tosa_bl.c b/drivers/video/backlight/tosa_bl.c
index 43edbada12d1..e03e60bbfd85 100644
--- a/drivers/video/backlight/tosa_bl.c
+++ b/drivers/video/backlight/tosa_bl.c
@@ -18,6 +18,7 @@
 #include <linux/gpio.h>
 #include <linux/fb.h>
 #include <linux/backlight.h>
+#include <linux/slab.h>
 
 #include <asm/mach/sharpsl_param.h>
 
@@ -72,7 +73,7 @@ static int tosa_bl_get_brightness(struct backlight_device *dev)
         return props->brightness;
 }
 
-static struct backlight_ops bl_ops = {
+static const struct backlight_ops bl_ops = {
         .get_brightness         = tosa_bl_get_brightness,
         .update_status          = tosa_bl_update_status,
 };
@@ -80,6 +81,7 @@ static struct backlight_ops bl_ops = {
 static int __devinit tosa_bl_probe(struct i2c_client *client,
                 const struct i2c_device_id *id)
 {
+        struct backlight_properties props;
         struct tosa_bl_data *data = kzalloc(sizeof(struct tosa_bl_data), GFP_KERNEL);
         int ret = 0;
         if (!data)
@@ -99,15 +101,16 @@ static int __devinit tosa_bl_probe(struct i2c_client *client,
         i2c_set_clientdata(client, data);
         data->i2c = client;
 
-        data->bl = backlight_device_register("tosa-bl", &client->dev,
-                        data, &bl_ops);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = 512 - 1;
+        data->bl = backlight_device_register("tosa-bl", &client->dev, data,
+                                             &bl_ops, &props);
         if (IS_ERR(data->bl)) {
                 ret = PTR_ERR(data->bl);
                 goto err_reg;
         }
 
         data->bl->props.brightness = 69;
-        data->bl->props.max_brightness = 512 - 1;
         data->bl->props.power = FB_BLANK_UNBLANK;
 
         backlight_update_status(data->bl);
diff --git a/drivers/video/backlight/tosa_lcd.c b/drivers/video/backlight/tosa_lcd.c
index 50ec17dfc517..772f6015219a 100644
--- a/drivers/video/backlight/tosa_lcd.c
+++ b/drivers/video/backlight/tosa_lcd.c
@@ -15,6 +15,7 @@
 #include <linux/device.h>
 #include <linux/spi/spi.h>
 #include <linux/i2c.h>
+#include <linux/slab.h>
 #include <linux/gpio.h>
 #include <linux/delay.h>
 #include <linux/lcd.h>
@@ -177,7 +178,7 @@ static int __devinit tosa_lcd_probe(struct spi_device *spi)
         if (!data)
                 return -ENOMEM;
 
-        data->is_vga = true; /* defaut to VGA mode */
+        data->is_vga = true; /* default to VGA mode */
 
         /*
          * bits_per_word cannot be configured in platform data
diff --git a/drivers/video/backlight/wm831x_bl.c b/drivers/video/backlight/wm831x_bl.c
index 467bdb7efb23..08fd87f3aecc 100644
--- a/drivers/video/backlight/wm831x_bl.c
+++ b/drivers/video/backlight/wm831x_bl.c
@@ -13,6 +13,7 @@
 #include <linux/platform_device.h>
 #include <linux/fb.h>
 #include <linux/backlight.h>
+#include <linux/slab.h>
 
 #include <linux/mfd/wm831x/core.h>
 #include <linux/mfd/wm831x/pdata.h>
@@ -112,7 +113,7 @@ static int wm831x_backlight_get_brightness(struct backlight_device *bl)
         return data->current_brightness;
 }
 
-static struct backlight_ops wm831x_backlight_ops = {
+static const struct backlight_ops wm831x_backlight_ops = {
         .options = BL_CORE_SUSPENDRESUME,
         .update_status  = wm831x_backlight_update_status,
         .get_brightness = wm831x_backlight_get_brightness,
@@ -125,6 +126,7 @@ static int wm831x_backlight_probe(struct platform_device *pdev)
         struct wm831x_backlight_pdata *pdata;
         struct wm831x_backlight_data *data;
         struct backlight_device *bl;
+        struct backlight_properties props;
         int ret, i, max_isel, isink_reg, dcdc_cfg;
 
         /* We need platform data */
@@ -191,15 +193,15 @@ static int wm831x_backlight_probe(struct platform_device *pdev)
         data->current_brightness = 0;
         data->isink_reg = isink_reg;
 
-        bl = backlight_device_register("wm831x", &pdev->dev,
-                        data, &wm831x_backlight_ops);
+        props.max_brightness = max_isel;
+        bl = backlight_device_register("wm831x", &pdev->dev, data,
+                                       &wm831x_backlight_ops, &props);
         if (IS_ERR(bl)) {
                 dev_err(&pdev->dev, "failed to register backlight\n");
                 kfree(data);
                 return PTR_ERR(bl);
         }
 
-        bl->props.max_brightness = max_isel;
         bl->props.brightness = max_isel;
 
         platform_set_drvdata(pdev, bl);
diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c
index e49ae5edcc00..23b2a8c0dbfc 100644
--- a/drivers/video/bf54x-lq043fb.c
+++ b/drivers/video/bf54x-lq043fb.c
@@ -82,7 +82,6 @@ struct bfin_bf54xfb_info {
         unsigned char *fb_buffer;       /* RGB Buffer */
 
         dma_addr_t dma_handle;
-        int lq043_mmap;
         int lq043_open_cnt;
         int irq;
         spinlock_t lock;        /* lock */
@@ -316,7 +315,6 @@ static int bfin_bf54x_fb_release(struct fb_info *info, int user)
         spin_lock(&fbi->lock);
 
         fbi->lq043_open_cnt--;
-        fbi->lq043_mmap = 0;
 
         if (fbi->lq043_open_cnt <= 0) {
 
@@ -374,33 +372,6 @@ static int bfin_bf54x_fb_check_var(struct fb_var_screeninfo *var,
         return 0;
 }
 
-static int bfin_bf54x_fb_mmap(struct fb_info *info, struct vm_area_struct *vma)
-{
-
-        struct bfin_bf54xfb_info *fbi = info->par;
-
-        if (fbi->lq043_mmap)
-                return -1;
-
-        spin_lock(&fbi->lock);
-        fbi->lq043_mmap = 1;
-        spin_unlock(&fbi->lock);
-
-        vma->vm_start = (unsigned long)(fbi->fb_buffer);
-
-        vma->vm_end = vma->vm_start + info->fix.smem_len;
-        /* For those who don't understand how mmap works, go read
-         *   Documentation/nommu-mmap.txt.
-         * For those that do, you will know that the VM_MAYSHARE flag
-         * must be set in the vma->vm_flags structure on noMMU
-         *   Other flags can be set, and are documented in
-         *   include/linux/mm.h
-         */
-        vma->vm_flags |=  VM_MAYSHARE | VM_SHARED;
-
-        return 0;
-}
-
 int bfin_bf54x_fb_cursor(struct fb_info *info, struct fb_cursor *cursor)
 {
         if (nocursor)
@@ -452,7 +423,6 @@ static struct fb_ops bfin_bf54x_fb_ops = {
         .fb_fillrect = cfb_fillrect,
         .fb_copyarea = cfb_copyarea,
         .fb_imageblit = cfb_imageblit,
-        .fb_mmap = bfin_bf54x_fb_mmap,
         .fb_cursor = bfin_bf54x_fb_cursor,
         .fb_setcolreg = bfin_bf54x_fb_setcolreg,
 };
@@ -463,7 +433,7 @@ static int bl_get_brightness(struct backlight_device *bd)
         return 0;
 }
 
-static struct backlight_ops bfin_lq043fb_bl_ops = {
+static const struct backlight_ops bfin_lq043fb_bl_ops = {
         .get_brightness = bl_get_brightness,
 };
 
@@ -531,6 +501,7 @@ static irqreturn_t bfin_bf54x_irq_error(int irq, void *dev_id)
 
 static int __devinit bfin_bf54x_probe(struct platform_device *pdev)
 {
+        struct backlight_properties props;
         struct bfin_bf54xfb_info *info;
         struct fb_info *fbinfo;
         int ret;
@@ -675,10 +646,16 @@ static int __devinit bfin_bf54x_probe(struct platform_device *pdev)
                 goto out8;
         }
 #ifndef NO_BL_SUPPORT
-        bl_dev =
-            backlight_device_register("bf54x-bl", NULL, NULL,
-                                      &bfin_lq043fb_bl_ops);
-        bl_dev->props.max_brightness = 255;
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = 255;
+        bl_dev = backlight_device_register("bf54x-bl", NULL, NULL,
+                                           &bfin_lq043fb_bl_ops, &props);
+        if (IS_ERR(bl_dev)) {
+                printk(KERN_ERR DRIVER_NAME
+                        ": unable to register backlight.\n");
+                ret = -EINVAL;
+                goto out9;
+        }
 
         lcd_dev = lcd_device_register(DRIVER_NAME, &pdev->dev, NULL, &bfin_lcd_ops);
         lcd_dev->props.max_contrast = 255, printk(KERN_INFO "Done.\n");
@@ -686,6 +663,8 @@ static int __devinit bfin_bf54x_probe(struct platform_device *pdev)
 
         return 0;
 
+out9:
+        unregister_framebuffer(fbinfo);
 out8:
         free_irq(info->irq, info);
 out7:
diff --git a/drivers/video/bfin-lq035q1-fb.c b/drivers/video/bfin-lq035q1-fb.c
new file mode 100644
index 000000000000..2baac7cc1425
--- /dev/null
+++ b/drivers/video/bfin-lq035q1-fb.c
@@ -0,0 +1,826 @@
+/*
+ * Blackfin LCD Framebuffer driver SHARP LQ035Q1DH02
+ *
+ * Copyright 2008-2009 Analog Devices Inc.
+ * Licensed under the GPL-2 or later.
+ */
+
+#define DRIVER_NAME "bfin-lq035q1"
+#define pr_fmt(fmt) DRIVER_NAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/fb.h>
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/interrupt.h>
+#include <linux/device.h>
+#include <linux/backlight.h>
+#include <linux/lcd.h>
+#include <linux/dma-mapping.h>
+#include <linux/platform_device.h>
+#include <linux/spi/spi.h>
+
+#include <asm/blackfin.h>
+#include <asm/irq.h>
+#include <asm/dma.h>
+#include <asm/portmux.h>
+#include <asm/gptimers.h>
+
+#include <asm/bfin-lq035q1.h>
+
+#if defined(BF533_FAMILY) || defined(BF538_FAMILY)
+#define TIMER_HSYNC_id                  TIMER1_id
+#define TIMER_HSYNCbit                  TIMER1bit
+#define TIMER_HSYNC_STATUS_TRUN         TIMER_STATUS_TRUN1
+#define TIMER_HSYNC_STATUS_TIMIL        TIMER_STATUS_TIMIL1
+#define TIMER_HSYNC_STATUS_TOVF         TIMER_STATUS_TOVF1
+
+#define TIMER_VSYNC_id                  TIMER2_id
+#define TIMER_VSYNCbit                  TIMER2bit
+#define TIMER_VSYNC_STATUS_TRUN         TIMER_STATUS_TRUN2
+#define TIMER_VSYNC_STATUS_TIMIL        TIMER_STATUS_TIMIL2
+#define TIMER_VSYNC_STATUS_TOVF         TIMER_STATUS_TOVF2
+#else
+#define TIMER_HSYNC_id                  TIMER0_id
+#define TIMER_HSYNCbit                  TIMER0bit
+#define TIMER_HSYNC_STATUS_TRUN         TIMER_STATUS_TRUN0
+#define TIMER_HSYNC_STATUS_TIMIL        TIMER_STATUS_TIMIL0
+#define TIMER_HSYNC_STATUS_TOVF         TIMER_STATUS_TOVF0
+
+#define TIMER_VSYNC_id                  TIMER1_id
+#define TIMER_VSYNCbit                  TIMER1bit
+#define TIMER_VSYNC_STATUS_TRUN         TIMER_STATUS_TRUN1
+#define TIMER_VSYNC_STATUS_TIMIL        TIMER_STATUS_TIMIL1
+#define TIMER_VSYNC_STATUS_TOVF         TIMER_STATUS_TOVF1
+#endif
+
+#define LCD_X_RES               320     /* Horizontal Resolution */
+#define LCD_Y_RES               240     /* Vertical Resolution */
+#define DMA_BUS_SIZE            16
+
+#define USE_RGB565_16_BIT_PPI
+
+#ifdef USE_RGB565_16_BIT_PPI
+#define LCD_BPP         16      /* Bit Per Pixel */
+#define CLOCKS_PER_PIX  1
+#define CPLD_PIPELINE_DELAY_COR 0       /* NO CPLB */
+#endif
+
+/* Interface 16/18-bit TFT over an 8-bit wide PPI using a small Programmable Logic Device (CPLD)
+ * http://blackfin.uclinux.org/gf/project/stamp/frs/?action=FrsReleaseBrowse&frs_package_id=165
+ */
+
+#ifdef USE_RGB565_8_BIT_PPI
+#define LCD_BPP         16      /* Bit Per Pixel */
+#define CLOCKS_PER_PIX  2
+#define CPLD_PIPELINE_DELAY_COR 3       /* RGB565 */
+#endif
+
+#ifdef USE_RGB888_8_BIT_PPI
+#define LCD_BPP         24      /* Bit Per Pixel */
+#define CLOCKS_PER_PIX  3
+#define CPLD_PIPELINE_DELAY_COR 5       /* RGB888 */
+#endif
+
+        /*
+         * HS and VS timing parameters (all in number of PPI clk ticks)
+         */
+
+#define U_LINE          4                               /* Blanking Lines */
+
+#define H_ACTPIX        (LCD_X_RES * CLOCKS_PER_PIX)    /* active horizontal pixel */
+#define H_PERIOD        (336 * CLOCKS_PER_PIX)          /* HS period */
+#define H_PULSE         (2 * CLOCKS_PER_PIX)                            /* HS pulse width */
+#define H_START         (7 * CLOCKS_PER_PIX + CPLD_PIPELINE_DELAY_COR)  /* first valid pixel */
+
+#define V_LINES         (LCD_Y_RES + U_LINE)            /* total vertical lines */
+#define V_PULSE         (2 * CLOCKS_PER_PIX)            /* VS pulse width (1-5 H_PERIODs) */
+#define V_PERIOD        (H_PERIOD * V_LINES)            /* VS period */
+
+#define ACTIVE_VIDEO_MEM_OFFSET         ((U_LINE / 2) * LCD_X_RES * (LCD_BPP / 8))
+
+#define BFIN_LCD_NBR_PALETTE_ENTRIES    256
+
+#define PPI_TX_MODE                     0x2
+#define PPI_XFER_TYPE_11                0xC
+#define PPI_PORT_CFG_01                 0x10
+#define PPI_POLS_1                      0x8000
+
+#if (CLOCKS_PER_PIX > 1)
+#define PPI_PMODE (DLEN_8 | PACK_EN)
+#else
+#define PPI_PMODE (DLEN_16)
+#endif
+
+#define LQ035_INDEX                     0x74
+#define LQ035_DATA                      0x76
+
+#define LQ035_DRIVER_OUTPUT_CTL         0x1
+#define LQ035_SHUT_CTL                  0x11
+
+#define LQ035_DRIVER_OUTPUT_MASK        (LQ035_LR | LQ035_TB | LQ035_BGR | LQ035_REV)
+#define LQ035_DRIVER_OUTPUT_DEFAULT     (0x2AEF & ~LQ035_DRIVER_OUTPUT_MASK)
+
+#define LQ035_SHUT                      (1 << 0)        /* Shutdown */
+#define LQ035_ON                        (0 << 0)        /* Shutdown */
+
+struct bfin_lq035q1fb_info {
+        struct fb_info *fb;
+        struct device *dev;
+        struct spi_driver spidrv;
+        struct bfin_lq035q1fb_disp_info *disp_info;
+        unsigned char *fb_buffer;       /* RGB Buffer */
+        dma_addr_t dma_handle;
+        int lq035_open_cnt;
+        int irq;
+        spinlock_t lock;        /* lock */
+        u32 pseudo_pal[16];
+};
+
+static int nocursor;
+module_param(nocursor, int, 0644);
+MODULE_PARM_DESC(nocursor, "cursor enable/disable");
+
+struct spi_control {
+        unsigned short mode;
+};
+
+static int lq035q1_control(struct spi_device *spi, unsigned char reg, unsigned short value)
+{
+        int ret;
+        u8 regs[3] = { LQ035_INDEX, 0, 0 };
+        u8 dat[3] = { LQ035_DATA, 0, 0 };
+
+        if (!spi)
+                return -ENODEV;
+
+        regs[2] = reg;
+        dat[1] = value >> 8;
+        dat[2] = value & 0xFF;
+
+        ret = spi_write(spi, regs, ARRAY_SIZE(regs));
+        ret |= spi_write(spi, dat, ARRAY_SIZE(dat));
+        return ret;
+}
+
+static int __devinit lq035q1_spidev_probe(struct spi_device *spi)
+{
+        int ret;
+        struct spi_control *ctl;
+        struct bfin_lq035q1fb_info *info = container_of(spi->dev.driver,
+                                                struct bfin_lq035q1fb_info,
+                                                spidrv.driver);
+
+        ctl = kzalloc(sizeof(*ctl), GFP_KERNEL);
+
+        if (!ctl)
+                return -ENOMEM;
+
+        ctl->mode = (info->disp_info->mode &
+                LQ035_DRIVER_OUTPUT_MASK) | LQ035_DRIVER_OUTPUT_DEFAULT;
+
+        ret = lq035q1_control(spi, LQ035_SHUT_CTL, LQ035_ON);
+        ret |= lq035q1_control(spi, LQ035_DRIVER_OUTPUT_CTL, ctl->mode);
+        if (ret)
+                return ret;
+
+        spi_set_drvdata(spi, ctl);
+
+        return 0;
+}
+
+static int lq035q1_spidev_remove(struct spi_device *spi)
+{
+        return lq035q1_control(spi, LQ035_SHUT_CTL, LQ035_SHUT);
+}
+
+#ifdef CONFIG_PM
+static int lq035q1_spidev_suspend(struct spi_device *spi, pm_message_t state)
+{
+        return lq035q1_control(spi, LQ035_SHUT_CTL, LQ035_SHUT);
+}
+
+static int lq035q1_spidev_resume(struct spi_device *spi)
+{
+        int ret;
+        struct spi_control *ctl = spi_get_drvdata(spi);
+
+        ret = lq035q1_control(spi, LQ035_DRIVER_OUTPUT_CTL, ctl->mode);
+        if (ret)
+                return ret;
+
+        return lq035q1_control(spi, LQ035_SHUT_CTL, LQ035_ON);
+}
+#else
+# define lq035q1_spidev_suspend NULL
+# define lq035q1_spidev_resume  NULL
+#endif
+
+/* Power down all displays on reboot, poweroff or halt */
+static void lq035q1_spidev_shutdown(struct spi_device *spi)
+{
+        lq035q1_control(spi, LQ035_SHUT_CTL, LQ035_SHUT);
+}
+
+static int lq035q1_backlight(struct bfin_lq035q1fb_info *info, unsigned arg)
+{
+        if (info->disp_info->use_bl)
+                gpio_set_value(info->disp_info->gpio_bl, arg);
+
+        return 0;
+}
+
+static void bfin_lq035q1_config_ppi(struct bfin_lq035q1fb_info *fbi)
+{
+        bfin_write_PPI_DELAY(H_START);
+        bfin_write_PPI_COUNT(H_ACTPIX - 1);
+        bfin_write_PPI_FRAME(V_LINES);
+
+        bfin_write_PPI_CONTROL(PPI_TX_MODE |       /* output mode , PORT_DIR */
+                                PPI_XFER_TYPE_11 | /* sync mode XFR_TYPE */
+                                PPI_PORT_CFG_01 |  /* two frame sync PORT_CFG */
+                                PPI_PMODE |        /* 8/16 bit data length / PACK_EN? */
+                                PPI_POLS_1);       /* faling edge syncs POLS */
+}
+
+static inline void bfin_lq035q1_disable_ppi(void)
+{
+        bfin_write_PPI_CONTROL(bfin_read_PPI_CONTROL() & ~PORT_EN);
+}
+
+static inline void bfin_lq035q1_enable_ppi(void)
+{
+        bfin_write_PPI_CONTROL(bfin_read_PPI_CONTROL() | PORT_EN);
+}
+
+static void bfin_lq035q1_start_timers(void)
+{
+        enable_gptimers(TIMER_VSYNCbit | TIMER_HSYNCbit);
+}
+
+static void bfin_lq035q1_stop_timers(void)
+{
+        disable_gptimers(TIMER_HSYNCbit | TIMER_VSYNCbit);
+
+        set_gptimer_status(0, TIMER_HSYNC_STATUS_TRUN | TIMER_VSYNC_STATUS_TRUN |
+                                TIMER_HSYNC_STATUS_TIMIL | TIMER_VSYNC_STATUS_TIMIL |
+                                 TIMER_HSYNC_STATUS_TOVF | TIMER_VSYNC_STATUS_TOVF);
+
+}
+
+static void bfin_lq035q1_init_timers(void)
+{
+
+        bfin_lq035q1_stop_timers();
+
+        set_gptimer_period(TIMER_HSYNC_id, H_PERIOD);
+        set_gptimer_pwidth(TIMER_HSYNC_id, H_PULSE);
+        set_gptimer_config(TIMER_HSYNC_id, TIMER_MODE_PWM | TIMER_PERIOD_CNT |
+                                      TIMER_TIN_SEL | TIMER_CLK_SEL|
+                                      TIMER_EMU_RUN);
+
+        set_gptimer_period(TIMER_VSYNC_id, V_PERIOD);
+        set_gptimer_pwidth(TIMER_VSYNC_id, V_PULSE);
+        set_gptimer_config(TIMER_VSYNC_id, TIMER_MODE_PWM | TIMER_PERIOD_CNT |
+                                      TIMER_TIN_SEL | TIMER_CLK_SEL |
+                                      TIMER_EMU_RUN);
+
+}
+
+static void bfin_lq035q1_config_dma(struct bfin_lq035q1fb_info *fbi)
+{
+
+        set_dma_config(CH_PPI,
+                       set_bfin_dma_config(DIR_READ, DMA_FLOW_AUTO,
+                                           INTR_DISABLE, DIMENSION_2D,
+                                           DATA_SIZE_16,
+                                           DMA_NOSYNC_KEEP_DMA_BUF));
+        set_dma_x_count(CH_PPI, (LCD_X_RES * LCD_BPP) / DMA_BUS_SIZE);
+        set_dma_x_modify(CH_PPI, DMA_BUS_SIZE / 8);
+        set_dma_y_count(CH_PPI, V_LINES);
+
+        set_dma_y_modify(CH_PPI, DMA_BUS_SIZE / 8);
+        set_dma_start_addr(CH_PPI, (unsigned long)fbi->fb_buffer);
+
+}
+
+#if (CLOCKS_PER_PIX == 1)
+static const u16 ppi0_req_16[] = {P_PPI0_CLK, P_PPI0_FS1, P_PPI0_FS2,
+                            P_PPI0_D0, P_PPI0_D1, P_PPI0_D2,
+                            P_PPI0_D3, P_PPI0_D4, P_PPI0_D5,
+                            P_PPI0_D6, P_PPI0_D7, P_PPI0_D8,
+                            P_PPI0_D9, P_PPI0_D10, P_PPI0_D11,
+                            P_PPI0_D12, P_PPI0_D13, P_PPI0_D14,
+                            P_PPI0_D15, 0};
+#else
+static const u16 ppi0_req_16[] = {P_PPI0_CLK, P_PPI0_FS1, P_PPI0_FS2,
+                            P_PPI0_D0, P_PPI0_D1, P_PPI0_D2,
+                            P_PPI0_D3, P_PPI0_D4, P_PPI0_D5,
+                            P_PPI0_D6, P_PPI0_D7, 0};
+#endif
+
+static inline void bfin_lq035q1_free_ports(void)
+{
+        peripheral_free_list(ppi0_req_16);
+        if (ANOMALY_05000400)
+                gpio_free(P_IDENT(P_PPI0_FS3));
+}
+
+static int __devinit bfin_lq035q1_request_ports(struct platform_device *pdev)
+{
+        /* ANOMALY_05000400 - PPI Does Not Start Properly In Specific Mode:
+         * Drive PPI_FS3 Low
+         */
+        if (ANOMALY_05000400) {
+                int ret = gpio_request(P_IDENT(P_PPI0_FS3), "PPI_FS3");
+                if (ret)
+                        return ret;
+                gpio_direction_output(P_IDENT(P_PPI0_FS3), 0);
+        }
+
+        if (peripheral_request_list(ppi0_req_16, DRIVER_NAME)) {
+                dev_err(&pdev->dev, "requesting peripherals failed\n");
+                return -EFAULT;
+        }
+
+        return 0;
+}
+
+static int bfin_lq035q1_fb_open(struct fb_info *info, int user)
+{
+        struct bfin_lq035q1fb_info *fbi = info->par;
+
+        spin_lock(&fbi->lock);
+        fbi->lq035_open_cnt++;
+
+        if (fbi->lq035_open_cnt <= 1) {
+
+                bfin_lq035q1_disable_ppi();
+                SSYNC();
+
+                bfin_lq035q1_config_dma(fbi);
+                bfin_lq035q1_config_ppi(fbi);
+                bfin_lq035q1_init_timers();
+
+                /* start dma */
+                enable_dma(CH_PPI);
+                bfin_lq035q1_enable_ppi();
+                bfin_lq035q1_start_timers();
+                lq035q1_backlight(fbi, 1);
+        }
+
+        spin_unlock(&fbi->lock);
+
+        return 0;
+}
+
+static int bfin_lq035q1_fb_release(struct fb_info *info, int user)
+{
+        struct bfin_lq035q1fb_info *fbi = info->par;
+
+        spin_lock(&fbi->lock);
+
+        fbi->lq035_open_cnt--;
+
+        if (fbi->lq035_open_cnt <= 0) {
+                lq035q1_backlight(fbi, 0);
+                bfin_lq035q1_disable_ppi();
+                SSYNC();
+                disable_dma(CH_PPI);
+                bfin_lq035q1_stop_timers();
+        }
+
+        spin_unlock(&fbi->lock);
+
+        return 0;
+}
+
+static int bfin_lq035q1_fb_check_var(struct fb_var_screeninfo *var,
+                                     struct fb_info *info)
+{
+        switch (var->bits_per_pixel) {
+#if (LCD_BPP == 24)
+        case 24:/* TRUECOLOUR, 16m */
+#else
+        case 16:/* DIRECTCOLOUR, 64k */
+#endif
+                var->red.offset = info->var.red.offset;
+                var->green.offset = info->var.green.offset;
+                var->blue.offset = info->var.blue.offset;
+                var->red.length = info->var.red.length;
+                var->green.length = info->var.green.length;
+                var->blue.length = info->var.blue.length;
+                var->transp.offset = 0;
+                var->transp.length = 0;
+                var->transp.msb_right = 0;
+                var->red.msb_right = 0;
+                var->green.msb_right = 0;
+                var->blue.msb_right = 0;
+                break;
+        default:
+                pr_debug("%s: depth not supported: %u BPP\n", __func__,
+                         var->bits_per_pixel);
+                return -EINVAL;
+        }
+
+        if (info->var.xres != var->xres || info->var.yres != var->yres ||
+            info->var.xres_virtual != var->xres_virtual ||
+            info->var.yres_virtual != var->yres_virtual) {
+                pr_debug("%s: Resolution not supported: X%u x Y%u \n",
+                         __func__, var->xres, var->yres);
+                return -EINVAL;
+        }
+
+        /*
+         *  Memory limit
+         */
+
+        if ((info->fix.line_length * var->yres_virtual) > info->fix.smem_len) {
+                pr_debug("%s: Memory Limit requested yres_virtual = %u\n",
+                         __func__, var->yres_virtual);
+                return -ENOMEM;
+        }
+
+
+        return 0;
+}
+
+int bfin_lq035q1_fb_cursor(struct fb_info *info, struct fb_cursor *cursor)
+{
+        if (nocursor)
+                return 0;
+        else
+                return -EINVAL; /* just to force soft_cursor() call */
+}
+
+static int bfin_lq035q1_fb_setcolreg(u_int regno, u_int red, u_int green,
+                                   u_int blue, u_int transp,
+                                   struct fb_info *info)
+{
+        if (regno >= BFIN_LCD_NBR_PALETTE_ENTRIES)
+                return -EINVAL;
+
+        if (info->var.grayscale) {
+                /* grayscale = 0.30*R + 0.59*G + 0.11*B */
+                red = green = blue = (red * 77 + green * 151 + blue * 28) >> 8;
+        }
+
+        if (info->fix.visual == FB_VISUAL_TRUECOLOR) {
+
+                u32 value;
+                /* Place color in the pseudopalette */
+                if (regno > 16)
+                        return -EINVAL;
+
+                red >>= (16 - info->var.red.length);
+                green >>= (16 - info->var.green.length);
+                blue >>= (16 - info->var.blue.length);
+
+                value = (red << info->var.red.offset) |
+                    (green << info->var.green.offset) |
+                    (blue << info->var.blue.offset);
+                value &= 0xFFFFFF;
+
+                ((u32 *) (info->pseudo_palette))[regno] = value;
+
+        }
+
+        return 0;
+}
+
+static struct fb_ops bfin_lq035q1_fb_ops = {
+        .owner = THIS_MODULE,
+        .fb_open = bfin_lq035q1_fb_open,
+        .fb_release = bfin_lq035q1_fb_release,
+        .fb_check_var = bfin_lq035q1_fb_check_var,
+        .fb_fillrect = cfb_fillrect,
+        .fb_copyarea = cfb_copyarea,
+        .fb_imageblit = cfb_imageblit,
+        .fb_cursor = bfin_lq035q1_fb_cursor,
+        .fb_setcolreg = bfin_lq035q1_fb_setcolreg,
+};
+
+static irqreturn_t bfin_lq035q1_irq_error(int irq, void *dev_id)
+{
+        /*struct bfin_lq035q1fb_info *info = (struct bfin_lq035q1fb_info *)dev_id;*/
+
+        u16 status = bfin_read_PPI_STATUS();
+        bfin_write_PPI_STATUS(-1);
+
+        if (status) {
+                bfin_lq035q1_disable_ppi();
+                disable_dma(CH_PPI);
+
+                /* start dma */
+                enable_dma(CH_PPI);
+                bfin_lq035q1_enable_ppi();
+                bfin_write_PPI_STATUS(-1);
+        }
+
+        return IRQ_HANDLED;
+}
+
+static int __devinit bfin_lq035q1_probe(struct platform_device *pdev)
+{
+        struct bfin_lq035q1fb_info *info;
+        struct fb_info *fbinfo;
+        int ret;
+
+        ret = request_dma(CH_PPI, DRIVER_NAME"_CH_PPI");
+        if (ret < 0) {
+                dev_err(&pdev->dev, "PPI DMA unavailable\n");
+                goto out1;
+        }
+
+        fbinfo = framebuffer_alloc(sizeof(*info), &pdev->dev);
+        if (!fbinfo) {
+                ret = -ENOMEM;
+                goto out2;
+        }
+
+        info = fbinfo->par;
+        info->fb = fbinfo;
+        info->dev = &pdev->dev;
+
+        info->disp_info = pdev->dev.platform_data;
+
+        platform_set_drvdata(pdev, fbinfo);
+
+        strcpy(fbinfo->fix.id, DRIVER_NAME);
+
+        fbinfo->fix.type = FB_TYPE_PACKED_PIXELS;
+        fbinfo->fix.type_aux = 0;
+        fbinfo->fix.xpanstep = 0;
+        fbinfo->fix.ypanstep = 0;
+        fbinfo->fix.ywrapstep = 0;
+        fbinfo->fix.accel = FB_ACCEL_NONE;
+        fbinfo->fix.visual = FB_VISUAL_TRUECOLOR;
+
+        fbinfo->var.nonstd = 0;
+        fbinfo->var.activate = FB_ACTIVATE_NOW;
+        fbinfo->var.height = -1;
+        fbinfo->var.width = -1;
+        fbinfo->var.accel_flags = 0;
+        fbinfo->var.vmode = FB_VMODE_NONINTERLACED;
+
+        fbinfo->var.xres = LCD_X_RES;
+        fbinfo->var.xres_virtual = LCD_X_RES;
+        fbinfo->var.yres = LCD_Y_RES;
+        fbinfo->var.yres_virtual = LCD_Y_RES;
+        fbinfo->var.bits_per_pixel = LCD_BPP;
+
+        if (info->disp_info->mode & LQ035_BGR) {
+#if (LCD_BPP == 24)
+                fbinfo->var.red.offset = 0;
+                fbinfo->var.green.offset = 8;
+                fbinfo->var.blue.offset = 16;
+#else
+                fbinfo->var.red.offset = 0;
+                fbinfo->var.green.offset = 5;
+                fbinfo->var.blue.offset = 11;
+#endif
+        } else {
+#if (LCD_BPP == 24)
+                fbinfo->var.red.offset = 16;
+                fbinfo->var.green.offset = 8;
+                fbinfo->var.blue.offset = 0;
+#else
+                fbinfo->var.red.offset = 11;
+                fbinfo->var.green.offset = 5;
+                fbinfo->var.blue.offset = 0;
+#endif
+        }
+
+        fbinfo->var.transp.offset = 0;
+
+#if (LCD_BPP == 24)
+        fbinfo->var.red.length = 8;
+        fbinfo->var.green.length = 8;
+        fbinfo->var.blue.length = 8;
+#else
+        fbinfo->var.red.length = 5;
+        fbinfo->var.green.length = 6;
+        fbinfo->var.blue.length = 5;
+#endif
+
+        fbinfo->var.transp.length = 0;
+
+        fbinfo->fix.smem_len = LCD_X_RES * LCD_Y_RES * LCD_BPP / 8
+                                + ACTIVE_VIDEO_MEM_OFFSET;
+
+        fbinfo->fix.line_length = fbinfo->var.xres_virtual *
+            fbinfo->var.bits_per_pixel / 8;
+
+
+        fbinfo->fbops = &bfin_lq035q1_fb_ops;
+        fbinfo->flags = FBINFO_FLAG_DEFAULT;
+
+        info->fb_buffer =
+            dma_alloc_coherent(NULL, fbinfo->fix.smem_len, &info->dma_handle,
+                               GFP_KERNEL);
+
+        if (NULL == info->fb_buffer) {
+                dev_err(&pdev->dev, "couldn't allocate dma buffer\n");
+                ret = -ENOMEM;
+                goto out3;
+        }
+
+        fbinfo->screen_base = (void *)info->fb_buffer + ACTIVE_VIDEO_MEM_OFFSET;
+        fbinfo->fix.smem_start = (int)info->fb_buffer + ACTIVE_VIDEO_MEM_OFFSET;
+
+        fbinfo->fbops = &bfin_lq035q1_fb_ops;
+
+        fbinfo->pseudo_palette = &info->pseudo_pal;
+
+        ret = fb_alloc_cmap(&fbinfo->cmap, BFIN_LCD_NBR_PALETTE_ENTRIES, 0);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "failed to allocate colormap (%d entries)\n",
+                       BFIN_LCD_NBR_PALETTE_ENTRIES);
+                goto out4;
+        }
+
+        ret = bfin_lq035q1_request_ports(pdev);
+        if (ret) {
+                dev_err(&pdev->dev, "couldn't request gpio port\n");
+                goto out6;
+        }
+
+        info->irq = platform_get_irq(pdev, 0);
+        if (info->irq < 0) {
+                ret = -EINVAL;
+                goto out7;
+        }
+
+        ret = request_irq(info->irq, bfin_lq035q1_irq_error, IRQF_DISABLED,
+                        DRIVER_NAME" PPI ERROR", info);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "unable to request PPI ERROR IRQ\n");
+                goto out7;
+        }
+
+        info->spidrv.driver.name = DRIVER_NAME"-spi";
+        info->spidrv.probe    = lq035q1_spidev_probe;
+        info->spidrv.remove   = __devexit_p(lq035q1_spidev_remove);
+        info->spidrv.shutdown = lq035q1_spidev_shutdown;
+        info->spidrv.suspend  = lq035q1_spidev_suspend;
+        info->spidrv.resume   = lq035q1_spidev_resume;
+
+        ret = spi_register_driver(&info->spidrv);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "couldn't register SPI Interface\n");
+                goto out8;
+        }
+
+        if (info->disp_info->use_bl) {
+                ret = gpio_request(info->disp_info->gpio_bl, "LQ035 Backlight");
+
+                if (ret) {
+                        dev_err(&pdev->dev, "failed to request GPIO %d\n",
+                                info->disp_info->gpio_bl);
+                        goto out9;
+                }
+                gpio_direction_output(info->disp_info->gpio_bl, 0);
+        }
+
+        ret = register_framebuffer(fbinfo);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "unable to register framebuffer\n");
+                goto out10;
+        }
+
+        dev_info(&pdev->dev, "%dx%d %d-bit RGB FrameBuffer initialized\n",
+                LCD_X_RES, LCD_Y_RES, LCD_BPP);
+
+        return 0;
+
+ out10:
+        if (info->disp_info->use_bl)
+                gpio_free(info->disp_info->gpio_bl);
+ out9:
+        spi_unregister_driver(&info->spidrv);
+ out8:
+        free_irq(info->irq, info);
+ out7:
+        bfin_lq035q1_free_ports();
+ out6:
+        fb_dealloc_cmap(&fbinfo->cmap);
+ out4:
+        dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer,
+                          info->dma_handle);
+ out3:
+        framebuffer_release(fbinfo);
+ out2:
+        free_dma(CH_PPI);
+ out1:
+        platform_set_drvdata(pdev, NULL);
+
+        return ret;
+}
+
+static int __devexit bfin_lq035q1_remove(struct platform_device *pdev)
+{
+        struct fb_info *fbinfo = platform_get_drvdata(pdev);
+        struct bfin_lq035q1fb_info *info = fbinfo->par;
+
+        if (info->disp_info->use_bl)
+                gpio_free(info->disp_info->gpio_bl);
+
+        spi_unregister_driver(&info->spidrv);
+
+        unregister_framebuffer(fbinfo);
+
+        free_dma(CH_PPI);
+        free_irq(info->irq, info);
+
+        if (info->fb_buffer != NULL)
+                dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer,
+                                  info->dma_handle);
+
+        fb_dealloc_cmap(&fbinfo->cmap);
+
+        bfin_lq035q1_free_ports();
+
+        platform_set_drvdata(pdev, NULL);
+        framebuffer_release(fbinfo);
+
+        dev_info(&pdev->dev, "unregistered LCD driver\n");
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int bfin_lq035q1_suspend(struct device *dev)
+{
+        struct fb_info *fbinfo = dev_get_drvdata(dev);
+        struct bfin_lq035q1fb_info *info = fbinfo->par;
+
+        if (info->lq035_open_cnt) {
+                lq035q1_backlight(info, 0);
+                bfin_lq035q1_disable_ppi();
+                SSYNC();
+                disable_dma(CH_PPI);
+                bfin_lq035q1_stop_timers();
+                bfin_write_PPI_STATUS(-1);
+        }
+
+        return 0;
+}
+
+static int bfin_lq035q1_resume(struct device *dev)
+{
+        struct fb_info *fbinfo = dev_get_drvdata(dev);
+        struct bfin_lq035q1fb_info *info = fbinfo->par;
+
+        if (info->lq035_open_cnt) {
+                bfin_lq035q1_disable_ppi();
+                SSYNC();
+
+                bfin_lq035q1_config_dma(info);
+                bfin_lq035q1_config_ppi(info);
+                bfin_lq035q1_init_timers();
+
+                /* start dma */
+                enable_dma(CH_PPI);
+                bfin_lq035q1_enable_ppi();
+                bfin_lq035q1_start_timers();
+                lq035q1_backlight(info, 1);
+        }
+
+        return 0;
+}
+
+static struct dev_pm_ops bfin_lq035q1_dev_pm_ops = {
+        .suspend = bfin_lq035q1_suspend,
+        .resume  = bfin_lq035q1_resume,
+};
+#endif
+
+static struct platform_driver bfin_lq035q1_driver = {
+        .probe   = bfin_lq035q1_probe,
+        .remove  = __devexit_p(bfin_lq035q1_remove),
+        .driver = {
+                .name = DRIVER_NAME,
+#ifdef CONFIG_PM
+                .pm   = &bfin_lq035q1_dev_pm_ops,
+#endif
+        },
+};
+
+static int __init bfin_lq035q1_driver_init(void)
+{
+        return platform_driver_register(&bfin_lq035q1_driver);
+}
+module_init(bfin_lq035q1_driver_init);
+
+static void __exit bfin_lq035q1_driver_cleanup(void)
+{
+        platform_driver_unregister(&bfin_lq035q1_driver);
+}
+module_exit(bfin_lq035q1_driver_cleanup);
+
+MODULE_DESCRIPTION("Blackfin TFT LCD Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/bfin-t350mcqb-fb.c b/drivers/video/bfin-t350mcqb-fb.c
index 5cc36cfbf07b..c2ec3dcd4e91 100644
--- a/drivers/video/bfin-t350mcqb-fb.c
+++ b/drivers/video/bfin-t350mcqb-fb.c
@@ -32,6 +32,7 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/gfp.h>
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/types.h>
@@ -87,7 +88,6 @@ struct bfin_t350mcqbfb_info {
         struct device *dev;
         unsigned char *fb_buffer;       /* RGB Buffer */
         dma_addr_t dma_handle;
-        int lq043_mmap;
         int lq043_open_cnt;
         int irq;
         spinlock_t lock;        /* lock */
@@ -235,7 +235,6 @@ static int bfin_t350mcqb_fb_release(struct fb_info *info, int user)
         spin_lock(&fbi->lock);
 
         fbi->lq043_open_cnt--;
-        fbi->lq043_mmap = 0;
 
         if (fbi->lq043_open_cnt <= 0) {
                 bfin_t350mcqb_disable_ppi();
@@ -293,32 +292,6 @@ static int bfin_t350mcqb_fb_check_var(struct fb_var_screeninfo *var,
         return 0;
 }
 
-static int bfin_t350mcqb_fb_mmap(struct fb_info *info, struct vm_area_struct *vma)
-{
-        struct bfin_t350mcqbfb_info *fbi = info->par;
-
-        if (fbi->lq043_mmap)
-                return -1;
-
-        spin_lock(&fbi->lock);
-        fbi->lq043_mmap = 1;
-        spin_unlock(&fbi->lock);
-
-        vma->vm_start = (unsigned long)(fbi->fb_buffer + ACTIVE_VIDEO_MEM_OFFSET);
-
-        vma->vm_end = vma->vm_start + info->fix.smem_len;
-        /* For those who don't understand how mmap works, go read
-         *   Documentation/nommu-mmap.txt.
-         * For those that do, you will know that the VM_MAYSHARE flag
-         * must be set in the vma->vm_flags structure on noMMU
-         *   Other flags can be set, and are documented in
-         *   include/linux/mm.h
-         */
-        vma->vm_flags |= VM_MAYSHARE | VM_SHARED;
-
-        return 0;
-}
-
 int bfin_t350mcqb_fb_cursor(struct fb_info *info, struct fb_cursor *cursor)
 {
         if (nocursor)
@@ -370,7 +343,6 @@ static struct fb_ops bfin_t350mcqb_fb_ops = {
         .fb_fillrect = cfb_fillrect,
         .fb_copyarea = cfb_copyarea,
         .fb_imageblit = cfb_imageblit,
-        .fb_mmap = bfin_t350mcqb_fb_mmap,
         .fb_cursor = bfin_t350mcqb_fb_cursor,
         .fb_setcolreg = bfin_t350mcqb_fb_setcolreg,
 };
@@ -381,7 +353,7 @@ static int bl_get_brightness(struct backlight_device *bd)
         return 0;
 }
 
-static struct backlight_ops bfin_lq043fb_bl_ops = {
+static const struct backlight_ops bfin_lq043fb_bl_ops = {
         .get_brightness = bl_get_brightness,
 };
 
@@ -448,6 +420,7 @@ static irqreturn_t bfin_t350mcqb_irq_error(int irq, void *dev_id)
 
 static int __devinit bfin_t350mcqb_probe(struct platform_device *pdev)
 {
+        struct backlight_properties props;
         struct bfin_t350mcqbfb_info *info;
         struct fb_info *fbinfo;
         int ret;
@@ -487,8 +460,8 @@ static int __devinit bfin_t350mcqb_probe(struct platform_device *pdev)
 
         fbinfo->var.nonstd = 0;
         fbinfo->var.activate = FB_ACTIVATE_NOW;
-        fbinfo->var.height = -1;
-        fbinfo->var.width = -1;
+        fbinfo->var.height = 53;
+        fbinfo->var.width = 70;
         fbinfo->var.accel_flags = 0;
         fbinfo->var.vmode = FB_VMODE_NONINTERLACED;
 
@@ -515,9 +488,9 @@ static int __devinit bfin_t350mcqb_probe(struct platform_device *pdev)
         fbinfo->fbops = &bfin_t350mcqb_fb_ops;
         fbinfo->flags = FBINFO_FLAG_DEFAULT;
 
-        info->fb_buffer =
-            dma_alloc_coherent(NULL, fbinfo->fix.smem_len, &info->dma_handle,
-                               GFP_KERNEL);
+        info->fb_buffer = dma_alloc_coherent(NULL, fbinfo->fix.smem_len +
+                                ACTIVE_VIDEO_MEM_OFFSET,
+                                &info->dma_handle, GFP_KERNEL);
 
         if (NULL == info->fb_buffer) {
                 printk(KERN_ERR DRIVER_NAME
@@ -569,10 +542,16 @@ static int __devinit bfin_t350mcqb_probe(struct platform_device *pdev)
                 goto out8;
         }
 #ifndef NO_BL_SUPPORT
-        bl_dev =
-            backlight_device_register("bf52x-bl", NULL, NULL,
-                                      &bfin_lq043fb_bl_ops);
-        bl_dev->props.max_brightness = 255;
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = 255;
+        bl_dev = backlight_device_register("bf52x-bl", NULL, NULL,
+                                           &bfin_lq043fb_bl_ops, &props);
+        if (IS_ERR(bl_dev)) {
+                printk(KERN_ERR DRIVER_NAME
+                        ": unable to register backlight.\n");
+                ret = -EINVAL;
+                goto out9;
+        }
 
         lcd_dev = lcd_device_register(DRIVER_NAME, NULL, &bfin_lcd_ops);
         lcd_dev->props.max_contrast = 255, printk(KERN_INFO "Done.\n");
@@ -580,6 +559,8 @@ static int __devinit bfin_t350mcqb_probe(struct platform_device *pdev)
 
         return 0;
 
+out9:
+        unregister_framebuffer(fbinfo);
 out8:
         free_irq(info->irq, info);
 out7:
@@ -587,8 +568,8 @@ out7:
 out6:
         fb_dealloc_cmap(&fbinfo->cmap);
 out4:
-        dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer,
-                          info->dma_handle);
+        dma_free_coherent(NULL, fbinfo->fix.smem_len + ACTIVE_VIDEO_MEM_OFFSET,
+                         info->fb_buffer, info->dma_handle);
 out3:
         framebuffer_release(fbinfo);
 out2:
@@ -611,8 +592,9 @@ static int __devexit bfin_t350mcqb_remove(struct platform_device *pdev)
         free_irq(info->irq, info);
 
         if (info->fb_buffer != NULL)
-                dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer,
-                                  info->dma_handle);
+                dma_free_coherent(NULL, fbinfo->fix.smem_len +
+                        ACTIVE_VIDEO_MEM_OFFSET, info->fb_buffer,
+                        info->dma_handle);
 
         fb_dealloc_cmap(&fbinfo->cmap);
 
@@ -634,17 +616,35 @@ static int __devexit bfin_t350mcqb_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM
 static int bfin_t350mcqb_suspend(struct platform_device *pdev, pm_message_t state)
 {
-        bfin_t350mcqb_disable_ppi();
-        disable_dma(CH_PPI);
-        bfin_write_PPI_STATUS(0xFFFF);
+        struct fb_info *fbinfo = platform_get_drvdata(pdev);
+        struct bfin_t350mcqbfb_info *fbi = fbinfo->par;
+
+        if (fbi->lq043_open_cnt) {
+                bfin_t350mcqb_disable_ppi();
+                disable_dma(CH_PPI);
+                bfin_t350mcqb_stop_timers();
+                bfin_write_PPI_STATUS(-1);
+        }
+
 
         return 0;
 }
 
 static int bfin_t350mcqb_resume(struct platform_device *pdev)
 {
-        enable_dma(CH_PPI);
-        bfin_t350mcqb_enable_ppi();
+        struct fb_info *fbinfo = platform_get_drvdata(pdev);
+        struct bfin_t350mcqbfb_info *fbi = fbinfo->par;
+
+        if (fbi->lq043_open_cnt) {
+                bfin_t350mcqb_config_dma(fbi);
+                bfin_t350mcqb_config_ppi(fbi);
+                bfin_t350mcqb_init_timers();
+
+                /* start dma */
+                enable_dma(CH_PPI);
+                bfin_t350mcqb_enable_ppi();
+                bfin_t350mcqb_start_timers();
+        }
 
         return 0;
 }
diff --git a/drivers/video/broadsheetfb.c b/drivers/video/broadsheetfb.c
index 509cb92e8731..ebda6876d3a9 100644
--- a/drivers/video/broadsheetfb.c
+++ b/drivers/video/broadsheetfb.c
@@ -29,11 +29,65 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/list.h>
+#include <linux/firmware.h>
 #include <linux/uaccess.h>
 
 #include <video/broadsheetfb.h>
 
-/* Display specific information */
+/* track panel specific parameters */
+struct panel_info {
+        int w;
+        int h;
+        u16 sdcfg;
+        u16 gdcfg;
+        u16 lutfmt;
+        u16 fsynclen;
+        u16 fendfbegin;
+        u16 lsynclen;
+        u16 lendlbegin;
+        u16 pixclk;
+};
+
+/* table of panel specific parameters to be indexed into by the board drivers */
+static struct panel_info panel_table[] = {
+        {       /* standard 6" on TFT backplane */
+                .w = 800,
+                .h = 600,
+                .sdcfg = (100 | (1 << 8) | (1 << 9)),
+                .gdcfg = 2,
+                .lutfmt = (4 | (1 << 7)),
+                .fsynclen = 4,
+                .fendfbegin = (10 << 8) | 4,
+                .lsynclen = 10,
+                .lendlbegin = (100 << 8) | 4,
+                .pixclk = 6,
+        },
+        {       /* custom 3.7" flexible on PET or steel */
+                .w = 320,
+                .h = 240,
+                .sdcfg = (67 | (0 << 8) | (0 << 9) | (0 << 10) | (0 << 12)),
+                .gdcfg = 3,
+                .lutfmt = (4 | (1 << 7)),
+                .fsynclen = 0,
+                .fendfbegin = (80 << 8) | 4,
+                .lsynclen = 10,
+                .lendlbegin = (80 << 8) | 20,
+                .pixclk = 14,
+        },
+        {       /* standard 9.7" on TFT backplane */
+                .w = 1200,
+                .h = 825,
+                .sdcfg = (100 | (1 << 8) | (1 << 9) | (0 << 10) | (0 << 12)),
+                .gdcfg = 2,
+                .lutfmt = (4 | (1 << 7)),
+                .fsynclen = 0,
+                .fendfbegin = (4 << 8) | 4,
+                .lsynclen = 4,
+                .lendlbegin = (60 << 8) | 10,
+                .pixclk = 3,
+        },
+};
+
 #define DPY_W 800
 #define DPY_H 600
 
@@ -62,30 +116,30 @@ static struct fb_var_screeninfo broadsheetfb_var __devinitdata = {
 };
 
 /* main broadsheetfb functions */
-static void broadsheet_issue_data(struct broadsheetfb_par *par, u16 data)
+static void broadsheet_gpio_issue_data(struct broadsheetfb_par *par, u16 data)
 {
         par->board->set_ctl(par, BS_WR, 0);
         par->board->set_hdb(par, data);
         par->board->set_ctl(par, BS_WR, 1);
 }
 
-static void broadsheet_issue_cmd(struct broadsheetfb_par *par, u16 data)
+static void broadsheet_gpio_issue_cmd(struct broadsheetfb_par *par, u16 data)
 {
         par->board->set_ctl(par, BS_DC, 0);
-        broadsheet_issue_data(par, data);
+        broadsheet_gpio_issue_data(par, data);
 }
 
-static void broadsheet_send_command(struct broadsheetfb_par *par, u16 data)
+static void broadsheet_gpio_send_command(struct broadsheetfb_par *par, u16 data)
 {
         par->board->wait_for_rdy(par);
 
         par->board->set_ctl(par, BS_CS, 0);
-        broadsheet_issue_cmd(par, data);
+        broadsheet_gpio_issue_cmd(par, data);
         par->board->set_ctl(par, BS_DC, 1);
         par->board->set_ctl(par, BS_CS, 1);
 }
 
-static void broadsheet_send_cmdargs(struct broadsheetfb_par *par, u16 cmd,
+static void broadsheet_gpio_send_cmdargs(struct broadsheetfb_par *par, u16 cmd,
                                         int argc, u16 *argv)
 {
         int i;
@@ -93,15 +147,43 @@ static void broadsheet_send_cmdargs(struct broadsheetfb_par *par, u16 cmd,
         par->board->wait_for_rdy(par);
 
         par->board->set_ctl(par, BS_CS, 0);
-        broadsheet_issue_cmd(par, cmd);
+        broadsheet_gpio_issue_cmd(par, cmd);
         par->board->set_ctl(par, BS_DC, 1);
 
         for (i = 0; i < argc; i++)
-                broadsheet_issue_data(par, argv[i]);
+                broadsheet_gpio_issue_data(par, argv[i]);
         par->board->set_ctl(par, BS_CS, 1);
 }
 
-static void broadsheet_burst_write(struct broadsheetfb_par *par, int size,
+static void broadsheet_mmio_send_cmdargs(struct broadsheetfb_par *par, u16 cmd,
+                                    int argc, u16 *argv)
+{
+        int i;
+
+        par->board->mmio_write(par, BS_MMIO_CMD, cmd);
+
+        for (i = 0; i < argc; i++)
+                par->board->mmio_write(par, BS_MMIO_DATA, argv[i]);
+}
+
+static void broadsheet_send_command(struct broadsheetfb_par *par, u16 data)
+{
+        if (par->board->mmio_write)
+                par->board->mmio_write(par, BS_MMIO_CMD, data);
+        else
+                broadsheet_gpio_send_command(par, data);
+}
+
+static void broadsheet_send_cmdargs(struct broadsheetfb_par *par, u16 cmd,
+                                    int argc, u16 *argv)
+{
+        if (par->board->mmio_write)
+                broadsheet_mmio_send_cmdargs(par, cmd, argc, argv);
+        else
+                broadsheet_gpio_send_cmdargs(par, cmd, argc, argv);
+}
+
+static void broadsheet_gpio_burst_write(struct broadsheetfb_par *par, int size,
                                         u16 *data)
 {
         int i;
@@ -121,7 +203,30 @@ static void broadsheet_burst_write(struct broadsheetfb_par *par, int size,
         par->board->set_ctl(par, BS_CS, 1);
 }
 
-static u16 broadsheet_get_data(struct broadsheetfb_par *par)
+static void broadsheet_mmio_burst_write(struct broadsheetfb_par *par, int size,
+                                   u16 *data)
+{
+        int i;
+        u16 tmp;
+
+        for (i = 0; i < size; i++) {
+                tmp = (data[i] & 0x0F) << 4;
+                tmp |= (data[i] & 0x0F00) << 4;
+                par->board->mmio_write(par, BS_MMIO_DATA, tmp);
+        }
+
+}
+
+static void broadsheet_burst_write(struct broadsheetfb_par *par, int size,
+                                   u16 *data)
+{
+        if (par->board->mmio_write)
+                broadsheet_mmio_burst_write(par, size, data);
+        else
+                broadsheet_gpio_burst_write(par, size, data);
+}
+
+static u16 broadsheet_gpio_get_data(struct broadsheetfb_par *par)
 {
         u16 res;
         /* wait for ready to go hi. (lo is busy) */
@@ -141,7 +246,16 @@ static u16 broadsheet_get_data(struct broadsheetfb_par *par)
         return res;
 }
 
-static void broadsheet_write_reg(struct broadsheetfb_par *par, u16 reg,
+
+static u16 broadsheet_get_data(struct broadsheetfb_par *par)
+{
+        if (par->board->mmio_read)
+                return par->board->mmio_read(par);
+        else
+                return broadsheet_gpio_get_data(par);
+}
+
+static void broadsheet_gpio_write_reg(struct broadsheetfb_par *par, u16 reg,
                                         u16 data)
 {
         /* wait for ready to go hi. (lo is busy) */
@@ -150,44 +264,541 @@ static void broadsheet_write_reg(struct broadsheetfb_par *par, u16 reg,
         /* cs lo, dc lo for cmd, we lo for each data, db as usual */
         par->board->set_ctl(par, BS_CS, 0);
 
-        broadsheet_issue_cmd(par, BS_CMD_WR_REG);
+        broadsheet_gpio_issue_cmd(par, BS_CMD_WR_REG);
 
         par->board->set_ctl(par, BS_DC, 1);
 
-        broadsheet_issue_data(par, reg);
-        broadsheet_issue_data(par, data);
+        broadsheet_gpio_issue_data(par, reg);
+        broadsheet_gpio_issue_data(par, data);
 
         par->board->set_ctl(par, BS_CS, 1);
 }
 
+static void broadsheet_mmio_write_reg(struct broadsheetfb_par *par, u16 reg,
+                                 u16 data)
+{
+        par->board->mmio_write(par, BS_MMIO_CMD, BS_CMD_WR_REG);
+        par->board->mmio_write(par, BS_MMIO_DATA, reg);
+        par->board->mmio_write(par, BS_MMIO_DATA, data);
+
+}
+
+static void broadsheet_write_reg(struct broadsheetfb_par *par, u16 reg,
+                                        u16 data)
+{
+        if (par->board->mmio_write)
+                broadsheet_mmio_write_reg(par, reg, data);
+        else
+                broadsheet_gpio_write_reg(par, reg, data);
+}
+
+static void broadsheet_write_reg32(struct broadsheetfb_par *par, u16 reg,
+                                        u32 data)
+{
+        broadsheet_write_reg(par, reg, cpu_to_le32(data) & 0xFFFF);
+        broadsheet_write_reg(par, reg + 2, (cpu_to_le32(data) >> 16) & 0xFFFF);
+}
+
+
 static u16 broadsheet_read_reg(struct broadsheetfb_par *par, u16 reg)
 {
-        broadsheet_send_command(par, reg);
-        msleep(100);
+        broadsheet_send_cmdargs(par, BS_CMD_RD_REG, 1, &reg);
+        par->board->wait_for_rdy(par);
         return broadsheet_get_data(par);
 }
 
+/* functions for waveform manipulation */
+static int is_broadsheet_pll_locked(struct broadsheetfb_par *par)
+{
+        return broadsheet_read_reg(par, 0x000A) & 0x0001;
+}
+
+static int broadsheet_setup_plls(struct broadsheetfb_par *par)
+{
+        int retry_count = 0;
+        u16 tmp;
+
+        /* disable arral saemipu mode */
+        broadsheet_write_reg(par, 0x0006, 0x0000);
+
+        broadsheet_write_reg(par, 0x0010, 0x0004);
+        broadsheet_write_reg(par, 0x0012, 0x5949);
+        broadsheet_write_reg(par, 0x0014, 0x0040);
+        broadsheet_write_reg(par, 0x0016, 0x0000);
+
+        do {
+                if (retry_count++ > 100)
+                        return -ETIMEDOUT;
+                mdelay(1);
+        } while (!is_broadsheet_pll_locked(par));
+
+        tmp = broadsheet_read_reg(par, 0x0006);
+        tmp &= ~0x1;
+        broadsheet_write_reg(par, 0x0006, tmp);
+
+        return 0;
+}
+
+static int broadsheet_setup_spi(struct broadsheetfb_par *par)
+{
+
+        broadsheet_write_reg(par, 0x0204, ((3 << 3) | 1));
+        broadsheet_write_reg(par, 0x0208, 0x0001);
+
+        return 0;
+}
+
+static int broadsheet_setup_spiflash(struct broadsheetfb_par *par,
+                                                u16 *orig_sfmcd)
+{
+
+        *orig_sfmcd = broadsheet_read_reg(par, 0x0204);
+        broadsheet_write_reg(par, 0x0208, 0);
+        broadsheet_write_reg(par, 0x0204, 0);
+        broadsheet_write_reg(par, 0x0204, ((3 << 3) | 1));
+
+        return 0;
+}
+
+static int broadsheet_spiflash_wait_for_bit(struct broadsheetfb_par *par,
+                                                u16 reg, int bitnum, int val,
+                                                int timeout)
+{
+        u16 tmp;
+
+        do {
+                tmp = broadsheet_read_reg(par, reg);
+                if (((tmp >> bitnum) & 1) == val)
+                        return 0;
+                mdelay(1);
+        } while (timeout--);
+
+        return -ETIMEDOUT;
+}
+
+static int broadsheet_spiflash_write_byte(struct broadsheetfb_par *par, u8 data)
+{
+        broadsheet_write_reg(par, 0x0202, (data | 0x100));
+
+        return broadsheet_spiflash_wait_for_bit(par, 0x0206, 3, 0, 100);
+}
+
+static int broadsheet_spiflash_read_byte(struct broadsheetfb_par *par, u8 *data)
+{
+        int err;
+        u16 tmp;
+
+        broadsheet_write_reg(par, 0x0202, 0);
+
+        err = broadsheet_spiflash_wait_for_bit(par, 0x0206, 3, 0, 100);
+        if (err)
+                return err;
+
+        tmp = broadsheet_read_reg(par, 0x200);
+
+        *data = tmp & 0xFF;
+
+        return 0;
+}
+
+static int broadsheet_spiflash_wait_for_status(struct broadsheetfb_par *par,
+                                                                int timeout)
+{
+        u8 tmp;
+        int err;
+
+        do {
+                broadsheet_write_reg(par, 0x0208, 1);
+
+                err = broadsheet_spiflash_write_byte(par, 0x05);
+                if (err)
+                        goto failout;
+
+                err = broadsheet_spiflash_read_byte(par, &tmp);
+                if (err)
+                        goto failout;
+
+                broadsheet_write_reg(par, 0x0208, 0);
+
+                if (!(tmp & 0x1))
+                        return 0;
+
+                mdelay(5);
+        } while (timeout--);
+
+        dev_err(par->info->device, "Timed out waiting for spiflash status\n");
+        return -ETIMEDOUT;
+
+failout:
+        broadsheet_write_reg(par, 0x0208, 0);
+        return err;
+}
+
+static int broadsheet_spiflash_op_on_address(struct broadsheetfb_par *par,
+                                                        u8 op, u32 addr)
+{
+        int i;
+        u8 tmp;
+        int err;
+
+        broadsheet_write_reg(par, 0x0208, 1);
+
+        err = broadsheet_spiflash_write_byte(par, op);
+        if (err)
+                return err;
+
+        for (i = 2; i >= 0; i--) {
+                tmp = ((addr >> (i * 8)) & 0xFF);
+                err = broadsheet_spiflash_write_byte(par, tmp);
+                if (err)
+                        return err;
+        }
+
+        return err;
+}
+
+static int broadsheet_verify_spiflash(struct broadsheetfb_par *par,
+                                                int *flash_type)
+{
+        int err = 0;
+        u8 sig;
+
+        err = broadsheet_spiflash_op_on_address(par, 0xAB, 0x00000000);
+        if (err)
+                goto failout;
+
+        err = broadsheet_spiflash_read_byte(par, &sig);
+        if (err)
+                goto failout;
+
+        if ((sig != 0x10) && (sig != 0x11)) {
+                dev_err(par->info->device, "Unexpected flash type\n");
+                err = -EINVAL;
+                goto failout;
+        }
+
+        *flash_type = sig;
+
+failout:
+        broadsheet_write_reg(par, 0x0208, 0);
+        return err;
+}
+
+static int broadsheet_setup_for_wfm_write(struct broadsheetfb_par *par,
+                                        u16 *initial_sfmcd, int *flash_type)
+
+{
+        int err;
+
+        err = broadsheet_setup_plls(par);
+        if (err)
+                return err;
+
+        broadsheet_write_reg(par, 0x0106, 0x0203);
+
+        err = broadsheet_setup_spi(par);
+        if (err)
+                return err;
+
+        err = broadsheet_setup_spiflash(par, initial_sfmcd);
+        if (err)
+                return err;
+
+        return broadsheet_verify_spiflash(par, flash_type);
+}
+
+static int broadsheet_spiflash_write_control(struct broadsheetfb_par *par,
+                                                int mode)
+{
+        int err;
+
+        broadsheet_write_reg(par, 0x0208, 1);
+        if (mode)
+                err = broadsheet_spiflash_write_byte(par, 0x06);
+        else
+                err = broadsheet_spiflash_write_byte(par, 0x04);
+
+        broadsheet_write_reg(par, 0x0208, 0);
+        return err;
+}
+
+static int broadsheet_spiflash_erase_sector(struct broadsheetfb_par *par,
+                                                int addr)
+{
+        int err;
+
+        broadsheet_spiflash_write_control(par, 1);
+
+        err = broadsheet_spiflash_op_on_address(par, 0xD8, addr);
+
+        broadsheet_write_reg(par, 0x0208, 0);
+
+        if (err)
+                return err;
+
+        err = broadsheet_spiflash_wait_for_status(par, 1000);
+
+        return err;
+}
+
+static int broadsheet_spiflash_read_range(struct broadsheetfb_par *par,
+                                                int addr, int size, char *data)
+{
+        int err;
+        int i;
+
+        err = broadsheet_spiflash_op_on_address(par, 0x03, addr);
+        if (err)
+                goto failout;
+
+        for (i = 0; i < size; i++) {
+                err = broadsheet_spiflash_read_byte(par, &data[i]);
+                if (err)
+                        goto failout;
+        }
+
+failout:
+        broadsheet_write_reg(par, 0x0208, 0);
+        return err;
+}
+
+#define BS_SPIFLASH_PAGE_SIZE 256
+static int broadsheet_spiflash_write_page(struct broadsheetfb_par *par,
+                                                int addr, const char *data)
+{
+        int err;
+        int i;
+
+        broadsheet_spiflash_write_control(par, 1);
+
+        err = broadsheet_spiflash_op_on_address(par, 0x02, addr);
+        if (err)
+                goto failout;
+
+        for (i = 0; i < BS_SPIFLASH_PAGE_SIZE; i++) {
+                err = broadsheet_spiflash_write_byte(par, data[i]);
+                if (err)
+                        goto failout;
+        }
+
+        broadsheet_write_reg(par, 0x0208, 0);
+
+        err = broadsheet_spiflash_wait_for_status(par, 100);
+
+failout:
+        return err;
+}
+
+static int broadsheet_spiflash_write_sector(struct broadsheetfb_par *par,
+                                int addr, const char *data, int sector_size)
+{
+        int i;
+        int err;
+
+        for (i = 0; i < sector_size; i += BS_SPIFLASH_PAGE_SIZE) {
+                err = broadsheet_spiflash_write_page(par, addr + i, &data[i]);
+                if (err)
+                        return err;
+        }
+        return 0;
+}
+
+/*
+ * The caller must guarantee that the data to be rewritten is entirely
+ * contained within this sector. That is, data_start_addr + data_len
+ * must be less than sector_start_addr + sector_size.
+ */
+static int broadsheet_spiflash_rewrite_sector(struct broadsheetfb_par *par,
+                                        int sector_size, int data_start_addr,
+                                        int data_len, const char *data)
+{
+        int err;
+        char *sector_buffer;
+        int tail_start_addr;
+        int start_sector_addr;
+
+        sector_buffer = kzalloc(sizeof(char)*sector_size, GFP_KERNEL);
+        if (!sector_buffer)
+                return -ENOMEM;
+
+        /* the start address of the sector is the 0th byte of that sector */
+        start_sector_addr = (data_start_addr / sector_size) * sector_size;
+
+        /*
+         * check if there is head data that we need to readback into our sector
+         * buffer first
+         */
+        if (data_start_addr != start_sector_addr) {
+                /*
+                 * we need to read every byte up till the start address of our
+                 * data and we put it into our sector buffer.
+                 */
+                err = broadsheet_spiflash_read_range(par, start_sector_addr,
+                                                data_start_addr, sector_buffer);
+                if (err)
+                        return err;
+        }
+
+        /* now we copy our data into the right place in the sector buffer */
+        memcpy(sector_buffer + data_start_addr, data, data_len);
+
+        /*
+         * now we check if there is a tail section of the sector that we need to
+         * readback.
+         */
+        tail_start_addr = (data_start_addr + data_len) % sector_size;
+
+        if (tail_start_addr) {
+                int tail_len;
+
+                tail_len = sector_size - tail_start_addr;
+
+                /* now we read this tail into our sector buffer */
+                err = broadsheet_spiflash_read_range(par, tail_start_addr,
+                        tail_len, sector_buffer + tail_start_addr);
+                if (err)
+                        return err;
+        }
+
+        /* if we got here we have the full sector that we want to rewrite. */
+
+        /* first erase the sector */
+        err = broadsheet_spiflash_erase_sector(par, start_sector_addr);
+        if (err)
+                return err;
+
+        /* now write it */
+        err = broadsheet_spiflash_write_sector(par, start_sector_addr,
+                                        sector_buffer, sector_size);
+        return err;
+}
+
+static int broadsheet_write_spiflash(struct broadsheetfb_par *par, u32 wfm_addr,
+                                const u8 *wfm, int bytecount, int flash_type)
+{
+        int sector_size;
+        int err;
+        int cur_addr;
+        int writecount;
+        int maxlen;
+        int offset = 0;
+
+        switch (flash_type) {
+        case 0x10:
+                sector_size = 32*1024;
+                break;
+        case 0x11:
+        default:
+                sector_size = 64*1024;
+                break;
+        }
+
+        while (bytecount) {
+                cur_addr = wfm_addr + offset;
+                maxlen = roundup(cur_addr, sector_size) - cur_addr;
+                writecount = min(bytecount, maxlen);
+
+                err = broadsheet_spiflash_rewrite_sector(par, sector_size,
+                                cur_addr, writecount, wfm + offset);
+                if (err)
+                        return err;
+
+                offset += writecount;
+                bytecount -= writecount;
+        }
+
+        return 0;
+}
+
+static int broadsheet_store_waveform_to_spiflash(struct broadsheetfb_par *par,
+                                                const u8 *wfm, size_t wfm_size)
+{
+        int err = 0;
+        u16 initial_sfmcd = 0;
+        int flash_type = 0;
+
+        err = broadsheet_setup_for_wfm_write(par, &initial_sfmcd, &flash_type);
+        if (err)
+                goto failout;
+
+        err = broadsheet_write_spiflash(par, 0x886, wfm, wfm_size, flash_type);
+
+failout:
+        broadsheet_write_reg(par, 0x0204, initial_sfmcd);
+        return err;
+}
+
+static ssize_t broadsheet_loadstore_waveform(struct device *dev,
+                                                struct device_attribute *attr,
+                                                const char *buf, size_t len)
+{
+        int err;
+        struct fb_info *info = dev_get_drvdata(dev);
+        struct broadsheetfb_par *par = info->par;
+        const struct firmware *fw_entry;
+
+        if (len < 1)
+                return -EINVAL;
+
+        err = request_firmware(&fw_entry, "broadsheet.wbf", dev);
+        if (err < 0) {
+                dev_err(dev, "Failed to get broadsheet waveform\n");
+                goto err_failed;
+        }
+
+        /* try to enforce reasonable min max on waveform */
+        if ((fw_entry->size < 8*1024) || (fw_entry->size > 64*1024)) {
+                dev_err(dev, "Invalid waveform\n");
+                err = -EINVAL;
+                goto err_failed;
+        }
+
+        mutex_lock(&(par->io_lock));
+        err = broadsheet_store_waveform_to_spiflash(par, fw_entry->data,
+                                                        fw_entry->size);
+
+        mutex_unlock(&(par->io_lock));
+        if (err < 0) {
+                dev_err(dev, "Failed to store broadsheet waveform\n");
+                goto err_failed;
+        }
+
+        dev_info(dev, "Stored broadsheet waveform, size %zd\n", fw_entry->size);
+
+        return len;
+
+err_failed:
+        return err;
+}
+static DEVICE_ATTR(loadstore_waveform, S_IWUSR, NULL,
+                        broadsheet_loadstore_waveform);
+
+/* upper level functions that manipulate the display and other stuff */
 static void __devinit broadsheet_init_display(struct broadsheetfb_par *par)
 {
         u16 args[5];
-
-        args[0] = DPY_W;
-        args[1] = DPY_H;
-        args[2] = (100 | (1 << 8) | (1 << 9)); /* sdcfg */
-        args[3] = 2; /* gdrv cfg */
-        args[4] = (4 | (1 << 7)); /* lut index format */
+        int xres = par->info->var.xres;
+        int yres = par->info->var.yres;
+
+        args[0] = panel_table[par->panel_index].w;
+        args[1] = panel_table[par->panel_index].h;
+        args[2] = panel_table[par->panel_index].sdcfg;
+        args[3] = panel_table[par->panel_index].gdcfg;
+        args[4] = panel_table[par->panel_index].lutfmt;
         broadsheet_send_cmdargs(par, BS_CMD_INIT_DSPE_CFG, 5, args);
 
         /* did the controller really set it? */
         broadsheet_send_cmdargs(par, BS_CMD_INIT_DSPE_CFG, 5, args);
 
-        args[0] = 4; /* fsync len */
-        args[1] = (10 << 8) | 4; /* fend/fbegin len */
-        args[2] = 10; /* line sync len */
-        args[3] = (100 << 8) | 4; /* line end/begin len */
-        args[4] = 6; /* pixel clock cfg */
+        args[0] = panel_table[par->panel_index].fsynclen;
+        args[1] = panel_table[par->panel_index].fendfbegin;
+        args[2] = panel_table[par->panel_index].lsynclen;
+        args[3] = panel_table[par->panel_index].lendlbegin;
+        args[4] = panel_table[par->panel_index].pixclk;
         broadsheet_send_cmdargs(par, BS_CMD_INIT_DSPE_TMG, 5, args);
 
+        broadsheet_write_reg32(par, 0x310, xres*yres*2);
+
         /* setup waveform */
         args[0] = 0x886;
         args[1] = 0;
@@ -207,8 +818,9 @@ static void __devinit broadsheet_init_display(struct broadsheetfb_par *par)
         args[0] = 0x154;
         broadsheet_send_cmdargs(par, BS_CMD_WR_REG, 1, args);
 
-        broadsheet_burst_write(par, DPY_W*DPY_H/2,
-                                (u16 *) par->info->screen_base);
+        broadsheet_burst_write(par, (panel_table[par->panel_index].w *
+                                        panel_table[par->panel_index].h)/2,
+                                        (u16 *) par->info->screen_base);
 
         broadsheet_send_command(par, BS_CMD_LD_IMG_END);
 
@@ -222,6 +834,21 @@ static void __devinit broadsheet_init_display(struct broadsheetfb_par *par)
         par->board->wait_for_rdy(par);
 }
 
+static void __devinit broadsheet_identify(struct broadsheetfb_par *par)
+{
+        u16 rev, prc;
+        struct device *dev = par->info->device;
+
+        rev = broadsheet_read_reg(par, BS_REG_REV);
+        prc = broadsheet_read_reg(par, BS_REG_PRC);
+        dev_info(dev, "Broadsheet Rev 0x%x, Product Code 0x%x\n", rev, prc);
+
+        if (prc != 0x0047)
+                dev_warn(dev, "Unrecognized Broadsheet Product Code\n");
+        if (rev != 0x0100)
+                dev_warn(dev, "Unrecognized Broadsheet Revision\n");
+}
+
 static void __devinit broadsheet_init(struct broadsheetfb_par *par)
 {
         broadsheet_send_command(par, BS_CMD_INIT_SYS_RUN);
@@ -236,6 +863,7 @@ static void broadsheetfb_dpy_update_pages(struct broadsheetfb_par *par,
         u16 args[5];
         unsigned char *buf = (unsigned char *)par->info->screen_base;
 
+        mutex_lock(&(par->io_lock));
         /* y1 must be a multiple of 4 so drop the lower bits */
         y1 &= 0xFFFC;
         /* y2 must be a multiple of 4 , but - 1 so up the lower bits */
@@ -265,6 +893,7 @@ static void broadsheetfb_dpy_update_pages(struct broadsheetfb_par *par,
         broadsheet_send_command(par, BS_CMD_WAIT_DSPE_FREND);
 
         par->board->wait_for_rdy(par);
+        mutex_unlock(&(par->io_lock));
 
 }
 
@@ -272,13 +901,15 @@ static void broadsheetfb_dpy_update(struct broadsheetfb_par *par)
 {
         u16 args[5];
 
+        mutex_lock(&(par->io_lock));
         args[0] = 0x3 << 4;
         broadsheet_send_cmdargs(par, BS_CMD_LD_IMG, 1, args);
 
         args[0] = 0x154;
         broadsheet_send_cmdargs(par, BS_CMD_WR_REG, 1, args);
-        broadsheet_burst_write(par, DPY_W*DPY_H/2,
-                                (u16 *) par->info->screen_base);
+        broadsheet_burst_write(par, (panel_table[par->panel_index].w *
+                                        panel_table[par->panel_index].h)/2,
+                                        (u16 *) par->info->screen_base);
 
         broadsheet_send_command(par, BS_CMD_LD_IMG_END);
 
@@ -290,7 +921,7 @@ static void broadsheetfb_dpy_update(struct broadsheetfb_par *par)
         broadsheet_send_command(par, BS_CMD_WAIT_DSPE_FREND);
 
         par->board->wait_for_rdy(par);
-
+        mutex_unlock(&(par->io_lock));
 }
 
 /* this is called back from the deferred io workqueue */
@@ -436,6 +1067,8 @@ static int __devinit broadsheetfb_probe(struct platform_device *dev)
         unsigned char *videomemory;
         struct broadsheetfb_par *par;
         int i;
+        int dpyw, dpyh;
+        int panel_index;
 
         /* pick up board specific routines */
         board = dev->dev.platform_data;
@@ -450,7 +1083,24 @@ static int __devinit broadsheetfb_probe(struct platform_device *dev)
         if (!info)
                 goto err;
 
-        videomemorysize = (DPY_W*DPY_H);
+        switch (board->get_panel_type()) {
+        case 37:
+                panel_index = 1;
+                break;
+        case 97:
+                panel_index = 2;
+                break;
+        case 6:
+        default:
+                panel_index = 0;
+                break;
+        }
+
+        dpyw = panel_table[panel_index].w;
+        dpyh = panel_table[panel_index].h;
+
+        videomemorysize = roundup((dpyw*dpyh), PAGE_SIZE);
+
         videomemory = vmalloc(videomemorysize);
         if (!videomemory)
                 goto err_fb_rel;
@@ -460,17 +1110,26 @@ static int __devinit broadsheetfb_probe(struct platform_device *dev)
         info->screen_base = (char *)videomemory;
         info->fbops = &broadsheetfb_ops;
 
+        broadsheetfb_var.xres = dpyw;
+        broadsheetfb_var.yres = dpyh;
+        broadsheetfb_var.xres_virtual = dpyw;
+        broadsheetfb_var.yres_virtual = dpyh;
         info->var = broadsheetfb_var;
+
+        broadsheetfb_fix.line_length = dpyw;
         info->fix = broadsheetfb_fix;
         info->fix.smem_len = videomemorysize;
         par = info->par;
+        par->panel_index = panel_index;
         par->info = info;
         par->board = board;
         par->write_reg = broadsheet_write_reg;
         par->read_reg = broadsheet_read_reg;
         init_waitqueue_head(&par->waitq);
 
-        info->flags = FBINFO_FLAG_DEFAULT;
+        mutex_init(&par->io_lock);
+
+        info->flags = FBINFO_FLAG_DEFAULT | FBINFO_VIRTFB;
 
         info->fbdefio = &broadsheetfb_defio;
         fb_deferred_io_init(info);
@@ -496,13 +1155,20 @@ static int __devinit broadsheetfb_probe(struct platform_device *dev)
         if (retval < 0)
                 goto err_free_irq;
 
+        broadsheet_identify(par);
+
         broadsheet_init(par);
 
         retval = register_framebuffer(info);
         if (retval < 0)
                 goto err_free_irq;
+
         platform_set_drvdata(dev, info);
 
+        retval = device_create_file(&dev->dev, &dev_attr_loadstore_waveform);
+        if (retval < 0)
+                goto err_unreg_fb;
+
         printk(KERN_INFO
                "fb%d: Broadsheet frame buffer, using %dK of video memory\n",
                info->node, videomemorysize >> 10);
@@ -510,6 +1176,8 @@ static int __devinit broadsheetfb_probe(struct platform_device *dev)
 
         return 0;
 
+err_unreg_fb:
+        unregister_framebuffer(info);
 err_free_irq:
         board->cleanup(par);
 err_cmap:
@@ -530,6 +1198,8 @@ static int __devexit broadsheetfb_remove(struct platform_device *dev)
 
         if (info) {
                 struct broadsheetfb_par *par = info->par;
+
+                device_remove_file(info->dev, &dev_attr_loadstore_waveform);
                 unregister_framebuffer(info);
                 fb_deferred_io_cleanup(info);
                 par->board->cleanup(par);
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c
index b0b147cb4cb3..43320925c4ce 100644
--- a/drivers/video/bw2.c
+++ b/drivers/video/bw2.c
@@ -12,7 +12,6 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/fb.h>
diff --git a/drivers/video/carminefb.c b/drivers/video/carminefb.c
index 0c02f8ec4bf3..d8345fcc4fe3 100644
--- a/drivers/video/carminefb.c
+++ b/drivers/video/carminefb.c
@@ -11,6 +11,7 @@
 #include <linux/fb.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 
 #include "carminefb.h"
 #include "carminefb_regs.h"
diff --git a/drivers/video/cfbcopyarea.c b/drivers/video/cfbcopyarea.c
index 79e5f40e6486..bb5a96b1645d 100644
--- a/drivers/video/cfbcopyarea.c
+++ b/drivers/video/cfbcopyarea.c
@@ -26,7 +26,6 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/fb.h>
-#include <linux/slab.h>
 #include <asm/types.h>
 #include <asm/io.h>
 #include "fb_draw.h"
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c
index fe45a3b8d0e0..77a040af20a7 100644
--- a/drivers/video/cg14.c
+++ b/drivers/video/cg14.c
@@ -11,7 +11,6 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/fb.h>
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c
index b2319fa7286f..30eedf79322c 100644
--- a/drivers/video/cg3.c
+++ b/drivers/video/cg3.c
@@ -12,7 +12,6 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/fb.h>
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c
index 0d47c6030e3d..6d0fcb43696e 100644
--- a/drivers/video/cg6.c
+++ b/drivers/video/cg6.c
@@ -12,7 +12,6 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/fb.h>
diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index 57b9d276497e..d637e1f53172 100644
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -19,7 +19,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index 4c2bf923418c..8d8dfda2f868 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -39,7 +39,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <linux/init.h>
diff --git a/drivers/video/clps711xfb.c b/drivers/video/clps711xfb.c
index 16f5db471ab5..99b354b8e257 100644
--- a/drivers/video/clps711xfb.c
+++ b/drivers/video/clps711xfb.c
@@ -19,8 +19,10 @@
  *
  *  Framebuffer driver for the CLPS7111 and EP7212 processors.
  */
+#include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/fb.h>
 #include <linux/init.h>
@@ -38,14 +40,6 @@ struct fb_info	*cfb;
 
 #define CMAP_MAX_SIZE   16
 
-/* The /proc entry for the backlight. */
-static struct proc_dir_entry *clps7111fb_backlight_proc_entry = NULL;
-
-static int clps7111fb_proc_backlight_read(char *page, char **start, off_t off,
-                int count, int *eof, void *data);
-static int clps7111fb_proc_backlight_write(struct file *file, 
-                const char *buffer, unsigned long count, void *data);
-
 /*
  * LCD AC Prescale.  This comes from the LCD panel manufacturers specifications.
  * This determines how many clocks + 1 of CL1 before the M signal toggles.
@@ -221,26 +215,23 @@ static struct fb_ops clps7111fb_ops = {
         .fb_imageblit   = cfb_imageblit,
 };
 
-static int 
-clps7111fb_proc_backlight_read(char *page, char **start, off_t off,
-                int count, int *eof, void *data)
+static int backlight_proc_show(struct seq_file *m, void *v)
 {
-        /* We need at least two characters, one for the digit, and one for
-         * the terminating NULL. */
-        if (count < 2) 
-                return -EINVAL;
-
         if (machine_is_edb7211()) {
-                return sprintf(page, "%d\n", 
+                seq_printf(m, "%d\n",
                                 (clps_readb(PDDR) & EDB_PD3_LCDBL) ? 1 : 0);
         }
 
         return 0;
 }
 
-static int 
-clps7111fb_proc_backlight_write(struct file *file, const char *buffer, 
-                unsigned long count, void *data)
+static int backlight_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, backlight_proc_show, NULL);
+}
+
+static ssize_t backlight_proc_write(struct file *file, const char *buffer,
+                                    size_t count, loff_t *pos)
 {
         unsigned char char_value;
         int value;
@@ -271,6 +262,15 @@ clps7111fb_proc_backlight_write(struct file *file, const char *buffer,
         return count;
 }
 
+static const struct file_operations backlight_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = backlight_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+        .write          = backlight_proc_write,
+};
+
 static void __init clps711x_guess_lcd_params(struct fb_info *info)
 {
         unsigned int lcdcon, syscon, size;
@@ -379,19 +379,11 @@ int __init clps711xfb_init(void)
 
         fb_alloc_cmap(&cfb->cmap, CMAP_MAX_SIZE, 0);
 
-        /* Register the /proc entries. */
-        clps7111fb_backlight_proc_entry = create_proc_entry("backlight", 0444,
-                NULL);
-        if (clps7111fb_backlight_proc_entry == NULL) {
+        if (!proc_create("backlight", 0444, NULL, &backlight_proc_fops)) {
                 printk("Couldn't create the /proc entry for the backlight.\n");
                 return -EINVAL;
         }
 
-        clps7111fb_backlight_proc_entry->read_proc = 
-                &clps7111fb_proc_backlight_read;
-        clps7111fb_backlight_proc_entry->write_proc = 
-                &clps7111fb_proc_backlight_write;
-
         /*
          * Power up the LCD
          */
diff --git a/drivers/video/cobalt_lcdfb.c b/drivers/video/cobalt_lcdfb.c
index 108b89e09a80..5eb61b5adfe8 100644
--- a/drivers/video/cobalt_lcdfb.c
+++ b/drivers/video/cobalt_lcdfb.c
@@ -287,7 +287,7 @@ static struct fb_ops cobalt_lcd_fbops = {
         .fb_cursor      = cobalt_lcdfb_cursor,
 };
 
-static int __init cobalt_lcdfb_probe(struct platform_device *dev)
+static int __devinit cobalt_lcdfb_probe(struct platform_device *dev)
 {
         struct fb_info *info;
         struct resource *res;
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index fc7d9bbb548c..8e8f18d29d7a 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -37,6 +37,7 @@ config VGACON_SOFT_SCROLLBACK
 config VGACON_SOFT_SCROLLBACK_SIZE
        int "Scrollback Buffer Size (in KB)"
        depends on VGACON_SOFT_SCROLLBACK
+       range 1 1024
        default "64"
        help
          Enter the amount of System RAM to allocate for the scrollback
diff --git a/drivers/video/console/bitblit.c b/drivers/video/console/bitblit.c
index 6b7c8fbc5495..af88651b0735 100644
--- a/drivers/video/console/bitblit.c
+++ b/drivers/video/console/bitblit.c
@@ -11,6 +11,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/fb.h>
 #include <linux/vt_kern.h>
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 3681c6a88212..b0a3fa00706d 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -3025,6 +3025,20 @@ static int fbcon_fb_unregistered(struct fb_info *info)
         return 0;
 }
 
+static void fbcon_remap_all(int idx)
+{
+        int i;
+        for (i = first_fb_vc; i <= last_fb_vc; i++)
+                set_con2fb_map(i, idx, 0);
+
+        if (con_is_bound(&fb_con)) {
+                printk(KERN_INFO "fbcon: Remapping primary device, "
+                       "fb%i, to tty %i-%i\n", idx,
+                       first_fb_vc + 1, last_fb_vc + 1);
+                info_idx = idx;
+        }
+}
+
 #ifdef CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
 static void fbcon_select_primary(struct fb_info *info)
 {
@@ -3225,6 +3239,10 @@ static int fbcon_event_notify(struct notifier_block *self,
                 caps = event->data;
                 fbcon_get_requirement(info, caps);
                 break;
+        case FB_EVENT_REMAP_ALL_CONSOLE:
+                idx = info->node;
+                fbcon_remap_all(idx);
+                break;
         }
 done:
         return ret;
diff --git a/drivers/video/console/fbcon_ccw.c b/drivers/video/console/fbcon_ccw.c
index bdf913ecf001..d135671d9961 100644
--- a/drivers/video/console/fbcon_ccw.c
+++ b/drivers/video/console/fbcon_ccw.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/fb.h>
 #include <linux/vt_kern.h>
diff --git a/drivers/video/console/fbcon_cw.c b/drivers/video/console/fbcon_cw.c
index a6819b9d1770..126110f8454f 100644
--- a/drivers/video/console/fbcon_cw.c
+++ b/drivers/video/console/fbcon_cw.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/fb.h>
 #include <linux/vt_kern.h>
diff --git a/drivers/video/console/fbcon_rotate.c b/drivers/video/console/fbcon_rotate.c
index 00884e013f0f..db6528f2d3f2 100644
--- a/drivers/video/console/fbcon_rotate.c
+++ b/drivers/video/console/fbcon_rotate.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/fb.h>
 #include <linux/vt_kern.h>
diff --git a/drivers/video/console/fbcon_ud.c b/drivers/video/console/fbcon_ud.c
index d9b5d6eb68a7..93a3e7381b50 100644
--- a/drivers/video/console/fbcon_ud.c
+++ b/drivers/video/console/fbcon_ud.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/fb.h>
 #include <linux/vt_kern.h>
diff --git a/drivers/video/console/mdacon.c b/drivers/video/console/mdacon.c
index dd3eaaad4441..0b67866cae10 100644
--- a/drivers/video/console/mdacon.c
+++ b/drivers/video/console/mdacon.c
@@ -33,7 +33,6 @@
 #include <linux/console.h>
 #include <linux/string.h>
 #include <linux/kd.h>
-#include <linux/slab.h>
 #include <linux/vt_kern.h>
 #include <linux/vt_buffer.h>
 #include <linux/selection.h>
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index 857b3668b3ba..6468a297e341 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -436,7 +436,7 @@ sti_init_glob_cfg(struct sti_struct *sti,
                             (offs < PCI_BASE_ADDRESS_0 ||
                              offs > PCI_BASE_ADDRESS_5)) {
                                 printk (KERN_WARNING
-                                        "STI pci region maping for region %d (%02x) can't be mapped\n",
+                                        "STI pci region mapping for region %d (%02x) can't be mapped\n",
                                         i,sti->rm_entry[i]);
                                 continue;
                         }
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index da55ccaf4d55..182dd6f8aadd 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -112,7 +112,7 @@ static int 		vga_video_font_height;
 static int              vga_scan_lines          __read_mostly;
 static unsigned int     vga_rolled_over;
 
-int vgacon_text_mode_force = 0;
+static int vgacon_text_mode_force;
 
 bool vgacon_text_force(void)
 {
@@ -585,6 +585,11 @@ static void vgacon_init(struct vc_data *c, int init)
         vgacon_uni_pagedir[1]++;
         if (!vgacon_uni_pagedir[0] && p)
                 con_set_default_unimap(c);
+
+        /* Only set the default if the user didn't deliberately override it */
+        if (global_cursor_default == -1)
+                global_cursor_default =
+                        !(screen_info.flags & VIDEO_FLAGS_NOCURSOR);
 }
 
 static void vgacon_deinit(struct vc_data *c)
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c
index da7c01b39be2..3a561df2e8a2 100644
--- a/drivers/video/cyber2000fb.c
+++ b/drivers/video/cyber2000fb.c
@@ -1573,15 +1573,15 @@ cyberpro_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
         if (err)
                 return err;
 
-        err = pci_request_regions(dev, name);
-        if (err)
-                return err;
-
         err = -ENOMEM;
         cfb = cyberpro_alloc_fb_info(id->driver_data, name);
         if (!cfb)
                 goto failed_release;
 
+        err = pci_request_regions(dev, cfb->fb.fix.id);
+        if (err)
+                goto failed_regions;
+
         cfb->dev = dev;
         cfb->region = pci_ioremap_bar(dev, 0);
         if (!cfb->region)
@@ -1633,10 +1633,10 @@ cyberpro_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
 failed:
         iounmap(cfb->region);
 failed_ioremap:
+        pci_release_regions(dev);
+failed_regions:
         cyberpro_free_fb_info(cfb);
 failed_release:
-        pci_release_regions(dev);
-
         return err;
 }
 
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index ea1fd3f47511..8d244ba0f601 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -28,6 +28,9 @@
 #include <linux/uaccess.h>
 #include <linux/interrupt.h>
 #include <linux/clk.h>
+#include <linux/cpufreq.h>
+#include <linux/console.h>
+#include <linux/slab.h>
 #include <video/da8xx-fb.h>
 
 #define DRIVER_NAME "da8xx_lcdc"
@@ -113,6 +116,12 @@ struct da8xx_fb_par {
         unsigned short pseudo_palette[16];
         unsigned int databuf_sz;
         unsigned int palette_sz;
+        unsigned int pxl_clk;
+        int blank;
+#ifdef CONFIG_CPU_FREQ
+        struct notifier_block   freq_transition;
+#endif
+        void (*panel_power_ctrl)(int);
 };
 
 /* Variable Screen Information */
@@ -155,7 +164,7 @@ struct da8xx_panel {
         int             vfp;            /* Vertical front porch */
         int             vbp;            /* Vertical back porch */
         int             vsw;            /* Vertical Sync Pulse Width */
-        int             pxl_clk;        /* Pixel clock */
+        unsigned int    pxl_clk;        /* Pixel clock */
         unsigned char   invert_pxl_clk; /* Invert Pixel clock */
 };
 
@@ -171,7 +180,7 @@ static struct da8xx_panel known_lcd_panels[] = {
                 .vfp = 2,
                 .vbp = 2,
                 .vsw = 0,
-                .pxl_clk = 0x10,
+                .pxl_clk = 4608000,
                 .invert_pxl_clk = 1,
         },
         /* Sharp LK043T1DG01 */
@@ -185,13 +194,23 @@ static struct da8xx_panel known_lcd_panels[] = {
                 .vfp = 2,
                 .vbp = 2,
                 .vsw = 10,
-                .pxl_clk = 0x12,
+                .pxl_clk = 7833600,
                 .invert_pxl_clk = 0,
         },
 };
 
+/* Enable the Raster Engine of the LCD Controller */
+static inline void lcd_enable_raster(void)
+{
+        u32 reg;
+
+        reg = lcdc_read(LCD_RASTER_CTRL_REG);
+        if (!(reg & LCD_RASTER_ENABLE))
+                lcdc_write(reg | LCD_RASTER_ENABLE, LCD_RASTER_CTRL_REG);
+}
+
 /* Disable the Raster Engine of the LCD Controller */
-static void lcd_disable_raster(struct da8xx_fb_par *par)
+static inline void lcd_disable_raster(void)
 {
         u32 reg;
 
@@ -443,14 +462,25 @@ static int fb_setcolreg(unsigned regno, unsigned red, unsigned green,
 static void lcd_reset(struct da8xx_fb_par *par)
 {
         /* Disable the Raster if previously Enabled */
-        if (lcdc_read(LCD_RASTER_CTRL_REG) & LCD_RASTER_ENABLE)
-                lcd_disable_raster(par);
+        lcd_disable_raster();
 
         /* DMA has to be disabled */
         lcdc_write(0, LCD_DMA_CTRL_REG);
         lcdc_write(0, LCD_RASTER_CTRL_REG);
 }
 
+static void lcd_calc_clk_divider(struct da8xx_fb_par *par)
+{
+        unsigned int lcd_clk, div;
+
+        lcd_clk = clk_get_rate(par->lcdc_clk);
+        div = lcd_clk / par->pxl_clk;
+
+        /* Configure the LCD clock divisor. */
+        lcdc_write(LCD_CLK_DIVISOR(div) |
+                        (LCD_RASTER_MODE & 0x1), LCD_CTRL_REG);
+}
+
 static int lcd_init(struct da8xx_fb_par *par, const struct lcd_ctrl_config *cfg,
                 struct da8xx_panel *panel)
 {
@@ -459,9 +489,8 @@ static int lcd_init(struct da8xx_fb_par *par, const struct lcd_ctrl_config *cfg,
 
         lcd_reset(par);
 
-        /* Configure the LCD clock divisor. */
-        lcdc_write(LCD_CLK_DIVISOR(panel->pxl_clk) |
-                        (LCD_RASTER_MODE & 0x1), LCD_CTRL_REG);
+        /* Calculate the divider */
+        lcd_calc_clk_divider(par);
 
         if (panel->invert_pxl_clk)
                 lcdc_write((lcdc_read(LCD_RASTER_TIMING_2_REG) |
@@ -513,13 +542,11 @@ static int lcd_init(struct da8xx_fb_par *par, const struct lcd_ctrl_config *cfg,
 static irqreturn_t lcdc_irq_handler(int irq, void *arg)
 {
         u32 stat = lcdc_read(LCD_STAT_REG);
-        u32 reg;
 
         if ((stat & LCD_SYNC_LOST) && (stat & LCD_FIFO_UNDERFLOW)) {
-                reg = lcdc_read(LCD_RASTER_CTRL_REG);
-                lcdc_write(reg & ~LCD_RASTER_ENABLE, LCD_RASTER_CTRL_REG);
+                lcd_disable_raster();
                 lcdc_write(stat, LCD_STAT_REG);
-                lcdc_write(reg | LCD_RASTER_ENABLE, LCD_RASTER_CTRL_REG);
+                lcd_enable_raster();
         } else
                 lcdc_write(stat, LCD_STAT_REG);
 
@@ -574,6 +601,38 @@ static int fb_check_var(struct fb_var_screeninfo *var,
         return err;
 }
 
+#ifdef CONFIG_CPU_FREQ
+static int lcd_da8xx_cpufreq_transition(struct notifier_block *nb,
+                                     unsigned long val, void *data)
+{
+        struct da8xx_fb_par *par;
+
+        par = container_of(nb, struct da8xx_fb_par, freq_transition);
+        if (val == CPUFREQ_PRECHANGE) {
+                lcd_disable_raster();
+        } else if (val == CPUFREQ_POSTCHANGE) {
+                lcd_calc_clk_divider(par);
+                lcd_enable_raster();
+        }
+
+        return 0;
+}
+
+static inline int lcd_da8xx_cpufreq_register(struct da8xx_fb_par *par)
+{
+        par->freq_transition.notifier_call = lcd_da8xx_cpufreq_transition;
+
+        return cpufreq_register_notifier(&par->freq_transition,
+                                         CPUFREQ_TRANSITION_NOTIFIER);
+}
+
+static inline void lcd_da8xx_cpufreq_deregister(struct da8xx_fb_par *par)
+{
+        cpufreq_unregister_notifier(&par->freq_transition,
+                                    CPUFREQ_TRANSITION_NOTIFIER);
+}
+#endif
+
 static int __devexit fb_remove(struct platform_device *dev)
 {
         struct fb_info *info = dev_get_drvdata(&dev->dev);
@@ -581,8 +640,13 @@ static int __devexit fb_remove(struct platform_device *dev)
         if (info) {
                 struct da8xx_fb_par *par = info->par;
 
-                if (lcdc_read(LCD_RASTER_CTRL_REG) & LCD_RASTER_ENABLE)
-                        lcd_disable_raster(par);
+#ifdef CONFIG_CPU_FREQ
+                lcd_da8xx_cpufreq_deregister(par);
+#endif
+                if (par->panel_power_ctrl)
+                        par->panel_power_ctrl(0);
+
+                lcd_disable_raster();
                 lcdc_write(0, LCD_RASTER_CTRL_REG);
 
                 /* disable DMA  */
@@ -639,6 +703,35 @@ static int fb_ioctl(struct fb_info *info, unsigned int cmd,
         return 0;
 }
 
+static int cfb_blank(int blank, struct fb_info *info)
+{
+        struct da8xx_fb_par *par = info->par;
+        int ret = 0;
+
+        if (par->blank == blank)
+                return 0;
+
+        par->blank = blank;
+        switch (blank) {
+        case FB_BLANK_UNBLANK:
+                if (par->panel_power_ctrl)
+                        par->panel_power_ctrl(1);
+
+                lcd_enable_raster();
+                break;
+        case FB_BLANK_POWERDOWN:
+                if (par->panel_power_ctrl)
+                        par->panel_power_ctrl(0);
+
+                lcd_disable_raster();
+                break;
+        default:
+                ret = -EINVAL;
+        }
+
+        return ret;
+}
+
 static struct fb_ops da8xx_fb_ops = {
         .owner = THIS_MODULE,
         .fb_check_var = fb_check_var,
@@ -647,6 +740,7 @@ static struct fb_ops da8xx_fb_ops = {
         .fb_fillrect = cfb_fillrect,
         .fb_copyarea = cfb_copyarea,
         .fb_imageblit = cfb_imageblit,
+        .fb_blank = cfb_blank,
 };
 
 static int __init fb_probe(struct platform_device *device)
@@ -721,6 +815,12 @@ static int __init fb_probe(struct platform_device *device)
         }
 
         par = da8xx_fb_info->par;
+        par->lcdc_clk = fb_clk;
+        par->pxl_clk = lcdc_info->pxl_clk;
+        if (fb_pdata->panel_power_ctrl) {
+                par->panel_power_ctrl = fb_pdata->panel_power_ctrl;
+                par->panel_power_ctrl(1);
+        }
 
         if (lcd_init(par, lcd_cfg, lcdc_info) < 0) {
                 dev_err(&device->dev, "lcd_init failed\n");
@@ -754,8 +854,6 @@ static int __init fb_probe(struct platform_device *device)
         da8xx_fb_fix.smem_len = par->databuf_sz - par->palette_sz;
         da8xx_fb_fix.line_length = (lcdc_info->width * lcd_cfg->bpp) / 8;
 
-        par->lcdc_clk = fb_clk;
-
         par->irq = platform_get_irq(device, 0);
         if (par->irq < 0) {
                 ret = -ENOENT;
@@ -814,12 +912,24 @@ static int __init fb_probe(struct platform_device *device)
                 goto err_dealloc_cmap;
         }
 
+#ifdef CONFIG_CPU_FREQ
+        ret = lcd_da8xx_cpufreq_register(par);
+        if (ret) {
+                dev_err(&device->dev, "failed to register cpufreq\n");
+                goto err_cpu_freq;
+        }
+#endif
+
         /* enable raster engine */
-        lcdc_write(lcdc_read(LCD_RASTER_CTRL_REG) |
-                        LCD_RASTER_ENABLE, LCD_RASTER_CTRL_REG);
+        lcd_enable_raster();
 
         return 0;
 
+#ifdef CONFIG_CPU_FREQ
+err_cpu_freq:
+        unregister_framebuffer(da8xx_fb_info);
+#endif
+
 err_dealloc_cmap:
         fb_dealloc_cmap(&da8xx_fb_info->cmap);
 
@@ -852,11 +962,35 @@ err_request_mem:
 #ifdef CONFIG_PM
 static int fb_suspend(struct platform_device *dev, pm_message_t state)
 {
-         return -EBUSY;
+        struct fb_info *info = platform_get_drvdata(dev);
+        struct da8xx_fb_par *par = info->par;
+
+        acquire_console_sem();
+        if (par->panel_power_ctrl)
+                par->panel_power_ctrl(0);
+
+        fb_set_suspend(info, 1);
+        lcd_disable_raster();
+        clk_disable(par->lcdc_clk);
+        release_console_sem();
+
+        return 0;
 }
 static int fb_resume(struct platform_device *dev)
 {
-         return -EBUSY;
+        struct fb_info *info = platform_get_drvdata(dev);
+        struct da8xx_fb_par *par = info->par;
+
+        acquire_console_sem();
+        if (par->panel_power_ctrl)
+                par->panel_power_ctrl(1);
+
+        clk_enable(par->lcdc_clk);
+        lcd_enable_raster();
+        fb_set_suspend(info, 0);
+        release_console_sem();
+
+        return 0;
 }
 #else
 #define fb_suspend NULL
diff --git a/drivers/video/display/display-sysfs.c b/drivers/video/display/display-sysfs.c
index 4830b1bf51e5..f6a09ab0dac6 100644
--- a/drivers/video/display/display-sysfs.c
+++ b/drivers/video/display/display-sysfs.c
@@ -27,6 +27,7 @@
 #include <linux/idr.h>
 #include <linux/err.h>
 #include <linux/kdev_t.h>
+#include <linux/slab.h>
 
 static ssize_t display_show_name(struct device *dev,
                                 struct device_attribute *attr, char *buf)
@@ -67,7 +68,7 @@ static ssize_t display_store_contrast(struct device *dev,
         contrast = simple_strtoul(buf, &endp, 0);
         size = endp - buf;
 
-        if (*endp && isspace(*endp))
+        if (isspace(*endp))
                 size++;
 
         if (size != count)
diff --git a/drivers/video/dnfb.c b/drivers/video/dnfb.c
index 606da043f4b4..ec56d2544c73 100644
--- a/drivers/video/dnfb.c
+++ b/drivers/video/dnfb.c
@@ -2,7 +2,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
diff --git a/drivers/video/efifb.c b/drivers/video/efifb.c
index eb12182b2059..ecf405562f5c 100644
--- a/drivers/video/efifb.c
+++ b/drivers/video/efifb.c
@@ -49,6 +49,7 @@ enum {
         M_MBP_2,        /* MacBook Pro 2nd gen */
         M_MBP_SR,       /* MacBook Pro (Santa Rosa) */
         M_MBP_4,        /* MacBook Pro, 4th gen */
+        M_MBP_5_1,    /* MacBook Pro, 5,1th gen */
         M_UNKNOWN       /* placeholder */
 };
 
@@ -70,6 +71,7 @@ static struct efifb_dmi_info {
         [M_MBP_2] = { "mbp2", 0, 0, 0, 0 }, /* placeholder */
         [M_MBP_SR] = { "mbp3", 0x80030000, 2048 * 4, 1440, 900 },
         [M_MBP_4] = { "mbp4", 0xc0060000, 2048 * 4, 1920, 1200 },
+        [M_MBP_5_1] = { "mbp51", 0xc0010000, 2048 * 4, 1440, 900 },
         [M_UNKNOWN] = { NULL, 0, 0, 0, 0 }
 };
 
@@ -106,6 +108,7 @@ static struct dmi_system_id __initdata dmi_system_table[] = {
         EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro3,1", M_MBP_SR),
         EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro3,1", M_MBP_SR),
         EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro4,1", M_MBP_4),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro5,1", M_MBP_5_1),
         {},
 };
 
@@ -161,8 +164,17 @@ static int efifb_setcolreg(unsigned regno, unsigned red, unsigned green,
         return 0;
 }
 
+static void efifb_destroy(struct fb_info *info)
+{
+        if (info->screen_base)
+                iounmap(info->screen_base);
+        release_mem_region(info->aperture_base, info->aperture_size);
+        framebuffer_release(info);
+}
+
 static struct fb_ops efifb_ops = {
         .owner          = THIS_MODULE,
+        .fb_destroy     = efifb_destroy,
         .fb_setcolreg   = efifb_setcolreg,
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
@@ -201,7 +213,7 @@ static int __init efifb_setup(char *options)
         return 0;
 }
 
-static int __init efifb_probe(struct platform_device *dev)
+static int __devinit efifb_probe(struct platform_device *dev)
 {
         struct fb_info *info;
         int err;
@@ -281,7 +293,7 @@ static int __init efifb_probe(struct platform_device *dev)
         info->par = NULL;
 
         info->aperture_base = efifb_fix.smem_start;
-        info->aperture_size = size_total;
+        info->aperture_size = size_remap;
 
         info->screen_base = ioremap(efifb_fix.smem_start, efifb_fix.smem_len);
         if (!info->screen_base) {
diff --git a/drivers/video/ep93xx-fb.c b/drivers/video/ep93xx-fb.c
index bd9d46f95291..0c99de0562ca 100644
--- a/drivers/video/ep93xx-fb.c
+++ b/drivers/video/ep93xx-fb.c
@@ -19,6 +19,7 @@
 
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
+#include <linux/slab.h>
 #include <linux/clk.h>
 #include <linux/fb.h>
 
@@ -358,6 +359,8 @@ static int ep93xxfb_setcolreg(unsigned int regno, unsigned int red,
 
         switch (info->fix.visual) {
         case FB_VISUAL_PSEUDOCOLOR:
+                if (regno > 255)
+                        return 1;
                 rgb = ((red & 0xff00) << 8) | (green & 0xff00) |
                         ((blue & 0xff00) >> 8);
 
diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c
index 2735b79e52a1..db9713b49ce9 100644
--- a/drivers/video/epson1355fb.c
+++ b/drivers/video/epson1355fb.c
@@ -48,7 +48,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <linux/init.h>
@@ -602,7 +601,7 @@ static int epson1355fb_remove(struct platform_device *dev)
         return 0;
 }
 
-int __init epson1355fb_probe(struct platform_device *dev)
+int __devinit epson1355fb_probe(struct platform_device *dev)
 {
         struct epson1355_par *default_par;
         struct fb_info *info;
diff --git a/drivers/video/fb_ddc.c b/drivers/video/fb_ddc.c
index 0cf96eb8a60f..4a874c8d039c 100644
--- a/drivers/video/fb_ddc.c
+++ b/drivers/video/fb_ddc.c
@@ -12,6 +12,7 @@
 #include <linux/device.h>
 #include <linux/fb.h>
 #include <linux/i2c-algo-bit.h>
+#include <linux/slab.h>
 
 #include "edid.h"
 
diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
index c27ab1ed9604..6113c47e095a 100644
--- a/drivers/video/fb_defio.c
+++ b/drivers/video/fb_defio.c
@@ -13,7 +13,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -71,7 +70,7 @@ int fb_deferred_io_fsync(struct file *file, struct dentry *dentry, int datasync)
 {
         struct fb_info *info = file->private_data;
 
-        /* Skip if deferred io is complied-in but disabled on this fbdev */
+        /* Skip if deferred io is compiled-in but disabled on this fbdev */
         if (!info->fbdefio)
                 return 0;
 
@@ -144,7 +143,9 @@ static const struct address_space_operations fb_deferred_io_aops = {
 static int fb_deferred_io_mmap(struct fb_info *info, struct vm_area_struct *vma)
 {
         vma->vm_ops = &fb_deferred_io_vm_ops;
-        vma->vm_flags |= ( VM_IO | VM_RESERVED | VM_DONTEXPAND );
+        vma->vm_flags |= ( VM_RESERVED | VM_DONTEXPAND );
+        if (!(info->flags & FBINFO_VIRTFB))
+                vma->vm_flags |= VM_IO;
         vma->vm_private_data = info;
         return 0;
 }
diff --git a/drivers/video/fbcvt.c b/drivers/video/fbcvt.c
index 0847c5e72cbd..7293eaccd81b 100644
--- a/drivers/video/fbcvt.c
+++ b/drivers/video/fbcvt.c
@@ -13,6 +13,7 @@
  *
  */
 #include <linux/fb.h>
+#include <linux/slab.h>
 
 #define FB_CVT_CELLSIZE               8
 #define FB_CVT_GTF_C                 40
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 99bbd282ce63..a15b44e9c003 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1513,7 +1513,6 @@ register_framebuffer(struct fb_info *fb_info)
                                        fb_info->fix.id,
                                        registered_fb[i]->fix.id);
                                 unregister_framebuffer(registered_fb[i]);
-                                break;
                         }
                 }
         }
diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c
index 9ae9cd32bd06..563a98b88e9b 100644
--- a/drivers/video/fbmon.c
+++ b/drivers/video/fbmon.c
@@ -29,6 +29,7 @@
 #include <linux/fb.h>
 #include <linux/module.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 #include <video/edid.h>
 #ifdef CONFIG_PPC_OF
 #include <asm/prom.h>
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c
index d4a2c11d9809..81aa3129c17d 100644
--- a/drivers/video/fbsysfs.c
+++ b/drivers/video/fbsysfs.c
@@ -16,6 +16,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/slab.h>
 #include <linux/fb.h>
 #include <linux/console.h>
 #include <linux/module.h>
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index 9dbb9646081f..a42fabab69df 100644
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -10,7 +10,6 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/fb.h>
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index 72d68b3dc478..994358a4f302 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -1536,6 +1536,7 @@ static int __devinit fsl_diu_probe(struct of_device *ofdev,
                 goto error;
         }
 
+        sysfs_attr_init(&machine_data->dev_attr.attr);
         machine_data->dev_attr.attr.name = "monitor";
         machine_data->dev_attr.attr.mode = S_IRUGO|S_IWUSR;
         machine_data->dev_attr.show = show_monitor;
@@ -1633,6 +1634,11 @@ static int __init fsl_diu_setup(char *options)
 #endif
 
 static struct of_device_id fsl_diu_match[] = {
+#ifdef CONFIG_PPC_MPC512x
+        {
+                .compatible = "fsl,mpc5121-diu",
+        },
+#endif
         {
                 .compatible = "fsl,diu",
         },
diff --git a/drivers/video/g364fb.c b/drivers/video/g364fb.c
index b7655c05da53..d662317d85e3 100644
--- a/drivers/video/g364fb.c
+++ b/drivers/video/g364fb.c
@@ -20,7 +20,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c
index f67db4268374..7d8c55d7fd28 100644
--- a/drivers/video/gbefb.c
+++ b/drivers/video/gbefb.c
@@ -13,6 +13,7 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/errno.h>
+#include <linux/gfp.h>
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
@@ -701,7 +702,7 @@ static int gbefb_set_par(struct fb_info *info)
            blocks of 512x128, 256x128 or 128x128 pixels, respectively for 8bit,
            16bit and 32 bit modes (64 kB). They cover the screen with partial
            tiles on the right and/or bottom of the screen if needed.
-           For exemple in 640x480 8 bit mode the mapping is:
+           For example in 640x480 8 bit mode the mapping is:
 
            <-------- 640 ----->
            <---- 512 ----><128|384 offscreen>
@@ -1128,7 +1129,7 @@ static int __init gbefb_setup(char *options)
         return 0;
 }
 
-static int __init gbefb_probe(struct platform_device *p_dev)
+static int __devinit gbefb_probe(struct platform_device *p_dev)
 {
         int i, ret = 0;
         struct fb_info *info;
diff --git a/drivers/video/geode/display_gx.c b/drivers/video/geode/display_gx.c
index e759895bf3d3..f0af911a096d 100644
--- a/drivers/video/geode/display_gx.c
+++ b/drivers/video/geode/display_gx.c
@@ -17,7 +17,7 @@
 #include <asm/io.h>
 #include <asm/div64.h>
 #include <asm/delay.h>
-#include <asm/geode.h>
+#include <linux/cs5535.h>
 
 #include "gxfb.h"
 
@@ -25,7 +25,7 @@ unsigned int gx_frame_buffer_size(void)
 {
         unsigned int val;
 
-        if (!geode_has_vsa2()) {
+        if (!cs5535_has_vsa2()) {
                 uint32_t hi, lo;
 
                 /* The number of pages is (PMAX - PMIN)+1 */
diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c
index f20eff8c4a81..c6b554f72c6d 100644
--- a/drivers/video/geode/gx1fb_core.c
+++ b/drivers/video/geode/gx1fb_core.c
@@ -15,7 +15,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <linux/init.h>
diff --git a/drivers/video/geode/gxfb.h b/drivers/video/geode/gxfb.h
index 16a96f8fd8c5..d19e9378b0c0 100644
--- a/drivers/video/geode/gxfb.h
+++ b/drivers/video/geode/gxfb.h
@@ -340,7 +340,7 @@ static inline void write_fp(struct gxfb_par *par, int reg, uint32_t val)
 }
 
 
-/* MSRs are defined in asm/geode.h; their bitfields are here */
+/* MSRs are defined in linux/cs5535.h; their bitfields are here */
 
 #define MSR_GLCP_SYS_RSTPLL_DOTPOSTDIV3 (1 << 3)
 #define MSR_GLCP_SYS_RSTPLL_DOTPREMULT2 (1 << 2)
diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c
index 2552cac39e1c..76e7dac6f259 100644
--- a/drivers/video/geode/gxfb_core.c
+++ b/drivers/video/geode/gxfb_core.c
@@ -25,14 +25,13 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <linux/console.h>
 #include <linux/suspend.h>
 #include <linux/init.h>
 #include <linux/pci.h>
-#include <asm/geode.h>
+#include <linux/cs5535.h>
 
 #include "gxfb.h"
 
diff --git a/drivers/video/geode/lxfb.h b/drivers/video/geode/lxfb.h
index 6a51448fd3f7..e4c4d89b7860 100644
--- a/drivers/video/geode/lxfb.h
+++ b/drivers/video/geode/lxfb.h
@@ -1,3 +1,13 @@
+/* Geode LX framebuffer driver
+ *
+ * Copyright (C) 2006-2007, Advanced Micro Devices,Inc.
+ * Copyright (c) 2008  Andres Salomon <dilinger@debian.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
 #ifndef _LXFB_H_
 #define _LXFB_H_
 
@@ -355,6 +365,8 @@ enum fp_registers {
         FP_CRC, /* 0x458 */
 };
 
+#define FP_PT2_HSP                      (1 << 22)
+#define FP_PT2_VSP                      (1 << 23)
 #define FP_PT2_SCRC                     (1 << 27)       /* shfclk free */
 
 #define FP_PM_P                         (1 << 24)       /* panel power ctl */
@@ -409,7 +421,7 @@ static inline void write_fp(struct lxfb_par *par, int reg, uint32_t val)
 }
 
 
-/* MSRs are defined in asm/geode.h; their bitfields are here */
+/* MSRs are defined in linux/cs5535.h; their bitfields are here */
 
 #define MSR_GLCP_DOTPLL_LOCK            (1 << 25)       /* r/o */
 #define MSR_GLCP_DOTPLL_HALFPIX         (1 << 24)
diff --git a/drivers/video/geode/lxfb_core.c b/drivers/video/geode/lxfb_core.c
index 889cbe39e580..1a18da86d3fa 100644
--- a/drivers/video/geode/lxfb_core.c
+++ b/drivers/video/geode/lxfb_core.c
@@ -16,7 +16,6 @@
 #include <linux/string.h>
 #include <linux/console.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/suspend.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
diff --git a/drivers/video/geode/lxfb_ops.c b/drivers/video/geode/lxfb_ops.c
index b1cd49c99356..bc35a95e59d4 100644
--- a/drivers/video/geode/lxfb_ops.c
+++ b/drivers/video/geode/lxfb_ops.c
@@ -13,7 +13,7 @@
 #include <linux/fb.h>
 #include <linux/uaccess.h>
 #include <linux/delay.h>
-#include <asm/geode.h>
+#include <linux/cs5535.h>
 
 #include "lxfb.h"
 
@@ -274,7 +274,15 @@ static void lx_graphics_enable(struct fb_info *info)
                 u32 msrlo, msrhi;
 
                 write_fp(par, FP_PT1, 0);
-                write_fp(par, FP_PT2, FP_PT2_SCRC);
+                temp = FP_PT2_SCRC;
+
+                if (info->var.sync & FB_SYNC_HOR_HIGH_ACT)
+                        temp |= FP_PT2_HSP;
+
+                if (info->var.sync & FB_SYNC_VERT_HIGH_ACT)
+                        temp |= FP_PT2_VSP;
+
+                write_fp(par, FP_PT2, temp);
                 write_fp(par, FP_DFC, FP_DFC_BC);
 
                 msrlo = MSR_LX_MSR_PADSEL_TFT_SEL_LOW;
@@ -307,7 +315,7 @@ unsigned int lx_framebuffer_size(void)
 {
         unsigned int val;
 
-        if (!geode_has_vsa2()) {
+        if (!cs5535_has_vsa2()) {
                 uint32_t hi, lo;
 
                 /* The number of pages is (PMAX - PMIN)+1 */
diff --git a/drivers/video/geode/suspend_gx.c b/drivers/video/geode/suspend_gx.c
index 9aff32ef8bb6..1bb043d70c64 100644
--- a/drivers/video/geode/suspend_gx.c
+++ b/drivers/video/geode/suspend_gx.c
@@ -10,7 +10,7 @@
 #include <linux/fb.h>
 #include <asm/io.h>
 #include <asm/msr.h>
-#include <asm/geode.h>
+#include <linux/cs5535.h>
 #include <asm/delay.h>
 
 #include "gxfb.h"
diff --git a/drivers/video/geode/video_gx.c b/drivers/video/geode/video_gx.c
index b8d52a8360db..6082f653c68a 100644
--- a/drivers/video/geode/video_gx.c
+++ b/drivers/video/geode/video_gx.c
@@ -16,7 +16,7 @@
 #include <asm/io.h>
 #include <asm/delay.h>
 #include <asm/msr.h>
-#include <asm/geode.h>
+#include <linux/cs5535.h>
 
 #include "gxfb.h"
 
diff --git a/drivers/video/hecubafb.c b/drivers/video/hecubafb.c
index 0b4bffbe67c8..c77bcc6ab463 100644
--- a/drivers/video/hecubafb.c
+++ b/drivers/video/hecubafb.c
@@ -32,7 +32,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -253,7 +252,7 @@ static int __devinit hecubafb_probe(struct platform_device *dev)
         par->send_command = apollo_send_command;
         par->send_data = apollo_send_data;
 
-        info->flags = FBINFO_FLAG_DEFAULT;
+        info->flags = FBINFO_FLAG_DEFAULT | FBINFO_VIRTFB;
 
         info->fbdefio = &hecubafb_defio;
         fb_deferred_io_init(info);
diff --git a/drivers/video/hgafb.c b/drivers/video/hgafb.c
index 0129c044f6d6..8bbf251f83d9 100644
--- a/drivers/video/hgafb.c
+++ b/drivers/video/hgafb.c
@@ -36,7 +36,6 @@
 #include <linux/spinlock.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <linux/init.h>
@@ -551,7 +550,7 @@ static struct fb_ops hgafb_ops = {
          *  Initialization
          */
 
-static int __init hgafb_probe(struct platform_device *pdev)
+static int __devinit hgafb_probe(struct platform_device *pdev)
 {
         struct fb_info *info;
 
diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c
index e7116a6d82d3..393f3f3d3dfe 100644
--- a/drivers/video/hitfb.c
+++ b/drivers/video/hitfb.c
@@ -16,7 +16,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
@@ -325,7 +324,7 @@ static struct fb_ops hitfb_ops = {
         .fb_imageblit   = cfb_imageblit,
 };
 
-static int __init hitfb_probe(struct platform_device *dev)
+static int __devinit hitfb_probe(struct platform_device *dev)
 {
         unsigned short lcdclor, ldr3, ldvndr;
         struct fb_info *info;
@@ -456,7 +455,7 @@ static int hitfb_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops hitfb_dev_pm_ops = {
+static const struct dev_pm_ops hitfb_dev_pm_ops = {
         .suspend        = hitfb_suspend,
         .resume         = hitfb_resume,
 };
diff --git a/drivers/video/hpfb.c b/drivers/video/hpfb.c
index b8ebff1e8493..c8e280f1bb0b 100644
--- a/drivers/video/hpfb.c
+++ b/drivers/video/hpfb.c
@@ -10,7 +10,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/fb.h>
diff --git a/drivers/video/i810/i810-i2c.c b/drivers/video/i810/i810-i2c.c
index 9dd55e5324a1..cd2c728a809b 100644
--- a/drivers/video/i810/i810-i2c.c
+++ b/drivers/video/i810/i810-i2c.c
@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
+#include <linux/gfp.h>
 #include <linux/pci.h>
 #include <linux/fb.h>
 #include "i810.h"
diff --git a/drivers/video/i810/i810_dvt.c b/drivers/video/i810/i810_dvt.c
index 27fa703a2e0a..b4b3670667ab 100644
--- a/drivers/video/i810/i810_dvt.c
+++ b/drivers/video/i810/i810_dvt.c
@@ -212,24 +212,29 @@ inline void round_off_yres(u32 *xres, u32 *yres)
         *yres = (*xres * 3) >> 2;
 }
 
-void i810fb_encode_registers(const struct fb_var_screeninfo *var,
-                             struct i810fb_par *par, u32 xres, u32 yres)
+static int i810fb_find_best_mode(u32 xres, u32 yres, u32 pixclock)
 { 
         u32 diff = 0, diff_best = 0xFFFFFFFF, i = 0, i_best = 0; 
-        u8 hfl;
+        u8 hfl = (u8) ((xres >> 3) - 1);
 
-        hfl = (u8) ((xres >> 3) - 1);
         for (i = 0; i < ARRAY_SIZE(std_modes); i++) { 
                 if (std_modes[i].cr01 == hfl) { 
-                        if (std_modes[i].pixclock <= par->regs.pixclock)
-                                diff = par->regs.pixclock - 
-                                        std_modes[i].pixclock;
+                        if (std_modes[i].pixclock <= pixclock)
+                                diff = pixclock - std_modes[i].pixclock;
                         if (diff < diff_best) {  
                                 i_best = i;
                                 diff_best = diff;
                         }
                 }
         }
+        return i_best;
+}
+
+void i810fb_encode_registers(const struct fb_var_screeninfo *var,
+                             struct i810fb_par *par, u32 xres, u32 yres)
+{
+        u32 i_best = i810fb_find_best_mode(xres, yres, par->regs.pixclock);
+
         par->regs = std_modes[i_best];
 
         /* overlay */
@@ -239,36 +244,36 @@ void i810fb_encode_registers(const struct fb_var_screeninfo *var,
 
 void i810fb_fill_var_timings(struct fb_var_screeninfo *var)
 {
-        struct i810fb_par par;
         u32 total, xres, yres;
+        u32 mode, pixclock;
 
         xres = var->xres;
         yres = var->yres;
         
-        par.regs.pixclock = 1000000000/var->pixclock;
-        i810fb_encode_registers(var, &par, xres, yres);
+        pixclock = 1000000000 / var->pixclock;
+        mode = i810fb_find_best_mode(xres, yres, pixclock);
         
-        total = ((par.regs.cr00 | (par.regs.cr35 & 1) << 8) + 3) << 3;
+        total = (std_modes[mode].cr00 | (std_modes[mode].cr35 & 1) << 8) + 3;
+        total <<= 3;
         
-        var->pixclock = 1000000000/par.regs.pixclock;
-        var->right_margin = (par.regs.cr04 << 3) - xres;
-        var->hsync_len = ((par.regs.cr05 & 0x1F) - 
-                               (par.regs.cr04 & 0x1F)) << 3;
+        var->pixclock = 1000000000 / std_modes[mode].pixclock;
+        var->right_margin = (std_modes[mode].cr04 << 3) - xres;
+        var->hsync_len = ((std_modes[mode].cr05 & 0x1F) -
+                         (std_modes[mode].cr04 & 0x1F)) << 3;
         var->left_margin = (total - (xres + var->right_margin + 
                                      var->hsync_len));
         var->sync = FB_SYNC_ON_GREEN;
-        if (~(par.regs.msr & (1 << 6)))
+        if (~(std_modes[mode].msr & (1 << 6)))
                 var->sync |= FB_SYNC_HOR_HIGH_ACT;
-        if (~(par.regs.msr & (1 << 7)))
+        if (~(std_modes[mode].msr & (1 << 7)))
                 var->sync |= FB_SYNC_VERT_HIGH_ACT;
 
-
-        total = ((par.regs.cr06 | (par.regs.cr30 & 0x0F)  << 8)) + 2;
-        var->lower_margin = (par.regs.cr10 | 
-                             (par.regs.cr32 & 0x0F) << 8) - yres;
-        var->vsync_len = (par.regs.cr11 & 0x0F) - (var->lower_margin & 0x0F);
-        var->upper_margin = total - (yres + var->lower_margin + 
-                                     var->vsync_len);
+        total = (std_modes[mode].cr06 | (std_modes[mode].cr30 & 0xF)  << 8) + 2;
+        var->lower_margin = (std_modes[mode].cr10 |
+                            (std_modes[mode].cr32 & 0x0F) << 8) - yres;
+        var->vsync_len = (std_modes[mode].cr11 & 0x0F) -
+                         (var->lower_margin & 0x0F);
+        var->upper_margin = total - (yres + var->lower_margin + var->vsync_len);
 }
 
 u32 i810_get_watermark(struct fb_var_screeninfo *var,
diff --git a/drivers/video/imsttfb.c b/drivers/video/imsttfb.c
index 15d50b9906ce..efb2c10656b0 100644
--- a/drivers/video/imsttfb.c
+++ b/drivers/video/imsttfb.c
@@ -21,7 +21,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index 66358fa825f3..b4b6deceed15 100644
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@@ -593,7 +593,8 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf
  */
 static int imxfb_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct imxfb_info *fbi = platform_get_drvdata(dev);
+        struct fb_info *info = platform_get_drvdata(dev);
+        struct imxfb_info *fbi = info->par;
 
         pr_debug("%s\n", __func__);
 
@@ -603,7 +604,8 @@ static int imxfb_suspend(struct platform_device *dev, pm_message_t state)
 
 static int imxfb_resume(struct platform_device *dev)
 {
-        struct imxfb_info *fbi = platform_get_drvdata(dev);
+        struct fb_info *info = platform_get_drvdata(dev);
+        struct imxfb_info *fbi = info->par;
 
         pr_debug("%s\n", __func__);
 
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index 0cafd642fbc0..5ba399991050 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -874,6 +874,9 @@ static int __devinit intelfb_pci_register(struct pci_dev *pdev,
         if (bailearly == 18)
                 bailout(dinfo);
 
+        /* read active pipe */
+        dinfo->pipe = intelfbhw_active_pipe(&dinfo->save_state);
+
         /* Cursor initialisation */
         if (dinfo->hwcursor) {
                 intelfbhw_cursor_init(dinfo);
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c
index 0689f97c5238..38065cf94ac4 100644
--- a/drivers/video/intelfb/intelfbhw.c
+++ b/drivers/video/intelfb/intelfbhw.c
@@ -24,7 +24,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <linux/ioport.h>
@@ -469,6 +468,32 @@ void intelfbhw_do_blank(int blank, struct fb_info *info)
 }
 
 
+/* Check which pipe is connected to an active display plane. */
+int intelfbhw_active_pipe(const struct intelfb_hwstate *hw)
+{
+        int pipe = -1;
+
+        /* keep old default behaviour - prefer PIPE_A */
+        if (hw->disp_b_ctrl & DISPPLANE_PLANE_ENABLE) {
+                pipe = (hw->disp_b_ctrl >> DISPPLANE_SEL_PIPE_SHIFT);
+                pipe &= PIPE_MASK;
+                if (unlikely(pipe == PIPE_A))
+                        return PIPE_A;
+        }
+        if (hw->disp_a_ctrl & DISPPLANE_PLANE_ENABLE) {
+                pipe = (hw->disp_a_ctrl >> DISPPLANE_SEL_PIPE_SHIFT);
+                pipe &= PIPE_MASK;
+                if (likely(pipe == PIPE_A))
+                        return PIPE_A;
+        }
+        /* Impossible that no pipe is selected - return PIPE_A */
+        WARN_ON(pipe == -1);
+        if (unlikely(pipe == -1))
+                pipe = PIPE_A;
+
+        return pipe;
+}
+
 void intelfbhw_setcolreg(struct intelfb_info *dinfo, unsigned regno,
                          unsigned red, unsigned green, unsigned blue,
                          unsigned transp)
@@ -1019,7 +1044,7 @@ int intelfbhw_mode_to_hw(struct intelfb_info *dinfo,
                          struct intelfb_hwstate *hw,
                          struct fb_var_screeninfo *var)
 {
-        int pipe = PIPE_A;
+        int pipe = intelfbhw_active_pipe(hw);
         u32 *dpll, *fp0, *fp1;
         u32 m1, m2, n, p1, p2, clock_target, clock;
         u32 hsync_start, hsync_end, hblank_start, hblank_end, htotal, hactive;
@@ -1033,12 +1058,6 @@ int intelfbhw_mode_to_hw(struct intelfb_info *dinfo,
         /* Disable VGA */
         hw->vgacntrl |= VGA_DISABLE;
 
-        /* Check whether pipe A or pipe B is enabled. */
-        if (hw->pipe_a_conf & PIPECONF_ENABLE)
-                pipe = PIPE_A;
-        else if (hw->pipe_b_conf & PIPECONF_ENABLE)
-                pipe = PIPE_B;
-
         /* Set which pipe's registers will be set. */
         if (pipe == PIPE_B) {
                 dpll = &hw->dpll_b;
@@ -1262,7 +1281,6 @@ int intelfbhw_mode_to_hw(struct intelfb_info *dinfo,
 int intelfbhw_program_mode(struct intelfb_info *dinfo,
                            const struct intelfb_hwstate *hw, int blank)
 {
-        int pipe = PIPE_A;
         u32 tmp;
         const u32 *dpll, *fp0, *fp1, *pipe_conf;
         const u32 *hs, *ht, *hb, *vs, *vt, *vb, *ss;
@@ -1272,7 +1290,7 @@ int intelfbhw_program_mode(struct intelfb_info *dinfo,
         u32 src_size_reg;
         u32 count, tmp_val[3];
 
-        /* Assume single pipe, display plane A, analog CRT. */
+        /* Assume single pipe */
 
 #if VERBOSE > 0
         DBG_MSG("intelfbhw_program_mode\n");
@@ -1283,15 +1301,9 @@ int intelfbhw_program_mode(struct intelfb_info *dinfo,
         tmp |= VGA_DISABLE;
         OUTREG(VGACNTRL, tmp);
 
-        /* Check whether pipe A or pipe B is enabled. */
-        if (hw->pipe_a_conf & PIPECONF_ENABLE)
-                pipe = PIPE_A;
-        else if (hw->pipe_b_conf & PIPECONF_ENABLE)
-                pipe = PIPE_B;
-
-        dinfo->pipe = pipe;
+        dinfo->pipe = intelfbhw_active_pipe(hw);
 
-        if (pipe == PIPE_B) {
+        if (dinfo->pipe == PIPE_B) {
                 dpll = &hw->dpll_b;
                 fp0 = &hw->fpb0;
                 fp1 = &hw->fpb1;
diff --git a/drivers/video/intelfb/intelfbhw.h b/drivers/video/intelfb/intelfbhw.h
index 0b076bac321b..216ca20f259f 100644
--- a/drivers/video/intelfb/intelfbhw.h
+++ b/drivers/video/intelfb/intelfbhw.h
@@ -604,5 +604,6 @@ extern void intelfbhw_cursor_reset(struct intelfb_info *dinfo);
 extern int intelfbhw_enable_irq(struct intelfb_info *dinfo);
 extern void intelfbhw_disable_irq(struct intelfb_info *dinfo);
 extern int intelfbhw_wait_for_vsync(struct intelfb_info *dinfo, u32 pipe);
+extern int intelfbhw_active_pipe(const struct intelfb_hwstate *hw);
 
 #endif /* _INTELFBHW_H */
diff --git a/drivers/video/leo.c b/drivers/video/leo.c
index e145e2d16fe3..1db55f128490 100644
--- a/drivers/video/leo.c
+++ b/drivers/video/leo.c
@@ -11,7 +11,6 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/fb.h>
diff --git a/drivers/video/macfb.c b/drivers/video/macfb.c
index d66887e8cbb1..43207cc6cc19 100644
--- a/drivers/video/macfb.c
+++ b/drivers/video/macfb.c
@@ -1,29 +1,33 @@
-/* macfb.c: Generic framebuffer for Macs whose colourmaps/modes we
-   don't know how to set */
-
-/* (c) 1999 David Huggins-Daines <dhd@debian.org>
-
-   Primarily based on vesafb.c, by Gerd Knorr
-   (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de>
-
-   Also uses information and code from:
-   
-   The original macfb.c from Linux/mac68k 2.0, by Alan Cox, Juergen
-   Mellinger, Mikael Forselius, Michael Schmitz, and others.
-
-   valkyriefb.c, by Martin Costabel, Kevin Schoedel, Barry Nathan, Dan
-   Jacobowitz, Paul Mackerras, Fabio Riccardi, and Geert Uytterhoeven.
-   
-   This code is free software.  You may copy, modify, and distribute
-   it subject to the terms and conditions of the GNU General Public
-   License, version 2, or any later version, at your convenience. */
+/*
+ * macfb.c: Generic framebuffer for Macs whose colourmaps/modes we
+ * don't know how to set.
+ *
+ * (c) 1999 David Huggins-Daines <dhd@debian.org>
+ *
+ * Primarily based on vesafb.c, by Gerd Knorr
+ * (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de>
+ *
+ * Also uses information and code from:
+ *
+ * The original macfb.c from Linux/mac68k 2.0, by Alan Cox, Juergen
+ * Mellinger, Mikael Forselius, Michael Schmitz, and others.
+ *
+ * valkyriefb.c, by Martin Costabel, Kevin Schoedel, Barry Nathan, Dan
+ * Jacobowitz, Paul Mackerras, Fabio Riccardi, and Geert Uytterhoeven.
+ *
+ * The VideoToolbox "Bugs" web page at
+ * http://rajsky.psych.nyu.edu/Tips/VideoBugs.html
+ *
+ * This code is free software.  You may copy, modify, and distribute
+ * it subject to the terms and conditions of the GNU General Public
+ * License, version 2, or any later version, at your convenience.
+ */
 
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/nubus.h>
 #include <linux/init.h>
@@ -31,9 +35,6 @@
 
 #include <asm/setup.h>
 #include <asm/bootinfo.h>
-#include <asm/uaccess.h>
-#include <asm/pgtable.h>
-#include <asm/irq.h>
 #include <asm/macintosh.h>
 #include <asm/io.h>
 
@@ -44,7 +45,7 @@
 #define DAFB_BASE 0xf9800200
 
 /* Address for the built-in Civic framebuffer in Quadra AVs */
-#define CIVIC_BASE 0x50f30800   /* Only tested on 660AV! */
+#define CIVIC_BASE 0x50f30800
 
 /* GSC (Gray Scale Controller) base address */
 #define GSC_BASE 0x50F20000
@@ -52,37 +53,9 @@
 /* CSC (Color Screen Controller) base address */
 #define CSC_BASE 0x50F20000
 
-static int (*macfb_setpalette) (unsigned int regno, unsigned int red,
-                                unsigned int green, unsigned int blue,
-                                struct fb_info *info) = NULL;
-static int valkyrie_setpalette (unsigned int regno, unsigned int red,
-                                unsigned int green, unsigned int blue,
-                                struct fb_info *info);
-static int dafb_setpalette (unsigned int regno, unsigned int red,
-                            unsigned int green, unsigned int blue,
-                            struct fb_info *fb_info);
-static int rbv_setpalette (unsigned int regno, unsigned int red,
-                           unsigned int green, unsigned int blue,
-                           struct fb_info *fb_info);
-static int mdc_setpalette (unsigned int regno, unsigned int red,
-                           unsigned int green, unsigned int blue,
-                           struct fb_info *fb_info);
-static int toby_setpalette (unsigned int regno, unsigned int red,
-                            unsigned int green, unsigned int blue,
-                            struct fb_info *fb_info);
-static int civic_setpalette (unsigned int regno, unsigned int red,
-                             unsigned int green, unsigned int blue,
-                             struct fb_info *fb_info);
-static int csc_setpalette (unsigned int regno, unsigned int red,
-                           unsigned int green, unsigned int blue,
-                           struct fb_info *fb_info);
-
-static struct {
-        unsigned char addr;
-        /* Note: word-aligned */
-        char pad[3];
-        unsigned char lut;
-} __iomem *valkyrie_cmap_regs;
+static int (*macfb_setpalette)(unsigned int regno, unsigned int red,
+                               unsigned int green, unsigned int blue,
+                               struct fb_info *info);
 
 static struct {
         unsigned char addr;
@@ -116,15 +89,15 @@ static struct {
 } __iomem *civic_cmap_regs;
 
 static struct {
-        char    pad1[0x40];
-        unsigned char   clut_waddr;     /* 0x40 */
-        char    pad2;
-        unsigned char   clut_data;      /* 0x42 */
-        char    pad3[0x3];
-        unsigned char   clut_raddr;     /* 0x46 */
+        char pad1[0x40];
+        unsigned char clut_waddr;       /* 0x40 */
+        char pad2;
+        unsigned char clut_data;        /* 0x42 */
+        char pad3[0x3];
+        unsigned char clut_raddr;       /* 0x46 */
 } __iomem *csc_cmap_regs;
 
-/* We will leave these the way they are for the time being */
+/* The registers in these structs are in NuBus slot space */
 struct mdc_cmap_regs {
         char pad1[0x200200];
         unsigned char addr;
@@ -145,13 +118,10 @@ struct jet_cmap_regs {
         unsigned char lut;
 };
 
-#define PIXEL_TO_MM(a)  (((a)*10)/28)   /* width in mm at 72 dpi */     
-
-/* mode */
-static int  video_slot = 0;
+#define PIXEL_TO_MM(a)  (((a)*10)/28)   /* width in mm at 72 dpi */
 
 static struct fb_var_screeninfo macfb_defined = {
-        .bits_per_pixel = 8,    
+        .bits_per_pixel = 8,
         .activate       = FB_ACTIVATE_NOW,
         .width          = -1,
         .height         = -1,
@@ -167,181 +137,152 @@ static struct fb_fix_screeninfo macfb_fix = {
         .accel  = FB_ACCEL_NONE,
 };
 
+static void *slot_addr;
 static struct fb_info fb_info;
 static u32 pseudo_palette[16];
-static int inverse   = 0;
-static int vidtest   = 0;
+static int inverse;
+static int vidtest;
 
-static int valkyrie_setpalette (unsigned int regno, unsigned int red,
-                                unsigned int green, unsigned int blue,
-                                struct fb_info *info)
-{
-        unsigned long flags;
-        
-        red >>= 8;
-        green >>= 8;
-        blue >>= 8;
-
-        local_irq_save(flags);
-        
-        /* tell clut which address to fill */
-        nubus_writeb(regno, &valkyrie_cmap_regs->addr);
-        nop();
-
-        /* send one color channel at a time */
-        nubus_writeb(red, &valkyrie_cmap_regs->lut);
-        nop();
-        nubus_writeb(green, &valkyrie_cmap_regs->lut);
-        nop();
-        nubus_writeb(blue, &valkyrie_cmap_regs->lut);
-
-        local_irq_restore(flags);
-        return 0;
-}
-
-/* Unlike the Valkyrie, the DAFB cannot set individual colormap
-   registers.  Therefore, we do what the MacOS driver does (no
-   kidding!) and simply set them one by one until we hit the one we
-   want. */
-static int dafb_setpalette (unsigned int regno, unsigned int red,
-                            unsigned int green, unsigned int blue,
-                            struct fb_info *info)
+/*
+ * Unlike the Valkyrie, the DAFB cannot set individual colormap
+ * registers.  Therefore, we do what the MacOS driver does (no
+ * kidding!) and simply set them one by one until we hit the one we
+ * want.
+ */
+static int dafb_setpalette(unsigned int regno, unsigned int red,
+                           unsigned int green, unsigned int blue,
+                           struct fb_info *info)
 {
-        /* FIXME: really, really need to use ioremap() here,
-           phys_to_virt() doesn't work anymore */
         static int lastreg = -1;
         unsigned long flags;
-        
-        red >>= 8;
-        green >>= 8;
-        blue >>= 8;
 
         local_irq_save(flags);
-        
-        /* fbdev will set an entire colourmap, but X won't.  Hopefully
-           this should accommodate both of them */
-        if (regno != lastreg+1) {
+
+        /*
+         * fbdev will set an entire colourmap, but X won't.  Hopefully
+         * this should accommodate both of them
+         */
+        if (regno != lastreg + 1) {
                 int i;
-                
+
                 /* Stab in the dark trying to reset the CLUT pointer */
                 nubus_writel(0, &dafb_cmap_regs->reset);
                 nop();
-                
+
                 /* Loop until we get to the register we want */
                 for (i = 0; i < regno; i++) {
-                        nubus_writeb(info->cmap.red[i] >> 8, &dafb_cmap_regs->lut);
+                        nubus_writeb(info->cmap.red[i] >> 8,
+                                     &dafb_cmap_regs->lut);
                         nop();
-                        nubus_writeb(info->cmap.green[i] >> 8, &dafb_cmap_regs->lut);
+                        nubus_writeb(info->cmap.green[i] >> 8,
+                                     &dafb_cmap_regs->lut);
                         nop();
-                        nubus_writeb(info->cmap.blue[i] >> 8, &dafb_cmap_regs->lut);
+                        nubus_writeb(info->cmap.blue[i] >> 8,
+                                     &dafb_cmap_regs->lut);
                         nop();
                 }
         }
-                
+
         nubus_writeb(red, &dafb_cmap_regs->lut);
         nop();
         nubus_writeb(green, &dafb_cmap_regs->lut);
         nop();
         nubus_writeb(blue, &dafb_cmap_regs->lut);
-        
+
         local_irq_restore(flags);
         lastreg = regno;
         return 0;
 }
 
 /* V8 and Brazil seem to use the same DAC.  Sonora does as well. */
-static int v8_brazil_setpalette (unsigned int regno, unsigned int red,
-                                 unsigned int green, unsigned int blue,
-                                 struct fb_info *info)  
+static int v8_brazil_setpalette(unsigned int regno, unsigned int red,
+                                unsigned int green, unsigned int blue,
+                                struct fb_info *info)
 {
         unsigned int bpp = info->var.bits_per_pixel;
-        unsigned char _red  =red>>8;
-        unsigned char _green=green>>8;
-        unsigned char _blue =blue>>8;
-        unsigned char _regno;
         unsigned long flags;
 
-        if (bpp > 8) return 1; /* failsafe */
+        if (bpp > 8)
+                return 1; /* failsafe */
 
         local_irq_save(flags);
 
         /* On these chips, the CLUT register numbers are spread out
-           across the register space.  Thus:
-
-           In 8bpp, all regnos are valid.
-           
-           In 4bpp, the regnos are 0x0f, 0x1f, 0x2f, etc, etc
-           
-           In 2bpp, the regnos are 0x3f, 0x7f, 0xbf, 0xff */
-        _regno = (regno << (8 - bpp)) | (0xFF >> bpp);
-        nubus_writeb(_regno, &v8_brazil_cmap_regs->addr); nop();
+         * across the register space.  Thus:
+         * In 8bpp, all regnos are valid.
+         * In 4bpp, the regnos are 0x0f, 0x1f, 0x2f, etc, etc
+         * In 2bpp, the regnos are 0x3f, 0x7f, 0xbf, 0xff
+         */
+        regno = (regno << (8 - bpp)) | (0xFF >> bpp);
+        nubus_writeb(regno, &v8_brazil_cmap_regs->addr);
+        nop();
 
         /* send one color channel at a time */
-        nubus_writeb(_red, &v8_brazil_cmap_regs->lut); nop();
-        nubus_writeb(_green, &v8_brazil_cmap_regs->lut); nop();
-        nubus_writeb(_blue, &v8_brazil_cmap_regs->lut);
+        nubus_writeb(red, &v8_brazil_cmap_regs->lut);
+        nop();
+        nubus_writeb(green, &v8_brazil_cmap_regs->lut);
+        nop();
+        nubus_writeb(blue, &v8_brazil_cmap_regs->lut);
 
-        local_irq_restore(flags);       
+        local_irq_restore(flags);
         return 0;
 }
 
-static int rbv_setpalette (unsigned int regno, unsigned int red,
-                           unsigned int green, unsigned int blue,
-                           struct fb_info *info)
+/* RAM-Based Video */
+static int rbv_setpalette(unsigned int regno, unsigned int red,
+                          unsigned int green, unsigned int blue,
+                          struct fb_info *info)
 {
-        /* use MSBs */
-        unsigned char _red  =red>>8;
-        unsigned char _green=green>>8;
-        unsigned char _blue =blue>>8;
-        unsigned char _regno;
         unsigned long flags;
 
-        if (info->var.bits_per_pixel > 8) return 1; /* failsafe */
+        if (info->var.bits_per_pixel > 8)
+                return 1; /* failsafe */
 
         local_irq_save(flags);
-        
+
         /* From the VideoToolbox driver.  Seems to be saying that
          * regno #254 and #255 are the important ones for 1-bit color,
          * regno #252-255 are the important ones for 2-bit color, etc.
          */
-        _regno = regno + (256-(1 << info->var.bits_per_pixel));
+        regno += 256 - (1 << info->var.bits_per_pixel);
 
         /* reset clut? (VideoToolbox sez "not necessary") */
-        nubus_writeb(0xFF, &rbv_cmap_regs->cntl); nop();
-        
+        nubus_writeb(0xFF, &rbv_cmap_regs->cntl);
+        nop();
+
         /* tell clut which address to use. */
-        nubus_writeb(_regno, &rbv_cmap_regs->addr); nop();
-        
+        nubus_writeb(regno, &rbv_cmap_regs->addr);
+        nop();
+
         /* send one color channel at a time. */
-        nubus_writeb(_red,   &rbv_cmap_regs->lut); nop();
-        nubus_writeb(_green, &rbv_cmap_regs->lut); nop();
-        nubus_writeb(_blue,  &rbv_cmap_regs->lut);
-        
-        local_irq_restore(flags); /* done. */
+        nubus_writeb(red, &rbv_cmap_regs->lut);
+        nop();
+        nubus_writeb(green, &rbv_cmap_regs->lut);
+        nop();
+        nubus_writeb(blue, &rbv_cmap_regs->lut);
+
+        local_irq_restore(flags);
         return 0;
 }
 
-/* Macintosh Display Card (8x24) */
+/* Macintosh Display Card (8*24) */
 static int mdc_setpalette(unsigned int regno, unsigned int red,
                           unsigned int green, unsigned int blue,
                           struct fb_info *info)
 {
-        volatile struct mdc_cmap_regs *cmap_regs =
-                nubus_slot_addr(video_slot);
-        /* use MSBs */
-        unsigned char _red  =red>>8;
-        unsigned char _green=green>>8;
-        unsigned char _blue =blue>>8;
-        unsigned char _regno=regno;
+        struct mdc_cmap_regs *cmap_regs = slot_addr;
         unsigned long flags;
 
         local_irq_save(flags);
-        
+
         /* the nop's are there to order writes. */
-        nubus_writeb(_regno, &cmap_regs->addr); nop();
-        nubus_writeb(_red, &cmap_regs->lut);    nop();
-        nubus_writeb(_green, &cmap_regs->lut);  nop();
-        nubus_writeb(_blue, &cmap_regs->lut);
+        nubus_writeb(regno, &cmap_regs->addr);
+        nop();
+        nubus_writeb(red, &cmap_regs->lut);
+        nop();
+        nubus_writeb(green, &cmap_regs->lut);
+        nop();
+        nubus_writeb(blue, &cmap_regs->lut);
 
         local_irq_restore(flags);
         return 0;
@@ -350,24 +291,26 @@ static int mdc_setpalette(unsigned int regno, unsigned int red,
 /* Toby frame buffer */
 static int toby_setpalette(unsigned int regno, unsigned int red,
                            unsigned int green, unsigned int blue,
-                           struct fb_info *info) 
+                           struct fb_info *info)
 {
-        volatile struct toby_cmap_regs *cmap_regs =
-                nubus_slot_addr(video_slot);
+        struct toby_cmap_regs *cmap_regs = slot_addr;
         unsigned int bpp = info->var.bits_per_pixel;
-        /* use MSBs */
-        unsigned char _red  =~(red>>8);
-        unsigned char _green=~(green>>8);
-        unsigned char _blue =~(blue>>8);
-        unsigned char _regno = (regno << (8 - bpp)) | (0xFF >> bpp);
         unsigned long flags;
 
+        red = ~red;
+        green = ~green;
+        blue = ~blue;
+        regno = (regno << (8 - bpp)) | (0xFF >> bpp);
+
         local_irq_save(flags);
-                
-        nubus_writeb(_regno, &cmap_regs->addr); nop();
-        nubus_writeb(_red, &cmap_regs->lut);    nop();
-        nubus_writeb(_green, &cmap_regs->lut);  nop();
-        nubus_writeb(_blue, &cmap_regs->lut);
+
+        nubus_writeb(regno, &cmap_regs->addr);
+        nop();
+        nubus_writeb(red, &cmap_regs->lut);
+        nop();
+        nubus_writeb(green, &cmap_regs->lut);
+        nop();
+        nubus_writeb(blue, &cmap_regs->lut);
 
         local_irq_restore(flags);
         return 0;
@@ -378,20 +321,18 @@ static int jet_setpalette(unsigned int regno, unsigned int red,
                           unsigned int green, unsigned int blue,
                           struct fb_info *info)
 {
-        volatile struct jet_cmap_regs *cmap_regs =
-                nubus_slot_addr(video_slot);
-        /* use MSBs */
-        unsigned char _red   = (red>>8);
-        unsigned char _green = (green>>8);
-        unsigned char _blue  = (blue>>8);
+        struct jet_cmap_regs *cmap_regs = slot_addr;
         unsigned long flags;
 
         local_irq_save(flags);
-        
-        nubus_writeb(regno, &cmap_regs->addr); nop();
-        nubus_writeb(_red, &cmap_regs->lut); nop();
-        nubus_writeb(_green, &cmap_regs->lut); nop();
-        nubus_writeb(_blue, &cmap_regs->lut);
+
+        nubus_writeb(regno, &cmap_regs->addr);
+        nop();
+        nubus_writeb(red, &cmap_regs->lut);
+        nop();
+        nubus_writeb(green, &cmap_regs->lut);
+        nop();
+        nubus_writeb(blue, &cmap_regs->lut);
 
         local_irq_restore(flags);
         return 0;
@@ -400,53 +341,27 @@ static int jet_setpalette(unsigned int regno, unsigned int red,
 /*
  * Civic framebuffer -- Quadra AV built-in video.  A chip
  * called Sebastian holds the actual color palettes, and
- * apparently, there are two different banks of 512K RAM 
+ * apparently, there are two different banks of 512K RAM
  * which can act as separate framebuffers for doing video
  * input and viewing the screen at the same time!  The 840AV
- * Can add another 1MB RAM to give the two framebuffers 
+ * Can add another 1MB RAM to give the two framebuffers
  * 1MB RAM apiece.
- *
- * FIXME: this doesn't seem to work anymore.
  */
-static int civic_setpalette (unsigned int regno, unsigned int red,
-                             unsigned int green, unsigned int blue,
-                             struct fb_info *info)
+static int civic_setpalette(unsigned int regno, unsigned int red,
+                            unsigned int green, unsigned int blue,
+                            struct fb_info *info)
 {
-        static int lastreg = -1;
         unsigned long flags;
         int clut_status;
         
-        if (info->var.bits_per_pixel > 8) return 1; /* failsafe */
-
-        red   >>= 8;
-        green >>= 8;
-        blue  >>= 8;
+        if (info->var.bits_per_pixel > 8)
+                return 1; /* failsafe */
 
         local_irq_save(flags);
-        
-        /*
-         * Set the register address
-         */
-        nubus_writeb(regno, &civic_cmap_regs->addr); nop();
 
-        /*
-         * Wait for VBL interrupt here;
-         * They're usually not enabled from Penguin, so we won't check
-         */
-#if 0
-        {
-#define CIVIC_VBL_OFFSET        0x120
-                volatile unsigned long *vbl = nubus_readl(civic_cmap_regs->vbl_addr + CIVIC_VBL_OFFSET);
-                /* do interrupt setup stuff here? */
-                *vbl = 0L; nop();       /* clear */
-                *vbl = 1L; nop();       /* set */
-                while (*vbl != 0L)      /* wait for next vbl */
-                {
-                        usleep(10);     /* needed? */
-                }
-                /* do interrupt shutdown stuff here? */
-        }
-#endif
+        /* Set the register address */
+        nubus_writeb(regno, &civic_cmap_regs->addr);
+        nop();
 
         /*
          * Grab a status word and do some checking;
@@ -459,39 +374,52 @@ static int civic_setpalette (unsigned int regno, unsigned int red,
 #if 0
                 if ((clut_status & 0x000D) != 0)
                 {
-                        nubus_writeb(0x00, &civic_cmap_regs->lut); nop();
-                        nubus_writeb(0x00, &civic_cmap_regs->lut); nop();
+                        nubus_writeb(0x00, &civic_cmap_regs->lut);
+                        nop();
+                        nubus_writeb(0x00, &civic_cmap_regs->lut);
+                        nop();
                 }
 #endif
 
-                nubus_writeb(  red, &civic_cmap_regs->lut); nop();
-                nubus_writeb(green, &civic_cmap_regs->lut); nop();
-                nubus_writeb( blue, &civic_cmap_regs->lut); nop();
-                nubus_writeb( 0x00, &civic_cmap_regs->lut); nop();
+                nubus_writeb(red, &civic_cmap_regs->lut);
+                nop();
+                nubus_writeb(green, &civic_cmap_regs->lut);
+                nop();
+                nubus_writeb(blue, &civic_cmap_regs->lut);
+                nop();
+                nubus_writeb(0x00, &civic_cmap_regs->lut);
         }
         else
         {
                 unsigned char junk;
 
-                junk = nubus_readb(&civic_cmap_regs->lut); nop();
-                junk = nubus_readb(&civic_cmap_regs->lut); nop();
-                junk = nubus_readb(&civic_cmap_regs->lut); nop();
-                junk = nubus_readb(&civic_cmap_regs->lut); nop();
+                junk = nubus_readb(&civic_cmap_regs->lut);
+                nop();
+                junk = nubus_readb(&civic_cmap_regs->lut);
+                nop();
+                junk = nubus_readb(&civic_cmap_regs->lut);
+                nop();
+                junk = nubus_readb(&civic_cmap_regs->lut);
+                nop();
 
                 if ((clut_status & 0x000D) != 0)
                 {
-                        nubus_writeb(0x00, &civic_cmap_regs->lut); nop();
-                        nubus_writeb(0x00, &civic_cmap_regs->lut); nop();
+                        nubus_writeb(0x00, &civic_cmap_regs->lut);
+                        nop();
+                        nubus_writeb(0x00, &civic_cmap_regs->lut);
+                        nop();
                 }
 
-                nubus_writeb(  red, &civic_cmap_regs->lut); nop();
-                nubus_writeb(green, &civic_cmap_regs->lut); nop();
-                nubus_writeb( blue, &civic_cmap_regs->lut); nop();
-                nubus_writeb( junk, &civic_cmap_regs->lut); nop();
+                nubus_writeb(red, &civic_cmap_regs->lut);
+                nop();
+                nubus_writeb(green, &civic_cmap_regs->lut);
+                nop();
+                nubus_writeb(blue, &civic_cmap_regs->lut);
+                nop();
+                nubus_writeb(junk, &civic_cmap_regs->lut);
         }
 
         local_irq_restore(flags);
-        lastreg = regno;
         return 0;
 }
 
@@ -500,16 +428,21 @@ static int civic_setpalette (unsigned int regno, unsigned int red,
  * (and the 5300 too, but that's a PowerMac). This function
  * brought to you in part by the ECSC driver for MkLinux.
  */
-
-static int csc_setpalette (unsigned int regno, unsigned int red,
-                           unsigned int green, unsigned int blue,
-                           struct fb_info *info)
+static int csc_setpalette(unsigned int regno, unsigned int red,
+                          unsigned int green, unsigned int blue,
+                          struct fb_info *info)
 {
-        mdelay(1);
+        unsigned long flags;
+
+        local_irq_save(flags);
+
+        udelay(1); /* mklinux on PB 5300 waits for 260 ns */
         nubus_writeb(regno, &csc_cmap_regs->clut_waddr);
-        nubus_writeb(red,   &csc_cmap_regs->clut_data);
+        nubus_writeb(red, &csc_cmap_regs->clut_data);
         nubus_writeb(green, &csc_cmap_regs->clut_data);
-        nubus_writeb(blue,  &csc_cmap_regs->clut_data);
+        nubus_writeb(blue, &csc_cmap_regs->clut_data);
+
+        local_irq_restore(flags);
         return 0;
 }
 
@@ -518,10 +451,10 @@ static int macfb_setcolreg(unsigned regno, unsigned red, unsigned green,
                            struct fb_info *fb_info)
 {
         /*
-         *  Set a single color register. The values supplied are
-         *  already rounded down to the hardware's capabilities
-         *  (according to the entries in the `var' structure). Return
-         *  != 0 for invalid regno.
+         * Set a single color register. The values supplied are
+         * already rounded down to the hardware's capabilities
+         * (according to the entries in the `var' structure).
+         * Return non-zero for invalid regno.
          */
         
         if (regno >= fb_info->cmap.len)
@@ -536,8 +469,8 @@ static int macfb_setcolreg(unsigned regno, unsigned red, unsigned green,
                 case 4:
                 case 8:
                         if (macfb_setpalette)
-                                macfb_setpalette(regno, red, green, blue,
-                                                 fb_info);
+                                macfb_setpalette(regno, red >> 8, green >> 8,
+                                                 blue >> 8, fb_info);
                         else
                                 return 1;
                         break;
@@ -555,28 +488,22 @@ static int macfb_setcolreg(unsigned regno, unsigned red, unsigned green,
                         } else {
                                 /* 0:5:6:5 */
                                 ((u32*) (fb_info->pseudo_palette))[regno] =
-                                        ((red   & 0xf800)      ) |
+                                        ((red   & 0xf800) >>  0) |
                                         ((green & 0xfc00) >>  5) |
                                         ((blue  & 0xf800) >> 11);
                         }
                         break;
-                        /* I'm pretty sure that one or the other of these
-                           doesn't exist on 68k Macs */
+                /*
+                 * 24-bit colour almost doesn't exist on 68k Macs --
+                 * http://support.apple.com/kb/TA28634 (Old Article: 10992)
+                 */
                 case 24:
-                        red   >>= 8;
-                        green >>= 8;
-                        blue  >>= 8;
-                        ((u32 *)(fb_info->pseudo_palette))[regno] =
-                                (red   << fb_info->var.red.offset)   |
-                                (green << fb_info->var.green.offset) |
-                                (blue  << fb_info->var.blue.offset);
-                        break;
                 case 32:
                         red   >>= 8;
                         green >>= 8;
                         blue  >>= 8;
                         ((u32 *)(fb_info->pseudo_palette))[regno] =
-                                (red   << fb_info->var.red.offset)   |
+                                (red   << fb_info->var.red.offset) |
                                 (green << fb_info->var.green.offset) |
                                 (blue  << fb_info->var.blue.offset);
                         break;
@@ -597,25 +524,24 @@ static struct fb_ops macfb_ops = {
 static void __init macfb_setup(char *options)
 {
         char *this_opt;
-        
+
         if (!options || !*options)
                 return;
-        
+
         while ((this_opt = strsep(&options, ",")) != NULL) {
-                if (!*this_opt) continue;
-                
-                if (! strcmp(this_opt, "inverse"))
-                        inverse=1;
-                /* This means "turn on experimental CLUT code" */
-                else if (!strcmp(this_opt, "vidtest"))
-                        vidtest=1;
+                if (!*this_opt)
+                        continue;
+
+                if (!strcmp(this_opt, "inverse"))
+                        inverse = 1;
+                else
+                        if (!strcmp(this_opt, "vidtest"))
+                                vidtest = 1; /* enable experimental CLUT code */
         }
 }
 
 static void __init iounmap_macfb(void)
 {
-        if (valkyrie_cmap_regs)
-                iounmap(valkyrie_cmap_regs);
         if (dafb_cmap_regs)
                 iounmap(dafb_cmap_regs);
         if (v8_brazil_cmap_regs)
@@ -642,48 +568,55 @@ static int __init macfb_init(void)
         if (!MACH_IS_MAC) 
                 return -ENODEV;
 
-        /* There can only be one internal video controller anyway so
-           we're not too worried about this */
+        if (mac_bi_data.id == MAC_MODEL_Q630 ||
+            mac_bi_data.id == MAC_MODEL_P588)
+                return -ENODEV; /* See valkyriefb.c */
+
         macfb_defined.xres = mac_bi_data.dimensions & 0xFFFF;
         macfb_defined.yres = mac_bi_data.dimensions >> 16;
         macfb_defined.bits_per_pixel = mac_bi_data.videodepth;
+
         macfb_fix.line_length = mac_bi_data.videorow;
-        macfb_fix.smem_len = macfb_fix.line_length * macfb_defined.yres;
+        macfb_fix.smem_len    = macfb_fix.line_length * macfb_defined.yres;
         /* Note: physical address (since 2.1.127) */
-        macfb_fix.smem_start = mac_bi_data.videoaddr;
-        /* This is actually redundant with the initial mappings.
-           However, there are some non-obvious aspects to the way
-           those mappings are set up, so this is in fact the safest
-           way to ensure that this driver will work on every possible
-           Mac */
-        fb_info.screen_base = ioremap(mac_bi_data.videoaddr, macfb_fix.smem_len);
-        
-        printk("macfb: framebuffer at 0x%08lx, mapped to 0x%p, size %dk\n",
-               macfb_fix.smem_start, fb_info.screen_base, macfb_fix.smem_len/1024);
-        printk("macfb: mode is %dx%dx%d, linelength=%d\n",
-               macfb_defined.xres, macfb_defined.yres, macfb_defined.bits_per_pixel, macfb_fix.line_length);
-        
+        macfb_fix.smem_start  = mac_bi_data.videoaddr;
+
         /*
-         *      Fill in the available video resolution
+         * This is actually redundant with the initial mappings.
+         * However, there are some non-obvious aspects to the way
+         * those mappings are set up, so this is in fact the safest
+         * way to ensure that this driver will work on every possible Mac
          */
-         
-        macfb_defined.xres_virtual   = macfb_defined.xres;
-        macfb_defined.yres_virtual   = macfb_defined.yres;
-        macfb_defined.height = PIXEL_TO_MM(macfb_defined.yres);
-        macfb_defined.width  = PIXEL_TO_MM(macfb_defined.xres);  
+        fb_info.screen_base = ioremap(mac_bi_data.videoaddr,
+                                      macfb_fix.smem_len);
+        if (!fb_info.screen_base)
+                return -ENODEV;
 
-        printk("macfb: scrolling: redraw\n");
+        printk("macfb: framebuffer at 0x%08lx, mapped to 0x%p, size %dk\n",
+               macfb_fix.smem_start, fb_info.screen_base,
+               macfb_fix.smem_len / 1024);
+        printk("macfb: mode is %dx%dx%d, linelength=%d\n",
+               macfb_defined.xres, macfb_defined.yres,
+               macfb_defined.bits_per_pixel, macfb_fix.line_length);
+
+        /* Fill in the available video resolution */
+        macfb_defined.xres_virtual = macfb_defined.xres;
         macfb_defined.yres_virtual = macfb_defined.yres;
+        macfb_defined.height       = PIXEL_TO_MM(macfb_defined.yres);
+        macfb_defined.width        = PIXEL_TO_MM(macfb_defined.xres);
 
-        /* some dummy values for timing to make fbset happy */
-        macfb_defined.pixclock     = 10000000 / macfb_defined.xres * 1000 / macfb_defined.yres;
+        /* Some dummy values for timing to make fbset happy */
+        macfb_defined.pixclock     = 10000000 / macfb_defined.xres *
+                                     1000 / macfb_defined.yres;
         macfb_defined.left_margin  = (macfb_defined.xres / 8) & 0xf8;
         macfb_defined.hsync_len    = (macfb_defined.xres / 8) & 0xf8;
 
         switch (macfb_defined.bits_per_pixel) {
         case 1:
-                /* XXX: I think this will catch any program that tries
-                   to do FBIO_PUTCMAP when the visual is monochrome */
+                /*
+                 * XXX: I think this will catch any program that tries
+                 * to do FBIO_PUTCMAP when the visual is monochrome.
+                 */
                 macfb_defined.red.length = macfb_defined.bits_per_pixel;
                 macfb_defined.green.length = macfb_defined.bits_per_pixel;
                 macfb_defined.blue.length = macfb_defined.bits_per_pixel;
@@ -708,53 +641,52 @@ static int __init macfb_init(void)
                 macfb_defined.green.length = 5;
                 macfb_defined.blue.offset = 0;
                 macfb_defined.blue.length = 5;
-                printk("macfb: directcolor: "
-                       "size=1:5:5:5, shift=15:10:5:0\n");
                 video_cmap_len = 16;
-                /* Should actually be FB_VISUAL_DIRECTCOLOR, but this
-                   works too */
+                /*
+                 * Should actually be FB_VISUAL_DIRECTCOLOR, but this
+                 * works too
+                 */
                 macfb_fix.visual = FB_VISUAL_TRUECOLOR;
                 break;
         case 24:
         case 32:
-                /* XXX: have to test these... can any 68k Macs
-                   actually do this on internal video? */
                 macfb_defined.red.offset = 16;
                 macfb_defined.red.length = 8;
                 macfb_defined.green.offset = 8;
                 macfb_defined.green.length = 8;
                 macfb_defined.blue.offset = 0;
                 macfb_defined.blue.length = 8;
-                printk("macfb: truecolor: "
-                       "size=0:8:8:8, shift=0:16:8:0\n");
                 video_cmap_len = 16;
                 macfb_fix.visual = FB_VISUAL_TRUECOLOR;
+                break;
         default:
                 video_cmap_len = 0;
                 macfb_fix.visual = FB_VISUAL_MONO01;
-                printk("macfb: unknown or unsupported bit depth: %d\n", macfb_defined.bits_per_pixel);
+                printk("macfb: unknown or unsupported bit depth: %d\n",
+                       macfb_defined.bits_per_pixel);
                 break;
         }
         
-        /* Hardware dependent stuff */
-        /*  We take a wild guess that if the video physical address is
-         *  in nubus slot space, that the nubus card is driving video.
-         *  Penguin really ought to tell us whether we are using internal
-         *  video or not.
+        /*
+         * We take a wild guess that if the video physical address is
+         * in nubus slot space, that the nubus card is driving video.
+         * Penguin really ought to tell us whether we are using internal
+         * video or not.
+         * Hopefully we only find one of them.  Otherwise our NuBus
+         * code is really broken :-)
          */
-        /* Hopefully we only find one of them.  Otherwise our NuBus
-           code is really broken :-) */
 
-        while ((ndev = nubus_find_type(NUBUS_CAT_DISPLAY, NUBUS_TYPE_VIDEO, ndev))
-                != NULL)
+        while ((ndev = nubus_find_type(NUBUS_CAT_DISPLAY,
+                                       NUBUS_TYPE_VIDEO, ndev)))
         {
-                if (!(mac_bi_data.videoaddr >= ndev->board->slot_addr
-                      && (mac_bi_data.videoaddr <
-                          (unsigned long)nubus_slot_addr(ndev->board->slot+1))))
+                unsigned long base = ndev->board->slot_addr;
+
+                if (mac_bi_data.videoaddr < base ||
+                    mac_bi_data.videoaddr - base > 0xFFFFFF)
                         continue;
+
                 video_is_nubus = 1;
-                /* We should probably just use the slot address... */
-                video_slot = ndev->board->slot;
+                slot_addr = (unsigned char *)base;
 
                 switch(ndev->dr_hw) {
                 case NUBUS_DRHW_APPLE_MDC:
@@ -771,7 +703,7 @@ static int __init macfb_init(void)
                         strcpy(macfb_fix.id, "Jet");
                         macfb_setpalette = jet_setpalette;
                         macfb_defined.activate = FB_ACTIVATE_NOW;
-                        break;                  
+                        break;
                 default:
                         strcpy(macfb_fix.id, "Generic NuBus");
                         break;
@@ -779,30 +711,19 @@ static int __init macfb_init(void)
         }
 
         /* If it's not a NuBus card, it must be internal video */
-        /* FIXME: this function is getting way too big.  (this driver
-           is too...) */
         if (!video_is_nubus)
-                switch( mac_bi_data.id )
-                {
-                        /* Valkyrie Quadras */
-                case MAC_MODEL_Q630:
-                        /* I'm not sure about this one */
-                case MAC_MODEL_P588:
-                        strcpy(macfb_fix.id, "Valkyrie");
-                        macfb_setpalette = valkyrie_setpalette;
-                        macfb_defined.activate = FB_ACTIVATE_NOW;
-                        valkyrie_cmap_regs = ioremap(DAC_BASE, 0x1000);
-                        break;
-
-                        /* DAFB Quadras */
-                        /* Note: these first four have the v7 DAFB, which is
-                           known to be rather unlike the ones used in the
-                           other models */
+                switch (mac_bi_data.id) {
+                /*
+                 * DAFB Quadras
+                 * Note: these first four have the v7 DAFB, which is
+                 * known to be rather unlike the ones used in the
+                 * other models
+                 */
                 case MAC_MODEL_P475:
                 case MAC_MODEL_P475F:
                 case MAC_MODEL_P575:
                 case MAC_MODEL_Q605:
-        
+
                 case MAC_MODEL_Q800:
                 case MAC_MODEL_Q650:
                 case MAC_MODEL_Q610:
@@ -817,17 +738,21 @@ static int __init macfb_init(void)
                         dafb_cmap_regs = ioremap(DAFB_BASE, 0x1000);
                         break;
 
-                        /* LC II uses the V8 framebuffer */
+                /*
+                 * LC II uses the V8 framebuffer
+                 */
                 case MAC_MODEL_LCII:
                         strcpy(macfb_fix.id, "V8");
                         macfb_setpalette = v8_brazil_setpalette;
                         macfb_defined.activate = FB_ACTIVATE_NOW;
                         v8_brazil_cmap_regs = ioremap(DAC_BASE, 0x1000);
                         break;
-                
-                        /* IIvi, IIvx use the "Brazil" framebuffer (which is
-                           very much like the V8, it seems, and probably uses
-                           the same DAC) */
+
+                /*
+                 * IIvi, IIvx use the "Brazil" framebuffer (which is
+                 * very much like the V8, it seems, and probably uses
+                 * the same DAC)
+                 */
                 case MAC_MODEL_IIVI:
                 case MAC_MODEL_IIVX:
                 case MAC_MODEL_P600:
@@ -836,12 +761,14 @@ static int __init macfb_init(void)
                         macfb_defined.activate = FB_ACTIVATE_NOW;
                         v8_brazil_cmap_regs = ioremap(DAC_BASE, 0x1000);
                         break;
-                
-                        /* LC III (and friends) use the Sonora framebuffer */
-                        /* Incidentally this is also used in the non-AV models
-                           of the x100 PowerMacs */
-                        /* These do in fact seem to use the same DAC interface
-                           as the LC II. */
+
+                /*
+                 * LC III (and friends) use the Sonora framebuffer
+                 * Incidentally this is also used in the non-AV models
+                 * of the x100 PowerMacs
+                 * These do in fact seem to use the same DAC interface
+                 * as the LC II.
+                 */
                 case MAC_MODEL_LCIII:
                 case MAC_MODEL_P520:
                 case MAC_MODEL_P550:
@@ -852,9 +779,11 @@ static int __init macfb_init(void)
                         v8_brazil_cmap_regs = ioremap(DAC_BASE, 0x1000);
                         break;
 
-                        /* IIci and IIsi use the infamous RBV chip
-                           (the IIsi is just a rebadged and crippled
-                           IIci in a different case, BTW) */
+                /*
+                 * IIci and IIsi use the infamous RBV chip
+                 * (the IIsi is just a rebadged and crippled
+                 * IIci in a different case, BTW)
+                 */
                 case MAC_MODEL_IICI:
                 case MAC_MODEL_IISI:
                         macfb_setpalette = rbv_setpalette;
@@ -863,7 +792,9 @@ static int __init macfb_init(void)
                         rbv_cmap_regs = ioremap(DAC_BASE, 0x1000);
                         break;
 
-                        /* AVs use the Civic framebuffer */
+                /*
+                 * AVs use the Civic framebuffer
+                 */
                 case MAC_MODEL_Q840:
                 case MAC_MODEL_C660:
                         macfb_setpalette = civic_setpalette;
@@ -873,15 +804,10 @@ static int __init macfb_init(void)
                         break;
 
                 
-                        /* Write a setpalette function for your machine, then
-                           you can add something similar here.  These are
-                           grouped by classes of video chipsets.  Some of this
-                           information is from the VideoToolbox "Bugs" web
-                           page at
-                           http://rajsky.psych.nyu.edu/Tips/VideoBugs.html */
-
-                        /* Assorted weirdos */
-                        /* We think this may be like the LC II */
+                /*
+                 * Assorted weirdos
+                 * We think this may be like the LC II
+                 */
                 case MAC_MODEL_LC:
                         if (vidtest) {
                                 macfb_setpalette = v8_brazil_setpalette;
@@ -891,7 +817,10 @@ static int __init macfb_init(void)
                         }
                         strcpy(macfb_fix.id, "LC");
                         break;
-                        /* We think this may be like the LC II */
+
+                /*
+                 * We think this may be like the LC II
+                 */
                 case MAC_MODEL_CCL:
                         if (vidtest) {
                                 macfb_setpalette = v8_brazil_setpalette;
@@ -902,31 +831,42 @@ static int __init macfb_init(void)
                         strcpy(macfb_fix.id, "Color Classic");
                         break;
 
-                        /* And we *do* mean "weirdos" */
+                /*
+                 * And we *do* mean "weirdos"
+                 */
                 case MAC_MODEL_TV:
                         strcpy(macfb_fix.id, "Mac TV");
                         break;
 
-                        /* These don't have colour, so no need to worry */
+                /*
+                 * These don't have colour, so no need to worry
+                 */
                 case MAC_MODEL_SE30:
                 case MAC_MODEL_CLII:
                         strcpy(macfb_fix.id, "Monochrome");
                         break;
 
-                        /* Powerbooks are particularly difficult.  Many of
-                           them have separate framebuffers for external and
-                           internal video, which is admittedly pretty cool,
-                           but will be a bit of a headache to support here.
-                           Also, many of them are grayscale, and we don't
-                           really support that. */
-
+                /*
+                 * Powerbooks are particularly difficult.  Many of
+                 * them have separate framebuffers for external and
+                 * internal video, which is admittedly pretty cool,
+                 * but will be a bit of a headache to support here.
+                 * Also, many of them are grayscale, and we don't
+                 * really support that.
+                 */
+
+                /*
+                 * Slot 0 ROM says TIM. No external video. B&W.
+                 */
                 case MAC_MODEL_PB140:
                 case MAC_MODEL_PB145:
                 case MAC_MODEL_PB170:
                         strcpy(macfb_fix.id, "DDC");
                         break;
 
-                        /* Internal is GSC, External (if present) is ViSC */
+                /*
+                 * Internal is GSC, External (if present) is ViSC
+                 */
                 case MAC_MODEL_PB150:   /* no external video */
                 case MAC_MODEL_PB160:
                 case MAC_MODEL_PB165:
@@ -936,13 +876,17 @@ static int __init macfb_init(void)
                         strcpy(macfb_fix.id, "GSC");
                         break;
 
-                        /* Internal is TIM, External is ViSC */
+                /*
+                 * Internal is TIM, External is ViSC
+                 */
                 case MAC_MODEL_PB165C:
                 case MAC_MODEL_PB180C:
                         strcpy(macfb_fix.id, "TIM");
                         break;
 
-                        /* Internal is CSC, External is Keystone+Ariel. */
+                /*
+                 * Internal is CSC, External is Keystone+Ariel.
+                 */
                 case MAC_MODEL_PB190:   /* external video is optional */
                 case MAC_MODEL_PB520:
                 case MAC_MODEL_PB250:
@@ -954,7 +898,7 @@ static int __init macfb_init(void)
                         strcpy(macfb_fix.id, "CSC");
                         csc_cmap_regs = ioremap(CSC_BASE, 0x1000);
                         break;
-                
+
                 default:
                         strcpy(macfb_fix.id, "Unknown");
                         break;
@@ -969,7 +913,7 @@ static int __init macfb_init(void)
         err = fb_alloc_cmap(&fb_info.cmap, video_cmap_len, 0);
         if (err)
                 goto fail_unmap;
-        
+
         err = register_framebuffer(&fb_info);
         if (err)
                 goto fail_dealloc;
diff --git a/drivers/video/macmodes.c b/drivers/video/macmodes.c
index 083f60321ed8..af86c081d2be 100644
--- a/drivers/video/macmodes.c
+++ b/drivers/video/macmodes.c
@@ -33,6 +33,10 @@
 
 static const struct fb_videomode mac_modedb[] = {
     {
+        /* 512x384, 60Hz, Non-Interlaced (15.67 MHz dot clock) */
+        "mac2", 60, 512, 384, 63828, 80, 16, 19, 1, 32, 3,
+        0, FB_VMODE_NONINTERLACED
+    }, {
         /* 640x480, 60 Hz, Non-Interlaced (25.175 MHz dotclock) */
         "mac5", 60, 640, 480, 39722, 32, 32, 33, 10, 96, 2,
         0, FB_VMODE_NONINTERLACED
@@ -41,6 +45,10 @@ static const struct fb_videomode mac_modedb[] = {
         "mac6", 67, 640, 480, 33334, 80, 80, 39, 3, 64, 3,
         0, FB_VMODE_NONINTERLACED
     }, {
+        /* 640x870, 75Hz (portrait), Non-Interlaced (57.28 MHz dot clock) */
+        "mac7", 75, 640, 870, 17457, 80, 32, 42, 3, 80, 3,
+        0, FB_VMODE_NONINTERLACED
+    }, {
         /* 800x600, 56 Hz, Non-Interlaced (36.00 MHz dotclock) */
         "mac9", 56, 800, 600, 27778, 112, 40, 22, 1, 72, 2,
         FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
@@ -105,10 +113,6 @@ static const struct fb_videomode mac_modedb[] = {
         "mac1", 60, 512, 384, pixclock, left, right, upper, lower, hslen, vslen,
         sync, FB_VMODE_INTERLACED
     }, {
-        /* VMODE_512_384_60: 512x384, 60Hz, Non-Interlaced */
-        "mac2", 60, 512, 384, pixclock, left, right, upper, lower, hslen, vslen,
-        sync, FB_VMODE_NONINTERLACED
-    }, {
         /* VMODE_640_480_50I: 640x480, 50Hz, Interlaced (PAL) */
         "mac3", 50, 640, 480, pixclock, left, right, upper, lower, hslen, vslen,
         sync, FB_VMODE_INTERLACED
@@ -117,10 +121,6 @@ static const struct fb_videomode mac_modedb[] = {
         "mac4", 60, 640, 480, pixclock, left, right, upper, lower, hslen, vslen,
         sync, FB_VMODE_INTERLACED
     }, {
-        /* VMODE_640_870_75P: 640x870, 75Hz (portrait), Non-Interlaced */
-        "mac7", 75, 640, 870, pixclock, left, right, upper, lower, hslen, vslen,
-        sync, FB_VMODE_NONINTERLACED
-    }, {
         /* VMODE_768_576_50I: 768x576, 50Hz (PAL full frame), Interlaced */
         "mac8", 50, 768, 576, pixclock, left, right, upper, lower, hslen, vslen,
         sync, FB_VMODE_INTERLACED
@@ -134,38 +134,42 @@ static const struct fb_videomode mac_modedb[] = {
      *
      *  These MUST be ordered in
      *    - increasing resolution
-     *    - decreasing refresh rate
+     *    - decreasing pixel clock period
      */
 
 static const struct mode_map {
     int vmode;
     const struct fb_videomode *mode;
 } mac_modes[] = {
+    /* 512x384 */
+    { VMODE_512_384_60, &mac_modedb[0] },
     /* 640x480 */
-    { VMODE_640_480_67, &mac_modedb[1] },
-    { VMODE_640_480_60, &mac_modedb[0] },
+    { VMODE_640_480_60, &mac_modedb[1] },
+    { VMODE_640_480_67, &mac_modedb[2] },
+    /* 640x870 */
+    { VMODE_640_870_75P, &mac_modedb[3] },
     /* 800x600 */
-    { VMODE_800_600_75, &mac_modedb[5] },
-    { VMODE_800_600_72, &mac_modedb[4] },
-    { VMODE_800_600_60, &mac_modedb[3] },
-    { VMODE_800_600_56, &mac_modedb[2] },
+    { VMODE_800_600_56, &mac_modedb[4] },
+    { VMODE_800_600_60, &mac_modedb[5] },
+    { VMODE_800_600_75, &mac_modedb[7] },
+    { VMODE_800_600_72, &mac_modedb[6] },
     /* 832x624 */
-    { VMODE_832_624_75, &mac_modedb[6] },
+    { VMODE_832_624_75, &mac_modedb[8] },
     /* 1024x768 */
-    { VMODE_1024_768_75, &mac_modedb[10] },
-    { VMODE_1024_768_75V, &mac_modedb[9] },
-    { VMODE_1024_768_70, &mac_modedb[8] },
-    { VMODE_1024_768_60, &mac_modedb[7] },
+    { VMODE_1024_768_60, &mac_modedb[9] },
+    { VMODE_1024_768_70, &mac_modedb[10] },
+    { VMODE_1024_768_75V, &mac_modedb[11] },
+    { VMODE_1024_768_75, &mac_modedb[12] },
     /* 1152x768 */
-    { VMODE_1152_768_60, &mac_modedb[14] },
+    { VMODE_1152_768_60, &mac_modedb[16] },
     /* 1152x870 */
-    { VMODE_1152_870_75, &mac_modedb[11] },
+    { VMODE_1152_870_75, &mac_modedb[13] },
     /* 1280x960 */
-    { VMODE_1280_960_75, &mac_modedb[12] },
+    { VMODE_1280_960_75, &mac_modedb[14] },
     /* 1280x1024 */
-    { VMODE_1280_1024_75, &mac_modedb[13] },
+    { VMODE_1280_1024_75, &mac_modedb[15] },
     /* 1600x1024 */
-    { VMODE_1600_1024_60, &mac_modedb[15] },
+    { VMODE_1600_1024_60, &mac_modedb[17] },
     { -1, NULL }
 };
 
@@ -299,7 +303,6 @@ EXPORT_SYMBOL(mac_vmode_to_var);
 int mac_var_to_vmode(const struct fb_var_screeninfo *var, int *vmode,
                      int *cmode)
 {
-    const struct fb_videomode *mode = NULL;
     const struct mode_map *map;
 
     if (var->bits_per_pixel <= 8)
@@ -311,8 +314,13 @@ int mac_var_to_vmode(const struct fb_var_screeninfo *var, int *vmode,
     else
         return -EINVAL;
 
+    /*
+     * Find the mac_mode with a matching resolution or failing that, the
+     * closest larger resolution. Skip modes with a shorter pixel clock period.
+     */
     for (map = mac_modes; map->vmode != -1; map++) {
-        mode = map->mode;
+        const struct fb_videomode *mode = map->mode;
+
         if (var->xres > mode->xres || var->yres > mode->yres)
             continue;
         if (var->xres_virtual > mode->xres || var->yres_virtual > mode->yres)
@@ -322,6 +330,24 @@ int mac_var_to_vmode(const struct fb_var_screeninfo *var, int *vmode,
         if ((var->vmode & FB_VMODE_MASK) != mode->vmode)
             continue;
         *vmode = map->vmode;
+
+        /*
+         * Having found a good resolution, find the matching pixel clock
+         * or failing that, the closest longer pixel clock period.
+         */
+        map++;
+        while (map->vmode != -1) {
+            const struct fb_videomode *clk_mode = map->mode;
+
+            if (mode->xres != clk_mode->xres || mode->yres != clk_mode->yres)
+                break;
+            if (var->pixclock > mode->pixclock)
+                break;
+            if (mode->vmode != clk_mode->vmode)
+                continue;
+            *vmode = map->vmode;
+            map++;
+        }
         return 0;
     }
     return -EINVAL;
diff --git a/drivers/video/matrox/g450_pll.c b/drivers/video/matrox/g450_pll.c
index 09f6e045d5be..c15f8a57498e 100644
--- a/drivers/video/matrox/g450_pll.c
+++ b/drivers/video/matrox/g450_pll.c
@@ -368,7 +368,8 @@ static int __g450_setclk(struct matrox_fb_info *minfo, unsigned int fout,
                                         M1064_XDVICLKCTRL_C1DVICLKEN |
                                         M1064_XDVICLKCTRL_DVILOOPCTL |
                                         M1064_XDVICLKCTRL_P1LOOPBWDTCTL;
-                                matroxfb_DAC_out(minfo, M1064_XDVICLKCTRL, tmp);
+                                /* Setting this breaks PC systems so don't do it */
+                                /* matroxfb_DAC_out(minfo, M1064_XDVICLKCTRL, tmp); */
                                 matroxfb_DAC_out(minfo, M1064_XPWRCTRL,
                                                  xpwrctrl);
 
diff --git a/drivers/video/matrox/i2c-matroxfb.c b/drivers/video/matrox/i2c-matroxfb.c
index f3728ab262f8..403b14445a78 100644
--- a/drivers/video/matrox/i2c-matroxfb.c
+++ b/drivers/video/matrox/i2c-matroxfb.c
@@ -13,6 +13,7 @@
 #include "matroxfb_base.h"
 #include "matroxfb_maven.h"
 #include <linux/i2c.h>
+#include <linux/slab.h>
 #include <linux/i2c-algo-bit.h>
 
 /* MGA-TVO I2C for G200, G400 */
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index 7064fb4427b6..052dd9f0b760 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -113,6 +113,7 @@
 #include "matroxfb_g450.h"
 #include <linux/matroxfb.h>
 #include <linux/interrupt.h>
+#include <linux/slab.h>
 #include <linux/uaccess.h>
 
 #ifdef CONFIG_PPC_PMAC
diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c
index 78414baa5a54..d7112c39614b 100644
--- a/drivers/video/matrox/matroxfb_crtc2.c
+++ b/drivers/video/matrox/matroxfb_crtc2.c
@@ -15,6 +15,7 @@
 #include "matroxfb_misc.h"
 #include "matroxfb_DAC1064.h"
 #include <linux/matroxfb.h>
+#include <linux/slab.h>
 #include <linux/uaccess.h>
 
 /* **************************************************** */
diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c
index 91af9159111f..1e3e8f19783e 100644
--- a/drivers/video/matrox/matroxfb_maven.c
+++ b/drivers/video/matrox/matroxfb_maven.c
@@ -17,6 +17,7 @@
 #include "matroxfb_DAC1064.h"
 #include <linux/i2c.h>
 #include <linux/matroxfb.h>
+#include <linux/slab.h>
 #include <asm/div64.h>
 
 #define MGATVO_B        1
diff --git a/drivers/video/maxinefb.c b/drivers/video/maxinefb.c
index 5e91c2b30af9..5cf52d3c8e75 100644
--- a/drivers/video/maxinefb.c
+++ b/drivers/video/maxinefb.c
@@ -28,7 +28,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/fb.h>
@@ -92,6 +91,9 @@ static int maxinefb_setcolreg(unsigned regno, unsigned red, unsigned green,
         /* value to be written into the palette reg. */
         unsigned long hw_colorvalue = 0;
 
+        if (regno > 255)
+                return 1;
+
         red   >>= 8;    /* The cmap fields are 16 bits    */
         green >>= 8;    /* wide, but the harware colormap */
         blue  >>= 8;    /* registers are only 8 bits wide */
diff --git a/drivers/video/mb862xx/Makefile b/drivers/video/mb862xx/Makefile
index 07664814bb1d..d7777714166b 100644
--- a/drivers/video/mb862xx/Makefile
+++ b/drivers/video/mb862xx/Makefile
@@ -2,4 +2,4 @@
 # Makefile for the MB862xx framebuffer driver
 #
 
-obj-$(CONFIG_FB_MB862XX)        := mb862xxfb.o
+obj-$(CONFIG_FB_MB862XX)        := mb862xxfb.o mb862xxfb_accel.o
diff --git a/drivers/video/mb862xx/mb862xxfb.c b/drivers/video/mb862xx/mb862xxfb.c
index a28e3cfbbf70..8280a58a0e55 100644
--- a/drivers/video/mb862xx/mb862xxfb.c
+++ b/drivers/video/mb862xx/mb862xxfb.c
@@ -31,15 +31,6 @@
 #define CARMINE_MEM_SIZE        0x8000000
 #define DRV_NAME                "mb862xxfb"
 
-#if defined(CONFIG_LWMON5)
-static struct mb862xx_gc_mode lwmon5_gc_mode = {
-        /* Mode for Sharp LQ104V1DG61 TFT LCD Panel */
-        { "640x480", 60, 640, 480, 40000, 48, 16, 32, 11, 96, 2, 0, 0, 0 },
-        /* 16 bits/pixel, 32MB, 100MHz, SDRAM memory mode value */
-        16, 0x2000000, GC_CCF_COT_100, 0x414fb7f2
-};
-#endif
-
 #if defined(CONFIG_SOCRATES)
 static struct mb862xx_gc_mode socrates_gc_mode = {
         /* Mode for Prime View PM070WL4 TFT LCD Panel */
@@ -214,6 +205,8 @@ static int mb862xxfb_set_par(struct fb_info *fbi)
         unsigned long reg, sc;
 
         dev_dbg(par->dev, "%s\n", __func__);
+        if (par->type == BT_CORALP)
+                mb862xxfb_init_accel(fbi, fbi->var.xres);
 
         if (par->pre_init)
                 return 0;
@@ -453,6 +446,18 @@ static ssize_t mb862xxfb_show_dispregs(struct device *dev,
                 ptr += sprintf(ptr, "%08x = %08x\n",
                                reg, inreg(disp, reg));
 
+        for (reg = 0x400; reg <= 0x410; reg += 4)
+                ptr += sprintf(ptr, "geo %08x = %08x\n",
+                               reg, inreg(geo, reg));
+
+        for (reg = 0x400; reg <= 0x410; reg += 4)
+                ptr += sprintf(ptr, "draw %08x = %08x\n",
+                               reg, inreg(draw, reg));
+
+        for (reg = 0x440; reg <= 0x450; reg += 4)
+                ptr += sprintf(ptr, "draw %08x = %08x\n",
+                               reg, inreg(draw, reg));
+
         return ptr - buf;
 }
 
@@ -586,10 +591,6 @@ static int __devinit of_platform_mb862xx_probe(struct of_device *ofdev,
                 goto irqdisp;
         }
 
-#if defined(CONFIG_LWMON5)
-        par->gc_mode = &lwmon5_gc_mode;
-#endif
-
 #if defined(CONFIG_SOCRATES)
         par->gc_mode = &socrates_gc_mode;
 #endif
diff --git a/drivers/video/mb862xx/mb862xxfb.h b/drivers/video/mb862xx/mb862xxfb.h
index c4c8f4dd2217..d7e7cb76bbf2 100644
--- a/drivers/video/mb862xx/mb862xxfb.h
+++ b/drivers/video/mb862xx/mb862xxfb.h
@@ -61,6 +61,8 @@ struct mb862xxfb_par {
         u32                     pseudo_palette[16];
 };
 
+extern void mb862xxfb_init_accel(struct fb_info *info, int xres);
+
 #if defined(CONFIG_FB_MB862XX_LIME) && defined(CONFIG_FB_MB862XX_PCI_GDC)
 #error  "Select Lime GDC or CoralP/Carmine support, but not both together"
 #endif
diff --git a/drivers/video/mb862xx/mb862xxfb_accel.c b/drivers/video/mb862xx/mb862xxfb_accel.c
new file mode 100644
index 000000000000..fe92eed6da70
--- /dev/null
+++ b/drivers/video/mb862xx/mb862xxfb_accel.c
@@ -0,0 +1,335 @@
+/*
+ * drivers/mb862xx/mb862xxfb_accel.c
+ *
+ * Fujitsu Carmine/Coral-P(A)/Lime framebuffer driver acceleration support
+ *
+ * (C) 2007 Alexander Shishkin <virtuoso@slind.org>
+ * (C) 2009 Valentin Sitdikov <v.sitdikov@gmail.com>
+ * (C) 2009 Siemens AG
+ *
+ * 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.
+ *
+ */
+#include <linux/fb.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/slab.h>
+#if defined(CONFIG_OF)
+#include <linux/of_platform.h>
+#endif
+#include "mb862xxfb.h"
+#include "mb862xx_reg.h"
+#include "mb862xxfb_accel.h"
+
+static void mb862xxfb_write_fifo(u32 count, u32 *data, struct fb_info *info)
+{
+        struct mb862xxfb_par *par = info->par;
+        static u32 free;
+
+        u32 total = 0;
+        while (total < count) {
+                if (free) {
+                        outreg(geo, GDC_GEO_REG_INPUT_FIFO, data[total]);
+                        total++;
+                        free--;
+                } else {
+                        free = (u32) inreg(draw, GDC_REG_FIFO_COUNT);
+                }
+        }
+}
+
+static void mb86290fb_copyarea(struct fb_info *info,
+                               const struct fb_copyarea *area)
+{
+        __u32 cmd[6];
+
+        cmd[0] = (GDC_TYPE_SETREGISTER << 24) | (1 << 16) | GDC_REG_MODE_BITMAP;
+        /* Set raster operation */
+        cmd[1] = (2 << 7) | (GDC_ROP_COPY << 9);
+        cmd[2] = GDC_TYPE_BLTCOPYP << 24;
+
+        if (area->sx >= area->dx && area->sy >= area->dy)
+                cmd[2] |= GDC_CMD_BLTCOPY_TOP_LEFT << 16;
+        else if (area->sx >= area->dx && area->sy <= area->dy)
+                cmd[2] |= GDC_CMD_BLTCOPY_BOTTOM_LEFT << 16;
+        else if (area->sx <= area->dx && area->sy >= area->dy)
+                cmd[2] |= GDC_CMD_BLTCOPY_TOP_RIGHT << 16;
+        else
+                cmd[2] |= GDC_CMD_BLTCOPY_BOTTOM_RIGHT << 16;
+
+        cmd[3] = (area->sy << 16) | area->sx;
+        cmd[4] = (area->dy << 16) | area->dx;
+        cmd[5] = (area->height << 16) | area->width;
+        mb862xxfb_write_fifo(6, cmd, info);
+}
+
+/*
+ * Fill in the cmd array /GDC FIFO commands/ to draw a 1bit image.
+ * Make sure cmd has enough room!
+ */
+static void mb86290fb_imageblit1(u32 *cmd, u16 step, u16 dx, u16 dy,
+                                 u16 width, u16 height, u32 fgcolor,
+                                 u32 bgcolor, const struct fb_image *image,
+                                 struct fb_info *info)
+{
+        int i;
+        unsigned const char *line;
+        u16 bytes;
+
+        /* set colors and raster operation regs */
+        cmd[0] = (GDC_TYPE_SETREGISTER << 24) | (1 << 16) | GDC_REG_MODE_BITMAP;
+        /* Set raster operation */
+        cmd[1] = (2 << 7) | (GDC_ROP_COPY << 9);
+        cmd[2] =
+            (GDC_TYPE_SETCOLORREGISTER << 24) | (GDC_CMD_BODY_FORE_COLOR << 16);
+        cmd[3] = fgcolor;
+        cmd[4] =
+            (GDC_TYPE_SETCOLORREGISTER << 24) | (GDC_CMD_BODY_BACK_COLOR << 16);
+        cmd[5] = bgcolor;
+
+        i = 0;
+        line = image->data;
+        bytes = (image->width + 7) >> 3;
+
+        /* and the image */
+        cmd[6] = (GDC_TYPE_DRAWBITMAPP << 24) |
+            (GDC_CMD_BITMAP << 16) | (2 + (step * height));
+        cmd[7] = (dy << 16) | dx;
+        cmd[8] = (height << 16) | width;
+
+        while (i < height) {
+                memcpy(&cmd[9 + i * step], line, step << 2);
+#ifdef __LITTLE_ENDIAN
+                {
+                        int k = 0;
+                        for (k = 0; k < step; k++)
+                                cmd[9 + i * step + k] =
+                                    cpu_to_be32(cmd[9 + i * step + k]);
+                }
+#endif
+                line += bytes;
+                i++;
+        }
+}
+
+/*
+ * Fill in the cmd array /GDC FIFO commands/ to draw a 8bit image.
+ * Make sure cmd has enough room!
+ */
+static void mb86290fb_imageblit8(u32 *cmd, u16 step, u16 dx, u16 dy,
+                                 u16 width, u16 height, u32 fgcolor,
+                                 u32 bgcolor, const struct fb_image *image,
+                                 struct fb_info *info)
+{
+        int i, j;
+        unsigned const char *line, *ptr;
+        u16 bytes;
+
+        cmd[0] = (GDC_TYPE_DRAWBITMAPP << 24) |
+            (GDC_CMD_BLT_DRAW << 16) | (2 + (height * step));
+        cmd[1] = (dy << 16) | dx;
+        cmd[2] = (height << 16) | width;
+
+        i = 0;
+        line = ptr = image->data;
+        bytes = image->width;
+
+        while (i < height) {
+                ptr = line;
+                for (j = 0; j < step; j++) {
+                        cmd[3 + i * step + j] =
+                            (((u32 *) (info->pseudo_palette))[*ptr]) & 0xffff;
+                        ptr++;
+                        cmd[3 + i * step + j] |=
+                            ((((u32 *) (info->
+                                        pseudo_palette))[*ptr]) & 0xffff) << 16;
+                        ptr++;
+                }
+
+                line += bytes;
+                i++;
+        }
+}
+
+/*
+ * Fill in the cmd array /GDC FIFO commands/ to draw a 16bit image.
+ * Make sure cmd has enough room!
+ */
+static void mb86290fb_imageblit16(u32 *cmd, u16 step, u16 dx, u16 dy,
+                                  u16 width, u16 height, u32 fgcolor,
+                                  u32 bgcolor, const struct fb_image *image,
+                                  struct fb_info *info)
+{
+        int i;
+        unsigned const char *line;
+        u16 bytes;
+
+        i = 0;
+        line = image->data;
+        bytes = image->width << 1;
+
+        cmd[0] = (GDC_TYPE_DRAWBITMAPP << 24) |
+            (GDC_CMD_BLT_DRAW << 16) | (2 + step * height);
+        cmd[1] = (dy << 16) | dx;
+        cmd[2] = (height << 16) | width;
+
+        while (i < height) {
+                memcpy(&cmd[3 + i * step], line, step);
+                line += bytes;
+                i++;
+        }
+}
+
+static void mb86290fb_imageblit(struct fb_info *info,
+                                const struct fb_image *image)
+{
+        int mdr;
+        u32 *cmd = NULL;
+        void (*cmdfn) (u32 *, u16, u16, u16, u16, u16, u32, u32,
+                       const struct fb_image *, struct fb_info *) = NULL;
+        u32 cmdlen;
+        u32 fgcolor = 0, bgcolor = 0;
+        u16 step;
+
+        u16 width = image->width, height = image->height;
+        u16 dx = image->dx, dy = image->dy;
+        int x2, y2, vxres, vyres;
+
+        mdr = (GDC_ROP_COPY << 9);
+        x2 = image->dx + image->width;
+        y2 = image->dy + image->height;
+        vxres = info->var.xres_virtual;
+        vyres = info->var.yres_virtual;
+        x2 = min(x2, vxres);
+        y2 = min(y2, vyres);
+        width = x2 - dx;
+        height = y2 - dy;
+
+        switch (image->depth) {
+        case 1:
+                step = (width + 31) >> 5;
+                cmdlen = 9 + height * step;
+                cmdfn = mb86290fb_imageblit1;
+                if (info->fix.visual == FB_VISUAL_TRUECOLOR ||
+                    info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
+                        fgcolor =
+                            ((u32 *) (info->pseudo_palette))[image->fg_color];
+                        bgcolor =
+                            ((u32 *) (info->pseudo_palette))[image->bg_color];
+                } else {
+                        fgcolor = image->fg_color;
+                        bgcolor = image->bg_color;
+                }
+
+                break;
+
+        case 8:
+                step = (width + 1) >> 1;
+                cmdlen = 3 + height * step;
+                cmdfn = mb86290fb_imageblit8;
+                break;
+
+        case 16:
+                step = (width + 1) >> 1;
+                cmdlen = 3 + height * step;
+                cmdfn = mb86290fb_imageblit16;
+                break;
+
+        default:
+                cfb_imageblit(info, image);
+                return;
+        }
+
+        cmd = kmalloc(cmdlen * 4, GFP_DMA);
+        if (!cmd)
+                return cfb_imageblit(info, image);
+        cmdfn(cmd, step, dx, dy, width, height, fgcolor, bgcolor, image, info);
+        mb862xxfb_write_fifo(cmdlen, cmd, info);
+        kfree(cmd);
+}
+
+static void mb86290fb_fillrect(struct fb_info *info,
+                               const struct fb_fillrect *rect)
+{
+
+        u32 x2, y2, vxres, vyres, height, width, fg;
+        u32 cmd[7];
+
+        vxres = info->var.xres_virtual;
+        vyres = info->var.yres_virtual;
+
+        if (!rect->width || !rect->height || rect->dx > vxres
+            || rect->dy > vyres)
+                return;
+
+        /* We could use hardware clipping but on many cards you get around
+         * hardware clipping by writing to framebuffer directly. */
+        x2 = rect->dx + rect->width;
+        y2 = rect->dy + rect->height;
+        x2 = min(x2, vxres);
+        y2 = min(y2, vyres);
+        width = x2 - rect->dx;
+        height = y2 - rect->dy;
+        if (info->fix.visual == FB_VISUAL_TRUECOLOR ||
+            info->fix.visual == FB_VISUAL_DIRECTCOLOR)
+                fg = ((u32 *) (info->pseudo_palette))[rect->color];
+        else
+                fg = rect->color;
+
+        switch (rect->rop) {
+
+        case ROP_XOR:
+                /* Set raster operation */
+                cmd[1] = (2 << 7) | (GDC_ROP_XOR << 9);
+                break;
+
+        case ROP_COPY:
+                /* Set raster operation */
+                cmd[1] = (2 << 7) | (GDC_ROP_COPY << 9);
+                break;
+
+        }
+
+        cmd[0] = (GDC_TYPE_SETREGISTER << 24) | (1 << 16) | GDC_REG_MODE_BITMAP;
+        /* cmd[1] set earlier */
+        cmd[2] =
+            (GDC_TYPE_SETCOLORREGISTER << 24) | (GDC_CMD_BODY_FORE_COLOR << 16);
+        cmd[3] = fg;
+        cmd[4] = (GDC_TYPE_DRAWRECTP << 24) | (GDC_CMD_BLT_FILL << 16);
+        cmd[5] = (rect->dy << 16) | (rect->dx);
+        cmd[6] = (height << 16) | width;
+
+        mb862xxfb_write_fifo(7, cmd, info);
+}
+
+void mb862xxfb_init_accel(struct fb_info *info, int xres)
+{
+        struct mb862xxfb_par *par = info->par;
+
+        if (info->var.bits_per_pixel == 32) {
+                info->fbops->fb_fillrect = cfb_fillrect;
+                info->fbops->fb_copyarea = cfb_copyarea;
+                info->fbops->fb_imageblit = cfb_imageblit;
+        } else {
+                outreg(disp, GC_L0EM, 3);
+                info->fbops->fb_fillrect = mb86290fb_fillrect;
+                info->fbops->fb_copyarea = mb86290fb_copyarea;
+                info->fbops->fb_imageblit = mb86290fb_imageblit;
+        }
+        outreg(draw, GDC_REG_DRAW_BASE, 0);
+        outreg(draw, GDC_REG_MODE_MISC, 0x8000);
+        outreg(draw, GDC_REG_X_RESOLUTION, xres);
+
+        info->flags |=
+            FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT |
+            FBINFO_HWACCEL_IMAGEBLIT;
+        info->fix.accel = 0xff; /*FIXME: add right define */
+}
+EXPORT_SYMBOL(mb862xxfb_init_accel);
+
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/video/mb862xx/mb862xxfb_accel.h b/drivers/video/mb862xx/mb862xxfb_accel.h
new file mode 100644
index 000000000000..96a2dfef0f60
--- /dev/null
+++ b/drivers/video/mb862xx/mb862xxfb_accel.h
@@ -0,0 +1,203 @@
+#ifndef __MB826XXFB_ACCEL_H__
+#define __MB826XXFB_ACCEL_H__
+
+/* registers */
+#define GDC_GEO_REG_INPUT_FIFO 0x00000400L
+
+/* Special Registers */
+#define GDC_REG_CTRL                0x00000400L
+#define GDC_REG_FIFO_STATUS         0x00000404L
+#define GDC_REG_FIFO_COUNT          0x00000408L
+#define GDC_REG_SETUP_STATUS        0x0000040CL
+#define GDC_REG_DDA_STATUS          0x00000410L
+#define GDC_REG_ENGINE_STATUS       0x00000414L
+#define GDC_REG_ERROR_STATUS        0x00000418L
+#define GDC_REG_MODE_MISC           0x00000420L /* MDR0 */
+#define GDC_REG_MODE_LINE           0x00000424L /* MDR1 */
+#define GDC_REG_MODE_POLYGON        0x00000428L /* MDR2 */
+#define GDC_REG_MODE_TEXTURE        0x0000042CL /* MDR3 */
+#define GDC_REG_MODE_BITMAP         0x00000430L /* MDR4 */
+#define GDC_REG_MODE_EXTENSION      0x0000043CL /* MDR7 */
+
+/* Configuration Registers */
+#define GDC_REG_DRAW_BASE           0x00000440L
+#define GDC_REG_X_RESOLUTION        0x00000444L
+#define GDC_REG_Z_BASE              0x00000448L
+#define GDC_REG_TEXTURE_BASE        0x0000044CL
+#define GDC_REG_POLYGON_FLAG_BASE   0x00000450L
+#define GDC_REG_CLIP_XMIN           0x00000454L
+#define GDC_REG_CLIP_XMAX           0x00000458L
+#define GDC_REG_CLIP_YMIN           0x0000045CL
+#define GDC_REG_CLIP_YMAX           0x00000460L
+#define GDC_REG_TEXURE_SIZE         0x00000464L
+#define GDC_REG_TILE_SIZE           0x00000468L
+#define GDC_REG_TEX_BUF_OFFSET      0x0000046CL
+
+/* for MB86293 or later */
+#define GDC_REG_ALPHA_MAP_BASE      0x00000474L /* ABR */
+
+/* Constant Registers */
+#define GDC_REG_FOREGROUND_COLOR    0x00000480L
+#define GDC_REG_BACKGROUND_COLOR    0x00000484L
+#define GDC_REG_ALPHA               0x00000488L
+#define GDC_REG_LINE_PATTERN        0x0000048CL
+#define GDC_REG_TEX_BORDER_COLOR    0x00000494L
+#define GDC_REG_LINE_PATTERN_OFFSET 0x000003E0L
+
+/* Coomand Code */
+#define GDC_CMD_PIXEL                   0x00000000L
+#define GDC_CMD_PIXEL_Z                 0x00000001L
+
+#define GDC_CMD_X_VECTOR                0x00000020L
+#define GDC_CMD_Y_VECTOR                0x00000021L
+#define GDC_CMD_X_VECTOR_NOEND          0x00000022L
+#define GDC_CMD_Y_VECTOR_NOEND          0x00000023L
+#define GDC_CMD_X_VECTOR_BLPO           0x00000024L
+#define GDC_CMD_Y_VECTOR_BLPO           0x00000025L
+#define GDC_CMD_X_VECTOR_NOEND_BLPO     0x00000026L
+#define GDC_CMD_Y_VECTOR_NOEND_BLPO     0x00000027L
+#define GDC_CMD_AA_X_VECTOR             0x00000028L
+#define GDC_CMD_AA_Y_VECTOR             0x00000029L
+#define GDC_CMD_AA_X_VECTOR_NOEND       0x0000002AL
+#define GDC_CMD_AA_Y_VECTOR_NOEND       0x0000002BL
+#define GDC_CMD_AA_X_VECTOR_BLPO        0x0000002CL
+#define GDC_CMD_AA_Y_VECTOR_BLPO        0x0000002DL
+#define GDC_CMD_AA_X_VECTOR_NOEND_BLPO  0x0000002EL
+#define GDC_CMD_AA_Y_VECTOR_NOEND_BLPO  0x0000002FL
+
+#define GDC_CMD_0_VECTOR                0x00000030L
+#define GDC_CMD_1_VECTOR                0x00000031L
+#define GDC_CMD_0_VECTOR_NOEND          0x00000032L
+#define GDC_CMD_1_VECTOR_NOEND          0x00000033L
+#define GDC_CMD_0_VECTOR_BLPO           0x00000034L
+#define GDC_CMD_1_VECTOR_BLPO           0x00000035L
+#define GDC_CMD_0_VECTOR_NOEND_BLPO     0x00000036L
+#define GDC_CMD_1_VECTOR_NOEND_BLPO     0x00000037L
+#define GDC_CMD_AA_0_VECTOR             0x00000038L
+#define GDC_CMD_AA_1_VECTOR             0x00000039L
+#define GDC_CMD_AA_0_VECTOR_NOEND       0x0000003AL
+#define GDC_CMD_AA_1_VECTOR_NOEND       0x0000003BL
+#define GDC_CMD_AA_0_VECTOR_BLPO        0x0000003CL
+#define GDC_CMD_AA_1_VECTOR_BLPO        0x0000003DL
+#define GDC_CMD_AA_0_VECTOR_NOEND_BLPO  0x0000003EL
+#define GDC_CMD_AA_1_VECTOR_NOEND_BLPO  0x0000003FL
+
+#define GDC_CMD_BLT_FILL                0x00000041L
+#define GDC_CMD_BLT_DRAW                0x00000042L
+#define GDC_CMD_BITMAP                  0x00000043L
+#define GDC_CMD_BLTCOPY_TOP_LEFT        0x00000044L
+#define GDC_CMD_BLTCOPY_TOP_RIGHT       0x00000045L
+#define GDC_CMD_BLTCOPY_BOTTOM_LEFT     0x00000046L
+#define GDC_CMD_BLTCOPY_BOTTOM_RIGHT    0x00000047L
+#define GDC_CMD_LOAD_TEXTURE            0x00000048L
+#define GDC_CMD_LOAD_TILE               0x00000049L
+
+#define GDC_CMD_TRAP_RIGHT              0x00000060L
+#define GDC_CMD_TRAP_LEFT               0x00000061L
+#define GDC_CMD_TRIANGLE_FAN            0x00000062L
+#define GDC_CMD_FLAG_TRIANGLE_FAN       0x00000063L
+
+#define GDC_CMD_FLUSH_FB                0x000000C1L
+#define GDC_CMD_FLUSH_Z                 0x000000C2L
+
+#define GDC_CMD_POLYGON_BEGIN           0x000000E0L
+#define GDC_CMD_POLYGON_END             0x000000E1L
+#define GDC_CMD_CLEAR_POLY_FLAG         0x000000E2L
+#define GDC_CMD_NORMAL                  0x000000FFL
+
+#define GDC_CMD_VECTOR_BLPO_FLAG        0x00040000L
+#define GDC_CMD_FAST_VECTOR_BLPO_FLAG   0x00000004L
+
+/* for MB86293 or later */
+#define GDC_CMD_MDR1                            0x00000000L
+#define GDC_CMD_MDR1S                           0x00000002L
+#define GDC_CMD_MDR1B                           0x00000004L
+#define GDC_CMD_MDR2                            0x00000001L
+#define GDC_CMD_MDR2S                           0x00000003L
+#define GDC_CMD_MDR2TL                          0x00000007L
+#define GDC_CMD_GMDR1E                          0x00000010L
+#define GDC_CMD_GMDR2E                          0x00000020L
+#define GDC_CMD_OVERLAP_SHADOW_XY               0x00000000L
+#define GDC_CMD_OVERLAP_SHADOW_XY_COMPOSITION   0x00000001L
+#define GDC_CMD_OVERLAP_Z_PACKED_ONBS           0x00000007L
+#define GDC_CMD_OVERLAP_Z_ORIGIN                0x00000000L
+#define GDC_CMD_OVERLAP_Z_NON_TOPLEFT           0x00000001L
+#define GDC_CMD_OVERLAP_Z_BORDER                0x00000002L
+#define GDC_CMD_OVERLAP_Z_SHADOW                0x00000003L
+#define GDC_CMD_BLTCOPY_ALT_ALPHA               0x00000000L     /* Reserverd */
+#define GDC_CMD_DC_LOGOUT                       0x00000000L     /* Reserverd */
+#define GDC_CMD_BODY_FORE_COLOR                 0x00000000L
+#define GDC_CMD_BODY_BACK_COLOR                 0x00000001L
+#define GDC_CMD_SHADOW_FORE_COLOR               0x00000002L
+#define GDC_CMD_SHADOW_BACK_COLOR               0x00000003L
+#define GDC_CMD_BORDER_FORE_COLOR               0x00000004L
+#define GDC_CMD_BORDER_BACK_COLOR               0x00000005L
+
+/* Type Code Table */
+#define GDC_TYPE_G_NOP                                  0x00000020L
+#define GDC_TYPE_G_BEGIN                                0x00000021L
+#define GDC_TYPE_G_BEGINCONT                            0x00000022L
+#define GDC_TYPE_G_END                                  0x00000023L
+#define GDC_TYPE_G_VERTEX                               0x00000030L
+#define GDC_TYPE_G_VERTEXLOG                            0x00000032L
+#define GDC_TYPE_G_VERTEXNOPLOG                         0x00000033L
+#define GDC_TYPE_G_INIT                                 0x00000040L
+#define GDC_TYPE_G_VIEWPORT                             0x00000041L
+#define GDC_TYPE_G_DEPTHRANGE                           0x00000042L
+#define GDC_TYPE_G_LOADMATRIX                           0x00000043L
+#define GDC_TYPE_G_VIEWVOLUMEXYCLIP                     0x00000044L
+#define GDC_TYPE_G_VIEWVOLUMEZCLIP                      0x00000045L
+#define GDC_TYPE_G_VIEWVOLUMEWCLIP                      0x00000046L
+#define GDC_TYPE_SETLVERTEX2I                           0x00000072L
+#define GDC_TYPE_SETLVERTEX2IP                          0x00000073L
+#define GDC_TYPE_SETMODEREGISTER                        0x000000C0L
+#define GDC_TYPE_SETGMODEREGISTER                       0x000000C1L
+#define GDC_TYPE_OVERLAPXYOFFT                          0x000000C8L
+#define GDC_TYPE_OVERLAPZOFFT                           0x000000C9L
+#define GDC_TYPE_DC_LOGOUTADDR                          0x000000CCL
+#define GDC_TYPE_SETCOLORREGISTER                       0x000000CEL
+#define GDC_TYPE_G_BEGINE                               0x000000E1L
+#define GDC_TYPE_G_BEGINCONTE                           0x000000E2L
+#define GDC_TYPE_G_ENDE                                 0x000000E3L
+#define GDC_TYPE_DRAWPIXEL                              0x00000000L
+#define GDC_TYPE_DRAWPIXELZ                             0x00000001L
+#define GDC_TYPE_DRAWLINE                               0x00000002L
+#define GDC_TYPE_DRAWLINE2I                             0x00000003L
+#define GDC_TYPE_DRAWLINE2IP                            0x00000004L
+#define GDC_TYPE_DRAWTRAP                               0x00000005L
+#define GDC_TYPE_DRAWVERTEX2I                           0x00000006L
+#define GDC_TYPE_DRAWVERTEX2IP                          0x00000007L
+#define GDC_TYPE_DRAWRECTP                              0x00000009L
+#define GDC_TYPE_DRAWBITMAPP                            0x0000000BL
+#define GDC_TYPE_BLTCOPYP                               0x0000000DL
+#define GDC_TYPE_BLTCOPYALTERNATEP                      0x0000000FL
+#define GDC_TYPE_LOADTEXTUREP                           0x00000011L
+#define GDC_TYPE_BLTTEXTUREP                            0x00000013L
+#define GDC_TYPE_BLTCOPYALTALPHABLENDP                  0x0000001FL
+#define GDC_TYPE_SETVERTEX2I                            0x00000070L
+#define GDC_TYPE_SETVERTEX2IP                           0x00000071L
+#define GDC_TYPE_DRAW                                   0x000000F0L
+#define GDC_TYPE_SETREGISTER                            0x000000F1L
+#define GDC_TYPE_SYNC                                   0x000000FCL
+#define GDC_TYPE_INTERRUPT                              0x000000FDL
+#define GDC_TYPE_NOP                                    0x0
+
+/* Raster operation */
+#define GDC_ROP_CLEAR                   0x0000
+#define GDC_ROP_AND                     0x0001
+#define GDC_ROP_AND_REVERSE             0x0002
+#define GDC_ROP_COPY                    0x0003
+#define GDC_ROP_AND_INVERTED            0x0004
+#define GDC_ROP_NOP                     0x0005
+#define GDC_ROP_XOR                     0x0006
+#define GDC_ROP_OR                      0x0007
+#define GDC_ROP_NOR                     0x0008
+#define GDC_ROP_EQUIV                   0x0009
+#define GDC_ROP_INVERT                  0x000A
+#define GDC_ROP_OR_REVERSE              0x000B
+#define GDC_ROP_COPY_INVERTED           0x000C
+#define GDC_ROP_OR_INVERTED             0x000D
+#define GDC_ROP_NAND                    0x000E
+#define GDC_ROP_SET                     0x000F
+
+#endif
diff --git a/drivers/video/mbx/mbxdebugfs.c b/drivers/video/mbx/mbxdebugfs.c
index 15b8b3c4330e..ecad96524570 100644
--- a/drivers/video/mbx/mbxdebugfs.c
+++ b/drivers/video/mbx/mbxdebugfs.c
@@ -1,4 +1,5 @@
 #include <linux/debugfs.h>
+#include <linux/slab.h>
 
 #define BIG_BUFFER_SIZE (1024)
 
diff --git a/drivers/video/mbx/mbxfb.c b/drivers/video/mbx/mbxfb.c
index 01f77bcc68f9..afea9abbd678 100644
--- a/drivers/video/mbx/mbxfb.c
+++ b/drivers/video/mbx/mbxfb.c
@@ -693,7 +693,7 @@ static void __devinit setup_memc(struct fb_info *fbi)
         unsigned long tmp;
         int i;
 
-        /* FIXME: use platfrom specific parameters */
+        /* FIXME: use platform specific parameters */
         /* setup SDRAM controller */
         write_reg_dly((LMCFG_LMC_DS | LMCFG_LMC_TS | LMCFG_LMD_TS |
                 LMCFG_LMA_TS),
diff --git a/drivers/video/metronomefb.c b/drivers/video/metronomefb.c
index df1f757a6161..9b3d6e4584cc 100644
--- a/drivers/video/metronomefb.c
+++ b/drivers/video/metronomefb.c
@@ -23,7 +23,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -700,7 +699,7 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
         if (retval < 0)
                 goto err_free_irq;
 
-        info->flags = FBINFO_FLAG_DEFAULT;
+        info->flags = FBINFO_FLAG_DEFAULT | FBINFO_VIRTFB;
 
         info->fbdefio = &metronomefb_defio;
         fb_deferred_io_init(info);
diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index 34e4e7995169..0a4dbdc1693a 100644
--- a/drivers/video/modedb.c
+++ b/drivers/video/modedb.c
@@ -12,7 +12,9 @@
  */
 
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/fb.h>
+#include <linux/kernel.h>
 
 #undef DEBUG
 
@@ -402,21 +404,6 @@ const struct fb_videomode vesa_modes[] = {
 EXPORT_SYMBOL(vesa_modes);
 #endif /* CONFIG_FB_MODE_HELPERS */
 
-static int my_atoi(const char *name)
-{
-    int val = 0;
-
-    for (;; name++) {
-        switch (*name) {
-            case '0' ... '9':
-                val = 10*val+(*name-'0');
-                break;
-            default:
-                return val;
-        }
-    }
-}
-
 /**
  *      fb_try_mode - test a video mode
  *      @var: frame buffer user defined part of display
@@ -539,7 +526,7 @@ int fb_find_mode(struct fb_var_screeninfo *var,
                     namelen = i;
                     if (!refresh_specified && !bpp_specified &&
                         !yres_specified) {
-                        refresh = my_atoi(&name[i+1]);
+                        refresh = simple_strtol(&name[i+1], NULL, 10);
                         refresh_specified = 1;
                         if (cvt || rb)
                             cvt = 0;
@@ -549,7 +536,7 @@ int fb_find_mode(struct fb_var_screeninfo *var,
                 case '-':
                     namelen = i;
                     if (!bpp_specified && !yres_specified) {
-                        bpp = my_atoi(&name[i+1]);
+                        bpp = simple_strtol(&name[i+1], NULL, 10);
                         bpp_specified = 1;
                         if (cvt || rb)
                             cvt = 0;
@@ -558,7 +545,7 @@ int fb_find_mode(struct fb_var_screeninfo *var,
                     break;
                 case 'x':
                     if (!yres_specified) {
-                        yres = my_atoi(&name[i+1]);
+                        yres = simple_strtol(&name[i+1], NULL, 10);
                         yres_specified = 1;
                     } else
                         goto done;
@@ -586,7 +573,7 @@ int fb_find_mode(struct fb_var_screeninfo *var,
             }
         }
         if (i < 0 && yres_specified) {
-            xres = my_atoi(name);
+            xres = simple_strtol(name, NULL, 10);
             res_specified = 1;
         }
 done:
@@ -907,7 +894,7 @@ const struct fb_videomode *fb_match_mode(const struct fb_var_screeninfo *var,
 }
 
 /**
- * fb_add_videomode: adds videomode entry to modelist
+ * fb_add_videomode - adds videomode entry to modelist
  * @mode: videomode to add
  * @head: struct list_head of modelist
  *
@@ -942,7 +929,7 @@ int fb_add_videomode(const struct fb_videomode *mode, struct list_head *head)
 }
 
 /**
- * fb_delete_videomode: removed videomode entry from modelist
+ * fb_delete_videomode - removed videomode entry from modelist
  * @mode: videomode to remove
  * @head: struct list_head of modelist
  *
@@ -967,7 +954,7 @@ void fb_delete_videomode(const struct fb_videomode *mode,
 }
 
 /**
- * fb_destroy_modelist: destroy modelist
+ * fb_destroy_modelist - destroy modelist
  * @head: struct list_head of modelist
  */
 void fb_destroy_modelist(struct list_head *head)
@@ -982,7 +969,7 @@ void fb_destroy_modelist(struct list_head *head)
 EXPORT_SYMBOL_GPL(fb_destroy_modelist);
 
 /**
- * fb_videomode_to_modelist: convert mode array to mode list
+ * fb_videomode_to_modelist - convert mode array to mode list
  * @modedb: array of struct fb_videomode
  * @num: number of entries in array
  * @head: struct list_head of modelist
diff --git a/drivers/video/msm/mddi.c b/drivers/video/msm/mddi.c
index 474421fe79a6..c1ff271017a9 100644
--- a/drivers/video/msm/mddi.c
+++ b/drivers/video/msm/mddi.c
@@ -21,6 +21,7 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
+#include <linux/gfp.h>
 #include <linux/spinlock.h>
 #include <linux/clk.h>
 #include <linux/io.h>
diff --git a/drivers/video/msm/mddi_client_dummy.c b/drivers/video/msm/mddi_client_dummy.c
index ebbae87885b6..d2a091cebe2c 100644
--- a/drivers/video/msm/mddi_client_dummy.c
+++ b/drivers/video/msm/mddi_client_dummy.c
@@ -15,6 +15,7 @@
  * GNU General Public License for more details.
  */
 
+#include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
diff --git a/drivers/video/msm/mddi_client_nt35399.c b/drivers/video/msm/mddi_client_nt35399.c
index c9e9349451cb..f239f4a25e01 100644
--- a/drivers/video/msm/mddi_client_nt35399.c
+++ b/drivers/video/msm/mddi_client_nt35399.c
@@ -21,6 +21,7 @@
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include <linux/gpio.h>
+#include <linux/slab.h>
 #include <mach/msm_fb.h>
 
 static DECLARE_WAIT_QUEUE_HEAD(nt35399_vsync_wait);
diff --git a/drivers/video/msm/mddi_client_toshiba.c b/drivers/video/msm/mddi_client_toshiba.c
index 71048e78f7f0..f9bc932ac46b 100644
--- a/drivers/video/msm/mddi_client_toshiba.c
+++ b/drivers/video/msm/mddi_client_toshiba.c
@@ -21,6 +21,7 @@
 #include <linux/interrupt.h>
 #include <linux/gpio.h>
 #include <linux/sched.h>
+#include <linux/slab.h>
 #include <mach/msm_fb.h>
 
 
diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c
index 6c519e2fa2b7..19c01c6208e8 100644
--- a/drivers/video/msm/mdp.c
+++ b/drivers/video/msm/mdp.c
@@ -23,6 +23,7 @@
 #include <linux/clk.h>
 #include <linux/file.h>
 #include <linux/major.h>
+#include <linux/slab.h>
 
 #include <mach/msm_iomap.h>
 #include <mach/msm_fb.h>
diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c
index 49101dda45ee..debe5933fd2e 100644
--- a/drivers/video/msm/msm_fb.c
+++ b/drivers/video/msm/msm_fb.c
@@ -17,6 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/module.h>
 #include <linux/fb.h>
+#include <linux/slab.h>
 #include <linux/delay.h>
 
 #include <linux/freezer.h>
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c
index 054ef29be479..772ba3f45e6f 100644
--- a/drivers/video/mx3fb.c
+++ b/drivers/video/mx3fb.c
@@ -324,8 +324,11 @@ static void sdc_enable_channel(struct mx3fb_info *mx3_fbi)
         unsigned long flags;
         dma_cookie_t cookie;
 
-        dev_dbg(mx3fb->dev, "mx3fbi %p, desc %p, sg %p\n", mx3_fbi,
-                to_tx_desc(mx3_fbi->txd), to_tx_desc(mx3_fbi->txd)->sg);
+        if (mx3_fbi->txd)
+                dev_dbg(mx3fb->dev, "mx3fbi %p, desc %p, sg %p\n", mx3_fbi,
+                        to_tx_desc(mx3_fbi->txd), to_tx_desc(mx3_fbi->txd)->sg);
+        else
+                dev_dbg(mx3fb->dev, "mx3fbi %p, txd = NULL\n", mx3_fbi);
 
         /* This enables the channel */
         if (mx3_fbi->cookie < 0) {
@@ -646,6 +649,7 @@ static int sdc_set_global_alpha(struct mx3fb_data *mx3fb, bool enable, uint8_t a
 
 static void sdc_set_brightness(struct mx3fb_data *mx3fb, uint8_t value)
 {
+        dev_dbg(mx3fb->dev, "%s: value = %d\n", __func__, value);
         /* This might be board-specific */
         mx3fb_write_reg(mx3fb, 0x03000000UL | value << 16, SDC_PWM_CTRL);
         return;
@@ -1486,12 +1490,12 @@ static int mx3fb_probe(struct platform_device *pdev)
                 goto ersdc0;
         }
 
+        mx3fb->backlight_level = 255;
+
         ret = init_fb_chan(mx3fb, to_idmac_chan(chan));
         if (ret < 0)
                 goto eisdc0;
 
-        mx3fb->backlight_level = 255;
-
         return 0;
 
 eisdc0:
diff --git a/drivers/video/nuc900fb.c b/drivers/video/nuc900fb.c
new file mode 100644
index 000000000000..6bf0d460a738
--- /dev/null
+++ b/drivers/video/nuc900fb.c
@@ -0,0 +1,779 @@
+/*
+ *
+ * Copyright (c) 2009 Nuvoton technology corporation
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ *  Description:
+ *    Nuvoton LCD Controller Driver
+ *  Author:
+ *    Wang Qiang (rurality.linux@gmail.com) 2009/12/11
+ */
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/mm.h>
+#include <linux/tty.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/dma-mapping.h>
+#include <linux/interrupt.h>
+#include <linux/workqueue.h>
+#include <linux/wait.h>
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+#include <linux/cpufreq.h>
+#include <linux/io.h>
+#include <linux/pm.h>
+#include <linux/device.h>
+
+#include <mach/map.h>
+#include <mach/regs-clock.h>
+#include <mach/regs-ldm.h>
+#include <mach/fb.h>
+#include <mach/clkdev.h>
+
+#include "nuc900fb.h"
+
+
+/*
+ *  Initialize the nuc900 video (dual) buffer address
+ */
+static void nuc900fb_set_lcdaddr(struct fb_info *info)
+{
+        struct nuc900fb_info *fbi = info->par;
+        void __iomem *regs = fbi->io;
+        unsigned long vbaddr1, vbaddr2;
+
+        vbaddr1  = info->fix.smem_start;
+        vbaddr2  = info->fix.smem_start;
+        vbaddr2 += info->fix.line_length * info->var.yres;
+
+        /* set frambuffer start phy addr*/
+        writel(vbaddr1, regs + REG_LCM_VA_BADDR0);
+        writel(vbaddr2, regs + REG_LCM_VA_BADDR1);
+
+        writel(fbi->regs.lcd_va_fbctrl, regs + REG_LCM_VA_FBCTRL);
+        writel(fbi->regs.lcd_va_scale, regs + REG_LCM_VA_SCALE);
+}
+
+/*
+ *      calculate divider for lcd div
+ */
+static unsigned int nuc900fb_calc_pixclk(struct nuc900fb_info *fbi,
+                                         unsigned long pixclk)
+{
+        unsigned long clk = fbi->clk_rate;
+        unsigned long long div;
+
+        /* pixclk is in picseconds. our clock is in Hz*/
+        /* div = (clk * pixclk)/10^12 */
+        div = (unsigned long long)clk * pixclk;
+        div >>= 12;
+        do_div(div, 625 * 625UL * 625);
+
+        dev_dbg(fbi->dev, "pixclk %ld, divisor is %lld\n", pixclk, div);
+
+        return div;
+}
+
+/*
+ *      Check the video params of 'var'.
+ */
+static int nuc900fb_check_var(struct fb_var_screeninfo *var,
+                               struct fb_info *info)
+{
+        struct nuc900fb_info *fbi = info->par;
+        struct nuc900fb_mach_info *mach_info = fbi->dev->platform_data;
+        struct nuc900fb_display *display = NULL;
+        struct nuc900fb_display *default_display = mach_info->displays +
+                                                   mach_info->default_display;
+        int i;
+
+        dev_dbg(fbi->dev, "check_var(var=%p, info=%p)\n", var, info);
+
+        /* validate x/y resolution */
+        /* choose default mode if possible */
+        if (var->xres == default_display->xres &&
+            var->yres == default_display->yres &&
+            var->bits_per_pixel == default_display->bpp)
+                display = default_display;
+        else
+                for (i = 0; i < mach_info->num_displays; i++)
+                        if (var->xres == mach_info->displays[i].xres &&
+                            var->yres == mach_info->displays[i].yres &&
+                            var->bits_per_pixel == mach_info->displays[i].bpp) {
+                                display = mach_info->displays + i;
+                                break;
+                        }
+
+        if (display == NULL) {
+                printk(KERN_ERR "wrong resolution or depth %dx%d at %d bit per pixel\n",
+                        var->xres, var->yres, var->bits_per_pixel);
+                return -EINVAL;
+        }
+
+        /* it should be the same size as the display */
+        var->xres_virtual       = display->xres;
+        var->yres_virtual       = display->yres;
+        var->height             = display->height;
+        var->width              = display->width;
+
+        /* copy lcd settings */
+        var->pixclock           = display->pixclock;
+        var->left_margin        = display->left_margin;
+        var->right_margin       = display->right_margin;
+        var->upper_margin       = display->upper_margin;
+        var->lower_margin       = display->lower_margin;
+        var->vsync_len          = display->vsync_len;
+        var->hsync_len          = display->hsync_len;
+
+        var->transp.offset      = 0;
+        var->transp.length      = 0;
+
+        fbi->regs.lcd_dccs = display->dccs;
+        fbi->regs.lcd_device_ctrl = display->devctl;
+        fbi->regs.lcd_va_fbctrl = display->fbctrl;
+        fbi->regs.lcd_va_scale = display->scale;
+
+        /* set R/G/B possions */
+        switch (var->bits_per_pixel) {
+        case 1:
+        case 2:
+        case 4:
+        case 8:
+        default:
+                var->red.offset         = 0;
+                var->red.length         = var->bits_per_pixel;
+                var->green              = var->red;
+                var->blue               = var->red;
+                break;
+        case 12:
+                var->red.length         = 4;
+                var->green.length       = 4;
+                var->blue.length        = 4;
+                var->red.offset         = 8;
+                var->green.offset       = 4;
+                var->blue.offset        = 0;
+                break;
+        case 16:
+                var->red.length         = 5;
+                var->green.length       = 6;
+                var->blue.length        = 5;
+                var->red.offset         = 11;
+                var->green.offset       = 5;
+                var->blue.offset        = 0;
+                break;
+        case 18:
+                var->red.length         = 6;
+                var->green.length       = 6;
+                var->blue.length        = 6;
+                var->red.offset         = 12;
+                var->green.offset       = 6;
+                var->blue.offset        = 0;
+                break;
+        case 32:
+                var->red.length         = 8;
+                var->green.length       = 8;
+                var->blue.length        = 8;
+                var->red.offset         = 16;
+                var->green.offset       = 8;
+                var->blue.offset        = 0;
+                break;
+        }
+
+        return 0;
+}
+
+/*
+ *      Calculate lcd register values from var setting & save into hw
+ */
+static void nuc900fb_calculate_lcd_regs(const struct fb_info *info,
+                                        struct nuc900fb_hw *regs)
+{
+        const struct fb_var_screeninfo *var = &info->var;
+        int vtt = var->height + var->upper_margin + var->lower_margin;
+        int htt = var->width + var->left_margin + var->right_margin;
+        int hsync = var->width + var->right_margin;
+        int vsync = var->height + var->lower_margin;
+
+        regs->lcd_crtc_size = LCM_CRTC_SIZE_VTTVAL(vtt) |
+                              LCM_CRTC_SIZE_HTTVAL(htt);
+        regs->lcd_crtc_dend = LCM_CRTC_DEND_VDENDVAL(var->height) |
+                              LCM_CRTC_DEND_HDENDVAL(var->width);
+        regs->lcd_crtc_hr = LCM_CRTC_HR_EVAL(var->width + 5) |
+                            LCM_CRTC_HR_SVAL(var->width + 1);
+        regs->lcd_crtc_hsync = LCM_CRTC_HSYNC_EVAL(hsync + var->hsync_len) |
+                               LCM_CRTC_HSYNC_SVAL(hsync);
+        regs->lcd_crtc_vr = LCM_CRTC_VR_EVAL(vsync + var->vsync_len) |
+                            LCM_CRTC_VR_SVAL(vsync);
+
+}
+
+/*
+ *      Activate (set) the controller from the given framebuffer
+ *      information
+ */
+static void nuc900fb_activate_var(struct fb_info *info)
+{
+        struct nuc900fb_info *fbi = info->par;
+        void __iomem *regs = fbi->io;
+        struct fb_var_screeninfo *var = &info->var;
+        int clkdiv;
+
+        clkdiv = nuc900fb_calc_pixclk(fbi, var->pixclock) - 1;
+        if (clkdiv < 0)
+                clkdiv = 0;
+
+        nuc900fb_calculate_lcd_regs(info, &fbi->regs);
+
+        /* set the new lcd registers*/
+
+        dev_dbg(fbi->dev, "new lcd register set:\n");
+        dev_dbg(fbi->dev, "dccs       = 0x%08x\n", fbi->regs.lcd_dccs);
+        dev_dbg(fbi->dev, "dev_ctl    = 0x%08x\n", fbi->regs.lcd_device_ctrl);
+        dev_dbg(fbi->dev, "crtc_size  = 0x%08x\n", fbi->regs.lcd_crtc_size);
+        dev_dbg(fbi->dev, "crtc_dend  = 0x%08x\n", fbi->regs.lcd_crtc_dend);
+        dev_dbg(fbi->dev, "crtc_hr    = 0x%08x\n", fbi->regs.lcd_crtc_hr);
+        dev_dbg(fbi->dev, "crtc_hsync = 0x%08x\n", fbi->regs.lcd_crtc_hsync);
+        dev_dbg(fbi->dev, "crtc_vr    = 0x%08x\n", fbi->regs.lcd_crtc_vr);
+
+        writel(fbi->regs.lcd_device_ctrl, regs + REG_LCM_DEV_CTRL);
+        writel(fbi->regs.lcd_crtc_size, regs + REG_LCM_CRTC_SIZE);
+        writel(fbi->regs.lcd_crtc_dend, regs + REG_LCM_CRTC_DEND);
+        writel(fbi->regs.lcd_crtc_hr, regs + REG_LCM_CRTC_HR);
+        writel(fbi->regs.lcd_crtc_hsync, regs + REG_LCM_CRTC_HSYNC);
+        writel(fbi->regs.lcd_crtc_vr, regs + REG_LCM_CRTC_VR);
+
+        /* set lcd address pointers */
+        nuc900fb_set_lcdaddr(info);
+
+        writel(fbi->regs.lcd_dccs, regs + REG_LCM_DCCS);
+}
+
+/*
+ *      Alters the hardware state.
+ *
+ */
+static int nuc900fb_set_par(struct fb_info *info)
+{
+        struct fb_var_screeninfo *var = &info->var;
+
+        switch (var->bits_per_pixel) {
+        case 32:
+        case 24:
+        case 18:
+        case 16:
+        case 12:
+                info->fix.visual = FB_VISUAL_TRUECOLOR;
+                break;
+        case 1:
+                info->fix.visual = FB_VISUAL_MONO01;
+                break;
+        default:
+                info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+                break;
+        }
+
+        info->fix.line_length = (var->xres_virtual * var->bits_per_pixel) / 8;
+
+        /* activate this new configuration */
+        nuc900fb_activate_var(info);
+        return 0;
+}
+
+static inline unsigned int chan_to_field(unsigned int chan,
+                                         struct fb_bitfield *bf)
+{
+        chan &= 0xffff;
+        chan >>= 16 - bf->length;
+        return chan << bf->offset;
+}
+
+static int nuc900fb_setcolreg(unsigned regno,
+                               unsigned red, unsigned green, unsigned blue,
+                               unsigned transp, struct fb_info *info)
+{
+        unsigned int val;
+
+        switch (info->fix.visual) {
+        case FB_VISUAL_TRUECOLOR:
+                /* true-colour, use pseuo-palette */
+                if (regno < 16) {
+                        u32 *pal = info->pseudo_palette;
+
+                        val  = chan_to_field(red, &info->var.red);
+                        val |= chan_to_field(green, &info->var.green);
+                        val |= chan_to_field(blue, &info->var.blue);
+                        pal[regno] = val;
+                }
+                break;
+
+        default:
+                return 1;   /* unknown type */
+        }
+        return 0;
+}
+
+/**
+ *      nuc900fb_blank
+ *
+ */
+static int nuc900fb_blank(int blank_mode, struct fb_info *info)
+{
+
+        return 0;
+}
+
+static struct fb_ops nuc900fb_ops = {
+        .owner                  = THIS_MODULE,
+        .fb_check_var           = nuc900fb_check_var,
+        .fb_set_par             = nuc900fb_set_par,
+        .fb_blank               = nuc900fb_blank,
+        .fb_setcolreg           = nuc900fb_setcolreg,
+        .fb_fillrect            = cfb_fillrect,
+        .fb_copyarea            = cfb_copyarea,
+        .fb_imageblit           = cfb_imageblit,
+};
+
+
+static inline void modify_gpio(void __iomem *reg,
+                               unsigned long set, unsigned long mask)
+{
+        unsigned long tmp;
+        tmp = readl(reg) & ~mask;
+        writel(tmp | set, reg);
+}
+
+/*
+ * Initialise LCD-related registers
+ */
+static int nuc900fb_init_registers(struct fb_info *info)
+{
+        struct nuc900fb_info *fbi = info->par;
+        struct nuc900fb_mach_info *mach_info = fbi->dev->platform_data;
+        void __iomem *regs = fbi->io;
+
+        /*reset the display engine*/
+        writel(0, regs + REG_LCM_DCCS);
+        writel(readl(regs + REG_LCM_DCCS) | LCM_DCCS_ENG_RST,
+               regs + REG_LCM_DCCS);
+        ndelay(100);
+        writel(readl(regs + REG_LCM_DCCS) & (~LCM_DCCS_ENG_RST),
+               regs + REG_LCM_DCCS);
+        ndelay(100);
+
+        writel(0, regs + REG_LCM_DEV_CTRL);
+
+        /* config gpio output */
+        modify_gpio(W90X900_VA_GPIO + 0x54, mach_info->gpio_dir,
+                    mach_info->gpio_dir_mask);
+        modify_gpio(W90X900_VA_GPIO + 0x58, mach_info->gpio_data,
+                    mach_info->gpio_data_mask);
+
+        return 0;
+}
+
+
+/*
+ *    Alloc the SDRAM region of NUC900 for the frame buffer.
+ *    The buffer should be a non-cached, non-buffered, memory region
+ *    to allow palette and pixel writes without flushing the cache.
+ */
+static int __init nuc900fb_map_video_memory(struct fb_info *info)
+{
+        struct nuc900fb_info *fbi = info->par;
+        dma_addr_t map_dma;
+        unsigned long map_size = PAGE_ALIGN(info->fix.smem_len);
+
+        dev_dbg(fbi->dev, "nuc900fb_map_video_memory(fbi=%p) map_size %lu\n",
+                fbi, map_size);
+
+        info->screen_base = dma_alloc_writecombine(fbi->dev, map_size,
+                                                        &map_dma, GFP_KERNEL);
+
+        if (!info->screen_base)
+                return -ENOMEM;
+
+        memset(info->screen_base, 0x00, map_size);
+        info->fix.smem_start = map_dma;
+
+        return 0;
+}
+
+static inline void nuc900fb_unmap_video_memory(struct fb_info *info)
+{
+        struct nuc900fb_info *fbi = info->par;
+        dma_free_writecombine(fbi->dev, PAGE_ALIGN(info->fix.smem_len),
+                              info->screen_base, info->fix.smem_start);
+}
+
+static irqreturn_t nuc900fb_irqhandler(int irq, void *dev_id)
+{
+        struct nuc900fb_info *fbi = dev_id;
+        void __iomem *regs = fbi->io;
+        void __iomem *irq_base = fbi->irq_base;
+        unsigned long lcdirq = readl(regs + REG_LCM_INT_CS);
+
+        if (lcdirq & LCM_INT_CS_DISP_F_STATUS) {
+                writel(readl(irq_base) | 1<<30, irq_base);
+
+                /* wait VA_EN low */
+                if ((readl(regs + REG_LCM_DCCS) &
+                    LCM_DCCS_SINGLE) == LCM_DCCS_SINGLE)
+                        while ((readl(regs + REG_LCM_DCCS) &
+                               LCM_DCCS_VA_EN) == LCM_DCCS_VA_EN)
+                                ;
+                /* display_out-enable */
+                writel(readl(regs + REG_LCM_DCCS) | LCM_DCCS_DISP_OUT_EN,
+                        regs + REG_LCM_DCCS);
+                /* va-enable*/
+                writel(readl(regs + REG_LCM_DCCS) | LCM_DCCS_VA_EN,
+                        regs + REG_LCM_DCCS);
+        } else if (lcdirq & LCM_INT_CS_UNDERRUN_INT) {
+                writel(readl(irq_base) | LCM_INT_CS_UNDERRUN_INT, irq_base);
+        } else if (lcdirq & LCM_INT_CS_BUS_ERROR_INT) {
+                writel(readl(irq_base) | LCM_INT_CS_BUS_ERROR_INT, irq_base);
+        }
+
+        return IRQ_HANDLED;
+}
+
+#ifdef CONFIG_CPU_FREQ
+
+static int nuc900fb_cpufreq_transition(struct notifier_block *nb,
+                                       unsigned long val, void *data)
+{
+        struct nuc900fb_info *info;
+        struct fb_info *fbinfo;
+        long delta_f;
+        info = container_of(nb, struct nuc900fb_info, freq_transition);
+        fbinfo = platform_get_drvdata(to_platform_device(info->dev));
+
+        delta_f = info->clk_rate - clk_get_rate(info->clk);
+
+        if ((val == CPUFREQ_POSTCHANGE && delta_f > 0) ||
+           (val == CPUFREQ_PRECHANGE && delta_f < 0)) {
+                info->clk_rate = clk_get_rate(info->clk);
+                nuc900fb_activate_var(fbinfo);
+        }
+
+        return 0;
+}
+
+static inline int nuc900fb_cpufreq_register(struct nuc900fb_info *fbi)
+{
+        fbi->freq_transition.notifier_call = nuc900fb_cpufreq_transition;
+        return cpufreq_register_notifier(&fbi->freq_transition,
+                                  CPUFREQ_TRANSITION_NOTIFIER);
+}
+
+static inline void nuc900fb_cpufreq_deregister(struct nuc900fb_info *fbi)
+{
+        cpufreq_unregister_notifier(&fbi->freq_transition,
+                                    CPUFREQ_TRANSITION_NOTIFIER);
+}
+#else
+static inline int nuc900fb_cpufreq_transition(struct notifier_block *nb,
+                                       unsigned long val, void *data)
+{
+        return 0;
+}
+
+static inline int nuc900fb_cpufreq_register(struct nuc900fb_info *fbi)
+{
+        return 0;
+}
+
+static inline void nuc900fb_cpufreq_deregister(struct nuc900fb_info *info)
+{
+}
+#endif
+
+static char driver_name[] = "nuc900fb";
+
+static int __devinit nuc900fb_probe(struct platform_device *pdev)
+{
+        struct nuc900fb_info *fbi;
+        struct nuc900fb_display *display;
+        struct fb_info     *fbinfo;
+        struct nuc900fb_mach_info *mach_info;
+        struct resource *res;
+        int ret;
+        int irq;
+        int i;
+        int size;
+
+        dev_dbg(&pdev->dev, "devinit\n");
+        mach_info = pdev->dev.platform_data;
+        if (mach_info == NULL) {
+                dev_err(&pdev->dev,
+                        "no platform data for lcd, cannot attach\n");
+                return -EINVAL;
+        }
+
+        if (mach_info->default_display > mach_info->num_displays) {
+                dev_err(&pdev->dev,
+                        "default display No. is %d but only %d displays \n",
+                        mach_info->default_display, mach_info->num_displays);
+                return -EINVAL;
+        }
+
+
+        display = mach_info->displays + mach_info->default_display;
+
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0) {
+                dev_err(&pdev->dev, "no irq for device\n");
+                return -ENOENT;
+        }
+
+        fbinfo = framebuffer_alloc(sizeof(struct nuc900fb_info), &pdev->dev);
+        if (!fbinfo)
+                return -ENOMEM;
+
+        platform_set_drvdata(pdev, fbinfo);
+
+        fbi = fbinfo->par;
+        fbi->dev = &pdev->dev;
+
+#ifdef CONFIG_CPU_NUC950
+        fbi->drv_type = LCDDRV_NUC950;
+#endif
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+
+        size = (res->end - res->start) + 1;
+        fbi->mem = request_mem_region(res->start, size, pdev->name);
+        if (fbi->mem == NULL) {
+                dev_err(&pdev->dev, "failed to alloc memory region\n");
+                ret = -ENOENT;
+                goto free_fb;
+        }
+
+        fbi->io = ioremap(res->start, size);
+        if (fbi->io == NULL) {
+                dev_err(&pdev->dev, "ioremap() of lcd registers failed\n");
+                ret = -ENXIO;
+                goto release_mem_region;
+        }
+
+        fbi->irq_base = fbi->io + REG_LCM_INT_CS;
+
+
+        /* Stop the LCD */
+        writel(0, fbi->io + REG_LCM_DCCS);
+
+        /* fill the fbinfo*/
+        strcpy(fbinfo->fix.id, driver_name);
+        fbinfo->fix.type                = FB_TYPE_PACKED_PIXELS;
+        fbinfo->fix.type_aux            = 0;
+        fbinfo->fix.xpanstep            = 0;
+        fbinfo->fix.ypanstep            = 0;
+        fbinfo->fix.ywrapstep           = 0;
+        fbinfo->fix.accel               = FB_ACCEL_NONE;
+        fbinfo->var.nonstd              = 0;
+        fbinfo->var.activate            = FB_ACTIVATE_NOW;
+        fbinfo->var.accel_flags         = 0;
+        fbinfo->var.vmode               = FB_VMODE_NONINTERLACED;
+        fbinfo->fbops                   = &nuc900fb_ops;
+        fbinfo->flags                   = FBINFO_FLAG_DEFAULT;
+        fbinfo->pseudo_palette          = &fbi->pseudo_pal;
+
+        ret = request_irq(irq, nuc900fb_irqhandler, IRQF_DISABLED,
+                          pdev->name, fbinfo);
+        if (ret) {
+                dev_err(&pdev->dev, "cannot register irq handler %d -err %d\n",
+                        irq, ret);
+                ret = -EBUSY;
+                goto release_regs;
+        }
+
+        nuc900_driver_clksrc_div(&pdev->dev, "ext", 0x2);
+
+        fbi->clk = clk_get(&pdev->dev, NULL);
+        if (!fbi->clk || IS_ERR(fbi->clk)) {
+                printk(KERN_ERR "nuc900-lcd:failed to get lcd clock source\n");
+                ret = -ENOENT;
+                goto release_irq;
+        }
+
+        clk_enable(fbi->clk);
+        dev_dbg(&pdev->dev, "got and enabled clock\n");
+
+        fbi->clk_rate = clk_get_rate(fbi->clk);
+
+        /* calutate the video buffer size */
+        for (i = 0; i < mach_info->num_displays; i++) {
+                unsigned long smem_len = mach_info->displays[i].xres;
+                smem_len *= mach_info->displays[i].yres;
+                smem_len *= mach_info->displays[i].bpp;
+                smem_len >>= 3;
+                if (fbinfo->fix.smem_len < smem_len)
+                        fbinfo->fix.smem_len = smem_len;
+        }
+
+        /* Initialize Video Memory */
+        ret = nuc900fb_map_video_memory(fbinfo);
+        if (ret) {
+                printk(KERN_ERR "Failed to allocate video RAM: %x\n", ret);
+                goto release_clock;
+        }
+
+        dev_dbg(&pdev->dev, "got video memory\n");
+
+        fbinfo->var.xres = display->xres;
+        fbinfo->var.yres = display->yres;
+        fbinfo->var.bits_per_pixel = display->bpp;
+
+        nuc900fb_init_registers(fbinfo);
+
+        nuc900fb_check_var(&fbinfo->var, fbinfo);
+
+        ret = nuc900fb_cpufreq_register(fbi);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "Failed to register cpufreq\n");
+                goto free_video_memory;
+        }
+
+        ret = register_framebuffer(fbinfo);
+        if (ret) {
+                printk(KERN_ERR "failed to register framebuffer device: %d\n",
+                        ret);
+                goto free_cpufreq;
+        }
+
+        printk(KERN_INFO "fb%d: %s frame buffer device\n",
+                fbinfo->node, fbinfo->fix.id);
+
+        return 0;
+
+free_cpufreq:
+        nuc900fb_cpufreq_deregister(fbi);
+free_video_memory:
+        nuc900fb_unmap_video_memory(fbinfo);
+release_clock:
+        clk_disable(fbi->clk);
+        clk_put(fbi->clk);
+release_irq:
+        free_irq(irq, fbi);
+release_regs:
+        iounmap(fbi->io);
+release_mem_region:
+        release_mem_region((unsigned long)fbi->mem, size);
+free_fb:
+        framebuffer_release(fbinfo);
+        return ret;
+}
+
+/*
+ * shutdown the lcd controller
+ */
+static void nuc900fb_stop_lcd(struct fb_info *info)
+{
+        struct nuc900fb_info *fbi = info->par;
+        void __iomem *regs = fbi->io;
+
+        writel((~LCM_DCCS_DISP_INT_EN) | (~LCM_DCCS_VA_EN) | (~LCM_DCCS_OSD_EN),
+                regs + REG_LCM_DCCS);
+}
+
+/*
+ *  Cleanup
+ */
+static int nuc900fb_remove(struct platform_device *pdev)
+{
+        struct fb_info *fbinfo = platform_get_drvdata(pdev);
+        struct nuc900fb_info *fbi = fbinfo->par;
+        int irq;
+
+        nuc900fb_stop_lcd(fbinfo);
+        msleep(1);
+
+        nuc900fb_unmap_video_memory(fbinfo);
+
+        iounmap(fbi->io);
+
+        irq = platform_get_irq(pdev, 0);
+        free_irq(irq, fbi);
+
+        release_resource(fbi->mem);
+        kfree(fbi->mem);
+
+        platform_set_drvdata(pdev, NULL);
+        framebuffer_release(fbinfo);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+
+/*
+ *      suspend and resume support for the lcd controller
+ */
+
+static int nuc900fb_suspend(struct platform_device *dev, pm_message_t state)
+{
+        struct fb_info     *fbinfo = platform_get_drvdata(dev);
+        struct nuc900fb_info *info = fbinfo->par;
+
+        nuc900fb_stop_lcd();
+        msleep(1);
+        clk_disable(info->clk);
+        return 0;
+}
+
+static int nuc900fb_resume(struct platform_device *dev)
+{
+        struct fb_info     *fbinfo = platform_get_drvdata(dev);
+        struct nuc900fb_info *fbi = fbinfo->par;
+
+        printk(KERN_INFO "nuc900fb resume\n");
+
+        clk_enable(fbi->clk);
+        msleep(1);
+
+        nuc900fb_init_registers(fbinfo);
+        nuc900fb_activate_var(bfinfo);
+
+        return 0;
+}
+
+#else
+#define nuc900fb_suspend NULL
+#define nuc900fb_resume  NULL
+#endif
+
+static struct platform_driver nuc900fb_driver = {
+        .probe          = nuc900fb_probe,
+        .remove         = nuc900fb_remove,
+        .suspend        = nuc900fb_suspend,
+        .resume         = nuc900fb_resume,
+        .driver         = {
+                .name   = "nuc900-lcd",
+                .owner  = THIS_MODULE,
+        },
+};
+
+int __devinit nuc900fb_init(void)
+{
+        return platform_driver_register(&nuc900fb_driver);
+}
+
+static void __exit nuc900fb_cleanup(void)
+{
+        platform_driver_unregister(&nuc900fb_driver);
+}
+
+module_init(nuc900fb_init);
+module_exit(nuc900fb_cleanup);
+
+MODULE_DESCRIPTION("Framebuffer driver for the NUC900");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/nuc900fb.h b/drivers/video/nuc900fb.h
new file mode 100644
index 000000000000..6c23aa3d3b89
--- /dev/null
+++ b/drivers/video/nuc900fb.h
@@ -0,0 +1,55 @@
+/*
+ *
+ * Copyright (c) 2009 Nuvoton technology corporation
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ *   Auther:
+ *        Wang Qiang(rurality.linux@gmail.com)  2009/12/16
+ */
+
+#ifndef __NUC900FB_H
+#define __NUC900FB_H
+
+#include <mach/map.h>
+#include <mach/fb.h>
+
+enum nuc900_lcddrv_type {
+        LCDDRV_NUC910,
+        LCDDRV_NUC930,
+        LCDDRV_NUC932,
+        LCDDRV_NUC950,
+        LCDDRV_NUC960,
+};
+
+
+#define PALETTE_BUFFER_SIZE     256
+#define PALETTE_BUFF_CLEAR      (0x80000000) /* entry is clear/invalid */
+
+struct nuc900fb_info {
+        struct device           *dev;
+        struct clk              *clk;
+
+        struct resource         *mem;
+        void __iomem            *io;
+        void __iomem            *irq_base;
+        int                     drv_type;
+        struct nuc900fb_hw      regs;
+        unsigned long           clk_rate;
+
+#ifdef CONFIG_CPU_FREQ
+        struct notifier_block   freq_transition;
+#endif
+
+        /* keep these registers in case we need to re-write palette */
+        u32                     palette_buffer[PALETTE_BUFFER_SIZE];
+        u32                     pseudo_pal[16];
+};
+
+int nuc900fb_init(void);
+
+#endif /* __NUC900FB_H */
diff --git a/drivers/video/nvidia/nv_backlight.c b/drivers/video/nvidia/nv_backlight.c
index 443e3c85a9a0..2fb552a6f32c 100644
--- a/drivers/video/nvidia/nv_backlight.c
+++ b/drivers/video/nvidia/nv_backlight.c
@@ -94,6 +94,7 @@ static struct backlight_ops nvidia_bl_ops = {
 
 void nvidia_bl_init(struct nvidia_par *par)
 {
+        struct backlight_properties props;
         struct fb_info *info = pci_get_drvdata(par->pci_dev);
         struct backlight_device *bd;
         char name[12];
@@ -109,7 +110,10 @@ void nvidia_bl_init(struct nvidia_par *par)
 
         snprintf(name, sizeof(name), "nvidiabl%d", info->node);
 
-        bd = backlight_device_register(name, info->dev, par, &nvidia_bl_ops);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
+        bd = backlight_device_register(name, info->dev, par, &nvidia_bl_ops,
+                                       &props);
         if (IS_ERR(bd)) {
                 info->bl_dev = NULL;
                 printk(KERN_WARNING "nvidia: Backlight registration failed\n");
@@ -121,7 +125,6 @@ void nvidia_bl_init(struct nvidia_par *par)
                 0x158 * FB_BACKLIGHT_MAX / MAX_LEVEL,
                 0x534 * FB_BACKLIGHT_MAX / MAX_LEVEL);
 
-        bd->props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
         bd->props.brightness = bd->props.max_brightness;
         bd->props.power = FB_BLANK_UNBLANK;
         backlight_update_status(bd);
diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c
index 6aaddb4f6788..d7994a173245 100644
--- a/drivers/video/nvidia/nv_i2c.c
+++ b/drivers/video/nvidia/nv_i2c.c
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
+#include <linux/gfp.h>
 #include <linux/pci.h>
 #include <linux/fb.h>
 
diff --git a/drivers/video/nvidia/nv_of.c b/drivers/video/nvidia/nv_of.c
index 73afd7eb9977..3bc13df4b120 100644
--- a/drivers/video/nvidia/nv_of.c
+++ b/drivers/video/nvidia/nv_of.c
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
+#include <linux/gfp.h>
 #include <linux/pci.h>
 #include <linux/fb.h>
 
diff --git a/drivers/video/nvidia/nv_setup.c b/drivers/video/nvidia/nv_setup.c
index eef2bb298d9f..2f2e162134fa 100644
--- a/drivers/video/nvidia/nv_setup.c
+++ b/drivers/video/nvidia/nv_setup.c
@@ -50,6 +50,7 @@
 #include <video/vga.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 #include "nv_type.h"
 #include "nv_local.h"
 #include "nv_proto.h"
diff --git a/drivers/video/offb.c b/drivers/video/offb.c
index 4d8c54c23dd7..61f8b8f919b0 100644
--- a/drivers/video/offb.c
+++ b/drivers/video/offb.c
@@ -17,7 +17,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -282,8 +281,17 @@ static int offb_set_par(struct fb_info *info)
         return 0;
 }
 
+static void offb_destroy(struct fb_info *info)
+{
+        if (info->screen_base)
+                iounmap(info->screen_base);
+        release_mem_region(info->aperture_base, info->aperture_size);
+        framebuffer_release(info);
+}
+
 static struct fb_ops offb_ops = {
         .owner          = THIS_MODULE,
+        .fb_destroy     = offb_destroy,
         .fb_setcolreg   = offb_setcolreg,
         .fb_set_par     = offb_set_par,
         .fb_blank       = offb_blank,
@@ -482,10 +490,14 @@ static void __init offb_init_fb(const char *name, const char *full_name,
         var->sync = 0;
         var->vmode = FB_VMODE_NONINTERLACED;
 
+        /* set offb aperture size for generic probing */
+        info->aperture_base = address;
+        info->aperture_size = fix->smem_len;
+
         info->fbops = &offb_ops;
         info->screen_base = ioremap(address, fix->smem_len);
         info->pseudo_palette = (void *) (info + 1);
-        info->flags = FBINFO_DEFAULT | foreign_endian;
+        info->flags = FBINFO_DEFAULT | FBINFO_MISC_FIRMWARE | foreign_endian;
 
         fb_alloc_cmap(&info->cmap, 256, 0);
 
diff --git a/drivers/video/omap/Kconfig b/drivers/video/omap/Kconfig
index 551e3e9c4cbe..455c6055325d 100644
--- a/drivers/video/omap/Kconfig
+++ b/drivers/video/omap/Kconfig
@@ -1,6 +1,7 @@
 config FB_OMAP
         tristate "OMAP frame buffer support (EXPERIMENTAL)"
-        depends on FB && ARCH_OMAP
+        depends on FB && ARCH_OMAP && (OMAP2_DSS = "n")
+
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -72,7 +73,7 @@ config FB_OMAP_LCD_MIPID
 
 config FB_OMAP_BOOTLOADER_INIT
         bool "Check bootloader initialization"
-        depends on FB_OMAP
+        depends on FB_OMAP || FB_OMAP2
         help
           Say Y here if you want to enable checking if the bootloader has
           already initialized the display controller. In this case the
diff --git a/drivers/video/omap/Makefile b/drivers/video/omap/Makefile
index b63b198d1f03..49226a1b909e 100644
--- a/drivers/video/omap/Makefile
+++ b/drivers/video/omap/Makefile
@@ -35,6 +35,7 @@ objs-y$(CONFIG_MACH_OMAP3EVM) += lcd_omap3evm.o
 objs-y$(CONFIG_MACH_OMAP3_BEAGLE) += lcd_omap3beagle.o
 objs-y$(CONFIG_FB_OMAP_LCD_MIPID) += lcd_mipid.o
 objs-y$(CONFIG_MACH_OVERO) += lcd_overo.o
+objs-y$(CONFIG_MACH_HERALD) += lcd_htcherald.o
 
 omapfb-objs := $(objs-yy)
 
diff --git a/drivers/video/omap/blizzard.c b/drivers/video/omap/blizzard.c
index 70dadf9d2334..2ffb34af4c59 100644
--- a/drivers/video/omap/blizzard.c
+++ b/drivers/video/omap/blizzard.c
@@ -26,10 +26,10 @@
 #include <linux/delay.h>
 #include <linux/clk.h>
 
-#include <mach/dma.h>
-#include <mach/omapfb.h>
-#include <mach/blizzard.h>
+#include <plat/dma.h>
+#include <plat/blizzard.h>
 
+#include "omapfb.h"
 #include "dispc.h"
 
 #define MODULE_NAME                             "blizzard"
diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c
index f16e42154229..529483467abf 100644
--- a/drivers/video/omap/dispc.c
+++ b/drivers/video/omap/dispc.c
@@ -24,11 +24,13 @@
 #include <linux/vmalloc.h>
 #include <linux/clk.h>
 #include <linux/io.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
 
-#include <mach/sram.h>
-#include <mach/omapfb.h>
-#include <mach/board.h>
+#include <plat/sram.h>
+#include <plat/board.h>
 
+#include "omapfb.h"
 #include "dispc.h"
 
 #define MODULE_NAME                     "dispc"
@@ -204,6 +206,7 @@ static u32 inline dispc_read_reg(int idx)
 /* Select RFBI or bypass mode */
 static void enable_rfbi_mode(int enable)
 {
+        void __iomem *rfbi_control;
         u32 l;
 
         l = dispc_read_reg(DISPC_CONTROL);
@@ -216,9 +219,15 @@ static void enable_rfbi_mode(int enable)
         dispc_write_reg(DISPC_CONTROL, l);
 
         /* Set bypass mode in RFBI module */
-        l = __raw_readl(OMAP2_IO_ADDRESS(RFBI_CONTROL));
+        rfbi_control = ioremap(RFBI_CONTROL, SZ_1K);
+        if (!rfbi_control) {
+                pr_err("Unable to ioremap rfbi_control\n");
+                return;
+        }
+        l = __raw_readl(rfbi_control);
         l |= enable ? 0 : (1 << 1);
-        __raw_writel(l, OMAP2_IO_ADDRESS(RFBI_CONTROL));
+        __raw_writel(l, rfbi_control);
+        iounmap(rfbi_control);
 }
 
 static void set_lcd_data_lines(int data_lines)
@@ -907,20 +916,20 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *dev)
 
 static int get_dss_clocks(void)
 {
-        dispc.dss_ick = clk_get(dispc.fbdev->dev, "ick");
+        dispc.dss_ick = clk_get(&dispc.fbdev->dssdev->dev, "ick");
         if (IS_ERR(dispc.dss_ick)) {
                 dev_err(dispc.fbdev->dev, "can't get ick\n");
                 return PTR_ERR(dispc.dss_ick);
         }
 
-        dispc.dss1_fck = clk_get(dispc.fbdev->dev, "dss1_fck");
+        dispc.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "dss1_fck");
         if (IS_ERR(dispc.dss1_fck)) {
                 dev_err(dispc.fbdev->dev, "can't get dss1_fck\n");
                 clk_put(dispc.dss_ick);
                 return PTR_ERR(dispc.dss1_fck);
         }
 
-        dispc.dss_54m_fck = clk_get(dispc.fbdev->dev, "tv_fck");
+        dispc.dss_54m_fck = clk_get(&dispc.fbdev->dssdev->dev, "tv_fck");
         if (IS_ERR(dispc.dss_54m_fck)) {
                 dev_err(dispc.fbdev->dev, "can't get tv_fck\n");
                 clk_put(dispc.dss_ick);
@@ -1367,6 +1376,7 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode,
         int r;
         u32 l;
         struct lcd_panel *panel = fbdev->panel;
+        void __iomem *ram_fw_base;
         int tmo = 10000;
         int skip_init = 0;
         int i;
@@ -1441,7 +1451,13 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode,
         }
 
         /* L3 firewall setting: enable access to OCM RAM */
-        __raw_writel(0x402000b0, OMAP2_IO_ADDRESS(0x680050a0));
+        ram_fw_base = ioremap(0x68005000, SZ_1K);
+        if (!ram_fw_base) {
+                dev_err(dispc.fbdev->dev, "Cannot ioremap to enable OCM RAM\n");
+                goto fail1;
+        }
+        __raw_writel(0x402000b0, ram_fw_base + 0xa0);
+        iounmap(ram_fw_base);
 
         if ((r = alloc_palette_ram()) < 0)
                 goto fail2;
diff --git a/drivers/video/omap/hwa742.c b/drivers/video/omap/hwa742.c
index ca51583ec98a..0016f77cd13f 100644
--- a/drivers/video/omap/hwa742.c
+++ b/drivers/video/omap/hwa742.c
@@ -25,10 +25,11 @@
 #include <linux/fb.h>
 #include <linux/delay.h>
 #include <linux/clk.h>
+#include <linux/interrupt.h>
 
-#include <mach/dma.h>
-#include <mach/omapfb.h>
-#include <mach/hwa742.h>
+#include <plat/dma.h>
+#include <plat/hwa742.h>
+#include "omapfb.h"
 
 #define HWA742_REV_CODE_REG       0x0
 #define HWA742_CONFIG_REG         0x2
diff --git a/drivers/video/omap/lcd_2430sdp.c b/drivers/video/omap/lcd_2430sdp.c
index 393712b6f369..e3eccc9af78e 100644
--- a/drivers/video/omap/lcd_2430sdp.c
+++ b/drivers/video/omap/lcd_2430sdp.c
@@ -25,12 +25,13 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/gpio.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 
-#include <mach/mux.h>
-#include <mach/omapfb.h>
+#include <plat/mux.h>
 #include <asm/mach-types.h>
 
+#include "omapfb.h"
+
 #define SDP2430_LCD_PANEL_BACKLIGHT_GPIO        91
 #define SDP2430_LCD_PANEL_ENABLE_GPIO           154
 #define SDP3430_LCD_PANEL_BACKLIGHT_GPIO        24
@@ -51,7 +52,7 @@ static unsigned enable_gpio;
 #define TWL4030_VPLL2_DEV_GRP           0x33
 #define TWL4030_VPLL2_DEDICATED         0x36
 
-#define t2_out(c, r, v) twl4030_i2c_write_u8(c, r, v)
+#define t2_out(c, r, v) twl_i2c_write_u8(c, r, v)
 
 
 static int sdp2430_panel_init(struct lcd_panel *panel,
diff --git a/drivers/video/omap/lcd_ams_delta.c b/drivers/video/omap/lcd_ams_delta.c
index 1f7439955e02..6978ae4ef83a 100644
--- a/drivers/video/omap/lcd_ams_delta.c
+++ b/drivers/video/omap/lcd_ams_delta.c
@@ -24,13 +24,80 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/delay.h>
+#include <linux/lcd.h>
 
-#include <mach/board-ams-delta.h>
+#include <plat/board-ams-delta.h>
 #include <mach/hardware.h>
-#include <mach/omapfb.h>
+
+#include "omapfb.h"
 
 #define AMS_DELTA_DEFAULT_CONTRAST      112
 
+#define AMS_DELTA_MAX_CONTRAST          0x00FF
+#define AMS_DELTA_LCD_POWER             0x0100
+
+
+/* LCD class device section */
+
+static int ams_delta_lcd;
+
+static int ams_delta_lcd_set_power(struct lcd_device *dev, int power)
+{
+        if (power == FB_BLANK_UNBLANK) {
+                if (!(ams_delta_lcd & AMS_DELTA_LCD_POWER)) {
+                        omap_writeb(ams_delta_lcd & AMS_DELTA_MAX_CONTRAST,
+                                        OMAP_PWL_ENABLE);
+                        omap_writeb(1, OMAP_PWL_CLK_ENABLE);
+                        ams_delta_lcd |= AMS_DELTA_LCD_POWER;
+                }
+        } else {
+                if (ams_delta_lcd & AMS_DELTA_LCD_POWER) {
+                        omap_writeb(0, OMAP_PWL_ENABLE);
+                        omap_writeb(0, OMAP_PWL_CLK_ENABLE);
+                        ams_delta_lcd &= ~AMS_DELTA_LCD_POWER;
+                }
+        }
+        return 0;
+}
+
+static int ams_delta_lcd_set_contrast(struct lcd_device *dev, int value)
+{
+        if ((value >= 0) && (value <= AMS_DELTA_MAX_CONTRAST)) {
+                omap_writeb(value, OMAP_PWL_ENABLE);
+                ams_delta_lcd &= ~AMS_DELTA_MAX_CONTRAST;
+                ams_delta_lcd |= value;
+        }
+        return 0;
+}
+
+#ifdef CONFIG_LCD_CLASS_DEVICE
+static int ams_delta_lcd_get_power(struct lcd_device *dev)
+{
+        if (ams_delta_lcd & AMS_DELTA_LCD_POWER)
+                return FB_BLANK_UNBLANK;
+        else
+                return FB_BLANK_POWERDOWN;
+}
+
+static int ams_delta_lcd_get_contrast(struct lcd_device *dev)
+{
+        if (!(ams_delta_lcd & AMS_DELTA_LCD_POWER))
+                return 0;
+
+        return ams_delta_lcd & AMS_DELTA_MAX_CONTRAST;
+}
+
+static struct lcd_ops ams_delta_lcd_ops = {
+        .get_power = ams_delta_lcd_get_power,
+        .set_power = ams_delta_lcd_set_power,
+        .get_contrast = ams_delta_lcd_get_contrast,
+        .set_contrast = ams_delta_lcd_set_contrast,
+};
+#endif
+
+
+/* omapfb panel section */
+
 static int ams_delta_panel_init(struct lcd_panel *panel,
                 struct omapfb_device *fbdev)
 {
@@ -47,10 +114,6 @@ static int ams_delta_panel_enable(struct lcd_panel *panel)
                         AMS_DELTA_LATCH2_LCD_NDISP);
         ams_delta_latch2_write(AMS_DELTA_LATCH2_LCD_VBLEN,
                         AMS_DELTA_LATCH2_LCD_VBLEN);
-
-        omap_writeb(1, OMAP_PWL_CLK_ENABLE);
-        omap_writeb(AMS_DELTA_DEFAULT_CONTRAST, OMAP_PWL_ENABLE);
-
         return 0;
 }
 
@@ -90,8 +153,31 @@ static struct lcd_panel ams_delta_panel = {
         .get_caps       = ams_delta_panel_get_caps,
 };
 
+
+/* platform driver section */
+
 static int ams_delta_panel_probe(struct platform_device *pdev)
 {
+        struct lcd_device *lcd_device = NULL;
+#ifdef CONFIG_LCD_CLASS_DEVICE
+        int ret;
+
+        lcd_device = lcd_device_register("omapfb", &pdev->dev, NULL,
+                                                &ams_delta_lcd_ops);
+
+        if (IS_ERR(lcd_device)) {
+                ret = PTR_ERR(lcd_device);
+                dev_err(&pdev->dev, "failed to register device\n");
+                return ret;
+        }
+
+        platform_set_drvdata(pdev, lcd_device);
+        lcd_device->props.max_contrast = AMS_DELTA_MAX_CONTRAST;
+#endif
+
+        ams_delta_lcd_set_contrast(lcd_device, AMS_DELTA_DEFAULT_CONTRAST);
+        ams_delta_lcd_set_power(lcd_device, FB_BLANK_UNBLANK);
+
         omapfb_register_panel(&ams_delta_panel);
         return 0;
 }
@@ -123,12 +209,12 @@ struct platform_driver ams_delta_panel_driver = {
         },
 };
 
-static int ams_delta_panel_drv_init(void)
+static int __init ams_delta_panel_drv_init(void)
 {
         return platform_driver_register(&ams_delta_panel_driver);
 }
 
-static void ams_delta_panel_drv_cleanup(void)
+static void __exit ams_delta_panel_drv_cleanup(void)
 {
         platform_driver_unregister(&ams_delta_panel_driver);
 }
diff --git a/drivers/video/omap/lcd_apollon.c b/drivers/video/omap/lcd_apollon.c
index 626ae3a532ff..2be94eb3bbf5 100644
--- a/drivers/video/omap/lcd_apollon.c
+++ b/drivers/video/omap/lcd_apollon.c
@@ -25,8 +25,9 @@
 #include <linux/platform_device.h>
 
 #include <mach/gpio.h>
-#include <mach/mux.h>
-#include <mach/omapfb.h>
+#include <plat/mux.h>
+
+#include "omapfb.h"
 
 /* #define USE_35INCH_LCD 1 */
 
diff --git a/drivers/video/omap/lcd_h3.c b/drivers/video/omap/lcd_h3.c
index 417ae5efa8bb..8df688748b5a 100644
--- a/drivers/video/omap/lcd_h3.c
+++ b/drivers/video/omap/lcd_h3.c
@@ -24,7 +24,7 @@
 #include <linux/i2c/tps65010.h>
 
 #include <mach/gpio.h>
-#include <mach/omapfb.h>
+#include "omapfb.h"
 
 #define MODULE_NAME     "omapfb-lcd_h3"
 
diff --git a/drivers/video/omap/lcd_h4.c b/drivers/video/omap/lcd_h4.c
index 0c398bda7601..03a06a982750 100644
--- a/drivers/video/omap/lcd_h4.c
+++ b/drivers/video/omap/lcd_h4.c
@@ -22,7 +22,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
-#include <mach/omapfb.h>
+#include "omapfb.h"
 
 static int h4_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
 {
diff --git a/drivers/video/omap/lcd_htcherald.c b/drivers/video/omap/lcd_htcherald.c
new file mode 100644
index 000000000000..4802419da83b
--- /dev/null
+++ b/drivers/video/omap/lcd_htcherald.c
@@ -0,0 +1,130 @@
+/*
+ * File: drivers/video/omap/lcd-htcherald.c
+ *
+ * LCD panel support for the HTC Herald
+ *
+ * Copyright (C) 2009 Cory Maccarrone <darkstar6262@gmail.com>
+ * Copyright (C) 2009 Wing Linux
+ *
+ * Based on the lcd_htcwizard.c file from the linwizard project:
+ * Copyright (C) linwizard.sourceforge.net
+ * Author: Angelo Arrifano <miknix@gmail.com>
+ * Based on lcd_h4 by Imre Deak <imre.deak@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+#include "omapfb.h"
+
+static int htcherald_panel_init(struct lcd_panel *panel,
+                                        struct omapfb_device *fbdev)
+{
+        return 0;
+}
+
+static void htcherald_panel_cleanup(struct lcd_panel *panel)
+{
+}
+
+static int htcherald_panel_enable(struct lcd_panel *panel)
+{
+        return 0;
+}
+
+static void htcherald_panel_disable(struct lcd_panel *panel)
+{
+}
+
+static unsigned long htcherald_panel_get_caps(struct lcd_panel *panel)
+{
+        return 0;
+}
+
+/* Found on WIZ200 (miknix) and some HERA110 models (darkstar62) */
+struct lcd_panel htcherald_panel_1 = {
+        .name           = "lcd_herald",
+        .config         = OMAP_LCDC_PANEL_TFT |
+                          OMAP_LCDC_INV_HSYNC |
+                          OMAP_LCDC_INV_VSYNC |
+                          OMAP_LCDC_INV_PIX_CLOCK,
+        .bpp            = 16,
+        .data_lines     = 16,
+        .x_res          = 240,
+        .y_res          = 320,
+        .pixel_clock    = 6093,
+        .pcd            = 0, /* 15 */
+        .hsw            = 10,
+        .hfp            = 10,
+        .hbp            = 20,
+        .vsw            = 3,
+        .vfp            = 2,
+        .vbp            = 2,
+
+        .init           = htcherald_panel_init,
+        .cleanup        = htcherald_panel_cleanup,
+        .enable         = htcherald_panel_enable,
+        .disable        = htcherald_panel_disable,
+        .get_caps       = htcherald_panel_get_caps,
+};
+
+static int htcherald_panel_probe(struct platform_device *pdev)
+{
+        omapfb_register_panel(&htcherald_panel_1);
+        return 0;
+}
+
+static int htcherald_panel_remove(struct platform_device *pdev)
+{
+        return 0;
+}
+
+static int htcherald_panel_suspend(struct platform_device *pdev,
+                                                pm_message_t mesg)
+{
+        return 0;
+}
+
+static int htcherald_panel_resume(struct platform_device *pdev)
+{
+        return 0;
+}
+
+struct platform_driver htcherald_panel_driver = {
+        .probe          = htcherald_panel_probe,
+        .remove         = htcherald_panel_remove,
+        .suspend        = htcherald_panel_suspend,
+        .resume         = htcherald_panel_resume,
+        .driver         = {
+                .name   = "lcd_htcherald",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init htcherald_panel_drv_init(void)
+{
+        return platform_driver_register(&htcherald_panel_driver);
+}
+
+static void __exit htcherald_panel_drv_cleanup(void)
+{
+        platform_driver_unregister(&htcherald_panel_driver);
+}
+
+module_init(htcherald_panel_drv_init);
+module_exit(htcherald_panel_drv_cleanup);
+
diff --git a/drivers/video/omap/lcd_inn1510.c b/drivers/video/omap/lcd_inn1510.c
index cdbd8bb607be..3271f1643b26 100644
--- a/drivers/video/omap/lcd_inn1510.c
+++ b/drivers/video/omap/lcd_inn1510.c
@@ -23,8 +23,8 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
-#include <mach/fpga.h>
-#include <mach/omapfb.h>
+#include <plat/fpga.h>
+#include "omapfb.h"
 
 static int innovator1510_panel_init(struct lcd_panel *panel,
                                     struct omapfb_device *fbdev)
diff --git a/drivers/video/omap/lcd_inn1610.c b/drivers/video/omap/lcd_inn1610.c
index 268f7f808a4e..9fff86f67bde 100644
--- a/drivers/video/omap/lcd_inn1610.c
+++ b/drivers/video/omap/lcd_inn1610.c
@@ -23,7 +23,7 @@
 #include <linux/platform_device.h>
 
 #include <mach/gpio.h>
-#include <mach/omapfb.h>
+#include "omapfb.h"
 
 #define MODULE_NAME     "omapfb-lcd_h3"
 
diff --git a/drivers/video/omap/lcd_ldp.c b/drivers/video/omap/lcd_ldp.c
index dbfe8974fb94..0f5952cae85e 100644
--- a/drivers/video/omap/lcd_ldp.c
+++ b/drivers/video/omap/lcd_ldp.c
@@ -24,13 +24,14 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 
 #include <mach/gpio.h>
-#include <mach/mux.h>
-#include <mach/omapfb.h>
+#include <plat/mux.h>
 #include <asm/mach-types.h>
 
+#include "omapfb.h"
+
 #define LCD_PANEL_BACKLIGHT_GPIO        (15 + OMAP_MAX_GPIO_LINES)
 #define LCD_PANEL_ENABLE_GPIO           (7 + OMAP_MAX_GPIO_LINES)
 
@@ -58,7 +59,7 @@
 #define TWL4030_VPLL2_DEV_GRP           0x33
 #define TWL4030_VPLL2_DEDICATED         0x36
 
-#define t2_out(c, r, v) twl4030_i2c_write_u8(c, r, v)
+#define t2_out(c, r, v) twl_i2c_write_u8(c, r, v)
 
 
 static int ldp_panel_init(struct lcd_panel *panel,
diff --git a/drivers/video/omap/lcd_mipid.c b/drivers/video/omap/lcd_mipid.c
index 918ee8934196..64dcc7439c99 100644
--- a/drivers/video/omap/lcd_mipid.c
+++ b/drivers/video/omap/lcd_mipid.c
@@ -20,11 +20,13 @@
  */
 #include <linux/device.h>
 #include <linux/delay.h>
+#include <linux/slab.h>
 #include <linux/workqueue.h>
 #include <linux/spi/spi.h>
 
-#include <mach/omapfb.h>
-#include <mach/lcd_mipid.h>
+#include <plat/lcd_mipid.h>
+
+#include "omapfb.h"
 
 #define MIPID_MODULE_NAME               "lcd_mipid"
 
@@ -607,7 +609,7 @@ static struct spi_driver mipid_spi_driver = {
         .remove = __devexit_p(mipid_spi_remove),
 };
 
-static int mipid_drv_init(void)
+static int __init mipid_drv_init(void)
 {
         spi_register_driver(&mipid_spi_driver);
 
@@ -615,7 +617,7 @@ static int mipid_drv_init(void)
 }
 module_init(mipid_drv_init);
 
-static void mipid_drv_cleanup(void)
+static void __exit mipid_drv_cleanup(void)
 {
         spi_unregister_driver(&mipid_spi_driver);
 }
diff --git a/drivers/video/omap/lcd_omap2evm.c b/drivers/video/omap/lcd_omap2evm.c
index 7a2bbe2ecec3..7e7a65c08452 100644
--- a/drivers/video/omap/lcd_omap2evm.c
+++ b/drivers/video/omap/lcd_omap2evm.c
@@ -24,12 +24,13 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 
-#include <mach/mux.h>
-#include <mach/omapfb.h>
+#include <plat/mux.h>
 #include <asm/mach-types.h>
 
+#include "omapfb.h"
+
 #define LCD_PANEL_ENABLE_GPIO   154
 #define LCD_PANEL_LR            128
 #define LCD_PANEL_UD            129
@@ -60,9 +61,9 @@ static int omap2evm_panel_init(struct lcd_panel *panel,
         gpio_direction_output(LCD_PANEL_LR, 1);
         gpio_direction_output(LCD_PANEL_UD, 1);
 
-        twl4030_i2c_write_u8(TWL4030_MODULE_LED, 0x11, TWL_LED_LEDEN);
-        twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x01, TWL_PWMA_PWMAON);
-        twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x02, TWL_PWMA_PWMAOFF);
+        twl_i2c_write_u8(TWL4030_MODULE_LED, 0x11, TWL_LED_LEDEN);
+        twl_i2c_write_u8(TWL4030_MODULE_PWMA, 0x01, TWL_PWMA_PWMAON);
+        twl_i2c_write_u8(TWL4030_MODULE_PWMA, 0x02, TWL_PWMA_PWMAOFF);
         bklight_level = 100;
 
         return 0;
@@ -100,7 +101,7 @@ static int omap2evm_bklight_setlevel(struct lcd_panel *panel,
         u8 c;
         if ((level >= 0) && (level <= 100)) {
                 c = (125 * (100 - level)) / 100 + 2;
-                twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, c, TWL_PWMA_PWMAOFF);
+                twl_i2c_write_u8(TWL4030_MODULE_PWMA, c, TWL_PWMA_PWMAOFF);
                 bklight_level = level;
         }
         return 0;
diff --git a/drivers/video/omap/lcd_omap3beagle.c b/drivers/video/omap/lcd_omap3beagle.c
index 4011910123bf..ca75cc2a87a5 100644
--- a/drivers/video/omap/lcd_omap3beagle.c
+++ b/drivers/video/omap/lcd_omap3beagle.c
@@ -23,12 +23,14 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 
-#include <mach/mux.h>
-#include <mach/omapfb.h>
+#include <plat/mux.h>
+#include <plat/mux.h>
 #include <asm/mach-types.h>
 
+#include "omapfb.h"
+
 #define LCD_PANEL_ENABLE_GPIO       170
 
 static int omap3beagle_panel_init(struct lcd_panel *panel,
diff --git a/drivers/video/omap/lcd_omap3evm.c b/drivers/video/omap/lcd_omap3evm.c
index b6a4c2c57a2f..06840da0b094 100644
--- a/drivers/video/omap/lcd_omap3evm.c
+++ b/drivers/video/omap/lcd_omap3evm.c
@@ -23,12 +23,13 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 
-#include <mach/mux.h>
-#include <mach/omapfb.h>
+#include <plat/mux.h>
 #include <asm/mach-types.h>
 
+#include "omapfb.h"
+
 #define LCD_PANEL_ENABLE_GPIO       153
 #define LCD_PANEL_LR                2
 #define LCD_PANEL_UD                3
@@ -62,9 +63,9 @@ static int omap3evm_panel_init(struct lcd_panel *panel,
         gpio_direction_output(LCD_PANEL_LR, 1);
         gpio_direction_output(LCD_PANEL_UD, 1);
 
-        twl4030_i2c_write_u8(TWL4030_MODULE_LED, 0x11, TWL_LED_LEDEN);
-        twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x01, TWL_PWMA_PWMAON);
-        twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x02, TWL_PWMA_PWMAOFF);
+        twl_i2c_write_u8(TWL4030_MODULE_LED, 0x11, TWL_LED_LEDEN);
+        twl_i2c_write_u8(TWL4030_MODULE_PWMA, 0x01, TWL_PWMA_PWMAON);
+        twl_i2c_write_u8(TWL4030_MODULE_PWMA, 0x02, TWL_PWMA_PWMAOFF);
         bklight_level = 100;
 
         return 0;
@@ -101,7 +102,7 @@ static int omap3evm_bklight_setlevel(struct lcd_panel *panel,
         u8 c;
         if ((level >= 0) && (level <= 100)) {
                 c = (125 * (100 - level)) / 100 + 2;
-                twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, c, TWL_PWMA_PWMAOFF);
+                twl_i2c_write_u8(TWL4030_MODULE_PWMA, c, TWL_PWMA_PWMAOFF);
                 bklight_level = level;
         }
         return 0;
diff --git a/drivers/video/omap/lcd_osk.c b/drivers/video/omap/lcd_osk.c
index b3fa88bc6269..b87e8b83f29c 100644
--- a/drivers/video/omap/lcd_osk.c
+++ b/drivers/video/omap/lcd_osk.c
@@ -24,8 +24,8 @@
 #include <linux/platform_device.h>
 
 #include <mach/gpio.h>
-#include <mach/mux.h>
-#include <mach/omapfb.h>
+#include <plat/mux.h>
+#include "omapfb.h"
 
 static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
 {
diff --git a/drivers/video/omap/lcd_overo.c b/drivers/video/omap/lcd_overo.c
index 2bc5c9268e5e..564933ffac6e 100644
--- a/drivers/video/omap/lcd_overo.c
+++ b/drivers/video/omap/lcd_overo.c
@@ -21,13 +21,14 @@
 
 #include <linux/module.h>
 #include <linux/platform_device.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 
 #include <mach/gpio.h>
-#include <mach/mux.h>
-#include <mach/omapfb.h>
+#include <plat/mux.h>
 #include <asm/mach-types.h>
 
+#include "omapfb.h"
+
 #define LCD_ENABLE       144
 
 static int overo_panel_init(struct lcd_panel *panel,
diff --git a/drivers/video/omap/lcd_palmte.c b/drivers/video/omap/lcd_palmte.c
index 4bf3c79f3cc7..4cb301750d02 100644
--- a/drivers/video/omap/lcd_palmte.c
+++ b/drivers/video/omap/lcd_palmte.c
@@ -23,8 +23,8 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
-#include <mach/fpga.h>
-#include <mach/omapfb.h>
+#include <plat/fpga.h>
+#include "omapfb.h"
 
 static int palmte_panel_init(struct lcd_panel *panel,
                                 struct omapfb_device *fbdev)
diff --git a/drivers/video/omap/lcd_palmtt.c b/drivers/video/omap/lcd_palmtt.c
index 48ea1f9f2cbf..ff0e6d7ab3a2 100644
--- a/drivers/video/omap/lcd_palmtt.c
+++ b/drivers/video/omap/lcd_palmtt.c
@@ -30,7 +30,7 @@ GPIO13 - screen blanking
 #include <linux/io.h>
 
 #include <mach/gpio.h>
-#include <mach/omapfb.h>
+#include "omapfb.h"
 
 static int palmtt_panel_init(struct lcd_panel *panel,
         struct omapfb_device *fbdev)
diff --git a/drivers/video/omap/lcd_palmz71.c b/drivers/video/omap/lcd_palmz71.c
index 0697d29b4d3b..2334e56536bc 100644
--- a/drivers/video/omap/lcd_palmz71.c
+++ b/drivers/video/omap/lcd_palmz71.c
@@ -24,7 +24,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
-#include <mach/omapfb.h>
+#include "omapfb.h"
 
 static int palmz71_panel_init(struct lcd_panel *panel,
                               struct omapfb_device *fbdev)
diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c
index ab3949256677..43ab7d8b66b2 100644
--- a/drivers/video/omap/lcdc.c
+++ b/drivers/video/omap/lcdc.c
@@ -28,48 +28,19 @@
 #include <linux/dma-mapping.h>
 #include <linux/vmalloc.h>
 #include <linux/clk.h>
+#include <linux/gfp.h>
 
-#include <mach/dma.h>
-#include <mach/omapfb.h>
+#include <mach/lcdc.h>
+#include <plat/dma.h>
 
 #include <asm/mach-types.h>
 
+#include "omapfb.h"
+
 #include "lcdc.h"
 
 #define MODULE_NAME                     "lcdc"
 
-#define OMAP_LCDC_BASE                  0xfffec000
-#define OMAP_LCDC_SIZE                  256
-#define OMAP_LCDC_IRQ                   INT_LCD_CTRL
-
-#define OMAP_LCDC_CONTROL               (OMAP_LCDC_BASE + 0x00)
-#define OMAP_LCDC_TIMING0               (OMAP_LCDC_BASE + 0x04)
-#define OMAP_LCDC_TIMING1               (OMAP_LCDC_BASE + 0x08)
-#define OMAP_LCDC_TIMING2               (OMAP_LCDC_BASE + 0x0c)
-#define OMAP_LCDC_STATUS                (OMAP_LCDC_BASE + 0x10)
-#define OMAP_LCDC_SUBPANEL              (OMAP_LCDC_BASE + 0x14)
-#define OMAP_LCDC_LINE_INT              (OMAP_LCDC_BASE + 0x18)
-#define OMAP_LCDC_DISPLAY_STATUS        (OMAP_LCDC_BASE + 0x1c)
-
-#define OMAP_LCDC_STAT_DONE             (1 << 0)
-#define OMAP_LCDC_STAT_VSYNC            (1 << 1)
-#define OMAP_LCDC_STAT_SYNC_LOST        (1 << 2)
-#define OMAP_LCDC_STAT_ABC              (1 << 3)
-#define OMAP_LCDC_STAT_LINE_INT         (1 << 4)
-#define OMAP_LCDC_STAT_FUF              (1 << 5)
-#define OMAP_LCDC_STAT_LOADED_PALETTE   (1 << 6)
-
-#define OMAP_LCDC_CTRL_LCD_EN           (1 << 0)
-#define OMAP_LCDC_CTRL_LCD_TFT          (1 << 7)
-#define OMAP_LCDC_CTRL_LINE_IRQ_CLR_SEL (1 << 10)
-
-#define OMAP_LCDC_IRQ_VSYNC             (1 << 2)
-#define OMAP_LCDC_IRQ_DONE              (1 << 3)
-#define OMAP_LCDC_IRQ_LOADED_PALETTE    (1 << 4)
-#define OMAP_LCDC_IRQ_LINE_NIRQ         (1 << 5)
-#define OMAP_LCDC_IRQ_LINE              (1 << 6)
-#define OMAP_LCDC_IRQ_MASK              (((1 << 5) - 1) << 2)
-
 #define MAX_PALETTE_SIZE                PAGE_SIZE
 
 enum lcdc_load_mode {
@@ -419,7 +390,7 @@ static int omap_lcdc_enable_plane(int plane, int enable)
 /*
  * Configure the LCD DMA for a palette load operation and do the palette
  * downloading synchronously. We don't use the frame+palette load mode of
- * the controller, since the palette can always be downloaded seperately.
+ * the controller, since the palette can always be downloaded separately.
  */
 static void load_palette(void)
 {
diff --git a/drivers/video/omap/omapfb.h b/drivers/video/omap/omapfb.h
new file mode 100644
index 000000000000..af3c9e571ec3
--- /dev/null
+++ b/drivers/video/omap/omapfb.h
@@ -0,0 +1,229 @@
+/*
+ * File: drivers/video/omap/omapfb.h
+ *
+ * Framebuffer driver for TI OMAP boards
+ *
+ * Copyright (C) 2004 Nokia Corporation
+ * Author: Imre Deak <imre.deak@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef __OMAPFB_H
+#define __OMAPFB_H
+
+#include <linux/fb.h>
+#include <linux/mutex.h>
+#include <linux/omapfb.h>
+
+#define OMAPFB_EVENT_READY      1
+#define OMAPFB_EVENT_DISABLED   2
+
+#define OMAP_LCDC_INV_VSYNC             0x0001
+#define OMAP_LCDC_INV_HSYNC             0x0002
+#define OMAP_LCDC_INV_PIX_CLOCK         0x0004
+#define OMAP_LCDC_INV_OUTPUT_EN         0x0008
+#define OMAP_LCDC_HSVS_RISING_EDGE      0x0010
+#define OMAP_LCDC_HSVS_OPPOSITE         0x0020
+
+#define OMAP_LCDC_SIGNAL_MASK           0x003f
+
+#define OMAP_LCDC_PANEL_TFT             0x0100
+
+#define OMAPFB_PLANE_XRES_MIN           8
+#define OMAPFB_PLANE_YRES_MIN           8
+
+struct omapfb_device;
+
+struct lcd_panel {
+        const char      *name;
+        int             config;         /* TFT/STN, signal inversion */
+        int             bpp;            /* Pixel format in fb mem */
+        int             data_lines;     /* Lines on LCD HW interface */
+
+        int             x_res, y_res;
+        int             pixel_clock;    /* In kHz */
+        int             hsw;            /* Horizontal synchronization
+                                           pulse width */
+        int             hfp;            /* Horizontal front porch */
+        int             hbp;            /* Horizontal back porch */
+        int             vsw;            /* Vertical synchronization
+                                           pulse width */
+        int             vfp;            /* Vertical front porch */
+        int             vbp;            /* Vertical back porch */
+        int             acb;            /* ac-bias pin frequency */
+        int             pcd;            /* pixel clock divider.
+                                           Obsolete use pixel_clock instead */
+
+        int             (*init)         (struct lcd_panel *panel,
+                                         struct omapfb_device *fbdev);
+        void            (*cleanup)      (struct lcd_panel *panel);
+        int             (*enable)       (struct lcd_panel *panel);
+        void            (*disable)      (struct lcd_panel *panel);
+        unsigned long   (*get_caps)     (struct lcd_panel *panel);
+        int             (*set_bklight_level)(struct lcd_panel *panel,
+                                             unsigned int level);
+        unsigned int    (*get_bklight_level)(struct lcd_panel *panel);
+        unsigned int    (*get_bklight_max)  (struct lcd_panel *panel);
+        int             (*run_test)     (struct lcd_panel *panel, int test_num);
+};
+
+struct extif_timings {
+        int cs_on_time;
+        int cs_off_time;
+        int we_on_time;
+        int we_off_time;
+        int re_on_time;
+        int re_off_time;
+        int we_cycle_time;
+        int re_cycle_time;
+        int cs_pulse_width;
+        int access_time;
+
+        int clk_div;
+
+        u32 tim[5];             /* set by extif->convert_timings */
+
+        int converted;
+};
+
+struct lcd_ctrl_extif {
+        int  (*init)            (struct omapfb_device *fbdev);
+        void (*cleanup)         (void);
+        void (*get_clk_info)    (u32 *clk_period, u32 *max_clk_div);
+        unsigned long (*get_max_tx_rate)(void);
+        int  (*convert_timings) (struct extif_timings *timings);
+        void (*set_timings)     (const struct extif_timings *timings);
+        void (*set_bits_per_cycle)(int bpc);
+        void (*write_command)   (const void *buf, unsigned int len);
+        void (*read_data)       (void *buf, unsigned int len);
+        void (*write_data)      (const void *buf, unsigned int len);
+        void (*transfer_area)   (int width, int height,
+                                 void (callback)(void *data), void *data);
+        int  (*setup_tearsync)  (unsigned pin_cnt,
+                                 unsigned hs_pulse_time, unsigned vs_pulse_time,
+                                 int hs_pol_inv, int vs_pol_inv, int div);
+        int  (*enable_tearsync) (int enable, unsigned line);
+
+        unsigned long           max_transmit_size;
+};
+
+struct omapfb_notifier_block {
+        struct notifier_block   nb;
+        void                    *data;
+        int                     plane_idx;
+};
+
+typedef int (*omapfb_notifier_callback_t)(struct notifier_block *,
+                                          unsigned long event,
+                                          void *fbi);
+
+struct lcd_ctrl {
+        const char      *name;
+        void            *data;
+
+        int             (*init)           (struct omapfb_device *fbdev,
+                                           int ext_mode,
+                                           struct omapfb_mem_desc *req_md);
+        void            (*cleanup)        (void);
+        void            (*bind_client)    (struct omapfb_notifier_block *nb);
+        void            (*get_caps)       (int plane, struct omapfb_caps *caps);
+        int             (*set_update_mode)(enum omapfb_update_mode mode);
+        enum omapfb_update_mode (*get_update_mode)(void);
+        int             (*setup_plane)    (int plane, int channel_out,
+                                           unsigned long offset,
+                                           int screen_width,
+                                           int pos_x, int pos_y, int width,
+                                           int height, int color_mode);
+        int             (*set_rotate)     (int angle);
+        int             (*setup_mem)      (int plane, size_t size,
+                                           int mem_type, unsigned long *paddr);
+        int             (*mmap)           (struct fb_info *info,
+                                           struct vm_area_struct *vma);
+        int             (*set_scale)      (int plane,
+                                           int orig_width, int orig_height,
+                                           int out_width, int out_height);
+        int             (*enable_plane)   (int plane, int enable);
+        int             (*update_window)  (struct fb_info *fbi,
+                                           struct omapfb_update_window *win,
+                                           void (*callback)(void *),
+                                           void *callback_data);
+        void            (*sync)           (void);
+        void            (*suspend)        (void);
+        void            (*resume)         (void);
+        int             (*run_test)       (int test_num);
+        int             (*setcolreg)      (u_int regno, u16 red, u16 green,
+                                           u16 blue, u16 transp,
+                                           int update_hw_mem);
+        int             (*set_color_key)  (struct omapfb_color_key *ck);
+        int             (*get_color_key)  (struct omapfb_color_key *ck);
+};
+
+enum omapfb_state {
+        OMAPFB_DISABLED         = 0,
+        OMAPFB_SUSPENDED        = 99,
+        OMAPFB_ACTIVE           = 100
+};
+
+struct omapfb_plane_struct {
+        int                             idx;
+        struct omapfb_plane_info        info;
+        enum omapfb_color_format        color_mode;
+        struct omapfb_device            *fbdev;
+};
+
+struct omapfb_device {
+        int                     state;
+        int                     ext_lcdc;               /* Using external
+                                                           LCD controller */
+        struct mutex            rqueue_mutex;
+
+        int                     palette_size;
+        u32                     pseudo_palette[17];
+
+        struct lcd_panel        *panel;                 /* LCD panel */
+        const struct lcd_ctrl   *ctrl;                  /* LCD controller */
+        const struct lcd_ctrl   *int_ctrl;              /* internal LCD ctrl */
+        struct lcd_ctrl_extif   *ext_if;                /* LCD ctrl external
+                                                           interface */
+        struct device           *dev;
+        struct fb_var_screeninfo        new_var;        /* for mode changes */
+
+        struct omapfb_mem_desc          mem_desc;
+        struct fb_info                  *fb_info[OMAPFB_PLANE_NUM];
+
+        struct platform_device  *dssdev;        /* dummy dev for clocks */
+};
+
+#ifdef CONFIG_ARCH_OMAP1
+extern struct lcd_ctrl omap1_lcd_ctrl;
+#else
+extern struct lcd_ctrl omap2_disp_ctrl;
+#endif
+
+extern void omapfb_register_panel(struct lcd_panel *panel);
+extern void omapfb_write_first_pixel(struct omapfb_device *fbdev, u16 pixval);
+extern void omapfb_notify_clients(struct omapfb_device *fbdev,
+                                  unsigned long event);
+extern int  omapfb_register_client(struct omapfb_notifier_block *nb,
+                                   omapfb_notifier_callback_t callback,
+                                   void *callback_data);
+extern int  omapfb_unregister_client(struct omapfb_notifier_block *nb);
+extern int  omapfb_update_window_async(struct fb_info *fbi,
+                                       struct omapfb_update_window *win,
+                                       void (*callback)(void *),
+                                       void *callback_data);
+
+#endif /* __OMAPFB_H */
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c
index 0d0c8c8b9b56..e264efd0278f 100644
--- a/drivers/video/omap/omapfb_main.c
+++ b/drivers/video/omap/omapfb_main.c
@@ -26,11 +26,12 @@
  */
 #include <linux/platform_device.h>
 #include <linux/mm.h>
+#include <linux/slab.h>
 #include <linux/uaccess.h>
 
-#include <mach/dma.h>
-#include <mach/omapfb.h>
+#include <plat/dma.h>
 
+#include "omapfb.h"
 #include "lcdc.h"
 #include "dispc.h"
 
@@ -83,6 +84,19 @@ static struct caps_table_struct color_caps[] = {
         { 1 << OMAPFB_COLOR_YUY422,     "YUY422", },
 };
 
+static void omapdss_release(struct device *dev)
+{
+}
+
+/* dummy device for clocks */
+static struct platform_device omapdss_device = {
+        .name           = "omapdss",
+        .id             = -1,
+        .dev            = {
+                .release = omapdss_release,
+        },
+};
+
 /*
  * ---------------------------------------------------------------------------
  * LCD panel
@@ -473,10 +487,11 @@ static int set_color_mode(struct omapfb_plane_struct *plane,
                 return 0;
         case 12:
                 var->bits_per_pixel = 16;
-                plane->color_mode = OMAPFB_COLOR_RGB444;
-                return 0;
         case 16:
-                plane->color_mode = OMAPFB_COLOR_RGB565;
+                if (plane->fbdev->panel->bpp == 12)
+                        plane->color_mode = OMAPFB_COLOR_RGB444;
+                else
+                        plane->color_mode = OMAPFB_COLOR_RGB565;
                 return 0;
         default:
                 return -EINVAL;
@@ -1700,6 +1715,7 @@ static int omapfb_do_probe(struct platform_device *pdev,
 
         fbdev->dev = &pdev->dev;
         fbdev->panel = panel;
+        fbdev->dssdev = &omapdss_device;
         platform_set_drvdata(pdev, fbdev);
 
         mutex_init(&fbdev->rqueue_mutex);
@@ -1814,8 +1830,16 @@ cleanup:
 
 static int omapfb_probe(struct platform_device *pdev)
 {
+        int r;
+
         BUG_ON(fbdev_pdev != NULL);
 
+        r = platform_device_register(&omapdss_device);
+        if (r) {
+                dev_err(&pdev->dev, "can't register omapdss device\n");
+                return r;
+        }
+
         /* Delay actual initialization until the LCD is registered */
         fbdev_pdev = pdev;
         if (fbdev_panel != NULL)
@@ -1843,6 +1867,9 @@ static int omapfb_remove(struct platform_device *pdev)
         fbdev->state = OMAPFB_DISABLED;
         omapfb_free_resources(fbdev, saved_state);
 
+        platform_device_unregister(&omapdss_device);
+        fbdev->dssdev = NULL;
+
         return 0;
 }
 
diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c
index ee01e84e19c1..1162603c72e5 100644
--- a/drivers/video/omap/rfbi.c
+++ b/drivers/video/omap/rfbi.c
@@ -27,8 +27,7 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 
-#include <mach/omapfb.h>
-
+#include "omapfb.h"
 #include "dispc.h"
 
 /* To work around an RFBI transfer rate limitation */
@@ -84,13 +83,13 @@ static inline u32 rfbi_read_reg(int idx)
 
 static int rfbi_get_clocks(void)
 {
-        rfbi.dss_ick = clk_get(rfbi.fbdev->dev, "ick");
+        rfbi.dss_ick = clk_get(&dispc.fbdev->dssdev->dev, "ick");
         if (IS_ERR(rfbi.dss_ick)) {
                 dev_err(rfbi.fbdev->dev, "can't get ick\n");
                 return PTR_ERR(rfbi.dss_ick);
         }
 
-        rfbi.dss1_fck = clk_get(rfbi.fbdev->dev, "dss1_fck");
+        rfbi.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "dss1_fck");
         if (IS_ERR(rfbi.dss1_fck)) {
                 dev_err(rfbi.fbdev->dev, "can't get dss1_fck\n");
                 clk_put(rfbi.dss_ick);
diff --git a/drivers/video/omap/sossi.c b/drivers/video/omap/sossi.c
index a76946220249..8fb7c708f563 100644
--- a/drivers/video/omap/sossi.c
+++ b/drivers/video/omap/sossi.c
@@ -23,10 +23,11 @@
 #include <linux/clk.h>
 #include <linux/irq.h>
 #include <linux/io.h>
+#include <linux/interrupt.h>
 
-#include <mach/dma.h>
-#include <mach/omapfb.h>
+#include <plat/dma.h>
 
+#include "omapfb.h"
 #include "lcdc.h"
 
 #define MODULE_NAME             "omapfb-sossi"
diff --git a/drivers/video/omap2/Kconfig b/drivers/video/omap2/Kconfig
new file mode 100644
index 000000000000..d877c361abda
--- /dev/null
+++ b/drivers/video/omap2/Kconfig
@@ -0,0 +1,9 @@
+config OMAP2_VRAM
+        bool
+
+config OMAP2_VRFB
+        bool
+
+source "drivers/video/omap2/dss/Kconfig"
+source "drivers/video/omap2/omapfb/Kconfig"
+source "drivers/video/omap2/displays/Kconfig"
diff --git a/drivers/video/omap2/Makefile b/drivers/video/omap2/Makefile
new file mode 100644
index 000000000000..d853d05dad31
--- /dev/null
+++ b/drivers/video/omap2/Makefile
@@ -0,0 +1,6 @@
+obj-$(CONFIG_OMAP2_VRAM) += vram.o
+obj-$(CONFIG_OMAP2_VRFB) += vrfb.o
+
+obj-y += dss/
+obj-y += omapfb/
+obj-y += displays/
diff --git a/drivers/video/omap2/displays/Kconfig b/drivers/video/omap2/displays/Kconfig
new file mode 100644
index 000000000000..dfb57ee50861
--- /dev/null
+++ b/drivers/video/omap2/displays/Kconfig
@@ -0,0 +1,40 @@
+menu "OMAP2/3 Display Device Drivers"
+        depends on OMAP2_DSS
+
+config PANEL_GENERIC
+        tristate "Generic Panel"
+        help
+          Generic panel driver.
+          Used for DVI output for Beagle and OMAP3 SDP.
+
+config PANEL_SHARP_LS037V7DW01
+        tristate "Sharp LS037V7DW01 LCD Panel"
+        depends on OMAP2_DSS
+        help
+          LCD Panel used in TI's SDP3430 and EVM boards
+
+config PANEL_SHARP_LQ043T1DG01
+        tristate "Sharp LQ043T1DG01 LCD Panel"
+        depends on OMAP2_DSS
+        help
+          LCD Panel used in TI's OMAP3517 EVM boards
+
+config PANEL_TAAL
+        tristate "Taal DSI Panel"
+        depends on OMAP2_DSS_DSI
+        help
+          Taal DSI command mode panel from TPO.
+
+config PANEL_TOPPOLY_TDO35S
+        tristate "Toppoly TDO35S LCD Panel support"
+        depends on OMAP2_DSS
+        help
+          LCD Panel used in CM-T35
+
+config PANEL_TPO_TD043MTEA1
+        tristate "TPO TD043MTEA1 LCD Panel"
+        depends on OMAP2_DSS && I2C
+        help
+          LCD Panel used in OMAP3 Pandora
+
+endmenu
diff --git a/drivers/video/omap2/displays/Makefile b/drivers/video/omap2/displays/Makefile
new file mode 100644
index 000000000000..e2bb32168dee
--- /dev/null
+++ b/drivers/video/omap2/displays/Makefile
@@ -0,0 +1,7 @@
+obj-$(CONFIG_PANEL_GENERIC) += panel-generic.o
+obj-$(CONFIG_PANEL_SHARP_LS037V7DW01) += panel-sharp-ls037v7dw01.o
+obj-$(CONFIG_PANEL_SHARP_LQ043T1DG01) += panel-sharp-lq043t1dg01.o
+
+obj-$(CONFIG_PANEL_TAAL) += panel-taal.o
+obj-$(CONFIG_PANEL_TOPPOLY_TDO35S) += panel-toppoly-tdo35s.o
+obj-$(CONFIG_PANEL_TPO_TD043MTEA1) += panel-tpo-td043mtea1.o
diff --git a/drivers/video/omap2/displays/panel-generic.c b/drivers/video/omap2/displays/panel-generic.c
new file mode 100644
index 000000000000..300eff5de1b4
--- /dev/null
+++ b/drivers/video/omap2/displays/panel-generic.c
@@ -0,0 +1,168 @@
+/*
+ * Generic panel support
+ *
+ * Copyright (C) 2008 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/module.h>
+#include <linux/delay.h>
+
+#include <plat/display.h>
+
+static struct omap_video_timings generic_panel_timings = {
+        /* 640 x 480 @ 60 Hz  Reduced blanking VESA CVT 0.31M3-R */
+        .x_res          = 640,
+        .y_res          = 480,
+        .pixel_clock    = 23500,
+        .hfp            = 48,
+        .hsw            = 32,
+        .hbp            = 80,
+        .vfp            = 3,
+        .vsw            = 4,
+        .vbp            = 7,
+};
+
+static int generic_panel_power_on(struct omap_dss_device *dssdev)
+{
+        int r;
+
+        r = omapdss_dpi_display_enable(dssdev);
+        if (r)
+                goto err0;
+
+        if (dssdev->platform_enable) {
+                r = dssdev->platform_enable(dssdev);
+                if (r)
+                        goto err1;
+        }
+
+        return 0;
+err1:
+        omapdss_dpi_display_disable(dssdev);
+err0:
+        return r;
+}
+
+static void generic_panel_power_off(struct omap_dss_device *dssdev)
+{
+        if (dssdev->platform_disable)
+                dssdev->platform_disable(dssdev);
+
+        omapdss_dpi_display_disable(dssdev);
+}
+
+static int generic_panel_probe(struct omap_dss_device *dssdev)
+{
+        dssdev->panel.config = OMAP_DSS_LCD_TFT;
+        dssdev->panel.timings = generic_panel_timings;
+
+        return 0;
+}
+
+static void generic_panel_remove(struct omap_dss_device *dssdev)
+{
+}
+
+static int generic_panel_enable(struct omap_dss_device *dssdev)
+{
+        int r = 0;
+
+        r = generic_panel_power_on(dssdev);
+        if (r)
+                return r;
+
+        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+        return 0;
+}
+
+static void generic_panel_disable(struct omap_dss_device *dssdev)
+{
+        generic_panel_power_off(dssdev);
+
+        dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
+}
+
+static int generic_panel_suspend(struct omap_dss_device *dssdev)
+{
+        generic_panel_power_off(dssdev);
+        dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
+        return 0;
+}
+
+static int generic_panel_resume(struct omap_dss_device *dssdev)
+{
+        int r = 0;
+
+        r = generic_panel_power_on(dssdev);
+        if (r)
+                return r;
+
+        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+        return 0;
+}
+
+static void generic_panel_set_timings(struct omap_dss_device *dssdev,
+                struct omap_video_timings *timings)
+{
+        dpi_set_timings(dssdev, timings);
+}
+
+static void generic_panel_get_timings(struct omap_dss_device *dssdev,
+                struct omap_video_timings *timings)
+{
+        *timings = dssdev->panel.timings;
+}
+
+static int generic_panel_check_timings(struct omap_dss_device *dssdev,
+                struct omap_video_timings *timings)
+{
+        return dpi_check_timings(dssdev, timings);
+}
+
+static struct omap_dss_driver generic_driver = {
+        .probe          = generic_panel_probe,
+        .remove         = generic_panel_remove,
+
+        .enable         = generic_panel_enable,
+        .disable        = generic_panel_disable,
+        .suspend        = generic_panel_suspend,
+        .resume         = generic_panel_resume,
+
+        .set_timings    = generic_panel_set_timings,
+        .get_timings    = generic_panel_get_timings,
+        .check_timings  = generic_panel_check_timings,
+
+        .driver         = {
+                .name   = "generic_panel",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init generic_panel_drv_init(void)
+{
+        return omap_dss_register_driver(&generic_driver);
+}
+
+static void __exit generic_panel_drv_exit(void)
+{
+        omap_dss_unregister_driver(&generic_driver);
+}
+
+module_init(generic_panel_drv_init);
+module_exit(generic_panel_drv_exit);
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/omap2/displays/panel-sharp-lq043t1dg01.c b/drivers/video/omap2/displays/panel-sharp-lq043t1dg01.c
new file mode 100644
index 000000000000..10267461991c
--- /dev/null
+++ b/drivers/video/omap2/displays/panel-sharp-lq043t1dg01.c
@@ -0,0 +1,159 @@
+/*
+ * LCD panel driver for Sharp LQ043T1DG01
+ *
+ * Copyright (C) 2009 Texas Instruments Inc
+ * Author: Vaibhav Hiremath <hvaibhav@ti.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/err.h>
+
+#include <plat/display.h>
+
+static struct omap_video_timings sharp_lq_timings = {
+        .x_res = 480,
+        .y_res = 272,
+
+        .pixel_clock    = 9000,
+
+        .hsw            = 42,
+        .hfp            = 3,
+        .hbp            = 2,
+
+        .vsw            = 11,
+        .vfp            = 3,
+        .vbp            = 2,
+};
+
+static int sharp_lq_panel_power_on(struct omap_dss_device *dssdev)
+{
+        int r;
+
+        r = omapdss_dpi_display_enable(dssdev);
+        if (r)
+                goto err0;
+
+        /* wait couple of vsyncs until enabling the LCD */
+        msleep(50);
+
+        if (dssdev->platform_enable) {
+                r = dssdev->platform_enable(dssdev);
+                if (r)
+                        goto err1;
+        }
+
+        return 0;
+err1:
+        omapdss_dpi_display_disable(dssdev);
+err0:
+        return r;
+}
+
+static void sharp_lq_panel_power_off(struct omap_dss_device *dssdev)
+{
+        if (dssdev->platform_disable)
+                dssdev->platform_disable(dssdev);
+
+        /* wait at least 5 vsyncs after disabling the LCD */
+        msleep(100);
+
+        omapdss_dpi_display_disable(dssdev);
+}
+
+static int sharp_lq_panel_probe(struct omap_dss_device *dssdev)
+{
+
+        dssdev->panel.config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+                OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IEO;
+        dssdev->panel.acb = 0x0;
+        dssdev->panel.timings = sharp_lq_timings;
+
+        return 0;
+}
+
+static void sharp_lq_panel_remove(struct omap_dss_device *dssdev)
+{
+}
+
+static int sharp_lq_panel_enable(struct omap_dss_device *dssdev)
+{
+        int r = 0;
+
+        r = sharp_lq_panel_power_on(dssdev);
+        if (r)
+                return r;
+
+        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+        return 0;
+}
+
+static void sharp_lq_panel_disable(struct omap_dss_device *dssdev)
+{
+        sharp_lq_panel_power_off(dssdev);
+
+        dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
+}
+
+static int sharp_lq_panel_suspend(struct omap_dss_device *dssdev)
+{
+        sharp_lq_panel_power_off(dssdev);
+        dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
+        return 0;
+}
+
+static int sharp_lq_panel_resume(struct omap_dss_device *dssdev)
+{
+        int r = 0;
+
+        r = sharp_lq_panel_power_on(dssdev);
+        if (r)
+                return r;
+
+        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+        return 0;
+}
+
+static struct omap_dss_driver sharp_lq_driver = {
+        .probe          = sharp_lq_panel_probe,
+        .remove         = sharp_lq_panel_remove,
+
+        .enable         = sharp_lq_panel_enable,
+        .disable        = sharp_lq_panel_disable,
+        .suspend        = sharp_lq_panel_suspend,
+        .resume         = sharp_lq_panel_resume,
+
+        .driver         = {
+                .name   = "sharp_lq_panel",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init sharp_lq_panel_drv_init(void)
+{
+        return omap_dss_register_driver(&sharp_lq_driver);
+}
+
+static void __exit sharp_lq_panel_drv_exit(void)
+{
+        omap_dss_unregister_driver(&sharp_lq_driver);
+}
+
+module_init(sharp_lq_panel_drv_init);
+module_exit(sharp_lq_panel_drv_exit);
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c b/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
new file mode 100644
index 000000000000..8d51a5e6341c
--- /dev/null
+++ b/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
@@ -0,0 +1,148 @@
+/*
+ * LCD panel driver for Sharp LS037V7DW01
+ *
+ * Copyright (C) 2008 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/err.h>
+
+#include <plat/display.h>
+
+static struct omap_video_timings sharp_ls_timings = {
+        .x_res = 480,
+        .y_res = 640,
+
+        .pixel_clock    = 19200,
+
+        .hsw            = 2,
+        .hfp            = 1,
+        .hbp            = 28,
+
+        .vsw            = 1,
+        .vfp            = 1,
+        .vbp            = 1,
+};
+
+static int sharp_ls_panel_probe(struct omap_dss_device *dssdev)
+{
+        dssdev->panel.config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+                OMAP_DSS_LCD_IHS;
+        dssdev->panel.acb = 0x28;
+        dssdev->panel.timings = sharp_ls_timings;
+
+        return 0;
+}
+
+static void sharp_ls_panel_remove(struct omap_dss_device *dssdev)
+{
+}
+
+static int sharp_ls_power_on(struct omap_dss_device *dssdev)
+{
+        int r = 0;
+
+        r = omapdss_dpi_display_enable(dssdev);
+        if (r)
+                goto err0;
+
+        /* wait couple of vsyncs until enabling the LCD */
+        msleep(50);
+
+        if (dssdev->platform_enable) {
+                r = dssdev->platform_enable(dssdev);
+                if (r)
+                        goto err1;
+        }
+
+        return 0;
+err1:
+        omapdss_dpi_display_disable(dssdev);
+err0:
+        return r;
+}
+
+static void sharp_ls_power_off(struct omap_dss_device *dssdev)
+{
+        if (dssdev->platform_disable)
+                dssdev->platform_disable(dssdev);
+
+        /* wait at least 5 vsyncs after disabling the LCD */
+
+        msleep(100);
+
+        omapdss_dpi_display_disable(dssdev);
+}
+
+static int sharp_ls_panel_enable(struct omap_dss_device *dssdev)
+{
+        int r;
+        r = sharp_ls_power_on(dssdev);
+        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+        return r;
+}
+
+static void sharp_ls_panel_disable(struct omap_dss_device *dssdev)
+{
+        sharp_ls_power_off(dssdev);
+        dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
+}
+
+static int sharp_ls_panel_suspend(struct omap_dss_device *dssdev)
+{
+        sharp_ls_power_off(dssdev);
+        dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
+        return 0;
+}
+
+static int sharp_ls_panel_resume(struct omap_dss_device *dssdev)
+{
+        int r;
+        r = sharp_ls_power_on(dssdev);
+        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+        return r;
+}
+
+static struct omap_dss_driver sharp_ls_driver = {
+        .probe          = sharp_ls_panel_probe,
+        .remove         = sharp_ls_panel_remove,
+
+        .enable         = sharp_ls_panel_enable,
+        .disable        = sharp_ls_panel_disable,
+        .suspend        = sharp_ls_panel_suspend,
+        .resume         = sharp_ls_panel_resume,
+
+        .driver         = {
+                .name   = "sharp_ls_panel",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init sharp_ls_panel_drv_init(void)
+{
+        return omap_dss_register_driver(&sharp_ls_driver);
+}
+
+static void __exit sharp_ls_panel_drv_exit(void)
+{
+        omap_dss_unregister_driver(&sharp_ls_driver);
+}
+
+module_init(sharp_ls_panel_drv_init);
+module_exit(sharp_ls_panel_drv_exit);
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c
new file mode 100644
index 000000000000..4f3988a41082
--- /dev/null
+++ b/drivers/video/omap2/displays/panel-taal.c
@@ -0,0 +1,1166 @@
+/*
+ * Taal DSI command mode panel
+ *
+ * Copyright (C) 2009 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*#define DEBUG*/
+
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/jiffies.h>
+#include <linux/sched.h>
+#include <linux/backlight.h>
+#include <linux/fb.h>
+#include <linux/interrupt.h>
+#include <linux/gpio.h>
+#include <linux/completion.h>
+#include <linux/workqueue.h>
+#include <linux/slab.h>
+
+#include <plat/display.h>
+
+/* DSI Virtual channel. Hardcoded for now. */
+#define TCH 0
+
+#define DCS_READ_NUM_ERRORS     0x05
+#define DCS_READ_POWER_MODE     0x0a
+#define DCS_READ_MADCTL         0x0b
+#define DCS_READ_PIXEL_FORMAT   0x0c
+#define DCS_RDDSDR              0x0f
+#define DCS_SLEEP_IN            0x10
+#define DCS_SLEEP_OUT           0x11
+#define DCS_DISPLAY_OFF         0x28
+#define DCS_DISPLAY_ON          0x29
+#define DCS_COLUMN_ADDR         0x2a
+#define DCS_PAGE_ADDR           0x2b
+#define DCS_MEMORY_WRITE        0x2c
+#define DCS_TEAR_OFF            0x34
+#define DCS_TEAR_ON             0x35
+#define DCS_MEM_ACC_CTRL        0x36
+#define DCS_PIXEL_FORMAT        0x3a
+#define DCS_BRIGHTNESS          0x51
+#define DCS_CTRL_DISPLAY        0x53
+#define DCS_WRITE_CABC          0x55
+#define DCS_READ_CABC           0x56
+#define DCS_GET_ID1             0xda
+#define DCS_GET_ID2             0xdb
+#define DCS_GET_ID3             0xdc
+
+/* #define TAAL_USE_ESD_CHECK */
+#define TAAL_ESD_CHECK_PERIOD   msecs_to_jiffies(5000)
+
+static int _taal_enable_te(struct omap_dss_device *dssdev, bool enable);
+
+struct taal_data {
+        struct backlight_device *bldev;
+
+        unsigned long   hw_guard_end;   /* next value of jiffies when we can
+                                         * issue the next sleep in/out command
+                                         */
+        unsigned long   hw_guard_wait;  /* max guard time in jiffies */
+
+        struct omap_dss_device *dssdev;
+
+        bool enabled;
+        u8 rotate;
+        bool mirror;
+
+        bool te_enabled;
+        bool use_ext_te;
+        struct completion te_completion;
+
+        bool use_dsi_bl;
+
+        bool cabc_broken;
+        unsigned cabc_mode;
+
+        bool intro_printed;
+
+        struct workqueue_struct *esd_wq;
+        struct delayed_work esd_work;
+};
+
+static void taal_esd_work(struct work_struct *work);
+
+static void hw_guard_start(struct taal_data *td, int guard_msec)
+{
+        td->hw_guard_wait = msecs_to_jiffies(guard_msec);
+        td->hw_guard_end = jiffies + td->hw_guard_wait;
+}
+
+static void hw_guard_wait(struct taal_data *td)
+{
+        unsigned long wait = td->hw_guard_end - jiffies;
+
+        if ((long)wait > 0 && wait <= td->hw_guard_wait) {
+                set_current_state(TASK_UNINTERRUPTIBLE);
+                schedule_timeout(wait);
+        }
+}
+
+static int taal_dcs_read_1(u8 dcs_cmd, u8 *data)
+{
+        int r;
+        u8 buf[1];
+
+        r = dsi_vc_dcs_read(TCH, dcs_cmd, buf, 1);
+
+        if (r < 0)
+                return r;
+
+        *data = buf[0];
+
+        return 0;
+}
+
+static int taal_dcs_write_0(u8 dcs_cmd)
+{
+        return dsi_vc_dcs_write(TCH, &dcs_cmd, 1);
+}
+
+static int taal_dcs_write_1(u8 dcs_cmd, u8 param)
+{
+        u8 buf[2];
+        buf[0] = dcs_cmd;
+        buf[1] = param;
+        return dsi_vc_dcs_write(TCH, buf, 2);
+}
+
+static int taal_sleep_in(struct taal_data *td)
+
+{
+        u8 cmd;
+        int r;
+
+        hw_guard_wait(td);
+
+        cmd = DCS_SLEEP_IN;
+        r = dsi_vc_dcs_write_nosync(TCH, &cmd, 1);
+        if (r)
+                return r;
+
+        hw_guard_start(td, 120);
+
+        msleep(5);
+
+        return 0;
+}
+
+static int taal_sleep_out(struct taal_data *td)
+{
+        int r;
+
+        hw_guard_wait(td);
+
+        r = taal_dcs_write_0(DCS_SLEEP_OUT);
+        if (r)
+                return r;
+
+        hw_guard_start(td, 120);
+
+        msleep(5);
+
+        return 0;
+}
+
+static int taal_get_id(u8 *id1, u8 *id2, u8 *id3)
+{
+        int r;
+
+        r = taal_dcs_read_1(DCS_GET_ID1, id1);
+        if (r)
+                return r;
+        r = taal_dcs_read_1(DCS_GET_ID2, id2);
+        if (r)
+                return r;
+        r = taal_dcs_read_1(DCS_GET_ID3, id3);
+        if (r)
+                return r;
+
+        return 0;
+}
+
+static int taal_set_addr_mode(u8 rotate, bool mirror)
+{
+        int r;
+        u8 mode;
+        int b5, b6, b7;
+
+        r = taal_dcs_read_1(DCS_READ_MADCTL, &mode);
+        if (r)
+                return r;
+
+        switch (rotate) {
+        default:
+        case 0:
+                b7 = 0;
+                b6 = 0;
+                b5 = 0;
+                break;
+        case 1:
+                b7 = 0;
+                b6 = 1;
+                b5 = 1;
+                break;
+        case 2:
+                b7 = 1;
+                b6 = 1;
+                b5 = 0;
+                break;
+        case 3:
+                b7 = 1;
+                b6 = 0;
+                b5 = 1;
+                break;
+        }
+
+        if (mirror)
+                b6 = !b6;
+
+        mode &= ~((1<<7) | (1<<6) | (1<<5));
+        mode |= (b7 << 7) | (b6 << 6) | (b5 << 5);
+
+        return taal_dcs_write_1(DCS_MEM_ACC_CTRL, mode);
+}
+
+static int taal_set_update_window(u16 x, u16 y, u16 w, u16 h)
+{
+        int r;
+        u16 x1 = x;
+        u16 x2 = x + w - 1;
+        u16 y1 = y;
+        u16 y2 = y + h - 1;
+
+        u8 buf[5];
+        buf[0] = DCS_COLUMN_ADDR;
+        buf[1] = (x1 >> 8) & 0xff;
+        buf[2] = (x1 >> 0) & 0xff;
+        buf[3] = (x2 >> 8) & 0xff;
+        buf[4] = (x2 >> 0) & 0xff;
+
+        r = dsi_vc_dcs_write_nosync(TCH, buf, sizeof(buf));
+        if (r)
+                return r;
+
+        buf[0] = DCS_PAGE_ADDR;
+        buf[1] = (y1 >> 8) & 0xff;
+        buf[2] = (y1 >> 0) & 0xff;
+        buf[3] = (y2 >> 8) & 0xff;
+        buf[4] = (y2 >> 0) & 0xff;
+
+        r = dsi_vc_dcs_write_nosync(TCH, buf, sizeof(buf));
+        if (r)
+                return r;
+
+        dsi_vc_send_bta_sync(TCH);
+
+        return r;
+}
+
+static int taal_bl_update_status(struct backlight_device *dev)
+{
+        struct omap_dss_device *dssdev = dev_get_drvdata(&dev->dev);
+        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+        int r;
+        int level;
+
+        if (dev->props.fb_blank == FB_BLANK_UNBLANK &&
+                        dev->props.power == FB_BLANK_UNBLANK)
+                level = dev->props.brightness;
+        else
+                level = 0;
+
+        dev_dbg(&dssdev->dev, "update brightness to %d\n", level);
+
+        if (td->use_dsi_bl) {
+                if (td->enabled) {
+                        dsi_bus_lock();
+                        r = taal_dcs_write_1(DCS_BRIGHTNESS, level);
+                        dsi_bus_unlock();
+                        if (r)
+                                return r;
+                }
+        } else {
+                if (!dssdev->set_backlight)
+                        return -EINVAL;
+
+                r = dssdev->set_backlight(dssdev, level);
+                if (r)
+                        return r;
+        }
+
+        return 0;
+}
+
+static int taal_bl_get_intensity(struct backlight_device *dev)
+{
+        if (dev->props.fb_blank == FB_BLANK_UNBLANK &&
+                        dev->props.power == FB_BLANK_UNBLANK)
+                return dev->props.brightness;
+
+        return 0;
+}
+
+static struct backlight_ops taal_bl_ops = {
+        .get_brightness = taal_bl_get_intensity,
+        .update_status  = taal_bl_update_status,
+};
+
+static void taal_get_timings(struct omap_dss_device *dssdev,
+                        struct omap_video_timings *timings)
+{
+        *timings = dssdev->panel.timings;
+}
+
+static void taal_get_resolution(struct omap_dss_device *dssdev,
+                u16 *xres, u16 *yres)
+{
+        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+
+        if (td->rotate == 0 || td->rotate == 2) {
+                *xres = dssdev->panel.timings.x_res;
+                *yres = dssdev->panel.timings.y_res;
+        } else {
+                *yres = dssdev->panel.timings.x_res;
+                *xres = dssdev->panel.timings.y_res;
+        }
+}
+
+static irqreturn_t taal_te_isr(int irq, void *data)
+{
+        struct omap_dss_device *dssdev = data;
+        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+
+        complete_all(&td->te_completion);
+
+        return IRQ_HANDLED;
+}
+
+static ssize_t taal_num_errors_show(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+        u8 errors;
+        int r;
+
+        if (td->enabled) {
+                dsi_bus_lock();
+                r = taal_dcs_read_1(DCS_READ_NUM_ERRORS, &errors);
+                dsi_bus_unlock();
+        } else {
+                r = -ENODEV;
+        }
+
+        if (r)
+                return r;
+
+        return snprintf(buf, PAGE_SIZE, "%d\n", errors);
+}
+
+static ssize_t taal_hw_revision_show(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+        u8 id1, id2, id3;
+        int r;
+
+        if (td->enabled) {
+                dsi_bus_lock();
+                r = taal_get_id(&id1, &id2, &id3);
+                dsi_bus_unlock();
+        } else {
+                r = -ENODEV;
+        }
+
+        if (r)
+                return r;
+
+        return snprintf(buf, PAGE_SIZE, "%02x.%02x.%02x\n", id1, id2, id3);
+}
+
+static const char *cabc_modes[] = {
+        "off",          /* used also always when CABC is not supported */
+        "ui",
+        "still-image",
+        "moving-image",
+};
+
+static ssize_t show_cabc_mode(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+        const char *mode_str;
+        int mode;
+        int len;
+
+        mode = td->cabc_mode;
+
+        mode_str = "unknown";
+        if (mode >= 0 && mode < ARRAY_SIZE(cabc_modes))
+                mode_str = cabc_modes[mode];
+        len = snprintf(buf, PAGE_SIZE, "%s\n", mode_str);
+
+        return len < PAGE_SIZE - 1 ? len : PAGE_SIZE - 1;
+}
+
+static ssize_t store_cabc_mode(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(cabc_modes); i++) {
+                if (sysfs_streq(cabc_modes[i], buf))
+                        break;
+        }
+
+        if (i == ARRAY_SIZE(cabc_modes))
+                return -EINVAL;
+
+        if (td->enabled) {
+                dsi_bus_lock();
+                if (!td->cabc_broken)
+                        taal_dcs_write_1(DCS_WRITE_CABC, i);
+                dsi_bus_unlock();
+        }
+
+        td->cabc_mode = i;
+
+        return count;
+}
+
+static ssize_t show_cabc_available_modes(struct device *dev,
+                struct device_attribute *attr,
+                char *buf)
+{
+        int len;
+        int i;
+
+        for (i = 0, len = 0;
+             len < PAGE_SIZE && i < ARRAY_SIZE(cabc_modes); i++)
+                len += snprintf(&buf[len], PAGE_SIZE - len, "%s%s%s",
+                        i ? " " : "", cabc_modes[i],
+                        i == ARRAY_SIZE(cabc_modes) - 1 ? "\n" : "");
+
+        return len < PAGE_SIZE ? len : PAGE_SIZE - 1;
+}
+
+static DEVICE_ATTR(num_dsi_errors, S_IRUGO, taal_num_errors_show, NULL);
+static DEVICE_ATTR(hw_revision, S_IRUGO, taal_hw_revision_show, NULL);
+static DEVICE_ATTR(cabc_mode, S_IRUGO | S_IWUSR,
+                show_cabc_mode, store_cabc_mode);
+static DEVICE_ATTR(cabc_available_modes, S_IRUGO,
+                show_cabc_available_modes, NULL);
+
+static struct attribute *taal_attrs[] = {
+        &dev_attr_num_dsi_errors.attr,
+        &dev_attr_hw_revision.attr,
+        &dev_attr_cabc_mode.attr,
+        &dev_attr_cabc_available_modes.attr,
+        NULL,
+};
+
+static struct attribute_group taal_attr_group = {
+        .attrs = taal_attrs,
+};
+
+static int taal_probe(struct omap_dss_device *dssdev)
+{
+        struct backlight_properties props;
+        struct taal_data *td;
+        struct backlight_device *bldev;
+        int r;
+
+        const struct omap_video_timings taal_panel_timings = {
+                .x_res          = 864,
+                .y_res          = 480,
+        };
+
+        dev_dbg(&dssdev->dev, "probe\n");
+
+        dssdev->panel.config = OMAP_DSS_LCD_TFT;
+        dssdev->panel.timings = taal_panel_timings;
+        dssdev->ctrl.pixel_size = 24;
+
+        td = kzalloc(sizeof(*td), GFP_KERNEL);
+        if (!td) {
+                r = -ENOMEM;
+                goto err0;
+        }
+        td->dssdev = dssdev;
+
+        td->esd_wq = create_singlethread_workqueue("taal_esd");
+        if (td->esd_wq == NULL) {
+                dev_err(&dssdev->dev, "can't create ESD workqueue\n");
+                r = -ENOMEM;
+                goto err1;
+        }
+        INIT_DELAYED_WORK_DEFERRABLE(&td->esd_work, taal_esd_work);
+
+        dev_set_drvdata(&dssdev->dev, td);
+
+        /* if no platform set_backlight() defined, presume DSI backlight
+         * control */
+        memset(&props, 0, sizeof(struct backlight_properties));
+        if (!dssdev->set_backlight)
+                td->use_dsi_bl = true;
+
+        if (td->use_dsi_bl)
+                props.max_brightness = 255;
+        else
+                props.max_brightness = 127;
+        bldev = backlight_device_register("taal", &dssdev->dev, dssdev,
+                                          &taal_bl_ops, &props);
+        if (IS_ERR(bldev)) {
+                r = PTR_ERR(bldev);
+                goto err2;
+        }
+
+        td->bldev = bldev;
+
+        bldev->props.fb_blank = FB_BLANK_UNBLANK;
+        bldev->props.power = FB_BLANK_UNBLANK;
+        if (td->use_dsi_bl)
+                bldev->props.brightness = 255;
+        else
+                bldev->props.brightness = 127;
+
+        taal_bl_update_status(bldev);
+
+        if (dssdev->phy.dsi.ext_te) {
+                int gpio = dssdev->phy.dsi.ext_te_gpio;
+
+                r = gpio_request(gpio, "taal irq");
+                if (r) {
+                        dev_err(&dssdev->dev, "GPIO request failed\n");
+                        goto err3;
+                }
+
+                gpio_direction_input(gpio);
+
+                r = request_irq(gpio_to_irq(gpio), taal_te_isr,
+                                IRQF_DISABLED | IRQF_TRIGGER_RISING,
+                                "taal vsync", dssdev);
+
+                if (r) {
+                        dev_err(&dssdev->dev, "IRQ request failed\n");
+                        gpio_free(gpio);
+                        goto err3;
+                }
+
+                init_completion(&td->te_completion);
+
+                td->use_ext_te = true;
+        }
+
+        r = sysfs_create_group(&dssdev->dev.kobj, &taal_attr_group);
+        if (r) {
+                dev_err(&dssdev->dev, "failed to create sysfs files\n");
+                goto err4;
+        }
+
+        return 0;
+err4:
+        if (td->use_ext_te) {
+                int gpio = dssdev->phy.dsi.ext_te_gpio;
+                free_irq(gpio_to_irq(gpio), dssdev);
+                gpio_free(gpio);
+        }
+err3:
+        backlight_device_unregister(bldev);
+err2:
+        cancel_delayed_work_sync(&td->esd_work);
+        destroy_workqueue(td->esd_wq);
+err1:
+        kfree(td);
+err0:
+        return r;
+}
+
+static void taal_remove(struct omap_dss_device *dssdev)
+{
+        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+        struct backlight_device *bldev;
+
+        dev_dbg(&dssdev->dev, "remove\n");
+
+        sysfs_remove_group(&dssdev->dev.kobj, &taal_attr_group);
+
+        if (td->use_ext_te) {
+                int gpio = dssdev->phy.dsi.ext_te_gpio;
+                free_irq(gpio_to_irq(gpio), dssdev);
+                gpio_free(gpio);
+        }
+
+        bldev = td->bldev;
+        bldev->props.power = FB_BLANK_POWERDOWN;
+        taal_bl_update_status(bldev);
+        backlight_device_unregister(bldev);
+
+        cancel_delayed_work_sync(&td->esd_work);
+        destroy_workqueue(td->esd_wq);
+
+        kfree(td);
+}
+
+static int taal_power_on(struct omap_dss_device *dssdev)
+{
+        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+        u8 id1, id2, id3;
+        int r;
+
+        if (dssdev->platform_enable) {
+                r = dssdev->platform_enable(dssdev);
+                if (r)
+                        return r;
+        }
+
+        /* it seems we have to wait a bit until taal is ready */
+        msleep(5);
+
+        dsi_bus_lock();
+
+        r = omapdss_dsi_display_enable(dssdev);
+        if (r) {
+                dev_err(&dssdev->dev, "failed to enable DSI\n");
+                goto err0;
+        }
+
+        omapdss_dsi_vc_enable_hs(TCH, false);
+
+        r = taal_sleep_out(td);
+        if (r)
+                goto err;
+
+        r = taal_get_id(&id1, &id2, &id3);
+        if (r)
+                goto err;
+
+        /* on early revisions CABC is broken */
+        if (id2 == 0x00 || id2 == 0xff || id2 == 0x81)
+                td->cabc_broken = true;
+
+        taal_dcs_write_1(DCS_BRIGHTNESS, 0xff);
+        taal_dcs_write_1(DCS_CTRL_DISPLAY, (1<<2) | (1<<5)); /* BL | BCTRL */
+
+        taal_dcs_write_1(DCS_PIXEL_FORMAT, 0x7); /* 24bit/pixel */
+
+        taal_set_addr_mode(td->rotate, td->mirror);
+        if (!td->cabc_broken)
+                taal_dcs_write_1(DCS_WRITE_CABC, td->cabc_mode);
+
+        taal_dcs_write_0(DCS_DISPLAY_ON);
+
+        r = _taal_enable_te(dssdev, td->te_enabled);
+        if (r)
+                goto err;
+
+#ifdef TAAL_USE_ESD_CHECK
+        queue_delayed_work(td->esd_wq, &td->esd_work, TAAL_ESD_CHECK_PERIOD);
+#endif
+
+        td->enabled = 1;
+
+        if (!td->intro_printed) {
+                dev_info(&dssdev->dev, "revision %02x.%02x.%02x\n",
+                                id1, id2, id3);
+                if (td->cabc_broken)
+                        dev_info(&dssdev->dev,
+                                        "old Taal version, CABC disabled\n");
+                td->intro_printed = true;
+        }
+
+        omapdss_dsi_vc_enable_hs(TCH, true);
+
+        dsi_bus_unlock();
+
+        return 0;
+err:
+        dsi_bus_unlock();
+
+        omapdss_dsi_display_disable(dssdev);
+err0:
+        if (dssdev->platform_disable)
+                dssdev->platform_disable(dssdev);
+
+        return r;
+}
+
+static void taal_power_off(struct omap_dss_device *dssdev)
+{
+        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+
+        dsi_bus_lock();
+
+        cancel_delayed_work(&td->esd_work);
+
+        taal_dcs_write_0(DCS_DISPLAY_OFF);
+        taal_sleep_in(td);
+
+        /* wait a bit so that the message goes through */
+        msleep(10);
+
+        omapdss_dsi_display_disable(dssdev);
+
+        if (dssdev->platform_disable)
+                dssdev->platform_disable(dssdev);
+
+        td->enabled = 0;
+
+        dsi_bus_unlock();
+}
+
+static int taal_enable(struct omap_dss_device *dssdev)
+{
+        int r;
+        dev_dbg(&dssdev->dev, "enable\n");
+
+        if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED)
+                return -EINVAL;
+
+        r = taal_power_on(dssdev);
+        if (r)
+                return r;
+
+        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+        return r;
+}
+
+static void taal_disable(struct omap_dss_device *dssdev)
+{
+        dev_dbg(&dssdev->dev, "disable\n");
+
+        if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
+                taal_power_off(dssdev);
+
+        dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
+}
+
+static int taal_suspend(struct omap_dss_device *dssdev)
+{
+        dev_dbg(&dssdev->dev, "suspend\n");
+
+        if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
+                return -EINVAL;
+
+        taal_power_off(dssdev);
+        dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
+
+        return 0;
+}
+
+static int taal_resume(struct omap_dss_device *dssdev)
+{
+        int r;
+        dev_dbg(&dssdev->dev, "resume\n");
+
+        if (dssdev->state != OMAP_DSS_DISPLAY_SUSPENDED)
+                return -EINVAL;
+
+        r = taal_power_on(dssdev);
+        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+        return r;
+}
+
+static void taal_framedone_cb(int err, void *data)
+{
+        struct omap_dss_device *dssdev = data;
+        dev_dbg(&dssdev->dev, "framedone, err %d\n", err);
+        dsi_bus_unlock();
+}
+
+static int taal_update(struct omap_dss_device *dssdev,
+                                    u16 x, u16 y, u16 w, u16 h)
+{
+        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+        int r;
+
+        dev_dbg(&dssdev->dev, "update %d, %d, %d x %d\n", x, y, w, h);
+
+        dsi_bus_lock();
+
+        if (!td->enabled) {
+                r = 0;
+                goto err;
+        }
+
+        r = omap_dsi_prepare_update(dssdev, &x, &y, &w, &h);
+        if (r)
+                goto err;
+
+        r = taal_set_update_window(x, y, w, h);
+        if (r)
+                goto err;
+
+        r = omap_dsi_update(dssdev, TCH, x, y, w, h,
+                        taal_framedone_cb, dssdev);
+        if (r)
+                goto err;
+
+        /* note: no bus_unlock here. unlock is in framedone_cb */
+        return 0;
+err:
+        dsi_bus_unlock();
+        return r;
+}
+
+static int taal_sync(struct omap_dss_device *dssdev)
+{
+        dev_dbg(&dssdev->dev, "sync\n");
+
+        dsi_bus_lock();
+        dsi_bus_unlock();
+
+        dev_dbg(&dssdev->dev, "sync done\n");
+
+        return 0;
+}
+
+static int _taal_enable_te(struct omap_dss_device *dssdev, bool enable)
+{
+        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+        int r;
+
+        td->te_enabled = enable;
+
+        if (enable)
+                r = taal_dcs_write_1(DCS_TEAR_ON, 0);
+        else
+                r = taal_dcs_write_0(DCS_TEAR_OFF);
+
+        omapdss_dsi_enable_te(dssdev, enable);
+
+        /* XXX for some reason, DSI TE breaks if we don't wait here.
+         * Panel bug? Needs more studying */
+        msleep(100);
+
+        return r;
+}
+
+static int taal_enable_te(struct omap_dss_device *dssdev, bool enable)
+{
+        int r;
+
+        dsi_bus_lock();
+
+        r = _taal_enable_te(dssdev, enable);
+
+        dsi_bus_unlock();
+
+        return r;
+}
+
+static int taal_get_te(struct omap_dss_device *dssdev)
+{
+        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+        return td->te_enabled;
+}
+
+static int taal_rotate(struct omap_dss_device *dssdev, u8 rotate)
+{
+        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+        int r;
+
+        dev_dbg(&dssdev->dev, "rotate %d\n", rotate);
+
+        dsi_bus_lock();
+
+        if (td->enabled) {
+                r = taal_set_addr_mode(rotate, td->mirror);
+                if (r)
+                        goto err;
+        }
+
+        td->rotate = rotate;
+
+        dsi_bus_unlock();
+        return 0;
+err:
+        dsi_bus_unlock();
+        return r;
+}
+
+static u8 taal_get_rotate(struct omap_dss_device *dssdev)
+{
+        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+        return td->rotate;
+}
+
+static int taal_mirror(struct omap_dss_device *dssdev, bool enable)
+{
+        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+        int r;
+
+        dev_dbg(&dssdev->dev, "mirror %d\n", enable);
+
+        dsi_bus_lock();
+        if (td->enabled) {
+                r = taal_set_addr_mode(td->rotate, enable);
+                if (r)
+                        goto err;
+        }
+
+        td->mirror = enable;
+
+        dsi_bus_unlock();
+        return 0;
+err:
+        dsi_bus_unlock();
+        return r;
+}
+
+static bool taal_get_mirror(struct omap_dss_device *dssdev)
+{
+        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+        return td->mirror;
+}
+
+static int taal_run_test(struct omap_dss_device *dssdev, int test_num)
+{
+        u8 id1, id2, id3;
+        int r;
+
+        dsi_bus_lock();
+
+        r = taal_dcs_read_1(DCS_GET_ID1, &id1);
+        if (r)
+                goto err;
+        r = taal_dcs_read_1(DCS_GET_ID2, &id2);
+        if (r)
+                goto err;
+        r = taal_dcs_read_1(DCS_GET_ID3, &id3);
+        if (r)
+                goto err;
+
+        dsi_bus_unlock();
+        return 0;
+err:
+        dsi_bus_unlock();
+        return r;
+}
+
+static int taal_memory_read(struct omap_dss_device *dssdev,
+                void *buf, size_t size,
+                u16 x, u16 y, u16 w, u16 h)
+{
+        int r;
+        int first = 1;
+        int plen;
+        unsigned buf_used = 0;
+        struct taal_data *td = dev_get_drvdata(&dssdev->dev);
+
+        if (!td->enabled)
+                return -ENODEV;
+
+        if (size < w * h * 3)
+                return -ENOMEM;
+
+        size = min(w * h * 3,
+                        dssdev->panel.timings.x_res *
+                        dssdev->panel.timings.y_res * 3);
+
+        dsi_bus_lock();
+
+        /* plen 1 or 2 goes into short packet. until checksum error is fixed,
+         * use short packets. plen 32 works, but bigger packets seem to cause
+         * an error. */
+        if (size % 2)
+                plen = 1;
+        else
+                plen = 2;
+
+        taal_set_update_window(x, y, w, h);
+
+        r = dsi_vc_set_max_rx_packet_size(TCH, plen);
+        if (r)
+                goto err0;
+
+        while (buf_used < size) {
+                u8 dcs_cmd = first ? 0x2e : 0x3e;
+                first = 0;
+
+                r = dsi_vc_dcs_read(TCH, dcs_cmd,
+                                buf + buf_used, size - buf_used);
+
+                if (r < 0) {
+                        dev_err(&dssdev->dev, "read error\n");
+                        goto err;
+                }
+
+                buf_used += r;
+
+                if (r < plen) {
+                        dev_err(&dssdev->dev, "short read\n");
+                        break;
+                }
+
+                if (signal_pending(current)) {
+                        dev_err(&dssdev->dev, "signal pending, "
+                                        "aborting memory read\n");
+                        r = -ERESTARTSYS;
+                        goto err;
+                }
+        }
+
+        r = buf_used;
+
+err:
+        dsi_vc_set_max_rx_packet_size(TCH, 1);
+err0:
+        dsi_bus_unlock();
+        return r;
+}
+
+static void taal_esd_work(struct work_struct *work)
+{
+        struct taal_data *td = container_of(work, struct taal_data,
+                        esd_work.work);
+        struct omap_dss_device *dssdev = td->dssdev;
+        u8 state1, state2;
+        int r;
+
+        if (!td->enabled)
+                return;
+
+        dsi_bus_lock();
+
+        r = taal_dcs_read_1(DCS_RDDSDR, &state1);
+        if (r) {
+                dev_err(&dssdev->dev, "failed to read Taal status\n");
+                goto err;
+        }
+
+        /* Run self diagnostics */
+        r = taal_sleep_out(td);
+        if (r) {
+                dev_err(&dssdev->dev, "failed to run Taal self-diagnostics\n");
+                goto err;
+        }
+
+        r = taal_dcs_read_1(DCS_RDDSDR, &state2);
+        if (r) {
+                dev_err(&dssdev->dev, "failed to read Taal status\n");
+                goto err;
+        }
+
+        /* Each sleep out command will trigger a self diagnostic and flip
+         * Bit6 if the test passes.
+         */
+        if (!((state1 ^ state2) & (1 << 6))) {
+                dev_err(&dssdev->dev, "LCD self diagnostics failed\n");
+                goto err;
+        }
+        /* Self-diagnostics result is also shown on TE GPIO line. We need
+         * to re-enable TE after self diagnostics */
+        if (td->use_ext_te && td->te_enabled) {
+                r = taal_dcs_write_1(DCS_TEAR_ON, 0);
+                if (r)
+                        goto err;
+        }
+
+        dsi_bus_unlock();
+
+        queue_delayed_work(td->esd_wq, &td->esd_work, TAAL_ESD_CHECK_PERIOD);
+
+        return;
+err:
+        dev_err(&dssdev->dev, "performing LCD reset\n");
+
+        taal_disable(dssdev);
+        taal_enable(dssdev);
+
+        dsi_bus_unlock();
+
+        queue_delayed_work(td->esd_wq, &td->esd_work, TAAL_ESD_CHECK_PERIOD);
+}
+
+static int taal_set_update_mode(struct omap_dss_device *dssdev,
+                enum omap_dss_update_mode mode)
+{
+        if (mode != OMAP_DSS_UPDATE_MANUAL)
+                return -EINVAL;
+        return 0;
+}
+
+static enum omap_dss_update_mode taal_get_update_mode(
+                struct omap_dss_device *dssdev)
+{
+        return OMAP_DSS_UPDATE_MANUAL;
+}
+
+static struct omap_dss_driver taal_driver = {
+        .probe          = taal_probe,
+        .remove         = taal_remove,
+
+        .enable         = taal_enable,
+        .disable        = taal_disable,
+        .suspend        = taal_suspend,
+        .resume         = taal_resume,
+
+        .set_update_mode = taal_set_update_mode,
+        .get_update_mode = taal_get_update_mode,
+
+        .update         = taal_update,
+        .sync           = taal_sync,
+
+        .get_resolution = taal_get_resolution,
+        .get_recommended_bpp = omapdss_default_get_recommended_bpp,
+
+        .enable_te      = taal_enable_te,
+        .get_te         = taal_get_te,
+
+        .set_rotate     = taal_rotate,
+        .get_rotate     = taal_get_rotate,
+        .set_mirror     = taal_mirror,
+        .get_mirror     = taal_get_mirror,
+        .run_test       = taal_run_test,
+        .memory_read    = taal_memory_read,
+
+        .get_timings    = taal_get_timings,
+
+        .driver         = {
+                .name   = "taal",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init taal_init(void)
+{
+        omap_dss_register_driver(&taal_driver);
+
+        return 0;
+}
+
+static void __exit taal_exit(void)
+{
+        omap_dss_unregister_driver(&taal_driver);
+}
+
+module_init(taal_init);
+module_exit(taal_exit);
+
+MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@nokia.com>");
+MODULE_DESCRIPTION("Taal Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/omap2/displays/panel-toppoly-tdo35s.c b/drivers/video/omap2/displays/panel-toppoly-tdo35s.c
new file mode 100644
index 000000000000..fa434ca6e4b7
--- /dev/null
+++ b/drivers/video/omap2/displays/panel-toppoly-tdo35s.c
@@ -0,0 +1,154 @@
+/*
+ * LCD panel driver for Toppoly TDO35S
+ *
+ * Copyright (C) 2009 CompuLab, Ltd.
+ * Author: Mike Rapoport <mike@compulab.co.il>
+ *
+ * Based on generic panel support
+ * Copyright (C) 2008 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/module.h>
+#include <linux/delay.h>
+
+#include <plat/display.h>
+
+static struct omap_video_timings toppoly_tdo_panel_timings = {
+        /* 640 x 480 @ 60 Hz  Reduced blanking VESA CVT 0.31M3-R */
+        .x_res          = 480,
+        .y_res          = 640,
+
+        .pixel_clock    = 26000,
+
+        .hfp            = 104,
+        .hsw            = 8,
+        .hbp            = 8,
+
+        .vfp            = 4,
+        .vsw            = 2,
+        .vbp            = 2,
+};
+
+static int toppoly_tdo_panel_power_on(struct omap_dss_device *dssdev)
+{
+        int r;
+
+        r = omapdss_dpi_display_enable(dssdev);
+        if (r)
+                goto err0;
+
+        if (dssdev->platform_enable) {
+                r = dssdev->platform_enable(dssdev);
+                if (r)
+                        goto err1;
+        }
+
+        return 0;
+err1:
+        omapdss_dpi_display_disable(dssdev);
+err0:
+        return r;
+}
+
+static void toppoly_tdo_panel_power_off(struct omap_dss_device *dssdev)
+{
+        if (dssdev->platform_disable)
+                dssdev->platform_disable(dssdev);
+
+        omapdss_dpi_display_disable(dssdev);
+}
+
+static int toppoly_tdo_panel_probe(struct omap_dss_device *dssdev)
+{
+        dssdev->panel.config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+                OMAP_DSS_LCD_IHS;
+        dssdev->panel.timings = toppoly_tdo_panel_timings;
+
+        return 0;
+}
+
+static void toppoly_tdo_panel_remove(struct omap_dss_device *dssdev)
+{
+}
+
+static int toppoly_tdo_panel_enable(struct omap_dss_device *dssdev)
+{
+        int r = 0;
+
+        r = toppoly_tdo_panel_power_on(dssdev);
+        if (r)
+                return r;
+
+        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+        return 0;
+}
+
+static void toppoly_tdo_panel_disable(struct omap_dss_device *dssdev)
+{
+        toppoly_tdo_panel_power_off(dssdev);
+
+        dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
+}
+
+static int toppoly_tdo_panel_suspend(struct omap_dss_device *dssdev)
+{
+        toppoly_tdo_panel_power_off(dssdev);
+        dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
+        return 0;
+}
+
+static int toppoly_tdo_panel_resume(struct omap_dss_device *dssdev)
+{
+        int r = 0;
+
+        r = toppoly_tdo_panel_power_on(dssdev);
+        if (r)
+                return r;
+
+        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+        return 0;
+}
+
+static struct omap_dss_driver generic_driver = {
+        .probe          = toppoly_tdo_panel_probe,
+        .remove         = toppoly_tdo_panel_remove,
+
+        .enable         = toppoly_tdo_panel_enable,
+        .disable        = toppoly_tdo_panel_disable,
+        .suspend        = toppoly_tdo_panel_suspend,
+        .resume         = toppoly_tdo_panel_resume,
+
+        .driver         = {
+                .name   = "toppoly_tdo35s_panel",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init toppoly_tdo_panel_drv_init(void)
+{
+        return omap_dss_register_driver(&generic_driver);
+}
+
+static void __exit toppoly_tdo_panel_drv_exit(void)
+{
+        omap_dss_unregister_driver(&generic_driver);
+}
+
+module_init(toppoly_tdo_panel_drv_init);
+module_exit(toppoly_tdo_panel_drv_exit);
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/omap2/displays/panel-tpo-td043mtea1.c b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
new file mode 100644
index 000000000000..e866e76b13d0
--- /dev/null
+++ b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
@@ -0,0 +1,529 @@
+/*
+ * LCD panel driver for TPO TD043MTEA1
+ *
+ * Author: Gražvydas Ignotas <notasas@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/spi/spi.h>
+#include <linux/regulator/consumer.h>
+#include <linux/gpio.h>
+#include <linux/err.h>
+#include <linux/slab.h>
+
+#include <plat/display.h>
+
+#define TPO_R02_MODE(x)         ((x) & 7)
+#define TPO_R02_MODE_800x480    7
+#define TPO_R02_NCLK_RISING     BIT(3)
+#define TPO_R02_HSYNC_HIGH      BIT(4)
+#define TPO_R02_VSYNC_HIGH      BIT(5)
+
+#define TPO_R03_NSTANDBY        BIT(0)
+#define TPO_R03_EN_CP_CLK       BIT(1)
+#define TPO_R03_EN_VGL_PUMP     BIT(2)
+#define TPO_R03_EN_PWM          BIT(3)
+#define TPO_R03_DRIVING_CAP_100 BIT(4)
+#define TPO_R03_EN_PRE_CHARGE   BIT(6)
+#define TPO_R03_SOFTWARE_CTL    BIT(7)
+
+#define TPO_R04_NFLIP_H         BIT(0)
+#define TPO_R04_NFLIP_V         BIT(1)
+#define TPO_R04_CP_CLK_FREQ_1H  BIT(2)
+#define TPO_R04_VGL_FREQ_1H     BIT(4)
+
+#define TPO_R03_VAL_NORMAL (TPO_R03_NSTANDBY | TPO_R03_EN_CP_CLK | \
+                        TPO_R03_EN_VGL_PUMP |  TPO_R03_EN_PWM | \
+                        TPO_R03_DRIVING_CAP_100 | TPO_R03_EN_PRE_CHARGE | \
+                        TPO_R03_SOFTWARE_CTL)
+
+#define TPO_R03_VAL_STANDBY (TPO_R03_DRIVING_CAP_100 | \
+                        TPO_R03_EN_PRE_CHARGE | TPO_R03_SOFTWARE_CTL)
+
+static const u16 tpo_td043_def_gamma[12] = {
+        106, 200, 289, 375, 460, 543, 625, 705, 785, 864, 942, 1020
+};
+
+struct tpo_td043_device {
+        struct spi_device *spi;
+        struct regulator *vcc_reg;
+        u16 gamma[12];
+        u32 mode;
+        u32 hmirror:1;
+        u32 vmirror:1;
+};
+
+static int tpo_td043_write(struct spi_device *spi, u8 addr, u8 data)
+{
+        struct spi_message      m;
+        struct spi_transfer     xfer;
+        u16                     w;
+        int                     r;
+
+        spi_message_init(&m);
+
+        memset(&xfer, 0, sizeof(xfer));
+
+        w = ((u16)addr << 10) | (1 << 8) | data;
+        xfer.tx_buf = &w;
+        xfer.bits_per_word = 16;
+        xfer.len = 2;
+        spi_message_add_tail(&xfer, &m);
+
+        r = spi_sync(spi, &m);
+        if (r < 0)
+                dev_warn(&spi->dev, "failed to write to LCD reg (%d)\n", r);
+        return r;
+}
+
+static void tpo_td043_write_gamma(struct spi_device *spi, u16 gamma[12])
+{
+        u8 i, val;
+
+        /* gamma bits [9:8] */
+        for (val = i = 0; i < 4; i++)
+                val |= (gamma[i] & 0x300) >> ((i + 1) * 2);
+        tpo_td043_write(spi, 0x11, val);
+
+        for (val = i = 0; i < 4; i++)
+                val |= (gamma[i+4] & 0x300) >> ((i + 1) * 2);
+        tpo_td043_write(spi, 0x12, val);
+
+        for (val = i = 0; i < 4; i++)
+                val |= (gamma[i+8] & 0x300) >> ((i + 1) * 2);
+        tpo_td043_write(spi, 0x13, val);
+
+        /* gamma bits [7:0] */
+        for (val = i = 0; i < 12; i++)
+                tpo_td043_write(spi, 0x14 + i, gamma[i] & 0xff);
+}
+
+static int tpo_td043_write_mirror(struct spi_device *spi, bool h, bool v)
+{
+        u8 reg4 = TPO_R04_NFLIP_H | TPO_R04_NFLIP_V | \
+                TPO_R04_CP_CLK_FREQ_1H | TPO_R04_VGL_FREQ_1H;
+        if (h)
+                reg4 &= ~TPO_R04_NFLIP_H;
+        if (v)
+                reg4 &= ~TPO_R04_NFLIP_V;
+
+        return tpo_td043_write(spi, 4, reg4);
+}
+
+static int tpo_td043_set_hmirror(struct omap_dss_device *dssdev, bool enable)
+{
+        struct tpo_td043_device *tpo_td043 = dev_get_drvdata(&dssdev->dev);
+
+        tpo_td043->hmirror = enable;
+        return tpo_td043_write_mirror(tpo_td043->spi, tpo_td043->hmirror,
+                        tpo_td043->vmirror);
+}
+
+static bool tpo_td043_get_hmirror(struct omap_dss_device *dssdev)
+{
+        struct tpo_td043_device *tpo_td043 = dev_get_drvdata(&dssdev->dev);
+
+        return tpo_td043->hmirror;
+}
+
+static ssize_t tpo_td043_vmirror_show(struct device *dev,
+        struct device_attribute *attr, char *buf)
+{
+        struct tpo_td043_device *tpo_td043 = dev_get_drvdata(dev);
+
+        return snprintf(buf, PAGE_SIZE, "%d\n", tpo_td043->vmirror);
+}
+
+static ssize_t tpo_td043_vmirror_store(struct device *dev,
+        struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct tpo_td043_device *tpo_td043 = dev_get_drvdata(dev);
+        long val;
+        int ret;
+
+        ret = strict_strtol(buf, 0, &val);
+        if (ret < 0)
+                return ret;
+
+        ret = tpo_td043_write_mirror(tpo_td043->spi, tpo_td043->hmirror, val);
+        if (ret < 0)
+                return ret;
+
+        tpo_td043->vmirror = val;
+
+        return count;
+}
+
+static ssize_t tpo_td043_mode_show(struct device *dev,
+        struct device_attribute *attr, char *buf)
+{
+        struct tpo_td043_device *tpo_td043 = dev_get_drvdata(dev);
+
+        return snprintf(buf, PAGE_SIZE, "%d\n", tpo_td043->mode);
+}
+
+static ssize_t tpo_td043_mode_store(struct device *dev,
+        struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct tpo_td043_device *tpo_td043 = dev_get_drvdata(dev);
+        long val;
+        int ret;
+
+        ret = strict_strtol(buf, 0, &val);
+        if (ret != 0 || val & ~7)
+                return -EINVAL;
+
+        tpo_td043->mode = val;
+
+        val |= TPO_R02_NCLK_RISING;
+        tpo_td043_write(tpo_td043->spi, 2, val);
+
+        return count;
+}
+
+static ssize_t tpo_td043_gamma_show(struct device *dev,
+        struct device_attribute *attr, char *buf)
+{
+        struct tpo_td043_device *tpo_td043 = dev_get_drvdata(dev);
+        ssize_t len = 0;
+        int ret;
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(tpo_td043->gamma); i++) {
+                ret = snprintf(buf + len, PAGE_SIZE - len, "%u ",
+                                tpo_td043->gamma[i]);
+                if (ret < 0)
+                        return ret;
+                len += ret;
+        }
+        buf[len - 1] = '\n';
+
+        return len;
+}
+
+static ssize_t tpo_td043_gamma_store(struct device *dev,
+        struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct tpo_td043_device *tpo_td043 = dev_get_drvdata(dev);
+        unsigned int g[12];
+        int ret;
+        int i;
+
+        ret = sscanf(buf, "%u %u %u %u %u %u %u %u %u %u %u %u",
+                        &g[0], &g[1], &g[2], &g[3], &g[4], &g[5],
+                        &g[6], &g[7], &g[8], &g[9], &g[10], &g[11]);
+
+        if (ret != 12)
+                return -EINVAL;
+
+        for (i = 0; i < 12; i++)
+                tpo_td043->gamma[i] = g[i];
+
+        tpo_td043_write_gamma(tpo_td043->spi, tpo_td043->gamma);
+
+        return count;
+}
+
+static DEVICE_ATTR(vmirror, S_IRUGO | S_IWUSR,
+                tpo_td043_vmirror_show, tpo_td043_vmirror_store);
+static DEVICE_ATTR(mode, S_IRUGO | S_IWUSR,
+                tpo_td043_mode_show, tpo_td043_mode_store);
+static DEVICE_ATTR(gamma, S_IRUGO | S_IWUSR,
+                tpo_td043_gamma_show, tpo_td043_gamma_store);
+
+static struct attribute *tpo_td043_attrs[] = {
+        &dev_attr_vmirror.attr,
+        &dev_attr_mode.attr,
+        &dev_attr_gamma.attr,
+        NULL,
+};
+
+static struct attribute_group tpo_td043_attr_group = {
+        .attrs = tpo_td043_attrs,
+};
+
+static const struct omap_video_timings tpo_td043_timings = {
+        .x_res          = 800,
+        .y_res          = 480,
+
+        .pixel_clock    = 36000,
+
+        .hsw            = 1,
+        .hfp            = 68,
+        .hbp            = 214,
+
+        .vsw            = 1,
+        .vfp            = 39,
+        .vbp            = 34,
+};
+
+static int tpo_td043_power_on(struct omap_dss_device *dssdev)
+{
+        struct tpo_td043_device *tpo_td043 = dev_get_drvdata(&dssdev->dev);
+        int nreset_gpio = dssdev->reset_gpio;
+        int r;
+
+        r = omapdss_dpi_display_enable(dssdev);
+        if (r)
+                goto err0;
+
+        if (dssdev->platform_enable) {
+                r = dssdev->platform_enable(dssdev);
+                if (r)
+                        goto err1;
+        }
+
+        regulator_enable(tpo_td043->vcc_reg);
+
+        /* wait for power up */
+        msleep(160);
+
+        if (gpio_is_valid(nreset_gpio))
+                gpio_set_value(nreset_gpio, 1);
+
+        tpo_td043_write(tpo_td043->spi, 2,
+                        TPO_R02_MODE(tpo_td043->mode) | TPO_R02_NCLK_RISING);
+        tpo_td043_write(tpo_td043->spi, 3, TPO_R03_VAL_NORMAL);
+        tpo_td043_write(tpo_td043->spi, 0x20, 0xf0);
+        tpo_td043_write(tpo_td043->spi, 0x21, 0xf0);
+        tpo_td043_write_mirror(tpo_td043->spi, tpo_td043->hmirror,
+                        tpo_td043->vmirror);
+        tpo_td043_write_gamma(tpo_td043->spi, tpo_td043->gamma);
+
+        return 0;
+err1:
+        omapdss_dpi_display_disable(dssdev);
+err0:
+        return r;
+}
+
+static void tpo_td043_power_off(struct omap_dss_device *dssdev)
+{
+        struct tpo_td043_device *tpo_td043 = dev_get_drvdata(&dssdev->dev);
+        int nreset_gpio = dssdev->reset_gpio;
+
+        tpo_td043_write(tpo_td043->spi, 3,
+                        TPO_R03_VAL_STANDBY | TPO_R03_EN_PWM);
+
+        if (gpio_is_valid(nreset_gpio))
+                gpio_set_value(nreset_gpio, 0);
+
+        /* wait for at least 2 vsyncs before cutting off power */
+        msleep(50);
+
+        tpo_td043_write(tpo_td043->spi, 3, TPO_R03_VAL_STANDBY);
+
+        regulator_disable(tpo_td043->vcc_reg);
+
+        if (dssdev->platform_disable)
+                dssdev->platform_disable(dssdev);
+
+        omapdss_dpi_display_disable(dssdev);
+}
+
+static int tpo_td043_enable(struct omap_dss_device *dssdev)
+{
+        int ret;
+
+        dev_dbg(&dssdev->dev, "enable\n");
+
+        ret = tpo_td043_power_on(dssdev);
+        if (ret)
+                return ret;
+
+        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+        return 0;
+}
+
+static void tpo_td043_disable(struct omap_dss_device *dssdev)
+{
+        dev_dbg(&dssdev->dev, "disable\n");
+
+        tpo_td043_power_off(dssdev);
+
+        dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
+}
+
+static int tpo_td043_suspend(struct omap_dss_device *dssdev)
+{
+        tpo_td043_power_off(dssdev);
+        dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
+        return 0;
+}
+
+static int tpo_td043_resume(struct omap_dss_device *dssdev)
+{
+        int r = 0;
+
+        r = tpo_td043_power_on(dssdev);
+        if (r)
+                return r;
+
+        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+        return 0;
+}
+
+static int tpo_td043_probe(struct omap_dss_device *dssdev)
+{
+        struct tpo_td043_device *tpo_td043 = dev_get_drvdata(&dssdev->dev);
+        int nreset_gpio = dssdev->reset_gpio;
+        int ret = 0;
+
+        dev_dbg(&dssdev->dev, "probe\n");
+
+        if (tpo_td043 == NULL) {
+                dev_err(&dssdev->dev, "missing tpo_td043_device\n");
+                return -ENODEV;
+        }
+
+        dssdev->panel.config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IHS |
+                                OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IPC;
+        dssdev->panel.timings = tpo_td043_timings;
+        dssdev->ctrl.pixel_size = 24;
+
+        tpo_td043->mode = TPO_R02_MODE_800x480;
+        memcpy(tpo_td043->gamma, tpo_td043_def_gamma, sizeof(tpo_td043->gamma));
+
+        tpo_td043->vcc_reg = regulator_get(&dssdev->dev, "vcc");
+        if (IS_ERR(tpo_td043->vcc_reg)) {
+                dev_err(&dssdev->dev, "failed to get LCD VCC regulator\n");
+                ret = PTR_ERR(tpo_td043->vcc_reg);
+                goto fail_regulator;
+        }
+
+        if (gpio_is_valid(nreset_gpio)) {
+                ret = gpio_request(nreset_gpio, "lcd reset");
+                if (ret < 0) {
+                        dev_err(&dssdev->dev, "couldn't request reset GPIO\n");
+                        goto fail_gpio_req;
+                }
+
+                ret = gpio_direction_output(nreset_gpio, 0);
+                if (ret < 0) {
+                        dev_err(&dssdev->dev, "couldn't set GPIO direction\n");
+                        goto fail_gpio_direction;
+                }
+        }
+
+        ret = sysfs_create_group(&dssdev->dev.kobj, &tpo_td043_attr_group);
+        if (ret)
+                dev_warn(&dssdev->dev, "failed to create sysfs files\n");
+
+        return 0;
+
+fail_gpio_direction:
+        gpio_free(nreset_gpio);
+fail_gpio_req:
+        regulator_put(tpo_td043->vcc_reg);
+fail_regulator:
+        kfree(tpo_td043);
+        return ret;
+}
+
+static void tpo_td043_remove(struct omap_dss_device *dssdev)
+{
+        struct tpo_td043_device *tpo_td043 = dev_get_drvdata(&dssdev->dev);
+        int nreset_gpio = dssdev->reset_gpio;
+
+        dev_dbg(&dssdev->dev, "remove\n");
+
+        sysfs_remove_group(&dssdev->dev.kobj, &tpo_td043_attr_group);
+        regulator_put(tpo_td043->vcc_reg);
+        if (gpio_is_valid(nreset_gpio))
+                gpio_free(nreset_gpio);
+}
+
+static struct omap_dss_driver tpo_td043_driver = {
+        .probe          = tpo_td043_probe,
+        .remove         = tpo_td043_remove,
+
+        .enable         = tpo_td043_enable,
+        .disable        = tpo_td043_disable,
+        .suspend        = tpo_td043_suspend,
+        .resume         = tpo_td043_resume,
+        .set_mirror     = tpo_td043_set_hmirror,
+        .get_mirror     = tpo_td043_get_hmirror,
+
+        .driver         = {
+                .name   = "tpo_td043mtea1_panel",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int tpo_td043_spi_probe(struct spi_device *spi)
+{
+        struct omap_dss_device *dssdev = spi->dev.platform_data;
+        struct tpo_td043_device *tpo_td043;
+        int ret;
+
+        if (dssdev == NULL) {
+                dev_err(&spi->dev, "missing dssdev\n");
+                return -ENODEV;
+        }
+
+        spi->bits_per_word = 16;
+        spi->mode = SPI_MODE_0;
+
+        ret = spi_setup(spi);
+        if (ret < 0) {
+                dev_err(&spi->dev, "spi_setup failed: %d\n", ret);
+                return ret;
+        }
+
+        tpo_td043 = kzalloc(sizeof(*tpo_td043), GFP_KERNEL);
+        if (tpo_td043 == NULL)
+                return -ENOMEM;
+
+        tpo_td043->spi = spi;
+        dev_set_drvdata(&spi->dev, tpo_td043);
+        dev_set_drvdata(&dssdev->dev, tpo_td043);
+
+        omap_dss_register_driver(&tpo_td043_driver);
+
+        return 0;
+}
+
+static int __devexit tpo_td043_spi_remove(struct spi_device *spi)
+{
+        struct tpo_td043_device *tpo_td043 = dev_get_drvdata(&spi->dev);
+
+        omap_dss_unregister_driver(&tpo_td043_driver);
+        kfree(tpo_td043);
+
+        return 0;
+}
+
+static struct spi_driver tpo_td043_spi_driver = {
+        .driver = {
+                .name   = "tpo_td043mtea1_panel_spi",
+                .bus    = &spi_bus_type,
+                .owner  = THIS_MODULE,
+        },
+        .probe  = tpo_td043_spi_probe,
+        .remove = __devexit_p(tpo_td043_spi_remove),
+};
+
+static int __init tpo_td043_init(void)
+{
+        return spi_register_driver(&tpo_td043_spi_driver);
+}
+
+static void __exit tpo_td043_exit(void)
+{
+        spi_unregister_driver(&tpo_td043_spi_driver);
+}
+
+module_init(tpo_td043_init);
+module_exit(tpo_td043_exit);
+
+MODULE_AUTHOR("Gražvydas Ignotas <notasas@gmail.com>");
+MODULE_DESCRIPTION("TPO TD043MTEA1 LCD Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/omap2/dss/Kconfig b/drivers/video/omap2/dss/Kconfig
new file mode 100644
index 000000000000..87afb81b2c44
--- /dev/null
+++ b/drivers/video/omap2/dss/Kconfig
@@ -0,0 +1,114 @@
+menuconfig OMAP2_DSS
+        tristate "OMAP2/3 Display Subsystem support (EXPERIMENTAL)"
+        depends on ARCH_OMAP2 || ARCH_OMAP3
+        help
+          OMAP2/3 Display Subsystem support.
+
+if OMAP2_DSS
+
+config OMAP2_VRAM_SIZE
+        int "VRAM size (MB)"
+        range 0 32
+        default 0
+        help
+          The amount of SDRAM to reserve at boot time for video RAM use.
+          This VRAM will be used by omapfb and other drivers that need
+          large continuous RAM area for video use.
+
+          You can also set this with "vram=<bytes>" kernel argument, or
+          in the board file.
+
+config OMAP2_DSS_DEBUG_SUPPORT
+        bool "Debug support"
+        default y
+        help
+          This enables debug messages. You need to enable printing
+          with 'debug' module parameter.
+
+config OMAP2_DSS_COLLECT_IRQ_STATS
+        bool "Collect DSS IRQ statistics"
+        depends on OMAP2_DSS_DEBUG_SUPPORT
+        default n
+        help
+          Collect DSS IRQ statistics, printable via debugfs.
+
+          The statistics can be found from
+          <debugfs>/omapdss/dispc_irq for DISPC interrupts, and
+          <debugfs>/omapdss/dsi_irq for DSI interrupts.
+
+config OMAP2_DSS_RFBI
+        bool "RFBI support"
+        default n
+        help
+          MIPI DBI support (RFBI, Remote Framebuffer Interface, in Texas
+          Instrument's terminology).
+
+          DBI is a bus between the host processor and a peripheral,
+          such as a display or a framebuffer chip.
+
+          See http://www.mipi.org/ for DBI spesifications.
+
+config OMAP2_DSS_VENC
+        bool "VENC support"
+        default y
+        help
+          OMAP Video Encoder support for S-Video and composite TV-out.
+
+config OMAP2_DSS_SDI
+        bool "SDI support"
+        depends on ARCH_OMAP3
+        default n
+        help
+          SDI (Serial Display Interface) support.
+
+          SDI is a high speed one-way display serial bus between the host
+          processor and a display.
+
+config OMAP2_DSS_DSI
+        bool "DSI support"
+        depends on ARCH_OMAP3
+        default n
+        help
+          MIPI DSI (Display Serial Interface) support.
+
+          DSI is a high speed half-duplex serial interface between the host
+          processor and a peripheral, such as a display or a framebuffer chip.
+
+          See http://www.mipi.org/ for DSI spesifications.
+
+config OMAP2_DSS_USE_DSI_PLL
+        bool "Use DSI PLL for PCLK (EXPERIMENTAL)"
+        default n
+        depends on OMAP2_DSS_DSI
+        help
+          Use DSI PLL to generate pixel clock.  Currently only for DPI output.
+          DSI PLL can be used to generate higher and more precise pixel clocks.
+
+config OMAP2_DSS_FAKE_VSYNC
+        bool "Fake VSYNC irq from manual update displays"
+        default n
+        help
+          If this is selected, DSI will generate a fake DISPC VSYNC interrupt
+          when DSI has sent a frame. This is only needed with DSI or RFBI
+          displays using manual mode, and you want VSYNC to, for example,
+          time animation.
+
+config OMAP2_DSS_MIN_FCK_PER_PCK
+        int "Minimum FCK/PCK ratio (for scaling)"
+        range 0 32
+        default 0
+        help
+          This can be used to adjust the minimum FCK/PCK ratio.
+
+          With this you can make sure that DISPC FCK is at least
+          n x PCK. Video plane scaling requires higher FCK than
+          normally.
+
+          If this is set to 0, there's no extra constraint on the
+          DISPC FCK. However, the FCK will at minimum be
+          2xPCK (if active matrix) or 3xPCK (if passive matrix).
+
+          Max FCK is 173MHz, so this doesn't work if your PCK
+          is very high.
+
+endif
diff --git a/drivers/video/omap2/dss/Makefile b/drivers/video/omap2/dss/Makefile
new file mode 100644
index 000000000000..980c72c2db98
--- /dev/null
+++ b/drivers/video/omap2/dss/Makefile
@@ -0,0 +1,6 @@
+obj-$(CONFIG_OMAP2_DSS) += omapdss.o
+omapdss-y := core.o dss.o dispc.o dpi.o display.o manager.o overlay.o
+omapdss-$(CONFIG_OMAP2_DSS_RFBI) += rfbi.o
+omapdss-$(CONFIG_OMAP2_DSS_VENC) += venc.o
+omapdss-$(CONFIG_OMAP2_DSS_SDI) += sdi.o
+omapdss-$(CONFIG_OMAP2_DSS_DSI) += dsi.o
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
new file mode 100644
index 000000000000..7ebe50b335ed
--- /dev/null
+++ b/drivers/video/omap2/dss/core.c
@@ -0,0 +1,976 @@
+/*
+ * linux/drivers/video/omap2/dss/core.c
+ *
+ * Copyright (C) 2009 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * Some code and ideas taken from drivers/video/omap/ driver
+ * by Imre Deak.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define DSS_SUBSYS_NAME "CORE"
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
+#include <linux/seq_file.h>
+#include <linux/debugfs.h>
+#include <linux/io.h>
+#include <linux/device.h>
+#include <linux/regulator/consumer.h>
+
+#include <plat/display.h>
+#include <plat/clock.h>
+
+#include "dss.h"
+
+static struct {
+        struct platform_device *pdev;
+        int             ctx_id;
+
+        struct clk      *dss_ick;
+        struct clk      *dss1_fck;
+        struct clk      *dss2_fck;
+        struct clk      *dss_54m_fck;
+        struct clk      *dss_96m_fck;
+        unsigned        num_clks_enabled;
+
+        struct regulator *vdds_dsi_reg;
+        struct regulator *vdds_sdi_reg;
+        struct regulator *vdda_dac_reg;
+} core;
+
+static void dss_clk_enable_all_no_ctx(void);
+static void dss_clk_disable_all_no_ctx(void);
+static void dss_clk_enable_no_ctx(enum dss_clock clks);
+static void dss_clk_disable_no_ctx(enum dss_clock clks);
+
+static char *def_disp_name;
+module_param_named(def_disp, def_disp_name, charp, 0);
+MODULE_PARM_DESC(def_disp_name, "default display name");
+
+#ifdef DEBUG
+unsigned int dss_debug;
+module_param_named(debug, dss_debug, bool, 0644);
+#endif
+
+/* CONTEXT */
+static int dss_get_ctx_id(void)
+{
+        struct omap_dss_board_info *pdata = core.pdev->dev.platform_data;
+        int r;
+
+        if (!pdata->get_last_off_on_transaction_id)
+                return 0;
+        r = pdata->get_last_off_on_transaction_id(&core.pdev->dev);
+        if (r < 0) {
+                dev_err(&core.pdev->dev, "getting transaction ID failed, "
+                                "will force context restore\n");
+                r = -1;
+        }
+        return r;
+}
+
+int dss_need_ctx_restore(void)
+{
+        int id = dss_get_ctx_id();
+
+        if (id < 0 || id != core.ctx_id) {
+                DSSDBG("ctx id %d -> id %d\n",
+                                core.ctx_id, id);
+                core.ctx_id = id;
+                return 1;
+        } else {
+                return 0;
+        }
+}
+
+static void save_all_ctx(void)
+{
+        DSSDBG("save context\n");
+
+        dss_clk_enable_no_ctx(DSS_CLK_ICK | DSS_CLK_FCK1);
+
+        dss_save_context();
+        dispc_save_context();
+#ifdef CONFIG_OMAP2_DSS_DSI
+        dsi_save_context();
+#endif
+
+        dss_clk_disable_no_ctx(DSS_CLK_ICK | DSS_CLK_FCK1);
+}
+
+static void restore_all_ctx(void)
+{
+        DSSDBG("restore context\n");
+
+        dss_clk_enable_all_no_ctx();
+
+        dss_restore_context();
+        dispc_restore_context();
+#ifdef CONFIG_OMAP2_DSS_DSI
+        dsi_restore_context();
+#endif
+
+        dss_clk_disable_all_no_ctx();
+}
+
+#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT)
+/* CLOCKS */
+static void core_dump_clocks(struct seq_file *s)
+{
+        int i;
+        struct clk *clocks[5] = {
+                core.dss_ick,
+                core.dss1_fck,
+                core.dss2_fck,
+                core.dss_54m_fck,
+                core.dss_96m_fck
+        };
+
+        seq_printf(s, "- CORE -\n");
+
+        seq_printf(s, "internal clk count\t\t%u\n", core.num_clks_enabled);
+
+        for (i = 0; i < 5; i++) {
+                if (!clocks[i])
+                        continue;
+                seq_printf(s, "%-15s\t%lu\t%d\n",
+                                clocks[i]->name,
+                                clk_get_rate(clocks[i]),
+                                clocks[i]->usecount);
+        }
+}
+#endif /* defined(CONFIG_DEBUG_FS) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT) */
+
+static int dss_get_clock(struct clk **clock, const char *clk_name)
+{
+        struct clk *clk;
+
+        clk = clk_get(&core.pdev->dev, clk_name);
+
+        if (IS_ERR(clk)) {
+                DSSERR("can't get clock %s", clk_name);
+                return PTR_ERR(clk);
+        }
+
+        *clock = clk;
+
+        DSSDBG("clk %s, rate %ld\n", clk_name, clk_get_rate(clk));
+
+        return 0;
+}
+
+static int dss_get_clocks(void)
+{
+        int r;
+
+        core.dss_ick = NULL;
+        core.dss1_fck = NULL;
+        core.dss2_fck = NULL;
+        core.dss_54m_fck = NULL;
+        core.dss_96m_fck = NULL;
+
+        r = dss_get_clock(&core.dss_ick, "ick");
+        if (r)
+                goto err;
+
+        r = dss_get_clock(&core.dss1_fck, "dss1_fck");
+        if (r)
+                goto err;
+
+        r = dss_get_clock(&core.dss2_fck, "dss2_fck");
+        if (r)
+                goto err;
+
+        r = dss_get_clock(&core.dss_54m_fck, "tv_fck");
+        if (r)
+                goto err;
+
+        r = dss_get_clock(&core.dss_96m_fck, "video_fck");
+        if (r)
+                goto err;
+
+        return 0;
+
+err:
+        if (core.dss_ick)
+                clk_put(core.dss_ick);
+        if (core.dss1_fck)
+                clk_put(core.dss1_fck);
+        if (core.dss2_fck)
+                clk_put(core.dss2_fck);
+        if (core.dss_54m_fck)
+                clk_put(core.dss_54m_fck);
+        if (core.dss_96m_fck)
+                clk_put(core.dss_96m_fck);
+
+        return r;
+}
+
+static void dss_put_clocks(void)
+{
+        if (core.dss_96m_fck)
+                clk_put(core.dss_96m_fck);
+        clk_put(core.dss_54m_fck);
+        clk_put(core.dss1_fck);
+        clk_put(core.dss2_fck);
+        clk_put(core.dss_ick);
+}
+
+unsigned long dss_clk_get_rate(enum dss_clock clk)
+{
+        switch (clk) {
+        case DSS_CLK_ICK:
+                return clk_get_rate(core.dss_ick);
+        case DSS_CLK_FCK1:
+                return clk_get_rate(core.dss1_fck);
+        case DSS_CLK_FCK2:
+                return clk_get_rate(core.dss2_fck);
+        case DSS_CLK_54M:
+                return clk_get_rate(core.dss_54m_fck);
+        case DSS_CLK_96M:
+                return clk_get_rate(core.dss_96m_fck);
+        }
+
+        BUG();
+        return 0;
+}
+
+static unsigned count_clk_bits(enum dss_clock clks)
+{
+        unsigned num_clks = 0;
+
+        if (clks & DSS_CLK_ICK)
+                ++num_clks;
+        if (clks & DSS_CLK_FCK1)
+                ++num_clks;
+        if (clks & DSS_CLK_FCK2)
+                ++num_clks;
+        if (clks & DSS_CLK_54M)
+                ++num_clks;
+        if (clks & DSS_CLK_96M)
+                ++num_clks;
+
+        return num_clks;
+}
+
+static void dss_clk_enable_no_ctx(enum dss_clock clks)
+{
+        unsigned num_clks = count_clk_bits(clks);
+
+        if (clks & DSS_CLK_ICK)
+                clk_enable(core.dss_ick);
+        if (clks & DSS_CLK_FCK1)
+                clk_enable(core.dss1_fck);
+        if (clks & DSS_CLK_FCK2)
+                clk_enable(core.dss2_fck);
+        if (clks & DSS_CLK_54M)
+                clk_enable(core.dss_54m_fck);
+        if (clks & DSS_CLK_96M)
+                clk_enable(core.dss_96m_fck);
+
+        core.num_clks_enabled += num_clks;
+}
+
+void dss_clk_enable(enum dss_clock clks)
+{
+        bool check_ctx = core.num_clks_enabled == 0;
+
+        dss_clk_enable_no_ctx(clks);
+
+        if (check_ctx && cpu_is_omap34xx() && dss_need_ctx_restore())
+                restore_all_ctx();
+}
+
+static void dss_clk_disable_no_ctx(enum dss_clock clks)
+{
+        unsigned num_clks = count_clk_bits(clks);
+
+        if (clks & DSS_CLK_ICK)
+                clk_disable(core.dss_ick);
+        if (clks & DSS_CLK_FCK1)
+                clk_disable(core.dss1_fck);
+        if (clks & DSS_CLK_FCK2)
+                clk_disable(core.dss2_fck);
+        if (clks & DSS_CLK_54M)
+                clk_disable(core.dss_54m_fck);
+        if (clks & DSS_CLK_96M)
+                clk_disable(core.dss_96m_fck);
+
+        core.num_clks_enabled -= num_clks;
+}
+
+void dss_clk_disable(enum dss_clock clks)
+{
+        if (cpu_is_omap34xx()) {
+                unsigned num_clks = count_clk_bits(clks);
+
+                BUG_ON(core.num_clks_enabled < num_clks);
+
+                if (core.num_clks_enabled == num_clks)
+                        save_all_ctx();
+        }
+
+        dss_clk_disable_no_ctx(clks);
+}
+
+static void dss_clk_enable_all_no_ctx(void)
+{
+        enum dss_clock clks;
+
+        clks = DSS_CLK_ICK | DSS_CLK_FCK1 | DSS_CLK_FCK2 | DSS_CLK_54M;
+        if (cpu_is_omap34xx())
+                clks |= DSS_CLK_96M;
+        dss_clk_enable_no_ctx(clks);
+}
+
+static void dss_clk_disable_all_no_ctx(void)
+{
+        enum dss_clock clks;
+
+        clks = DSS_CLK_ICK | DSS_CLK_FCK1 | DSS_CLK_FCK2 | DSS_CLK_54M;
+        if (cpu_is_omap34xx())
+                clks |= DSS_CLK_96M;
+        dss_clk_disable_no_ctx(clks);
+}
+
+static void dss_clk_disable_all(void)
+{
+        enum dss_clock clks;
+
+        clks = DSS_CLK_ICK | DSS_CLK_FCK1 | DSS_CLK_FCK2 | DSS_CLK_54M;
+        if (cpu_is_omap34xx())
+                clks |= DSS_CLK_96M;
+        dss_clk_disable(clks);
+}
+
+/* REGULATORS */
+
+struct regulator *dss_get_vdds_dsi(void)
+{
+        struct regulator *reg;
+
+        if (core.vdds_dsi_reg != NULL)
+                return core.vdds_dsi_reg;
+
+        reg = regulator_get(&core.pdev->dev, "vdds_dsi");
+        if (!IS_ERR(reg))
+                core.vdds_dsi_reg = reg;
+
+        return reg;
+}
+
+struct regulator *dss_get_vdds_sdi(void)
+{
+        struct regulator *reg;
+
+        if (core.vdds_sdi_reg != NULL)
+                return core.vdds_sdi_reg;
+
+        reg = regulator_get(&core.pdev->dev, "vdds_sdi");
+        if (!IS_ERR(reg))
+                core.vdds_sdi_reg = reg;
+
+        return reg;
+}
+
+struct regulator *dss_get_vdda_dac(void)
+{
+        struct regulator *reg;
+
+        if (core.vdda_dac_reg != NULL)
+                return core.vdda_dac_reg;
+
+        reg = regulator_get(&core.pdev->dev, "vdda_dac");
+        if (!IS_ERR(reg))
+                core.vdda_dac_reg = reg;
+
+        return reg;
+}
+
+/* DEBUGFS */
+#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT)
+static void dss_debug_dump_clocks(struct seq_file *s)
+{
+        core_dump_clocks(s);
+        dss_dump_clocks(s);
+        dispc_dump_clocks(s);
+#ifdef CONFIG_OMAP2_DSS_DSI
+        dsi_dump_clocks(s);
+#endif
+}
+
+static int dss_debug_show(struct seq_file *s, void *unused)
+{
+        void (*func)(struct seq_file *) = s->private;
+        func(s);
+        return 0;
+}
+
+static int dss_debug_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, dss_debug_show, inode->i_private);
+}
+
+static const struct file_operations dss_debug_fops = {
+        .open           = dss_debug_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+static struct dentry *dss_debugfs_dir;
+
+static int dss_initialize_debugfs(void)
+{
+        dss_debugfs_dir = debugfs_create_dir("omapdss", NULL);
+        if (IS_ERR(dss_debugfs_dir)) {
+                int err = PTR_ERR(dss_debugfs_dir);
+                dss_debugfs_dir = NULL;
+                return err;
+        }
+
+        debugfs_create_file("clk", S_IRUGO, dss_debugfs_dir,
+                        &dss_debug_dump_clocks, &dss_debug_fops);
+
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+        debugfs_create_file("dispc_irq", S_IRUGO, dss_debugfs_dir,
+                        &dispc_dump_irqs, &dss_debug_fops);
+#endif
+
+#if defined(CONFIG_OMAP2_DSS_DSI) && defined(CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS)
+        debugfs_create_file("dsi_irq", S_IRUGO, dss_debugfs_dir,
+                        &dsi_dump_irqs, &dss_debug_fops);
+#endif
+
+        debugfs_create_file("dss", S_IRUGO, dss_debugfs_dir,
+                        &dss_dump_regs, &dss_debug_fops);
+        debugfs_create_file("dispc", S_IRUGO, dss_debugfs_dir,
+                        &dispc_dump_regs, &dss_debug_fops);
+#ifdef CONFIG_OMAP2_DSS_RFBI
+        debugfs_create_file("rfbi", S_IRUGO, dss_debugfs_dir,
+                        &rfbi_dump_regs, &dss_debug_fops);
+#endif
+#ifdef CONFIG_OMAP2_DSS_DSI
+        debugfs_create_file("dsi", S_IRUGO, dss_debugfs_dir,
+                        &dsi_dump_regs, &dss_debug_fops);
+#endif
+#ifdef CONFIG_OMAP2_DSS_VENC
+        debugfs_create_file("venc", S_IRUGO, dss_debugfs_dir,
+                        &venc_dump_regs, &dss_debug_fops);
+#endif
+        return 0;
+}
+
+static void dss_uninitialize_debugfs(void)
+{
+        if (dss_debugfs_dir)
+                debugfs_remove_recursive(dss_debugfs_dir);
+}
+#endif /* CONFIG_DEBUG_FS && CONFIG_OMAP2_DSS_DEBUG_SUPPORT */
+
+/* PLATFORM DEVICE */
+static int omap_dss_probe(struct platform_device *pdev)
+{
+        struct omap_dss_board_info *pdata = pdev->dev.platform_data;
+        int skip_init = 0;
+        int r;
+        int i;
+
+        core.pdev = pdev;
+
+        dss_init_overlay_managers(pdev);
+        dss_init_overlays(pdev);
+
+        r = dss_get_clocks();
+        if (r)
+                goto fail0;
+
+        dss_clk_enable_all_no_ctx();
+
+        core.ctx_id = dss_get_ctx_id();
+        DSSDBG("initial ctx id %u\n", core.ctx_id);
+
+#ifdef CONFIG_FB_OMAP_BOOTLOADER_INIT
+        /* DISPC_CONTROL */
+        if (omap_readl(0x48050440) & 1) /* LCD enabled? */
+                skip_init = 1;
+#endif
+
+        r = dss_init(skip_init);
+        if (r) {
+                DSSERR("Failed to initialize DSS\n");
+                goto fail0;
+        }
+
+#ifdef CONFIG_OMAP2_DSS_RFBI
+        r = rfbi_init();
+        if (r) {
+                DSSERR("Failed to initialize rfbi\n");
+                goto fail0;
+        }
+#endif
+
+        r = dpi_init(pdev);
+        if (r) {
+                DSSERR("Failed to initialize dpi\n");
+                goto fail0;
+        }
+
+        r = dispc_init();
+        if (r) {
+                DSSERR("Failed to initialize dispc\n");
+                goto fail0;
+        }
+#ifdef CONFIG_OMAP2_DSS_VENC
+        r = venc_init(pdev);
+        if (r) {
+                DSSERR("Failed to initialize venc\n");
+                goto fail0;
+        }
+#endif
+        if (cpu_is_omap34xx()) {
+#ifdef CONFIG_OMAP2_DSS_SDI
+                r = sdi_init(skip_init);
+                if (r) {
+                        DSSERR("Failed to initialize SDI\n");
+                        goto fail0;
+                }
+#endif
+#ifdef CONFIG_OMAP2_DSS_DSI
+                r = dsi_init(pdev);
+                if (r) {
+                        DSSERR("Failed to initialize DSI\n");
+                        goto fail0;
+                }
+#endif
+        }
+
+#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT)
+        r = dss_initialize_debugfs();
+        if (r)
+                goto fail0;
+#endif
+
+        for (i = 0; i < pdata->num_devices; ++i) {
+                struct omap_dss_device *dssdev = pdata->devices[i];
+
+                r = omap_dss_register_device(dssdev);
+                if (r)
+                        DSSERR("device reg failed %d\n", i);
+
+                if (def_disp_name && strcmp(def_disp_name, dssdev->name) == 0)
+                        pdata->default_device = dssdev;
+        }
+
+        dss_clk_disable_all();
+
+        return 0;
+
+        /* XXX fail correctly */
+fail0:
+        return r;
+}
+
+static int omap_dss_remove(struct platform_device *pdev)
+{
+        struct omap_dss_board_info *pdata = pdev->dev.platform_data;
+        int i;
+        int c;
+
+#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT)
+        dss_uninitialize_debugfs();
+#endif
+
+#ifdef CONFIG_OMAP2_DSS_VENC
+        venc_exit();
+#endif
+        dispc_exit();
+        dpi_exit();
+#ifdef CONFIG_OMAP2_DSS_RFBI
+        rfbi_exit();
+#endif
+        if (cpu_is_omap34xx()) {
+#ifdef CONFIG_OMAP2_DSS_DSI
+                dsi_exit();
+#endif
+#ifdef CONFIG_OMAP2_DSS_SDI
+                sdi_exit();
+#endif
+        }
+
+        dss_exit();
+
+        /* these should be removed at some point */
+        c = core.dss_ick->usecount;
+        if (c > 0) {
+                DSSERR("warning: dss_ick usecount %d, disabling\n", c);
+                while (c-- > 0)
+                        clk_disable(core.dss_ick);
+        }
+
+        c = core.dss1_fck->usecount;
+        if (c > 0) {
+                DSSERR("warning: dss1_fck usecount %d, disabling\n", c);
+                while (c-- > 0)
+                        clk_disable(core.dss1_fck);
+        }
+
+        c = core.dss2_fck->usecount;
+        if (c > 0) {
+                DSSERR("warning: dss2_fck usecount %d, disabling\n", c);
+                while (c-- > 0)
+                        clk_disable(core.dss2_fck);
+        }
+
+        c = core.dss_54m_fck->usecount;
+        if (c > 0) {
+                DSSERR("warning: dss_54m_fck usecount %d, disabling\n", c);
+                while (c-- > 0)
+                        clk_disable(core.dss_54m_fck);
+        }
+
+        if (core.dss_96m_fck) {
+                c = core.dss_96m_fck->usecount;
+                if (c > 0) {
+                        DSSERR("warning: dss_96m_fck usecount %d, disabling\n",
+                                        c);
+                        while (c-- > 0)
+                                clk_disable(core.dss_96m_fck);
+                }
+        }
+
+        dss_put_clocks();
+
+        dss_uninit_overlays(pdev);
+        dss_uninit_overlay_managers(pdev);
+
+        for (i = 0; i < pdata->num_devices; ++i)
+                omap_dss_unregister_device(pdata->devices[i]);
+
+        return 0;
+}
+
+static void omap_dss_shutdown(struct platform_device *pdev)
+{
+        DSSDBG("shutdown\n");
+        dss_disable_all_devices();
+}
+
+static int omap_dss_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        DSSDBG("suspend %d\n", state.event);
+
+        return dss_suspend_all_devices();
+}
+
+static int omap_dss_resume(struct platform_device *pdev)
+{
+        DSSDBG("resume\n");
+
+        return dss_resume_all_devices();
+}
+
+static struct platform_driver omap_dss_driver = {
+        .probe          = omap_dss_probe,
+        .remove         = omap_dss_remove,
+        .shutdown       = omap_dss_shutdown,
+        .suspend        = omap_dss_suspend,
+        .resume         = omap_dss_resume,
+        .driver         = {
+                .name   = "omapdss",
+                .owner  = THIS_MODULE,
+        },
+};
+
+/* BUS */
+static int dss_bus_match(struct device *dev, struct device_driver *driver)
+{
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+
+        DSSDBG("bus_match. dev %s/%s, drv %s\n",
+                        dev_name(dev), dssdev->driver_name, driver->name);
+
+        return strcmp(dssdev->driver_name, driver->name) == 0;
+}
+
+static ssize_t device_name_show(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+        return snprintf(buf, PAGE_SIZE, "%s\n",
+                        dssdev->name ?
+                        dssdev->name : "");
+}
+
+static struct device_attribute default_dev_attrs[] = {
+        __ATTR(name, S_IRUGO, device_name_show, NULL),
+        __ATTR_NULL,
+};
+
+static ssize_t driver_name_show(struct device_driver *drv, char *buf)
+{
+        struct omap_dss_driver *dssdrv = to_dss_driver(drv);
+        return snprintf(buf, PAGE_SIZE, "%s\n",
+                        dssdrv->driver.name ?
+                        dssdrv->driver.name : "");
+}
+static struct driver_attribute default_drv_attrs[] = {
+        __ATTR(name, S_IRUGO, driver_name_show, NULL),
+        __ATTR_NULL,
+};
+
+static struct bus_type dss_bus_type = {
+        .name = "omapdss",
+        .match = dss_bus_match,
+        .dev_attrs = default_dev_attrs,
+        .drv_attrs = default_drv_attrs,
+};
+
+static void dss_bus_release(struct device *dev)
+{
+        DSSDBG("bus_release\n");
+}
+
+static struct device dss_bus = {
+        .release = dss_bus_release,
+};
+
+struct bus_type *dss_get_bus(void)
+{
+        return &dss_bus_type;
+}
+
+/* DRIVER */
+static int dss_driver_probe(struct device *dev)
+{
+        int r;
+        struct omap_dss_driver *dssdrv = to_dss_driver(dev->driver);
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+        struct omap_dss_board_info *pdata = core.pdev->dev.platform_data;
+        bool force;
+
+        DSSDBG("driver_probe: dev %s/%s, drv %s\n",
+                                dev_name(dev), dssdev->driver_name,
+                                dssdrv->driver.name);
+
+        dss_init_device(core.pdev, dssdev);
+
+        force = pdata->default_device == dssdev;
+        dss_recheck_connections(dssdev, force);
+
+        r = dssdrv->probe(dssdev);
+
+        if (r) {
+                DSSERR("driver probe failed: %d\n", r);
+                dss_uninit_device(core.pdev, dssdev);
+                return r;
+        }
+
+        DSSDBG("probe done for device %s\n", dev_name(dev));
+
+        dssdev->driver = dssdrv;
+
+        return 0;
+}
+
+static int dss_driver_remove(struct device *dev)
+{
+        struct omap_dss_driver *dssdrv = to_dss_driver(dev->driver);
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+
+        DSSDBG("driver_remove: dev %s/%s\n", dev_name(dev),
+                        dssdev->driver_name);
+
+        dssdrv->remove(dssdev);
+
+        dss_uninit_device(core.pdev, dssdev);
+
+        dssdev->driver = NULL;
+
+        return 0;
+}
+
+int omap_dss_register_driver(struct omap_dss_driver *dssdriver)
+{
+        dssdriver->driver.bus = &dss_bus_type;
+        dssdriver->driver.probe = dss_driver_probe;
+        dssdriver->driver.remove = dss_driver_remove;
+
+        if (dssdriver->get_resolution == NULL)
+                dssdriver->get_resolution = omapdss_default_get_resolution;
+        if (dssdriver->get_recommended_bpp == NULL)
+                dssdriver->get_recommended_bpp =
+                        omapdss_default_get_recommended_bpp;
+
+        return driver_register(&dssdriver->driver);
+}
+EXPORT_SYMBOL(omap_dss_register_driver);
+
+void omap_dss_unregister_driver(struct omap_dss_driver *dssdriver)
+{
+        driver_unregister(&dssdriver->driver);
+}
+EXPORT_SYMBOL(omap_dss_unregister_driver);
+
+/* DEVICE */
+static void reset_device(struct device *dev, int check)
+{
+        u8 *dev_p = (u8 *)dev;
+        u8 *dev_end = dev_p + sizeof(*dev);
+        void *saved_pdata;
+
+        saved_pdata = dev->platform_data;
+        if (check) {
+                /*
+                 * Check if there is any other setting than platform_data
+                 * in struct device; warn that these will be reset by our
+                 * init.
+                 */
+                dev->platform_data = NULL;
+                while (dev_p < dev_end) {
+                        if (*dev_p) {
+                                WARN("%s: struct device fields will be "
+                                                "discarded\n",
+                                     __func__);
+                                break;
+                        }
+                        dev_p++;
+                }
+        }
+        memset(dev, 0, sizeof(*dev));
+        dev->platform_data = saved_pdata;
+}
+
+
+static void omap_dss_dev_release(struct device *dev)
+{
+        reset_device(dev, 0);
+}
+
+int omap_dss_register_device(struct omap_dss_device *dssdev)
+{
+        static int dev_num;
+
+        WARN_ON(!dssdev->driver_name);
+
+        reset_device(&dssdev->dev, 1);
+        dssdev->dev.bus = &dss_bus_type;
+        dssdev->dev.parent = &dss_bus;
+        dssdev->dev.release = omap_dss_dev_release;
+        dev_set_name(&dssdev->dev, "display%d", dev_num++);
+        return device_register(&dssdev->dev);
+}
+
+void omap_dss_unregister_device(struct omap_dss_device *dssdev)
+{
+        device_unregister(&dssdev->dev);
+}
+
+/* BUS */
+static int omap_dss_bus_register(void)
+{
+        int r;
+
+        r = bus_register(&dss_bus_type);
+        if (r) {
+                DSSERR("bus register failed\n");
+                return r;
+        }
+
+        dev_set_name(&dss_bus, "omapdss");
+        r = device_register(&dss_bus);
+        if (r) {
+                DSSERR("bus driver register failed\n");
+                bus_unregister(&dss_bus_type);
+                return r;
+        }
+
+        return 0;
+}
+
+/* INIT */
+
+#ifdef CONFIG_OMAP2_DSS_MODULE
+static void omap_dss_bus_unregister(void)
+{
+        device_unregister(&dss_bus);
+
+        bus_unregister(&dss_bus_type);
+}
+
+static int __init omap_dss_init(void)
+{
+        int r;
+
+        r = omap_dss_bus_register();
+        if (r)
+                return r;
+
+        r = platform_driver_register(&omap_dss_driver);
+        if (r) {
+                omap_dss_bus_unregister();
+                return r;
+        }
+
+        return 0;
+}
+
+static void __exit omap_dss_exit(void)
+{
+        if (core.vdds_dsi_reg != NULL) {
+                regulator_put(core.vdds_dsi_reg);
+                core.vdds_dsi_reg = NULL;
+        }
+
+        if (core.vdds_sdi_reg != NULL) {
+                regulator_put(core.vdds_sdi_reg);
+                core.vdds_sdi_reg = NULL;
+        }
+
+        if (core.vdda_dac_reg != NULL) {
+                regulator_put(core.vdda_dac_reg);
+                core.vdda_dac_reg = NULL;
+        }
+
+        platform_driver_unregister(&omap_dss_driver);
+
+        omap_dss_bus_unregister();
+}
+
+module_init(omap_dss_init);
+module_exit(omap_dss_exit);
+#else
+static int __init omap_dss_init(void)
+{
+        return omap_dss_bus_register();
+}
+
+static int __init omap_dss_init2(void)
+{
+        return platform_driver_register(&omap_dss_driver);
+}
+
+core_initcall(omap_dss_init);
+device_initcall(omap_dss_init2);
+#endif
+
+MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@nokia.com>");
+MODULE_DESCRIPTION("OMAP2/3 Display Subsystem");
+MODULE_LICENSE("GPL v2");
+
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
new file mode 100644
index 000000000000..e777e352dbcd
--- /dev/null
+++ b/drivers/video/omap2/dss/dispc.c
@@ -0,0 +1,3181 @@
+/*
+ * linux/drivers/video/omap2/dss/dispc.c
+ *
+ * Copyright (C) 2009 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * Some code and ideas taken from drivers/video/omap/ driver
+ * by Imre Deak.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define DSS_SUBSYS_NAME "DISPC"
+
+#include <linux/kernel.h>
+#include <linux/dma-mapping.h>
+#include <linux/vmalloc.h>
+#include <linux/clk.h>
+#include <linux/io.h>
+#include <linux/jiffies.h>
+#include <linux/seq_file.h>
+#include <linux/delay.h>
+#include <linux/workqueue.h>
+
+#include <plat/sram.h>
+#include <plat/clock.h>
+
+#include <plat/display.h>
+
+#include "dss.h"
+
+/* DISPC */
+#define DISPC_BASE                      0x48050400
+
+#define DISPC_SZ_REGS                   SZ_1K
+
+struct dispc_reg { u16 idx; };
+
+#define DISPC_REG(idx)                  ((const struct dispc_reg) { idx })
+
+/* DISPC common */
+#define DISPC_REVISION                  DISPC_REG(0x0000)
+#define DISPC_SYSCONFIG                 DISPC_REG(0x0010)
+#define DISPC_SYSSTATUS                 DISPC_REG(0x0014)
+#define DISPC_IRQSTATUS                 DISPC_REG(0x0018)
+#define DISPC_IRQENABLE                 DISPC_REG(0x001C)
+#define DISPC_CONTROL                   DISPC_REG(0x0040)
+#define DISPC_CONFIG                    DISPC_REG(0x0044)
+#define DISPC_CAPABLE                   DISPC_REG(0x0048)
+#define DISPC_DEFAULT_COLOR0            DISPC_REG(0x004C)
+#define DISPC_DEFAULT_COLOR1            DISPC_REG(0x0050)
+#define DISPC_TRANS_COLOR0              DISPC_REG(0x0054)
+#define DISPC_TRANS_COLOR1              DISPC_REG(0x0058)
+#define DISPC_LINE_STATUS               DISPC_REG(0x005C)
+#define DISPC_LINE_NUMBER               DISPC_REG(0x0060)
+#define DISPC_TIMING_H                  DISPC_REG(0x0064)
+#define DISPC_TIMING_V                  DISPC_REG(0x0068)
+#define DISPC_POL_FREQ                  DISPC_REG(0x006C)
+#define DISPC_DIVISOR                   DISPC_REG(0x0070)
+#define DISPC_GLOBAL_ALPHA              DISPC_REG(0x0074)
+#define DISPC_SIZE_DIG                  DISPC_REG(0x0078)
+#define DISPC_SIZE_LCD                  DISPC_REG(0x007C)
+
+/* DISPC GFX plane */
+#define DISPC_GFX_BA0                   DISPC_REG(0x0080)
+#define DISPC_GFX_BA1                   DISPC_REG(0x0084)
+#define DISPC_GFX_POSITION              DISPC_REG(0x0088)
+#define DISPC_GFX_SIZE                  DISPC_REG(0x008C)
+#define DISPC_GFX_ATTRIBUTES            DISPC_REG(0x00A0)
+#define DISPC_GFX_FIFO_THRESHOLD        DISPC_REG(0x00A4)
+#define DISPC_GFX_FIFO_SIZE_STATUS      DISPC_REG(0x00A8)
+#define DISPC_GFX_ROW_INC               DISPC_REG(0x00AC)
+#define DISPC_GFX_PIXEL_INC             DISPC_REG(0x00B0)
+#define DISPC_GFX_WINDOW_SKIP           DISPC_REG(0x00B4)
+#define DISPC_GFX_TABLE_BA              DISPC_REG(0x00B8)
+
+#define DISPC_DATA_CYCLE1               DISPC_REG(0x01D4)
+#define DISPC_DATA_CYCLE2               DISPC_REG(0x01D8)
+#define DISPC_DATA_CYCLE3               DISPC_REG(0x01DC)
+
+#define DISPC_CPR_COEF_R                DISPC_REG(0x0220)
+#define DISPC_CPR_COEF_G                DISPC_REG(0x0224)
+#define DISPC_CPR_COEF_B                DISPC_REG(0x0228)
+
+#define DISPC_GFX_PRELOAD               DISPC_REG(0x022C)
+
+/* DISPC Video plane, n = 0 for VID1 and n = 1 for VID2 */
+#define DISPC_VID_REG(n, idx)           DISPC_REG(0x00BC + (n)*0x90 + idx)
+
+#define DISPC_VID_BA0(n)                DISPC_VID_REG(n, 0x0000)
+#define DISPC_VID_BA1(n)                DISPC_VID_REG(n, 0x0004)
+#define DISPC_VID_POSITION(n)           DISPC_VID_REG(n, 0x0008)
+#define DISPC_VID_SIZE(n)               DISPC_VID_REG(n, 0x000C)
+#define DISPC_VID_ATTRIBUTES(n)         DISPC_VID_REG(n, 0x0010)
+#define DISPC_VID_FIFO_THRESHOLD(n)     DISPC_VID_REG(n, 0x0014)
+#define DISPC_VID_FIFO_SIZE_STATUS(n)   DISPC_VID_REG(n, 0x0018)
+#define DISPC_VID_ROW_INC(n)            DISPC_VID_REG(n, 0x001C)
+#define DISPC_VID_PIXEL_INC(n)          DISPC_VID_REG(n, 0x0020)
+#define DISPC_VID_FIR(n)                DISPC_VID_REG(n, 0x0024)
+#define DISPC_VID_PICTURE_SIZE(n)       DISPC_VID_REG(n, 0x0028)
+#define DISPC_VID_ACCU0(n)              DISPC_VID_REG(n, 0x002C)
+#define DISPC_VID_ACCU1(n)              DISPC_VID_REG(n, 0x0030)
+
+/* coef index i = {0, 1, 2, 3, 4, 5, 6, 7} */
+#define DISPC_VID_FIR_COEF_H(n, i)      DISPC_REG(0x00F0 + (n)*0x90 + (i)*0x8)
+/* coef index i = {0, 1, 2, 3, 4, 5, 6, 7} */
+#define DISPC_VID_FIR_COEF_HV(n, i)     DISPC_REG(0x00F4 + (n)*0x90 + (i)*0x8)
+/* coef index i = {0, 1, 2, 3, 4} */
+#define DISPC_VID_CONV_COEF(n, i)       DISPC_REG(0x0130 + (n)*0x90 + (i)*0x4)
+/* coef index i = {0, 1, 2, 3, 4, 5, 6, 7} */
+#define DISPC_VID_FIR_COEF_V(n, i)      DISPC_REG(0x01E0 + (n)*0x20 + (i)*0x4)
+
+#define DISPC_VID_PRELOAD(n)            DISPC_REG(0x230 + (n)*0x04)
+
+
+#define DISPC_IRQ_MASK_ERROR            (DISPC_IRQ_GFX_FIFO_UNDERFLOW | \
+                                         DISPC_IRQ_OCP_ERR | \
+                                         DISPC_IRQ_VID1_FIFO_UNDERFLOW | \
+                                         DISPC_IRQ_VID2_FIFO_UNDERFLOW | \
+                                         DISPC_IRQ_SYNC_LOST | \
+                                         DISPC_IRQ_SYNC_LOST_DIGIT)
+
+#define DISPC_MAX_NR_ISRS               8
+
+struct omap_dispc_isr_data {
+        omap_dispc_isr_t        isr;
+        void                    *arg;
+        u32                     mask;
+};
+
+#define REG_GET(idx, start, end) \
+        FLD_GET(dispc_read_reg(idx), start, end)
+
+#define REG_FLD_MOD(idx, val, start, end)                               \
+        dispc_write_reg(idx, FLD_MOD(dispc_read_reg(idx), val, start, end))
+
+static const struct dispc_reg dispc_reg_att[] = { DISPC_GFX_ATTRIBUTES,
+        DISPC_VID_ATTRIBUTES(0),
+        DISPC_VID_ATTRIBUTES(1) };
+
+struct dispc_irq_stats {
+        unsigned long last_reset;
+        unsigned irq_count;
+        unsigned irqs[32];
+};
+
+static struct {
+        void __iomem    *base;
+
+        u32     fifo_size[3];
+
+        spinlock_t irq_lock;
+        u32 irq_error_mask;
+        struct omap_dispc_isr_data registered_isr[DISPC_MAX_NR_ISRS];
+        u32 error_irqs;
+        struct work_struct error_work;
+
+        u32             ctx[DISPC_SZ_REGS / sizeof(u32)];
+
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+        spinlock_t irq_stats_lock;
+        struct dispc_irq_stats irq_stats;
+#endif
+} dispc;
+
+static void _omap_dispc_set_irqs(void);
+
+static inline void dispc_write_reg(const struct dispc_reg idx, u32 val)
+{
+        __raw_writel(val, dispc.base + idx.idx);
+}
+
+static inline u32 dispc_read_reg(const struct dispc_reg idx)
+{
+        return __raw_readl(dispc.base + idx.idx);
+}
+
+#define SR(reg) \
+        dispc.ctx[(DISPC_##reg).idx / sizeof(u32)] = dispc_read_reg(DISPC_##reg)
+#define RR(reg) \
+        dispc_write_reg(DISPC_##reg, dispc.ctx[(DISPC_##reg).idx / sizeof(u32)])
+
+void dispc_save_context(void)
+{
+        if (cpu_is_omap24xx())
+                return;
+
+        SR(SYSCONFIG);
+        SR(IRQENABLE);
+        SR(CONTROL);
+        SR(CONFIG);
+        SR(DEFAULT_COLOR0);
+        SR(DEFAULT_COLOR1);
+        SR(TRANS_COLOR0);
+        SR(TRANS_COLOR1);
+        SR(LINE_NUMBER);
+        SR(TIMING_H);
+        SR(TIMING_V);
+        SR(POL_FREQ);
+        SR(DIVISOR);
+        SR(GLOBAL_ALPHA);
+        SR(SIZE_DIG);
+        SR(SIZE_LCD);
+
+        SR(GFX_BA0);
+        SR(GFX_BA1);
+        SR(GFX_POSITION);
+        SR(GFX_SIZE);
+        SR(GFX_ATTRIBUTES);
+        SR(GFX_FIFO_THRESHOLD);
+        SR(GFX_ROW_INC);
+        SR(GFX_PIXEL_INC);
+        SR(GFX_WINDOW_SKIP);
+        SR(GFX_TABLE_BA);
+
+        SR(DATA_CYCLE1);
+        SR(DATA_CYCLE2);
+        SR(DATA_CYCLE3);
+
+        SR(CPR_COEF_R);
+        SR(CPR_COEF_G);
+        SR(CPR_COEF_B);
+
+        SR(GFX_PRELOAD);
+
+        /* VID1 */
+        SR(VID_BA0(0));
+        SR(VID_BA1(0));
+        SR(VID_POSITION(0));
+        SR(VID_SIZE(0));
+        SR(VID_ATTRIBUTES(0));
+        SR(VID_FIFO_THRESHOLD(0));
+        SR(VID_ROW_INC(0));
+        SR(VID_PIXEL_INC(0));
+        SR(VID_FIR(0));
+        SR(VID_PICTURE_SIZE(0));
+        SR(VID_ACCU0(0));
+        SR(VID_ACCU1(0));
+
+        SR(VID_FIR_COEF_H(0, 0));
+        SR(VID_FIR_COEF_H(0, 1));
+        SR(VID_FIR_COEF_H(0, 2));
+        SR(VID_FIR_COEF_H(0, 3));
+        SR(VID_FIR_COEF_H(0, 4));
+        SR(VID_FIR_COEF_H(0, 5));
+        SR(VID_FIR_COEF_H(0, 6));
+        SR(VID_FIR_COEF_H(0, 7));
+
+        SR(VID_FIR_COEF_HV(0, 0));
+        SR(VID_FIR_COEF_HV(0, 1));
+        SR(VID_FIR_COEF_HV(0, 2));
+        SR(VID_FIR_COEF_HV(0, 3));
+        SR(VID_FIR_COEF_HV(0, 4));
+        SR(VID_FIR_COEF_HV(0, 5));
+        SR(VID_FIR_COEF_HV(0, 6));
+        SR(VID_FIR_COEF_HV(0, 7));
+
+        SR(VID_CONV_COEF(0, 0));
+        SR(VID_CONV_COEF(0, 1));
+        SR(VID_CONV_COEF(0, 2));
+        SR(VID_CONV_COEF(0, 3));
+        SR(VID_CONV_COEF(0, 4));
+
+        SR(VID_FIR_COEF_V(0, 0));
+        SR(VID_FIR_COEF_V(0, 1));
+        SR(VID_FIR_COEF_V(0, 2));
+        SR(VID_FIR_COEF_V(0, 3));
+        SR(VID_FIR_COEF_V(0, 4));
+        SR(VID_FIR_COEF_V(0, 5));
+        SR(VID_FIR_COEF_V(0, 6));
+        SR(VID_FIR_COEF_V(0, 7));
+
+        SR(VID_PRELOAD(0));
+
+        /* VID2 */
+        SR(VID_BA0(1));
+        SR(VID_BA1(1));
+        SR(VID_POSITION(1));
+        SR(VID_SIZE(1));
+        SR(VID_ATTRIBUTES(1));
+        SR(VID_FIFO_THRESHOLD(1));
+        SR(VID_ROW_INC(1));
+        SR(VID_PIXEL_INC(1));
+        SR(VID_FIR(1));
+        SR(VID_PICTURE_SIZE(1));
+        SR(VID_ACCU0(1));
+        SR(VID_ACCU1(1));
+
+        SR(VID_FIR_COEF_H(1, 0));
+        SR(VID_FIR_COEF_H(1, 1));
+        SR(VID_FIR_COEF_H(1, 2));
+        SR(VID_FIR_COEF_H(1, 3));
+        SR(VID_FIR_COEF_H(1, 4));
+        SR(VID_FIR_COEF_H(1, 5));
+        SR(VID_FIR_COEF_H(1, 6));
+        SR(VID_FIR_COEF_H(1, 7));
+
+        SR(VID_FIR_COEF_HV(1, 0));
+        SR(VID_FIR_COEF_HV(1, 1));
+        SR(VID_FIR_COEF_HV(1, 2));
+        SR(VID_FIR_COEF_HV(1, 3));
+        SR(VID_FIR_COEF_HV(1, 4));
+        SR(VID_FIR_COEF_HV(1, 5));
+        SR(VID_FIR_COEF_HV(1, 6));
+        SR(VID_FIR_COEF_HV(1, 7));
+
+        SR(VID_CONV_COEF(1, 0));
+        SR(VID_CONV_COEF(1, 1));
+        SR(VID_CONV_COEF(1, 2));
+        SR(VID_CONV_COEF(1, 3));
+        SR(VID_CONV_COEF(1, 4));
+
+        SR(VID_FIR_COEF_V(1, 0));
+        SR(VID_FIR_COEF_V(1, 1));
+        SR(VID_FIR_COEF_V(1, 2));
+        SR(VID_FIR_COEF_V(1, 3));
+        SR(VID_FIR_COEF_V(1, 4));
+        SR(VID_FIR_COEF_V(1, 5));
+        SR(VID_FIR_COEF_V(1, 6));
+        SR(VID_FIR_COEF_V(1, 7));
+
+        SR(VID_PRELOAD(1));
+}
+
+void dispc_restore_context(void)
+{
+        RR(SYSCONFIG);
+        RR(IRQENABLE);
+        /*RR(CONTROL);*/
+        RR(CONFIG);
+        RR(DEFAULT_COLOR0);
+        RR(DEFAULT_COLOR1);
+        RR(TRANS_COLOR0);
+        RR(TRANS_COLOR1);
+        RR(LINE_NUMBER);
+        RR(TIMING_H);
+        RR(TIMING_V);
+        RR(POL_FREQ);
+        RR(DIVISOR);
+        RR(GLOBAL_ALPHA);
+        RR(SIZE_DIG);
+        RR(SIZE_LCD);
+
+        RR(GFX_BA0);
+        RR(GFX_BA1);
+        RR(GFX_POSITION);
+        RR(GFX_SIZE);
+        RR(GFX_ATTRIBUTES);
+        RR(GFX_FIFO_THRESHOLD);
+        RR(GFX_ROW_INC);
+        RR(GFX_PIXEL_INC);
+        RR(GFX_WINDOW_SKIP);
+        RR(GFX_TABLE_BA);
+
+        RR(DATA_CYCLE1);
+        RR(DATA_CYCLE2);
+        RR(DATA_CYCLE3);
+
+        RR(CPR_COEF_R);
+        RR(CPR_COEF_G);
+        RR(CPR_COEF_B);
+
+        RR(GFX_PRELOAD);
+
+        /* VID1 */
+        RR(VID_BA0(0));
+        RR(VID_BA1(0));
+        RR(VID_POSITION(0));
+        RR(VID_SIZE(0));
+        RR(VID_ATTRIBUTES(0));
+        RR(VID_FIFO_THRESHOLD(0));
+        RR(VID_ROW_INC(0));
+        RR(VID_PIXEL_INC(0));
+        RR(VID_FIR(0));
+        RR(VID_PICTURE_SIZE(0));
+        RR(VID_ACCU0(0));
+        RR(VID_ACCU1(0));
+
+        RR(VID_FIR_COEF_H(0, 0));
+        RR(VID_FIR_COEF_H(0, 1));
+        RR(VID_FIR_COEF_H(0, 2));
+        RR(VID_FIR_COEF_H(0, 3));
+        RR(VID_FIR_COEF_H(0, 4));
+        RR(VID_FIR_COEF_H(0, 5));
+        RR(VID_FIR_COEF_H(0, 6));
+        RR(VID_FIR_COEF_H(0, 7));
+
+        RR(VID_FIR_COEF_HV(0, 0));
+        RR(VID_FIR_COEF_HV(0, 1));
+        RR(VID_FIR_COEF_HV(0, 2));
+        RR(VID_FIR_COEF_HV(0, 3));
+        RR(VID_FIR_COEF_HV(0, 4));
+        RR(VID_FIR_COEF_HV(0, 5));
+        RR(VID_FIR_COEF_HV(0, 6));
+        RR(VID_FIR_COEF_HV(0, 7));
+
+        RR(VID_CONV_COEF(0, 0));
+        RR(VID_CONV_COEF(0, 1));
+        RR(VID_CONV_COEF(0, 2));
+        RR(VID_CONV_COEF(0, 3));
+        RR(VID_CONV_COEF(0, 4));
+
+        RR(VID_FIR_COEF_V(0, 0));
+        RR(VID_FIR_COEF_V(0, 1));
+        RR(VID_FIR_COEF_V(0, 2));
+        RR(VID_FIR_COEF_V(0, 3));
+        RR(VID_FIR_COEF_V(0, 4));
+        RR(VID_FIR_COEF_V(0, 5));
+        RR(VID_FIR_COEF_V(0, 6));
+        RR(VID_FIR_COEF_V(0, 7));
+
+        RR(VID_PRELOAD(0));
+
+        /* VID2 */
+        RR(VID_BA0(1));
+        RR(VID_BA1(1));
+        RR(VID_POSITION(1));
+        RR(VID_SIZE(1));
+        RR(VID_ATTRIBUTES(1));
+        RR(VID_FIFO_THRESHOLD(1));
+        RR(VID_ROW_INC(1));
+        RR(VID_PIXEL_INC(1));
+        RR(VID_FIR(1));
+        RR(VID_PICTURE_SIZE(1));
+        RR(VID_ACCU0(1));
+        RR(VID_ACCU1(1));
+
+        RR(VID_FIR_COEF_H(1, 0));
+        RR(VID_FIR_COEF_H(1, 1));
+        RR(VID_FIR_COEF_H(1, 2));
+        RR(VID_FIR_COEF_H(1, 3));
+        RR(VID_FIR_COEF_H(1, 4));
+        RR(VID_FIR_COEF_H(1, 5));
+        RR(VID_FIR_COEF_H(1, 6));
+        RR(VID_FIR_COEF_H(1, 7));
+
+        RR(VID_FIR_COEF_HV(1, 0));
+        RR(VID_FIR_COEF_HV(1, 1));
+        RR(VID_FIR_COEF_HV(1, 2));
+        RR(VID_FIR_COEF_HV(1, 3));
+        RR(VID_FIR_COEF_HV(1, 4));
+        RR(VID_FIR_COEF_HV(1, 5));
+        RR(VID_FIR_COEF_HV(1, 6));
+        RR(VID_FIR_COEF_HV(1, 7));
+
+        RR(VID_CONV_COEF(1, 0));
+        RR(VID_CONV_COEF(1, 1));
+        RR(VID_CONV_COEF(1, 2));
+        RR(VID_CONV_COEF(1, 3));
+        RR(VID_CONV_COEF(1, 4));
+
+        RR(VID_FIR_COEF_V(1, 0));
+        RR(VID_FIR_COEF_V(1, 1));
+        RR(VID_FIR_COEF_V(1, 2));
+        RR(VID_FIR_COEF_V(1, 3));
+        RR(VID_FIR_COEF_V(1, 4));
+        RR(VID_FIR_COEF_V(1, 5));
+        RR(VID_FIR_COEF_V(1, 6));
+        RR(VID_FIR_COEF_V(1, 7));
+
+        RR(VID_PRELOAD(1));
+
+        /* enable last, because LCD & DIGIT enable are here */
+        RR(CONTROL);
+}
+
+#undef SR
+#undef RR
+
+static inline void enable_clocks(bool enable)
+{
+        if (enable)
+                dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
+        else
+                dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
+}
+
+bool dispc_go_busy(enum omap_channel channel)
+{
+        int bit;
+
+        if (channel == OMAP_DSS_CHANNEL_LCD)
+                bit = 5; /* GOLCD */
+        else
+                bit = 6; /* GODIGIT */
+
+        return REG_GET(DISPC_CONTROL, bit, bit) == 1;
+}
+
+void dispc_go(enum omap_channel channel)
+{
+        int bit;
+
+        enable_clocks(1);
+
+        if (channel == OMAP_DSS_CHANNEL_LCD)
+                bit = 0; /* LCDENABLE */
+        else
+                bit = 1; /* DIGITALENABLE */
+
+        /* if the channel is not enabled, we don't need GO */
+        if (REG_GET(DISPC_CONTROL, bit, bit) == 0)
+                goto end;
+
+        if (channel == OMAP_DSS_CHANNEL_LCD)
+                bit = 5; /* GOLCD */
+        else
+                bit = 6; /* GODIGIT */
+
+        if (REG_GET(DISPC_CONTROL, bit, bit) == 1) {
+                DSSERR("GO bit not down for channel %d\n", channel);
+                goto end;
+        }
+
+        DSSDBG("GO %s\n", channel == OMAP_DSS_CHANNEL_LCD ? "LCD" : "DIGIT");
+
+        REG_FLD_MOD(DISPC_CONTROL, 1, bit, bit);
+end:
+        enable_clocks(0);
+}
+
+static void _dispc_write_firh_reg(enum omap_plane plane, int reg, u32 value)
+{
+        BUG_ON(plane == OMAP_DSS_GFX);
+
+        dispc_write_reg(DISPC_VID_FIR_COEF_H(plane-1, reg), value);
+}
+
+static void _dispc_write_firhv_reg(enum omap_plane plane, int reg, u32 value)
+{
+        BUG_ON(plane == OMAP_DSS_GFX);
+
+        dispc_write_reg(DISPC_VID_FIR_COEF_HV(plane-1, reg), value);
+}
+
+static void _dispc_write_firv_reg(enum omap_plane plane, int reg, u32 value)
+{
+        BUG_ON(plane == OMAP_DSS_GFX);
+
+        dispc_write_reg(DISPC_VID_FIR_COEF_V(plane-1, reg), value);
+}
+
+static void _dispc_set_scale_coef(enum omap_plane plane, int hscaleup,
+                int vscaleup, int five_taps)
+{
+        /* Coefficients for horizontal up-sampling */
+        static const u32 coef_hup[8] = {
+                0x00800000,
+                0x0D7CF800,
+                0x1E70F5FF,
+                0x335FF5FE,
+                0xF74949F7,
+                0xF55F33FB,
+                0xF5701EFE,
+                0xF87C0DFF,
+        };
+
+        /* Coefficients for horizontal down-sampling */
+        static const u32 coef_hdown[8] = {
+                0x24382400,
+                0x28371FFE,
+                0x2C361BFB,
+                0x303516F9,
+                0x11343311,
+                0x1635300C,
+                0x1B362C08,
+                0x1F372804,
+        };
+
+        /* Coefficients for horizontal and vertical up-sampling */
+        static const u32 coef_hvup[2][8] = {
+                {
+                0x00800000,
+                0x037B02FF,
+                0x0C6F05FE,
+                0x205907FB,
+                0x00404000,
+                0x075920FE,
+                0x056F0CFF,
+                0x027B0300,
+                },
+                {
+                0x00800000,
+                0x0D7CF8FF,
+                0x1E70F5FE,
+                0x335FF5FB,
+                0xF7404000,
+                0xF55F33FE,
+                0xF5701EFF,
+                0xF87C0D00,
+                },
+        };
+
+        /* Coefficients for horizontal and vertical down-sampling */
+        static const u32 coef_hvdown[2][8] = {
+                {
+                0x24382400,
+                0x28391F04,
+                0x2D381B08,
+                0x3237170C,
+                0x123737F7,
+                0x173732F9,
+                0x1B382DFB,
+                0x1F3928FE,
+                },
+                {
+                0x24382400,
+                0x28371F04,
+                0x2C361B08,
+                0x3035160C,
+                0x113433F7,
+                0x163530F9,
+                0x1B362CFB,
+                0x1F3728FE,
+                },
+        };
+
+        /* Coefficients for vertical up-sampling */
+        static const u32 coef_vup[8] = {
+                0x00000000,
+                0x0000FF00,
+                0x0000FEFF,
+                0x0000FBFE,
+                0x000000F7,
+                0x0000FEFB,
+                0x0000FFFE,
+                0x000000FF,
+        };
+
+
+        /* Coefficients for vertical down-sampling */
+        static const u32 coef_vdown[8] = {
+                0x00000000,
+                0x000004FE,
+                0x000008FB,
+                0x00000CF9,
+                0x0000F711,
+                0x0000F90C,
+                0x0000FB08,
+                0x0000FE04,
+        };
+
+        const u32 *h_coef;
+        const u32 *hv_coef;
+        const u32 *hv_coef_mod;
+        const u32 *v_coef;
+        int i;
+
+        if (hscaleup)
+                h_coef = coef_hup;
+        else
+                h_coef = coef_hdown;
+
+        if (vscaleup) {
+                hv_coef = coef_hvup[five_taps];
+                v_coef = coef_vup;
+
+                if (hscaleup)
+                        hv_coef_mod = NULL;
+                else
+                        hv_coef_mod = coef_hvdown[five_taps];
+        } else {
+                hv_coef = coef_hvdown[five_taps];
+                v_coef = coef_vdown;
+
+                if (hscaleup)
+                        hv_coef_mod = coef_hvup[five_taps];
+                else
+                        hv_coef_mod = NULL;
+        }
+
+        for (i = 0; i < 8; i++) {
+                u32 h, hv;
+
+                h = h_coef[i];
+
+                hv = hv_coef[i];
+
+                if (hv_coef_mod) {
+                        hv &= 0xffffff00;
+                        hv |= (hv_coef_mod[i] & 0xff);
+                }
+
+                _dispc_write_firh_reg(plane, i, h);
+                _dispc_write_firhv_reg(plane, i, hv);
+        }
+
+        if (!five_taps)
+                return;
+
+        for (i = 0; i < 8; i++) {
+                u32 v;
+                v = v_coef[i];
+                _dispc_write_firv_reg(plane, i, v);
+        }
+}
+
+static void _dispc_setup_color_conv_coef(void)
+{
+        const struct color_conv_coef {
+                int  ry,  rcr,  rcb,   gy,  gcr,  gcb,   by,  bcr,  bcb;
+                int  full_range;
+        }  ctbl_bt601_5 = {
+                298,  409,    0,  298, -208, -100,  298,    0,  517, 0,
+        };
+
+        const struct color_conv_coef *ct;
+
+#define CVAL(x, y) (FLD_VAL(x, 26, 16) | FLD_VAL(y, 10, 0))
+
+        ct = &ctbl_bt601_5;
+
+        dispc_write_reg(DISPC_VID_CONV_COEF(0, 0), CVAL(ct->rcr, ct->ry));
+        dispc_write_reg(DISPC_VID_CONV_COEF(0, 1), CVAL(ct->gy,  ct->rcb));
+        dispc_write_reg(DISPC_VID_CONV_COEF(0, 2), CVAL(ct->gcb, ct->gcr));
+        dispc_write_reg(DISPC_VID_CONV_COEF(0, 3), CVAL(ct->bcr, ct->by));
+        dispc_write_reg(DISPC_VID_CONV_COEF(0, 4), CVAL(0,       ct->bcb));
+
+        dispc_write_reg(DISPC_VID_CONV_COEF(1, 0), CVAL(ct->rcr, ct->ry));
+        dispc_write_reg(DISPC_VID_CONV_COEF(1, 1), CVAL(ct->gy,  ct->rcb));
+        dispc_write_reg(DISPC_VID_CONV_COEF(1, 2), CVAL(ct->gcb, ct->gcr));
+        dispc_write_reg(DISPC_VID_CONV_COEF(1, 3), CVAL(ct->bcr, ct->by));
+        dispc_write_reg(DISPC_VID_CONV_COEF(1, 4), CVAL(0,       ct->bcb));
+
+#undef CVAL
+
+        REG_FLD_MOD(DISPC_VID_ATTRIBUTES(0), ct->full_range, 11, 11);
+        REG_FLD_MOD(DISPC_VID_ATTRIBUTES(1), ct->full_range, 11, 11);
+}
+
+
+static void _dispc_set_plane_ba0(enum omap_plane plane, u32 paddr)
+{
+        const struct dispc_reg ba0_reg[] = { DISPC_GFX_BA0,
+                DISPC_VID_BA0(0),
+                DISPC_VID_BA0(1) };
+
+        dispc_write_reg(ba0_reg[plane], paddr);
+}
+
+static void _dispc_set_plane_ba1(enum omap_plane plane, u32 paddr)
+{
+        const struct dispc_reg ba1_reg[] = { DISPC_GFX_BA1,
+                                      DISPC_VID_BA1(0),
+                                      DISPC_VID_BA1(1) };
+
+        dispc_write_reg(ba1_reg[plane], paddr);
+}
+
+static void _dispc_set_plane_pos(enum omap_plane plane, int x, int y)
+{
+        const struct dispc_reg pos_reg[] = { DISPC_GFX_POSITION,
+                                      DISPC_VID_POSITION(0),
+                                      DISPC_VID_POSITION(1) };
+
+        u32 val = FLD_VAL(y, 26, 16) | FLD_VAL(x, 10, 0);
+        dispc_write_reg(pos_reg[plane], val);
+}
+
+static void _dispc_set_pic_size(enum omap_plane plane, int width, int height)
+{
+        const struct dispc_reg siz_reg[] = { DISPC_GFX_SIZE,
+                                      DISPC_VID_PICTURE_SIZE(0),
+                                      DISPC_VID_PICTURE_SIZE(1) };
+        u32 val = FLD_VAL(height - 1, 26, 16) | FLD_VAL(width - 1, 10, 0);
+        dispc_write_reg(siz_reg[plane], val);
+}
+
+static void _dispc_set_vid_size(enum omap_plane plane, int width, int height)
+{
+        u32 val;
+        const struct dispc_reg vsi_reg[] = { DISPC_VID_SIZE(0),
+                                      DISPC_VID_SIZE(1) };
+
+        BUG_ON(plane == OMAP_DSS_GFX);
+
+        val = FLD_VAL(height - 1, 26, 16) | FLD_VAL(width - 1, 10, 0);
+        dispc_write_reg(vsi_reg[plane-1], val);
+}
+
+static void _dispc_setup_global_alpha(enum omap_plane plane, u8 global_alpha)
+{
+
+        BUG_ON(plane == OMAP_DSS_VIDEO1);
+
+        if (cpu_is_omap24xx())
+                return;
+
+        if (plane == OMAP_DSS_GFX)
+                REG_FLD_MOD(DISPC_GLOBAL_ALPHA, global_alpha, 7, 0);
+        else if (plane == OMAP_DSS_VIDEO2)
+                REG_FLD_MOD(DISPC_GLOBAL_ALPHA, global_alpha, 23, 16);
+}
+
+static void _dispc_set_pix_inc(enum omap_plane plane, s32 inc)
+{
+        const struct dispc_reg ri_reg[] = { DISPC_GFX_PIXEL_INC,
+                                     DISPC_VID_PIXEL_INC(0),
+                                     DISPC_VID_PIXEL_INC(1) };
+
+        dispc_write_reg(ri_reg[plane], inc);
+}
+
+static void _dispc_set_row_inc(enum omap_plane plane, s32 inc)
+{
+        const struct dispc_reg ri_reg[] = { DISPC_GFX_ROW_INC,
+                                     DISPC_VID_ROW_INC(0),
+                                     DISPC_VID_ROW_INC(1) };
+
+        dispc_write_reg(ri_reg[plane], inc);
+}
+
+static void _dispc_set_color_mode(enum omap_plane plane,
+                enum omap_color_mode color_mode)
+{
+        u32 m = 0;
+
+        switch (color_mode) {
+        case OMAP_DSS_COLOR_CLUT1:
+                m = 0x0; break;
+        case OMAP_DSS_COLOR_CLUT2:
+                m = 0x1; break;
+        case OMAP_DSS_COLOR_CLUT4:
+                m = 0x2; break;
+        case OMAP_DSS_COLOR_CLUT8:
+                m = 0x3; break;
+        case OMAP_DSS_COLOR_RGB12U:
+                m = 0x4; break;
+        case OMAP_DSS_COLOR_ARGB16:
+                m = 0x5; break;
+        case OMAP_DSS_COLOR_RGB16:
+                m = 0x6; break;
+        case OMAP_DSS_COLOR_RGB24U:
+                m = 0x8; break;
+        case OMAP_DSS_COLOR_RGB24P:
+                m = 0x9; break;
+        case OMAP_DSS_COLOR_YUV2:
+                m = 0xa; break;
+        case OMAP_DSS_COLOR_UYVY:
+                m = 0xb; break;
+        case OMAP_DSS_COLOR_ARGB32:
+                m = 0xc; break;
+        case OMAP_DSS_COLOR_RGBA32:
+                m = 0xd; break;
+        case OMAP_DSS_COLOR_RGBX32:
+                m = 0xe; break;
+        default:
+                BUG(); break;
+        }
+
+        REG_FLD_MOD(dispc_reg_att[plane], m, 4, 1);
+}
+
+static void _dispc_set_channel_out(enum omap_plane plane,
+                enum omap_channel channel)
+{
+        int shift;
+        u32 val;
+
+        switch (plane) {
+        case OMAP_DSS_GFX:
+                shift = 8;
+                break;
+        case OMAP_DSS_VIDEO1:
+        case OMAP_DSS_VIDEO2:
+                shift = 16;
+                break;
+        default:
+                BUG();
+                return;
+        }
+
+        val = dispc_read_reg(dispc_reg_att[plane]);
+        val = FLD_MOD(val, channel, shift, shift);
+        dispc_write_reg(dispc_reg_att[plane], val);
+}
+
+void dispc_set_burst_size(enum omap_plane plane,
+                enum omap_burst_size burst_size)
+{
+        int shift;
+        u32 val;
+
+        enable_clocks(1);
+
+        switch (plane) {
+        case OMAP_DSS_GFX:
+                shift = 6;
+                break;
+        case OMAP_DSS_VIDEO1:
+        case OMAP_DSS_VIDEO2:
+                shift = 14;
+                break;
+        default:
+                BUG();
+                return;
+        }
+
+        val = dispc_read_reg(dispc_reg_att[plane]);
+        val = FLD_MOD(val, burst_size, shift+1, shift);
+        dispc_write_reg(dispc_reg_att[plane], val);
+
+        enable_clocks(0);
+}
+
+static void _dispc_set_vid_color_conv(enum omap_plane plane, bool enable)
+{
+        u32 val;
+
+        BUG_ON(plane == OMAP_DSS_GFX);
+
+        val = dispc_read_reg(dispc_reg_att[plane]);
+        val = FLD_MOD(val, enable, 9, 9);
+        dispc_write_reg(dispc_reg_att[plane], val);
+}
+
+void dispc_enable_replication(enum omap_plane plane, bool enable)
+{
+        int bit;
+
+        if (plane == OMAP_DSS_GFX)
+                bit = 5;
+        else
+                bit = 10;
+
+        enable_clocks(1);
+        REG_FLD_MOD(dispc_reg_att[plane], enable, bit, bit);
+        enable_clocks(0);
+}
+
+void dispc_set_lcd_size(u16 width, u16 height)
+{
+        u32 val;
+        BUG_ON((width > (1 << 11)) || (height > (1 << 11)));
+        val = FLD_VAL(height - 1, 26, 16) | FLD_VAL(width - 1, 10, 0);
+        enable_clocks(1);
+        dispc_write_reg(DISPC_SIZE_LCD, val);
+        enable_clocks(0);
+}
+
+void dispc_set_digit_size(u16 width, u16 height)
+{
+        u32 val;
+        BUG_ON((width > (1 << 11)) || (height > (1 << 11)));
+        val = FLD_VAL(height - 1, 26, 16) | FLD_VAL(width - 1, 10, 0);
+        enable_clocks(1);
+        dispc_write_reg(DISPC_SIZE_DIG, val);
+        enable_clocks(0);
+}
+
+static void dispc_read_plane_fifo_sizes(void)
+{
+        const struct dispc_reg fsz_reg[] = { DISPC_GFX_FIFO_SIZE_STATUS,
+                                      DISPC_VID_FIFO_SIZE_STATUS(0),
+                                      DISPC_VID_FIFO_SIZE_STATUS(1) };
+        u32 size;
+        int plane;
+
+        enable_clocks(1);
+
+        for (plane = 0; plane < ARRAY_SIZE(dispc.fifo_size); ++plane) {
+                if (cpu_is_omap24xx())
+                        size = FLD_GET(dispc_read_reg(fsz_reg[plane]), 8, 0);
+                else if (cpu_is_omap34xx())
+                        size = FLD_GET(dispc_read_reg(fsz_reg[plane]), 10, 0);
+                else
+                        BUG();
+
+                dispc.fifo_size[plane] = size;
+        }
+
+        enable_clocks(0);
+}
+
+u32 dispc_get_plane_fifo_size(enum omap_plane plane)
+{
+        return dispc.fifo_size[plane];
+}
+
+void dispc_setup_plane_fifo(enum omap_plane plane, u32 low, u32 high)
+{
+        const struct dispc_reg ftrs_reg[] = { DISPC_GFX_FIFO_THRESHOLD,
+                                       DISPC_VID_FIFO_THRESHOLD(0),
+                                       DISPC_VID_FIFO_THRESHOLD(1) };
+        enable_clocks(1);
+
+        DSSDBG("fifo(%d) low/high old %u/%u, new %u/%u\n",
+                        plane,
+                        REG_GET(ftrs_reg[plane], 11, 0),
+                        REG_GET(ftrs_reg[plane], 27, 16),
+                        low, high);
+
+        if (cpu_is_omap24xx())
+                dispc_write_reg(ftrs_reg[plane],
+                                FLD_VAL(high, 24, 16) | FLD_VAL(low, 8, 0));
+        else
+                dispc_write_reg(ftrs_reg[plane],
+                                FLD_VAL(high, 27, 16) | FLD_VAL(low, 11, 0));
+
+        enable_clocks(0);
+}
+
+void dispc_enable_fifomerge(bool enable)
+{
+        enable_clocks(1);
+
+        DSSDBG("FIFO merge %s\n", enable ? "enabled" : "disabled");
+        REG_FLD_MOD(DISPC_CONFIG, enable ? 1 : 0, 14, 14);
+
+        enable_clocks(0);
+}
+
+static void _dispc_set_fir(enum omap_plane plane, int hinc, int vinc)
+{
+        u32 val;
+        const struct dispc_reg fir_reg[] = { DISPC_VID_FIR(0),
+                                      DISPC_VID_FIR(1) };
+
+        BUG_ON(plane == OMAP_DSS_GFX);
+
+        if (cpu_is_omap24xx())
+                val = FLD_VAL(vinc, 27, 16) | FLD_VAL(hinc, 11, 0);
+        else
+                val = FLD_VAL(vinc, 28, 16) | FLD_VAL(hinc, 12, 0);
+        dispc_write_reg(fir_reg[plane-1], val);
+}
+
+static void _dispc_set_vid_accu0(enum omap_plane plane, int haccu, int vaccu)
+{
+        u32 val;
+        const struct dispc_reg ac0_reg[] = { DISPC_VID_ACCU0(0),
+                                      DISPC_VID_ACCU0(1) };
+
+        BUG_ON(plane == OMAP_DSS_GFX);
+
+        val = FLD_VAL(vaccu, 25, 16) | FLD_VAL(haccu, 9, 0);
+        dispc_write_reg(ac0_reg[plane-1], val);
+}
+
+static void _dispc_set_vid_accu1(enum omap_plane plane, int haccu, int vaccu)
+{
+        u32 val;
+        const struct dispc_reg ac1_reg[] = { DISPC_VID_ACCU1(0),
+                                      DISPC_VID_ACCU1(1) };
+
+        BUG_ON(plane == OMAP_DSS_GFX);
+
+        val = FLD_VAL(vaccu, 25, 16) | FLD_VAL(haccu, 9, 0);
+        dispc_write_reg(ac1_reg[plane-1], val);
+}
+
+
+static void _dispc_set_scaling(enum omap_plane plane,
+                u16 orig_width, u16 orig_height,
+                u16 out_width, u16 out_height,
+                bool ilace, bool five_taps,
+                bool fieldmode)
+{
+        int fir_hinc;
+        int fir_vinc;
+        int hscaleup, vscaleup;
+        int accu0 = 0;
+        int accu1 = 0;
+        u32 l;
+
+        BUG_ON(plane == OMAP_DSS_GFX);
+
+        hscaleup = orig_width <= out_width;
+        vscaleup = orig_height <= out_height;
+
+        _dispc_set_scale_coef(plane, hscaleup, vscaleup, five_taps);
+
+        if (!orig_width || orig_width == out_width)
+                fir_hinc = 0;
+        else
+                fir_hinc = 1024 * orig_width / out_width;
+
+        if (!orig_height || orig_height == out_height)
+                fir_vinc = 0;
+        else
+                fir_vinc = 1024 * orig_height / out_height;
+
+        _dispc_set_fir(plane, fir_hinc, fir_vinc);
+
+        l = dispc_read_reg(dispc_reg_att[plane]);
+        l &= ~((0x0f << 5) | (0x3 << 21));
+
+        l |= fir_hinc ? (1 << 5) : 0;
+        l |= fir_vinc ? (1 << 6) : 0;
+
+        l |= hscaleup ? 0 : (1 << 7);
+        l |= vscaleup ? 0 : (1 << 8);
+
+        l |= five_taps ? (1 << 21) : 0;
+        l |= five_taps ? (1 << 22) : 0;
+
+        dispc_write_reg(dispc_reg_att[plane], l);
+
+        /*
+         * field 0 = even field = bottom field
+         * field 1 = odd field = top field
+         */
+        if (ilace && !fieldmode) {
+                accu1 = 0;
+                accu0 = (fir_vinc / 2) & 0x3ff;
+                if (accu0 >= 1024/2) {
+                        accu1 = 1024/2;
+                        accu0 -= accu1;
+                }
+        }
+
+        _dispc_set_vid_accu0(plane, 0, accu0);
+        _dispc_set_vid_accu1(plane, 0, accu1);
+}
+
+static void _dispc_set_rotation_attrs(enum omap_plane plane, u8 rotation,
+                bool mirroring, enum omap_color_mode color_mode)
+{
+        if (color_mode == OMAP_DSS_COLOR_YUV2 ||
+                        color_mode == OMAP_DSS_COLOR_UYVY) {
+                int vidrot = 0;
+
+                if (mirroring) {
+                        switch (rotation) {
+                        case OMAP_DSS_ROT_0:
+                                vidrot = 2;
+                                break;
+                        case OMAP_DSS_ROT_90:
+                                vidrot = 1;
+                                break;
+                        case OMAP_DSS_ROT_180:
+                                vidrot = 0;
+                                break;
+                        case OMAP_DSS_ROT_270:
+                                vidrot = 3;
+                                break;
+                        }
+                } else {
+                        switch (rotation) {
+                        case OMAP_DSS_ROT_0:
+                                vidrot = 0;
+                                break;
+                        case OMAP_DSS_ROT_90:
+                                vidrot = 1;
+                                break;
+                        case OMAP_DSS_ROT_180:
+                                vidrot = 2;
+                                break;
+                        case OMAP_DSS_ROT_270:
+                                vidrot = 3;
+                                break;
+                        }
+                }
+
+                REG_FLD_MOD(dispc_reg_att[plane], vidrot, 13, 12);
+
+                if (rotation == OMAP_DSS_ROT_90 || rotation == OMAP_DSS_ROT_270)
+                        REG_FLD_MOD(dispc_reg_att[plane], 0x1, 18, 18);
+                else
+                        REG_FLD_MOD(dispc_reg_att[plane], 0x0, 18, 18);
+        } else {
+                REG_FLD_MOD(dispc_reg_att[plane], 0, 13, 12);
+                REG_FLD_MOD(dispc_reg_att[plane], 0, 18, 18);
+        }
+}
+
+static int color_mode_to_bpp(enum omap_color_mode color_mode)
+{
+        switch (color_mode) {
+        case OMAP_DSS_COLOR_CLUT1:
+                return 1;
+        case OMAP_DSS_COLOR_CLUT2:
+                return 2;
+        case OMAP_DSS_COLOR_CLUT4:
+                return 4;
+        case OMAP_DSS_COLOR_CLUT8:
+                return 8;
+        case OMAP_DSS_COLOR_RGB12U:
+        case OMAP_DSS_COLOR_RGB16:
+        case OMAP_DSS_COLOR_ARGB16:
+        case OMAP_DSS_COLOR_YUV2:
+        case OMAP_DSS_COLOR_UYVY:
+                return 16;
+        case OMAP_DSS_COLOR_RGB24P:
+                return 24;
+        case OMAP_DSS_COLOR_RGB24U:
+        case OMAP_DSS_COLOR_ARGB32:
+        case OMAP_DSS_COLOR_RGBA32:
+        case OMAP_DSS_COLOR_RGBX32:
+                return 32;
+        default:
+                BUG();
+        }
+}
+
+static s32 pixinc(int pixels, u8 ps)
+{
+        if (pixels == 1)
+                return 1;
+        else if (pixels > 1)
+                return 1 + (pixels - 1) * ps;
+        else if (pixels < 0)
+                return 1 - (-pixels + 1) * ps;
+        else
+                BUG();
+}
+
+static void calc_vrfb_rotation_offset(u8 rotation, bool mirror,
+                u16 screen_width,
+                u16 width, u16 height,
+                enum omap_color_mode color_mode, bool fieldmode,
+                unsigned int field_offset,
+                unsigned *offset0, unsigned *offset1,
+                s32 *row_inc, s32 *pix_inc)
+{
+        u8 ps;
+
+        /* FIXME CLUT formats */
+        switch (color_mode) {
+        case OMAP_DSS_COLOR_CLUT1:
+        case OMAP_DSS_COLOR_CLUT2:
+        case OMAP_DSS_COLOR_CLUT4:
+        case OMAP_DSS_COLOR_CLUT8:
+                BUG();
+                return;
+        case OMAP_DSS_COLOR_YUV2:
+        case OMAP_DSS_COLOR_UYVY:
+                ps = 4;
+                break;
+        default:
+                ps = color_mode_to_bpp(color_mode) / 8;
+                break;
+        }
+
+        DSSDBG("calc_rot(%d): scrw %d, %dx%d\n", rotation, screen_width,
+                        width, height);
+
+        /*
+         * field 0 = even field = bottom field
+         * field 1 = odd field = top field
+         */
+        switch (rotation + mirror * 4) {
+        case OMAP_DSS_ROT_0:
+        case OMAP_DSS_ROT_180:
+                /*
+                 * If the pixel format is YUV or UYVY divide the width
+                 * of the image by 2 for 0 and 180 degree rotation.
+                 */
+                if (color_mode == OMAP_DSS_COLOR_YUV2 ||
+                        color_mode == OMAP_DSS_COLOR_UYVY)
+                        width = width >> 1;
+        case OMAP_DSS_ROT_90:
+        case OMAP_DSS_ROT_270:
+                *offset1 = 0;
+                if (field_offset)
+                        *offset0 = field_offset * screen_width * ps;
+                else
+                        *offset0 = 0;
+
+                *row_inc = pixinc(1 + (screen_width - width) +
+                                (fieldmode ? screen_width : 0),
+                                ps);
+                *pix_inc = pixinc(1, ps);
+                break;
+
+        case OMAP_DSS_ROT_0 + 4:
+        case OMAP_DSS_ROT_180 + 4:
+                /* If the pixel format is YUV or UYVY divide the width
+                 * of the image by 2  for 0 degree and 180 degree
+                 */
+                if (color_mode == OMAP_DSS_COLOR_YUV2 ||
+                        color_mode == OMAP_DSS_COLOR_UYVY)
+                        width = width >> 1;
+        case OMAP_DSS_ROT_90 + 4:
+        case OMAP_DSS_ROT_270 + 4:
+                *offset1 = 0;
+                if (field_offset)
+                        *offset0 = field_offset * screen_width * ps;
+                else
+                        *offset0 = 0;
+                *row_inc = pixinc(1 - (screen_width + width) -
+                                (fieldmode ? screen_width : 0),
+                                ps);
+                *pix_inc = pixinc(1, ps);
+                break;
+
+        default:
+                BUG();
+        }
+}
+
+static void calc_dma_rotation_offset(u8 rotation, bool mirror,
+                u16 screen_width,
+                u16 width, u16 height,
+                enum omap_color_mode color_mode, bool fieldmode,
+                unsigned int field_offset,
+                unsigned *offset0, unsigned *offset1,
+                s32 *row_inc, s32 *pix_inc)
+{
+        u8 ps;
+        u16 fbw, fbh;
+
+        /* FIXME CLUT formats */
+        switch (color_mode) {
+        case OMAP_DSS_COLOR_CLUT1:
+        case OMAP_DSS_COLOR_CLUT2:
+        case OMAP_DSS_COLOR_CLUT4:
+        case OMAP_DSS_COLOR_CLUT8:
+                BUG();
+                return;
+        default:
+                ps = color_mode_to_bpp(color_mode) / 8;
+                break;
+        }
+
+        DSSDBG("calc_rot(%d): scrw %d, %dx%d\n", rotation, screen_width,
+                        width, height);
+
+        /* width & height are overlay sizes, convert to fb sizes */
+
+        if (rotation == OMAP_DSS_ROT_0 || rotation == OMAP_DSS_ROT_180) {
+                fbw = width;
+                fbh = height;
+        } else {
+                fbw = height;
+                fbh = width;
+        }
+
+        /*
+         * field 0 = even field = bottom field
+         * field 1 = odd field = top field
+         */
+        switch (rotation + mirror * 4) {
+        case OMAP_DSS_ROT_0:
+                *offset1 = 0;
+                if (field_offset)
+                        *offset0 = *offset1 + field_offset * screen_width * ps;
+                else
+                        *offset0 = *offset1;
+                *row_inc = pixinc(1 + (screen_width - fbw) +
+                                (fieldmode ? screen_width : 0),
+                                ps);
+                *pix_inc = pixinc(1, ps);
+                break;
+        case OMAP_DSS_ROT_90:
+                *offset1 = screen_width * (fbh - 1) * ps;
+                if (field_offset)
+                        *offset0 = *offset1 + field_offset * ps;
+                else
+                        *offset0 = *offset1;
+                *row_inc = pixinc(screen_width * (fbh - 1) + 1 +
+                                (fieldmode ? 1 : 0), ps);
+                *pix_inc = pixinc(-screen_width, ps);
+                break;
+        case OMAP_DSS_ROT_180:
+                *offset1 = (screen_width * (fbh - 1) + fbw - 1) * ps;
+                if (field_offset)
+                        *offset0 = *offset1 - field_offset * screen_width * ps;
+                else
+                        *offset0 = *offset1;
+                *row_inc = pixinc(-1 -
+                                (screen_width - fbw) -
+                                (fieldmode ? screen_width : 0),
+                                ps);
+                *pix_inc = pixinc(-1, ps);
+                break;
+        case OMAP_DSS_ROT_270:
+                *offset1 = (fbw - 1) * ps;
+                if (field_offset)
+                        *offset0 = *offset1 - field_offset * ps;
+                else
+                        *offset0 = *offset1;
+                *row_inc = pixinc(-screen_width * (fbh - 1) - 1 -
+                                (fieldmode ? 1 : 0), ps);
+                *pix_inc = pixinc(screen_width, ps);
+                break;
+
+        /* mirroring */
+        case OMAP_DSS_ROT_0 + 4:
+                *offset1 = (fbw - 1) * ps;
+                if (field_offset)
+                        *offset0 = *offset1 + field_offset * screen_width * ps;
+                else
+                        *offset0 = *offset1;
+                *row_inc = pixinc(screen_width * 2 - 1 +
+                                (fieldmode ? screen_width : 0),
+                                ps);
+                *pix_inc = pixinc(-1, ps);
+                break;
+
+        case OMAP_DSS_ROT_90 + 4:
+                *offset1 = 0;
+                if (field_offset)
+                        *offset0 = *offset1 + field_offset * ps;
+                else
+                        *offset0 = *offset1;
+                *row_inc = pixinc(-screen_width * (fbh - 1) + 1 +
+                                (fieldmode ? 1 : 0),
+                                ps);
+                *pix_inc = pixinc(screen_width, ps);
+                break;
+
+        case OMAP_DSS_ROT_180 + 4:
+                *offset1 = screen_width * (fbh - 1) * ps;
+                if (field_offset)
+                        *offset0 = *offset1 - field_offset * screen_width * ps;
+                else
+                        *offset0 = *offset1;
+                *row_inc = pixinc(1 - screen_width * 2 -
+                                (fieldmode ? screen_width : 0),
+                                ps);
+                *pix_inc = pixinc(1, ps);
+                break;
+
+        case OMAP_DSS_ROT_270 + 4:
+                *offset1 = (screen_width * (fbh - 1) + fbw - 1) * ps;
+                if (field_offset)
+                        *offset0 = *offset1 - field_offset * ps;
+                else
+                        *offset0 = *offset1;
+                *row_inc = pixinc(screen_width * (fbh - 1) - 1 -
+                                (fieldmode ? 1 : 0),
+                                ps);
+                *pix_inc = pixinc(-screen_width, ps);
+                break;
+
+        default:
+                BUG();
+        }
+}
+
+static unsigned long calc_fclk_five_taps(u16 width, u16 height,
+                u16 out_width, u16 out_height, enum omap_color_mode color_mode)
+{
+        u32 fclk = 0;
+        /* FIXME venc pclk? */
+        u64 tmp, pclk = dispc_pclk_rate();
+
+        if (height > out_height) {
+                /* FIXME get real display PPL */
+                unsigned int ppl = 800;
+
+                tmp = pclk * height * out_width;
+                do_div(tmp, 2 * out_height * ppl);
+                fclk = tmp;
+
+                if (height > 2 * out_height) {
+                        if (ppl == out_width)
+                                return 0;
+
+                        tmp = pclk * (height - 2 * out_height) * out_width;
+                        do_div(tmp, 2 * out_height * (ppl - out_width));
+                        fclk = max(fclk, (u32) tmp);
+                }
+        }
+
+        if (width > out_width) {
+                tmp = pclk * width;
+                do_div(tmp, out_width);
+                fclk = max(fclk, (u32) tmp);
+
+                if (color_mode == OMAP_DSS_COLOR_RGB24U)
+                        fclk <<= 1;
+        }
+
+        return fclk;
+}
+
+static unsigned long calc_fclk(u16 width, u16 height,
+                u16 out_width, u16 out_height)
+{
+        unsigned int hf, vf;
+
+        /*
+         * FIXME how to determine the 'A' factor
+         * for the no downscaling case ?
+         */
+
+        if (width > 3 * out_width)
+                hf = 4;
+        else if (width > 2 * out_width)
+                hf = 3;
+        else if (width > out_width)
+                hf = 2;
+        else
+                hf = 1;
+
+        if (height > out_height)
+                vf = 2;
+        else
+                vf = 1;
+
+        /* FIXME venc pclk? */
+        return dispc_pclk_rate() * vf * hf;
+}
+
+void dispc_set_channel_out(enum omap_plane plane, enum omap_channel channel_out)
+{
+        enable_clocks(1);
+        _dispc_set_channel_out(plane, channel_out);
+        enable_clocks(0);
+}
+
+static int _dispc_setup_plane(enum omap_plane plane,
+                u32 paddr, u16 screen_width,
+                u16 pos_x, u16 pos_y,
+                u16 width, u16 height,
+                u16 out_width, u16 out_height,
+                enum omap_color_mode color_mode,
+                bool ilace,
+                enum omap_dss_rotation_type rotation_type,
+                u8 rotation, int mirror,
+                u8 global_alpha)
+{
+        const int maxdownscale = cpu_is_omap34xx() ? 4 : 2;
+        bool five_taps = 0;
+        bool fieldmode = 0;
+        int cconv = 0;
+        unsigned offset0, offset1;
+        s32 row_inc;
+        s32 pix_inc;
+        u16 frame_height = height;
+        unsigned int field_offset = 0;
+
+        if (paddr == 0)
+                return -EINVAL;
+
+        if (ilace && height == out_height)
+                fieldmode = 1;
+
+        if (ilace) {
+                if (fieldmode)
+                        height /= 2;
+                pos_y /= 2;
+                out_height /= 2;
+
+                DSSDBG("adjusting for ilace: height %d, pos_y %d, "
+                                "out_height %d\n",
+                                height, pos_y, out_height);
+        }
+
+        if (plane == OMAP_DSS_GFX) {
+                if (width != out_width || height != out_height)
+                        return -EINVAL;
+
+                switch (color_mode) {
+                case OMAP_DSS_COLOR_ARGB16:
+                case OMAP_DSS_COLOR_ARGB32:
+                case OMAP_DSS_COLOR_RGBA32:
+                case OMAP_DSS_COLOR_RGBX32:
+                        if (cpu_is_omap24xx())
+                                return -EINVAL;
+                        /* fall through */
+                case OMAP_DSS_COLOR_RGB12U:
+                case OMAP_DSS_COLOR_RGB16:
+                case OMAP_DSS_COLOR_RGB24P:
+                case OMAP_DSS_COLOR_RGB24U:
+                        break;
+
+                default:
+                        return -EINVAL;
+                }
+        } else {
+                /* video plane */
+
+                unsigned long fclk = 0;
+
+                if (out_width < width / maxdownscale ||
+                   out_width > width * 8)
+                        return -EINVAL;
+
+                if (out_height < height / maxdownscale ||
+                   out_height > height * 8)
+                        return -EINVAL;
+
+                switch (color_mode) {
+                case OMAP_DSS_COLOR_RGBX32:
+                case OMAP_DSS_COLOR_RGB12U:
+                        if (cpu_is_omap24xx())
+                                return -EINVAL;
+                        /* fall through */
+                case OMAP_DSS_COLOR_RGB16:
+                case OMAP_DSS_COLOR_RGB24P:
+                case OMAP_DSS_COLOR_RGB24U:
+                        break;
+
+                case OMAP_DSS_COLOR_ARGB16:
+                case OMAP_DSS_COLOR_ARGB32:
+                case OMAP_DSS_COLOR_RGBA32:
+                        if (cpu_is_omap24xx())
+                                return -EINVAL;
+                        if (plane == OMAP_DSS_VIDEO1)
+                                return -EINVAL;
+                        break;
+
+                case OMAP_DSS_COLOR_YUV2:
+                case OMAP_DSS_COLOR_UYVY:
+                        cconv = 1;
+                        break;
+
+                default:
+                        return -EINVAL;
+                }
+
+                /* Must use 5-tap filter? */
+                five_taps = height > out_height * 2;
+
+                if (!five_taps) {
+                        fclk = calc_fclk(width, height,
+                                        out_width, out_height);
+
+                        /* Try 5-tap filter if 3-tap fclk is too high */
+                        if (cpu_is_omap34xx() && height > out_height &&
+                                        fclk > dispc_fclk_rate())
+                                five_taps = true;
+                }
+
+                if (width > (2048 >> five_taps)) {
+                        DSSERR("failed to set up scaling, fclk too low\n");
+                        return -EINVAL;
+                }
+
+                if (five_taps)
+                        fclk = calc_fclk_five_taps(width, height,
+                                        out_width, out_height, color_mode);
+
+                DSSDBG("required fclk rate = %lu Hz\n", fclk);
+                DSSDBG("current fclk rate = %lu Hz\n", dispc_fclk_rate());
+
+                if (!fclk || fclk > dispc_fclk_rate()) {
+                        DSSERR("failed to set up scaling, "
+                                        "required fclk rate = %lu Hz, "
+                                        "current fclk rate = %lu Hz\n",
+                                        fclk, dispc_fclk_rate());
+                        return -EINVAL;
+                }
+        }
+
+        if (ilace && !fieldmode) {
+                /*
+                 * when downscaling the bottom field may have to start several
+                 * source lines below the top field. Unfortunately ACCUI
+                 * registers will only hold the fractional part of the offset
+                 * so the integer part must be added to the base address of the
+                 * bottom field.
+                 */
+                if (!height || height == out_height)
+                        field_offset = 0;
+                else
+                        field_offset = height / out_height / 2;
+        }
+
+        /* Fields are independent but interleaved in memory. */
+        if (fieldmode)
+                field_offset = 1;
+
+        if (rotation_type == OMAP_DSS_ROT_DMA)
+                calc_dma_rotation_offset(rotation, mirror,
+                                screen_width, width, frame_height, color_mode,
+                                fieldmode, field_offset,
+                                &offset0, &offset1, &row_inc, &pix_inc);
+        else
+                calc_vrfb_rotation_offset(rotation, mirror,
+                                screen_width, width, frame_height, color_mode,
+                                fieldmode, field_offset,
+                                &offset0, &offset1, &row_inc, &pix_inc);
+
+        DSSDBG("offset0 %u, offset1 %u, row_inc %d, pix_inc %d\n",
+                        offset0, offset1, row_inc, pix_inc);
+
+        _dispc_set_color_mode(plane, color_mode);
+
+        _dispc_set_plane_ba0(plane, paddr + offset0);
+        _dispc_set_plane_ba1(plane, paddr + offset1);
+
+        _dispc_set_row_inc(plane, row_inc);
+        _dispc_set_pix_inc(plane, pix_inc);
+
+        DSSDBG("%d,%d %dx%d -> %dx%d\n", pos_x, pos_y, width, height,
+                        out_width, out_height);
+
+        _dispc_set_plane_pos(plane, pos_x, pos_y);
+
+        _dispc_set_pic_size(plane, width, height);
+
+        if (plane != OMAP_DSS_GFX) {
+                _dispc_set_scaling(plane, width, height,
+                                   out_width, out_height,
+                                   ilace, five_taps, fieldmode);
+                _dispc_set_vid_size(plane, out_width, out_height);
+                _dispc_set_vid_color_conv(plane, cconv);
+        }
+
+        _dispc_set_rotation_attrs(plane, rotation, mirror, color_mode);
+
+        if (plane != OMAP_DSS_VIDEO1)
+                _dispc_setup_global_alpha(plane, global_alpha);
+
+        return 0;
+}
+
+static void _dispc_enable_plane(enum omap_plane plane, bool enable)
+{
+        REG_FLD_MOD(dispc_reg_att[plane], enable ? 1 : 0, 0, 0);
+}
+
+static void dispc_disable_isr(void *data, u32 mask)
+{
+        struct completion *compl = data;
+        complete(compl);
+}
+
+static void _enable_lcd_out(bool enable)
+{
+        REG_FLD_MOD(DISPC_CONTROL, enable ? 1 : 0, 0, 0);
+}
+
+static void dispc_enable_lcd_out(bool enable)
+{
+        struct completion frame_done_completion;
+        bool is_on;
+        int r;
+
+        enable_clocks(1);
+
+        /* When we disable LCD output, we need to wait until frame is done.
+         * Otherwise the DSS is still working, and turning off the clocks
+         * prevents DSS from going to OFF mode */
+        is_on = REG_GET(DISPC_CONTROL, 0, 0);
+
+        if (!enable && is_on) {
+                init_completion(&frame_done_completion);
+
+                r = omap_dispc_register_isr(dispc_disable_isr,
+                                &frame_done_completion,
+                                DISPC_IRQ_FRAMEDONE);
+
+                if (r)
+                        DSSERR("failed to register FRAMEDONE isr\n");
+        }
+
+        _enable_lcd_out(enable);
+
+        if (!enable && is_on) {
+                if (!wait_for_completion_timeout(&frame_done_completion,
+                                        msecs_to_jiffies(100)))
+                        DSSERR("timeout waiting for FRAME DONE\n");
+
+                r = omap_dispc_unregister_isr(dispc_disable_isr,
+                                &frame_done_completion,
+                                DISPC_IRQ_FRAMEDONE);
+
+                if (r)
+                        DSSERR("failed to unregister FRAMEDONE isr\n");
+        }
+
+        enable_clocks(0);
+}
+
+static void _enable_digit_out(bool enable)
+{
+        REG_FLD_MOD(DISPC_CONTROL, enable ? 1 : 0, 1, 1);
+}
+
+static void dispc_enable_digit_out(bool enable)
+{
+        struct completion frame_done_completion;
+        int r;
+
+        enable_clocks(1);
+
+        if (REG_GET(DISPC_CONTROL, 1, 1) == enable) {
+                enable_clocks(0);
+                return;
+        }
+
+        if (enable) {
+                unsigned long flags;
+                /* When we enable digit output, we'll get an extra digit
+                 * sync lost interrupt, that we need to ignore */
+                spin_lock_irqsave(&dispc.irq_lock, flags);
+                dispc.irq_error_mask &= ~DISPC_IRQ_SYNC_LOST_DIGIT;
+                _omap_dispc_set_irqs();
+                spin_unlock_irqrestore(&dispc.irq_lock, flags);
+        }
+
+        /* When we disable digit output, we need to wait until fields are done.
+         * Otherwise the DSS is still working, and turning off the clocks
+         * prevents DSS from going to OFF mode. And when enabling, we need to
+         * wait for the extra sync losts */
+        init_completion(&frame_done_completion);
+
+        r = omap_dispc_register_isr(dispc_disable_isr, &frame_done_completion,
+                        DISPC_IRQ_EVSYNC_EVEN | DISPC_IRQ_EVSYNC_ODD);
+        if (r)
+                DSSERR("failed to register EVSYNC isr\n");
+
+        _enable_digit_out(enable);
+
+        /* XXX I understand from TRM that we should only wait for the
+         * current field to complete. But it seems we have to wait
+         * for both fields */
+        if (!wait_for_completion_timeout(&frame_done_completion,
+                                msecs_to_jiffies(100)))
+                DSSERR("timeout waiting for EVSYNC\n");
+
+        if (!wait_for_completion_timeout(&frame_done_completion,
+                                msecs_to_jiffies(100)))
+                DSSERR("timeout waiting for EVSYNC\n");
+
+        r = omap_dispc_unregister_isr(dispc_disable_isr,
+                        &frame_done_completion,
+                        DISPC_IRQ_EVSYNC_EVEN | DISPC_IRQ_EVSYNC_ODD);
+        if (r)
+                DSSERR("failed to unregister EVSYNC isr\n");
+
+        if (enable) {
+                unsigned long flags;
+                spin_lock_irqsave(&dispc.irq_lock, flags);
+                dispc.irq_error_mask = DISPC_IRQ_MASK_ERROR;
+                dispc_write_reg(DISPC_IRQSTATUS, DISPC_IRQ_SYNC_LOST_DIGIT);
+                _omap_dispc_set_irqs();
+                spin_unlock_irqrestore(&dispc.irq_lock, flags);
+        }
+
+        enable_clocks(0);
+}
+
+bool dispc_is_channel_enabled(enum omap_channel channel)
+{
+        if (channel == OMAP_DSS_CHANNEL_LCD)
+                return !!REG_GET(DISPC_CONTROL, 0, 0);
+        else if (channel == OMAP_DSS_CHANNEL_DIGIT)
+                return !!REG_GET(DISPC_CONTROL, 1, 1);
+        else
+                BUG();
+}
+
+void dispc_enable_channel(enum omap_channel channel, bool enable)
+{
+        if (channel == OMAP_DSS_CHANNEL_LCD)
+                dispc_enable_lcd_out(enable);
+        else if (channel == OMAP_DSS_CHANNEL_DIGIT)
+                dispc_enable_digit_out(enable);
+        else
+                BUG();
+}
+
+void dispc_lcd_enable_signal_polarity(bool act_high)
+{
+        enable_clocks(1);
+        REG_FLD_MOD(DISPC_CONTROL, act_high ? 1 : 0, 29, 29);
+        enable_clocks(0);
+}
+
+void dispc_lcd_enable_signal(bool enable)
+{
+        enable_clocks(1);
+        REG_FLD_MOD(DISPC_CONTROL, enable ? 1 : 0, 28, 28);
+        enable_clocks(0);
+}
+
+void dispc_pck_free_enable(bool enable)
+{
+        enable_clocks(1);
+        REG_FLD_MOD(DISPC_CONTROL, enable ? 1 : 0, 27, 27);
+        enable_clocks(0);
+}
+
+void dispc_enable_fifohandcheck(bool enable)
+{
+        enable_clocks(1);
+        REG_FLD_MOD(DISPC_CONFIG, enable ? 1 : 0, 16, 16);
+        enable_clocks(0);
+}
+
+
+void dispc_set_lcd_display_type(enum omap_lcd_display_type type)
+{
+        int mode;
+
+        switch (type) {
+        case OMAP_DSS_LCD_DISPLAY_STN:
+                mode = 0;
+                break;
+
+        case OMAP_DSS_LCD_DISPLAY_TFT:
+                mode = 1;
+                break;
+
+        default:
+                BUG();
+                return;
+        }
+
+        enable_clocks(1);
+        REG_FLD_MOD(DISPC_CONTROL, mode, 3, 3);
+        enable_clocks(0);
+}
+
+void dispc_set_loadmode(enum omap_dss_load_mode mode)
+{
+        enable_clocks(1);
+        REG_FLD_MOD(DISPC_CONFIG, mode, 2, 1);
+        enable_clocks(0);
+}
+
+
+void dispc_set_default_color(enum omap_channel channel, u32 color)
+{
+        const struct dispc_reg def_reg[] = { DISPC_DEFAULT_COLOR0,
+                                DISPC_DEFAULT_COLOR1 };
+
+        enable_clocks(1);
+        dispc_write_reg(def_reg[channel], color);
+        enable_clocks(0);
+}
+
+u32 dispc_get_default_color(enum omap_channel channel)
+{
+        const struct dispc_reg def_reg[] = { DISPC_DEFAULT_COLOR0,
+                                DISPC_DEFAULT_COLOR1 };
+        u32 l;
+
+        BUG_ON(channel != OMAP_DSS_CHANNEL_DIGIT &&
+               channel != OMAP_DSS_CHANNEL_LCD);
+
+        enable_clocks(1);
+        l = dispc_read_reg(def_reg[channel]);
+        enable_clocks(0);
+
+        return l;
+}
+
+void dispc_set_trans_key(enum omap_channel ch,
+                enum omap_dss_trans_key_type type,
+                u32 trans_key)
+{
+        const struct dispc_reg tr_reg[] = {
+                DISPC_TRANS_COLOR0, DISPC_TRANS_COLOR1 };
+
+        enable_clocks(1);
+        if (ch == OMAP_DSS_CHANNEL_LCD)
+                REG_FLD_MOD(DISPC_CONFIG, type, 11, 11);
+        else /* OMAP_DSS_CHANNEL_DIGIT */
+                REG_FLD_MOD(DISPC_CONFIG, type, 13, 13);
+
+        dispc_write_reg(tr_reg[ch], trans_key);
+        enable_clocks(0);
+}
+
+void dispc_get_trans_key(enum omap_channel ch,
+                enum omap_dss_trans_key_type *type,
+                u32 *trans_key)
+{
+        const struct dispc_reg tr_reg[] = {
+                DISPC_TRANS_COLOR0, DISPC_TRANS_COLOR1 };
+
+        enable_clocks(1);
+        if (type) {
+                if (ch == OMAP_DSS_CHANNEL_LCD)
+                        *type = REG_GET(DISPC_CONFIG, 11, 11);
+                else if (ch == OMAP_DSS_CHANNEL_DIGIT)
+                        *type = REG_GET(DISPC_CONFIG, 13, 13);
+                else
+                        BUG();
+        }
+
+        if (trans_key)
+                *trans_key = dispc_read_reg(tr_reg[ch]);
+        enable_clocks(0);
+}
+
+void dispc_enable_trans_key(enum omap_channel ch, bool enable)
+{
+        enable_clocks(1);
+        if (ch == OMAP_DSS_CHANNEL_LCD)
+                REG_FLD_MOD(DISPC_CONFIG, enable, 10, 10);
+        else /* OMAP_DSS_CHANNEL_DIGIT */
+                REG_FLD_MOD(DISPC_CONFIG, enable, 12, 12);
+        enable_clocks(0);
+}
+void dispc_enable_alpha_blending(enum omap_channel ch, bool enable)
+{
+        if (cpu_is_omap24xx())
+                return;
+
+        enable_clocks(1);
+        if (ch == OMAP_DSS_CHANNEL_LCD)
+                REG_FLD_MOD(DISPC_CONFIG, enable, 18, 18);
+        else /* OMAP_DSS_CHANNEL_DIGIT */
+                REG_FLD_MOD(DISPC_CONFIG, enable, 19, 19);
+        enable_clocks(0);
+}
+bool dispc_alpha_blending_enabled(enum omap_channel ch)
+{
+        bool enabled;
+
+        if (cpu_is_omap24xx())
+                return false;
+
+        enable_clocks(1);
+        if (ch == OMAP_DSS_CHANNEL_LCD)
+                enabled = REG_GET(DISPC_CONFIG, 18, 18);
+        else if (ch == OMAP_DSS_CHANNEL_DIGIT)
+                enabled = REG_GET(DISPC_CONFIG, 18, 18);
+        else
+                BUG();
+        enable_clocks(0);
+
+        return enabled;
+
+}
+
+
+bool dispc_trans_key_enabled(enum omap_channel ch)
+{
+        bool enabled;
+
+        enable_clocks(1);
+        if (ch == OMAP_DSS_CHANNEL_LCD)
+                enabled = REG_GET(DISPC_CONFIG, 10, 10);
+        else if (ch == OMAP_DSS_CHANNEL_DIGIT)
+                enabled = REG_GET(DISPC_CONFIG, 12, 12);
+        else
+                BUG();
+        enable_clocks(0);
+
+        return enabled;
+}
+
+
+void dispc_set_tft_data_lines(u8 data_lines)
+{
+        int code;
+
+        switch (data_lines) {
+        case 12:
+                code = 0;
+                break;
+        case 16:
+                code = 1;
+                break;
+        case 18:
+                code = 2;
+                break;
+        case 24:
+                code = 3;
+                break;
+        default:
+                BUG();
+                return;
+        }
+
+        enable_clocks(1);
+        REG_FLD_MOD(DISPC_CONTROL, code, 9, 8);
+        enable_clocks(0);
+}
+
+void dispc_set_parallel_interface_mode(enum omap_parallel_interface_mode mode)
+{
+        u32 l;
+        int stallmode;
+        int gpout0 = 1;
+        int gpout1;
+
+        switch (mode) {
+        case OMAP_DSS_PARALLELMODE_BYPASS:
+                stallmode = 0;
+                gpout1 = 1;
+                break;
+
+        case OMAP_DSS_PARALLELMODE_RFBI:
+                stallmode = 1;
+                gpout1 = 0;
+                break;
+
+        case OMAP_DSS_PARALLELMODE_DSI:
+                stallmode = 1;
+                gpout1 = 1;
+                break;
+
+        default:
+                BUG();
+                return;
+        }
+
+        enable_clocks(1);
+
+        l = dispc_read_reg(DISPC_CONTROL);
+
+        l = FLD_MOD(l, stallmode, 11, 11);
+        l = FLD_MOD(l, gpout0, 15, 15);
+        l = FLD_MOD(l, gpout1, 16, 16);
+
+        dispc_write_reg(DISPC_CONTROL, l);
+
+        enable_clocks(0);
+}
+
+static bool _dispc_lcd_timings_ok(int hsw, int hfp, int hbp,
+                int vsw, int vfp, int vbp)
+{
+        if (cpu_is_omap24xx() || omap_rev() < OMAP3430_REV_ES3_0) {
+                if (hsw < 1 || hsw > 64 ||
+                                hfp < 1 || hfp > 256 ||
+                                hbp < 1 || hbp > 256 ||
+                                vsw < 1 || vsw > 64 ||
+                                vfp < 0 || vfp > 255 ||
+                                vbp < 0 || vbp > 255)
+                        return false;
+        } else {
+                if (hsw < 1 || hsw > 256 ||
+                                hfp < 1 || hfp > 4096 ||
+                                hbp < 1 || hbp > 4096 ||
+                                vsw < 1 || vsw > 256 ||
+                                vfp < 0 || vfp > 4095 ||
+                                vbp < 0 || vbp > 4095)
+                        return false;
+        }
+
+        return true;
+}
+
+bool dispc_lcd_timings_ok(struct omap_video_timings *timings)
+{
+        return _dispc_lcd_timings_ok(timings->hsw, timings->hfp,
+                        timings->hbp, timings->vsw,
+                        timings->vfp, timings->vbp);
+}
+
+static void _dispc_set_lcd_timings(int hsw, int hfp, int hbp,
+                                   int vsw, int vfp, int vbp)
+{
+        u32 timing_h, timing_v;
+
+        if (cpu_is_omap24xx() || omap_rev() < OMAP3430_REV_ES3_0) {
+                timing_h = FLD_VAL(hsw-1, 5, 0) | FLD_VAL(hfp-1, 15, 8) |
+                        FLD_VAL(hbp-1, 27, 20);
+
+                timing_v = FLD_VAL(vsw-1, 5, 0) | FLD_VAL(vfp, 15, 8) |
+                        FLD_VAL(vbp, 27, 20);
+        } else {
+                timing_h = FLD_VAL(hsw-1, 7, 0) | FLD_VAL(hfp-1, 19, 8) |
+                        FLD_VAL(hbp-1, 31, 20);
+
+                timing_v = FLD_VAL(vsw-1, 7, 0) | FLD_VAL(vfp, 19, 8) |
+                        FLD_VAL(vbp, 31, 20);
+        }
+
+        enable_clocks(1);
+        dispc_write_reg(DISPC_TIMING_H, timing_h);
+        dispc_write_reg(DISPC_TIMING_V, timing_v);
+        enable_clocks(0);
+}
+
+/* change name to mode? */
+void dispc_set_lcd_timings(struct omap_video_timings *timings)
+{
+        unsigned xtot, ytot;
+        unsigned long ht, vt;
+
+        if (!_dispc_lcd_timings_ok(timings->hsw, timings->hfp,
+                                timings->hbp, timings->vsw,
+                                timings->vfp, timings->vbp))
+                BUG();
+
+        _dispc_set_lcd_timings(timings->hsw, timings->hfp, timings->hbp,
+                        timings->vsw, timings->vfp, timings->vbp);
+
+        dispc_set_lcd_size(timings->x_res, timings->y_res);
+
+        xtot = timings->x_res + timings->hfp + timings->hsw + timings->hbp;
+        ytot = timings->y_res + timings->vfp + timings->vsw + timings->vbp;
+
+        ht = (timings->pixel_clock * 1000) / xtot;
+        vt = (timings->pixel_clock * 1000) / xtot / ytot;
+
+        DSSDBG("xres %u yres %u\n", timings->x_res, timings->y_res);
+        DSSDBG("pck %u\n", timings->pixel_clock);
+        DSSDBG("hsw %d hfp %d hbp %d vsw %d vfp %d vbp %d\n",
+                        timings->hsw, timings->hfp, timings->hbp,
+                        timings->vsw, timings->vfp, timings->vbp);
+
+        DSSDBG("hsync %luHz, vsync %luHz\n", ht, vt);
+}
+
+static void dispc_set_lcd_divisor(u16 lck_div, u16 pck_div)
+{
+        BUG_ON(lck_div < 1);
+        BUG_ON(pck_div < 2);
+
+        enable_clocks(1);
+        dispc_write_reg(DISPC_DIVISOR,
+                        FLD_VAL(lck_div, 23, 16) | FLD_VAL(pck_div, 7, 0));
+        enable_clocks(0);
+}
+
+static void dispc_get_lcd_divisor(int *lck_div, int *pck_div)
+{
+        u32 l;
+        l = dispc_read_reg(DISPC_DIVISOR);
+        *lck_div = FLD_GET(l, 23, 16);
+        *pck_div = FLD_GET(l, 7, 0);
+}
+
+unsigned long dispc_fclk_rate(void)
+{
+        unsigned long r = 0;
+
+        if (dss_get_dispc_clk_source() == DSS_SRC_DSS1_ALWON_FCLK)
+                r = dss_clk_get_rate(DSS_CLK_FCK1);
+        else
+#ifdef CONFIG_OMAP2_DSS_DSI
+                r = dsi_get_dsi1_pll_rate();
+#else
+        BUG();
+#endif
+        return r;
+}
+
+unsigned long dispc_lclk_rate(void)
+{
+        int lcd;
+        unsigned long r;
+        u32 l;
+
+        l = dispc_read_reg(DISPC_DIVISOR);
+
+        lcd = FLD_GET(l, 23, 16);
+
+        r = dispc_fclk_rate();
+
+        return r / lcd;
+}
+
+unsigned long dispc_pclk_rate(void)
+{
+        int lcd, pcd;
+        unsigned long r;
+        u32 l;
+
+        l = dispc_read_reg(DISPC_DIVISOR);
+
+        lcd = FLD_GET(l, 23, 16);
+        pcd = FLD_GET(l, 7, 0);
+
+        r = dispc_fclk_rate();
+
+        return r / lcd / pcd;
+}
+
+void dispc_dump_clocks(struct seq_file *s)
+{
+        int lcd, pcd;
+
+        enable_clocks(1);
+
+        dispc_get_lcd_divisor(&lcd, &pcd);
+
+        seq_printf(s, "- DISPC -\n");
+
+        seq_printf(s, "dispc fclk source = %s\n",
+                        dss_get_dispc_clk_source() == DSS_SRC_DSS1_ALWON_FCLK ?
+                        "dss1_alwon_fclk" : "dsi1_pll_fclk");
+
+        seq_printf(s, "fck\t\t%-16lu\n", dispc_fclk_rate());
+        seq_printf(s, "lck\t\t%-16lulck div\t%u\n", dispc_lclk_rate(), lcd);
+        seq_printf(s, "pck\t\t%-16lupck div\t%u\n", dispc_pclk_rate(), pcd);
+
+        enable_clocks(0);
+}
+
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+void dispc_dump_irqs(struct seq_file *s)
+{
+        unsigned long flags;
+        struct dispc_irq_stats stats;
+
+        spin_lock_irqsave(&dispc.irq_stats_lock, flags);
+
+        stats = dispc.irq_stats;
+        memset(&dispc.irq_stats, 0, sizeof(dispc.irq_stats));
+        dispc.irq_stats.last_reset = jiffies;
+
+        spin_unlock_irqrestore(&dispc.irq_stats_lock, flags);
+
+        seq_printf(s, "period %u ms\n",
+                        jiffies_to_msecs(jiffies - stats.last_reset));
+
+        seq_printf(s, "irqs %d\n", stats.irq_count);
+#define PIS(x) \
+        seq_printf(s, "%-20s %10d\n", #x, stats.irqs[ffs(DISPC_IRQ_##x)-1]);
+
+        PIS(FRAMEDONE);
+        PIS(VSYNC);
+        PIS(EVSYNC_EVEN);
+        PIS(EVSYNC_ODD);
+        PIS(ACBIAS_COUNT_STAT);
+        PIS(PROG_LINE_NUM);
+        PIS(GFX_FIFO_UNDERFLOW);
+        PIS(GFX_END_WIN);
+        PIS(PAL_GAMMA_MASK);
+        PIS(OCP_ERR);
+        PIS(VID1_FIFO_UNDERFLOW);
+        PIS(VID1_END_WIN);
+        PIS(VID2_FIFO_UNDERFLOW);
+        PIS(VID2_END_WIN);
+        PIS(SYNC_LOST);
+        PIS(SYNC_LOST_DIGIT);
+        PIS(WAKEUP);
+#undef PIS
+}
+#endif
+
+void dispc_dump_regs(struct seq_file *s)
+{
+#define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, dispc_read_reg(r))
+
+        dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
+
+        DUMPREG(DISPC_REVISION);
+        DUMPREG(DISPC_SYSCONFIG);
+        DUMPREG(DISPC_SYSSTATUS);
+        DUMPREG(DISPC_IRQSTATUS);
+        DUMPREG(DISPC_IRQENABLE);
+        DUMPREG(DISPC_CONTROL);
+        DUMPREG(DISPC_CONFIG);
+        DUMPREG(DISPC_CAPABLE);
+        DUMPREG(DISPC_DEFAULT_COLOR0);
+        DUMPREG(DISPC_DEFAULT_COLOR1);
+        DUMPREG(DISPC_TRANS_COLOR0);
+        DUMPREG(DISPC_TRANS_COLOR1);
+        DUMPREG(DISPC_LINE_STATUS);
+        DUMPREG(DISPC_LINE_NUMBER);
+        DUMPREG(DISPC_TIMING_H);
+        DUMPREG(DISPC_TIMING_V);
+        DUMPREG(DISPC_POL_FREQ);
+        DUMPREG(DISPC_DIVISOR);
+        DUMPREG(DISPC_GLOBAL_ALPHA);
+        DUMPREG(DISPC_SIZE_DIG);
+        DUMPREG(DISPC_SIZE_LCD);
+
+        DUMPREG(DISPC_GFX_BA0);
+        DUMPREG(DISPC_GFX_BA1);
+        DUMPREG(DISPC_GFX_POSITION);
+        DUMPREG(DISPC_GFX_SIZE);
+        DUMPREG(DISPC_GFX_ATTRIBUTES);
+        DUMPREG(DISPC_GFX_FIFO_THRESHOLD);
+        DUMPREG(DISPC_GFX_FIFO_SIZE_STATUS);
+        DUMPREG(DISPC_GFX_ROW_INC);
+        DUMPREG(DISPC_GFX_PIXEL_INC);
+        DUMPREG(DISPC_GFX_WINDOW_SKIP);
+        DUMPREG(DISPC_GFX_TABLE_BA);
+
+        DUMPREG(DISPC_DATA_CYCLE1);
+        DUMPREG(DISPC_DATA_CYCLE2);
+        DUMPREG(DISPC_DATA_CYCLE3);
+
+        DUMPREG(DISPC_CPR_COEF_R);
+        DUMPREG(DISPC_CPR_COEF_G);
+        DUMPREG(DISPC_CPR_COEF_B);
+
+        DUMPREG(DISPC_GFX_PRELOAD);
+
+        DUMPREG(DISPC_VID_BA0(0));
+        DUMPREG(DISPC_VID_BA1(0));
+        DUMPREG(DISPC_VID_POSITION(0));
+        DUMPREG(DISPC_VID_SIZE(0));
+        DUMPREG(DISPC_VID_ATTRIBUTES(0));
+        DUMPREG(DISPC_VID_FIFO_THRESHOLD(0));
+        DUMPREG(DISPC_VID_FIFO_SIZE_STATUS(0));
+        DUMPREG(DISPC_VID_ROW_INC(0));
+        DUMPREG(DISPC_VID_PIXEL_INC(0));
+        DUMPREG(DISPC_VID_FIR(0));
+        DUMPREG(DISPC_VID_PICTURE_SIZE(0));
+        DUMPREG(DISPC_VID_ACCU0(0));
+        DUMPREG(DISPC_VID_ACCU1(0));
+
+        DUMPREG(DISPC_VID_BA0(1));
+        DUMPREG(DISPC_VID_BA1(1));
+        DUMPREG(DISPC_VID_POSITION(1));
+        DUMPREG(DISPC_VID_SIZE(1));
+        DUMPREG(DISPC_VID_ATTRIBUTES(1));
+        DUMPREG(DISPC_VID_FIFO_THRESHOLD(1));
+        DUMPREG(DISPC_VID_FIFO_SIZE_STATUS(1));
+        DUMPREG(DISPC_VID_ROW_INC(1));
+        DUMPREG(DISPC_VID_PIXEL_INC(1));
+        DUMPREG(DISPC_VID_FIR(1));
+        DUMPREG(DISPC_VID_PICTURE_SIZE(1));
+        DUMPREG(DISPC_VID_ACCU0(1));
+        DUMPREG(DISPC_VID_ACCU1(1));
+
+        DUMPREG(DISPC_VID_FIR_COEF_H(0, 0));
+        DUMPREG(DISPC_VID_FIR_COEF_H(0, 1));
+        DUMPREG(DISPC_VID_FIR_COEF_H(0, 2));
+        DUMPREG(DISPC_VID_FIR_COEF_H(0, 3));
+        DUMPREG(DISPC_VID_FIR_COEF_H(0, 4));
+        DUMPREG(DISPC_VID_FIR_COEF_H(0, 5));
+        DUMPREG(DISPC_VID_FIR_COEF_H(0, 6));
+        DUMPREG(DISPC_VID_FIR_COEF_H(0, 7));
+        DUMPREG(DISPC_VID_FIR_COEF_HV(0, 0));
+        DUMPREG(DISPC_VID_FIR_COEF_HV(0, 1));
+        DUMPREG(DISPC_VID_FIR_COEF_HV(0, 2));
+        DUMPREG(DISPC_VID_FIR_COEF_HV(0, 3));
+        DUMPREG(DISPC_VID_FIR_COEF_HV(0, 4));
+        DUMPREG(DISPC_VID_FIR_COEF_HV(0, 5));
+        DUMPREG(DISPC_VID_FIR_COEF_HV(0, 6));
+        DUMPREG(DISPC_VID_FIR_COEF_HV(0, 7));
+        DUMPREG(DISPC_VID_CONV_COEF(0, 0));
+        DUMPREG(DISPC_VID_CONV_COEF(0, 1));
+        DUMPREG(DISPC_VID_CONV_COEF(0, 2));
+        DUMPREG(DISPC_VID_CONV_COEF(0, 3));
+        DUMPREG(DISPC_VID_CONV_COEF(0, 4));
+        DUMPREG(DISPC_VID_FIR_COEF_V(0, 0));
+        DUMPREG(DISPC_VID_FIR_COEF_V(0, 1));
+        DUMPREG(DISPC_VID_FIR_COEF_V(0, 2));
+        DUMPREG(DISPC_VID_FIR_COEF_V(0, 3));
+        DUMPREG(DISPC_VID_FIR_COEF_V(0, 4));
+        DUMPREG(DISPC_VID_FIR_COEF_V(0, 5));
+        DUMPREG(DISPC_VID_FIR_COEF_V(0, 6));
+        DUMPREG(DISPC_VID_FIR_COEF_V(0, 7));
+
+        DUMPREG(DISPC_VID_FIR_COEF_H(1, 0));
+        DUMPREG(DISPC_VID_FIR_COEF_H(1, 1));
+        DUMPREG(DISPC_VID_FIR_COEF_H(1, 2));
+        DUMPREG(DISPC_VID_FIR_COEF_H(1, 3));
+        DUMPREG(DISPC_VID_FIR_COEF_H(1, 4));
+        DUMPREG(DISPC_VID_FIR_COEF_H(1, 5));
+        DUMPREG(DISPC_VID_FIR_COEF_H(1, 6));
+        DUMPREG(DISPC_VID_FIR_COEF_H(1, 7));
+        DUMPREG(DISPC_VID_FIR_COEF_HV(1, 0));
+        DUMPREG(DISPC_VID_FIR_COEF_HV(1, 1));
+        DUMPREG(DISPC_VID_FIR_COEF_HV(1, 2));
+        DUMPREG(DISPC_VID_FIR_COEF_HV(1, 3));
+        DUMPREG(DISPC_VID_FIR_COEF_HV(1, 4));
+        DUMPREG(DISPC_VID_FIR_COEF_HV(1, 5));
+        DUMPREG(DISPC_VID_FIR_COEF_HV(1, 6));
+        DUMPREG(DISPC_VID_FIR_COEF_HV(1, 7));
+        DUMPREG(DISPC_VID_CONV_COEF(1, 0));
+        DUMPREG(DISPC_VID_CONV_COEF(1, 1));
+        DUMPREG(DISPC_VID_CONV_COEF(1, 2));
+        DUMPREG(DISPC_VID_CONV_COEF(1, 3));
+        DUMPREG(DISPC_VID_CONV_COEF(1, 4));
+        DUMPREG(DISPC_VID_FIR_COEF_V(1, 0));
+        DUMPREG(DISPC_VID_FIR_COEF_V(1, 1));
+        DUMPREG(DISPC_VID_FIR_COEF_V(1, 2));
+        DUMPREG(DISPC_VID_FIR_COEF_V(1, 3));
+        DUMPREG(DISPC_VID_FIR_COEF_V(1, 4));
+        DUMPREG(DISPC_VID_FIR_COEF_V(1, 5));
+        DUMPREG(DISPC_VID_FIR_COEF_V(1, 6));
+        DUMPREG(DISPC_VID_FIR_COEF_V(1, 7));
+
+        DUMPREG(DISPC_VID_PRELOAD(0));
+        DUMPREG(DISPC_VID_PRELOAD(1));
+
+        dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
+#undef DUMPREG
+}
+
+static void _dispc_set_pol_freq(bool onoff, bool rf, bool ieo, bool ipc,
+                                bool ihs, bool ivs, u8 acbi, u8 acb)
+{
+        u32 l = 0;
+
+        DSSDBG("onoff %d rf %d ieo %d ipc %d ihs %d ivs %d acbi %d acb %d\n",
+                        onoff, rf, ieo, ipc, ihs, ivs, acbi, acb);
+
+        l |= FLD_VAL(onoff, 17, 17);
+        l |= FLD_VAL(rf, 16, 16);
+        l |= FLD_VAL(ieo, 15, 15);
+        l |= FLD_VAL(ipc, 14, 14);
+        l |= FLD_VAL(ihs, 13, 13);
+        l |= FLD_VAL(ivs, 12, 12);
+        l |= FLD_VAL(acbi, 11, 8);
+        l |= FLD_VAL(acb, 7, 0);
+
+        enable_clocks(1);
+        dispc_write_reg(DISPC_POL_FREQ, l);
+        enable_clocks(0);
+}
+
+void dispc_set_pol_freq(enum omap_panel_config config, u8 acbi, u8 acb)
+{
+        _dispc_set_pol_freq((config & OMAP_DSS_LCD_ONOFF) != 0,
+                        (config & OMAP_DSS_LCD_RF) != 0,
+                        (config & OMAP_DSS_LCD_IEO) != 0,
+                        (config & OMAP_DSS_LCD_IPC) != 0,
+                        (config & OMAP_DSS_LCD_IHS) != 0,
+                        (config & OMAP_DSS_LCD_IVS) != 0,
+                        acbi, acb);
+}
+
+/* with fck as input clock rate, find dispc dividers that produce req_pck */
+void dispc_find_clk_divs(bool is_tft, unsigned long req_pck, unsigned long fck,
+                struct dispc_clock_info *cinfo)
+{
+        u16 pcd_min = is_tft ? 2 : 3;
+        unsigned long best_pck;
+        u16 best_ld, cur_ld;
+        u16 best_pd, cur_pd;
+
+        best_pck = 0;
+        best_ld = 0;
+        best_pd = 0;
+
+        for (cur_ld = 1; cur_ld <= 255; ++cur_ld) {
+                unsigned long lck = fck / cur_ld;
+
+                for (cur_pd = pcd_min; cur_pd <= 255; ++cur_pd) {
+                        unsigned long pck = lck / cur_pd;
+                        long old_delta = abs(best_pck - req_pck);
+                        long new_delta = abs(pck - req_pck);
+
+                        if (best_pck == 0 || new_delta < old_delta) {
+                                best_pck = pck;
+                                best_ld = cur_ld;
+                                best_pd = cur_pd;
+
+                                if (pck == req_pck)
+                                        goto found;
+                        }
+
+                        if (pck < req_pck)
+                                break;
+                }
+
+                if (lck / pcd_min < req_pck)
+                        break;
+        }
+
+found:
+        cinfo->lck_div = best_ld;
+        cinfo->pck_div = best_pd;
+        cinfo->lck = fck / cinfo->lck_div;
+        cinfo->pck = cinfo->lck / cinfo->pck_div;
+}
+
+/* calculate clock rates using dividers in cinfo */
+int dispc_calc_clock_rates(unsigned long dispc_fclk_rate,
+                struct dispc_clock_info *cinfo)
+{
+        if (cinfo->lck_div > 255 || cinfo->lck_div == 0)
+                return -EINVAL;
+        if (cinfo->pck_div < 2 || cinfo->pck_div > 255)
+                return -EINVAL;
+
+        cinfo->lck = dispc_fclk_rate / cinfo->lck_div;
+        cinfo->pck = cinfo->lck / cinfo->pck_div;
+
+        return 0;
+}
+
+int dispc_set_clock_div(struct dispc_clock_info *cinfo)
+{
+        DSSDBG("lck = %lu (%u)\n", cinfo->lck, cinfo->lck_div);
+        DSSDBG("pck = %lu (%u)\n", cinfo->pck, cinfo->pck_div);
+
+        dispc_set_lcd_divisor(cinfo->lck_div, cinfo->pck_div);
+
+        return 0;
+}
+
+int dispc_get_clock_div(struct dispc_clock_info *cinfo)
+{
+        unsigned long fck;
+
+        fck = dispc_fclk_rate();
+
+        cinfo->lck_div = REG_GET(DISPC_DIVISOR, 23, 16);
+        cinfo->pck_div = REG_GET(DISPC_DIVISOR, 7, 0);
+
+        cinfo->lck = fck / cinfo->lck_div;
+        cinfo->pck = cinfo->lck / cinfo->pck_div;
+
+        return 0;
+}
+
+/* dispc.irq_lock has to be locked by the caller */
+static void _omap_dispc_set_irqs(void)
+{
+        u32 mask;
+        u32 old_mask;
+        int i;
+        struct omap_dispc_isr_data *isr_data;
+
+        mask = dispc.irq_error_mask;
+
+        for (i = 0; i < DISPC_MAX_NR_ISRS; i++) {
+                isr_data = &dispc.registered_isr[i];
+
+                if (isr_data->isr == NULL)
+                        continue;
+
+                mask |= isr_data->mask;
+        }
+
+        enable_clocks(1);
+
+        old_mask = dispc_read_reg(DISPC_IRQENABLE);
+        /* clear the irqstatus for newly enabled irqs */
+        dispc_write_reg(DISPC_IRQSTATUS, (mask ^ old_mask) & mask);
+
+        dispc_write_reg(DISPC_IRQENABLE, mask);
+
+        enable_clocks(0);
+}
+
+int omap_dispc_register_isr(omap_dispc_isr_t isr, void *arg, u32 mask)
+{
+        int i;
+        int ret;
+        unsigned long flags;
+        struct omap_dispc_isr_data *isr_data;
+
+        if (isr == NULL)
+                return -EINVAL;
+
+        spin_lock_irqsave(&dispc.irq_lock, flags);
+
+        /* check for duplicate entry */
+        for (i = 0; i < DISPC_MAX_NR_ISRS; i++) {
+                isr_data = &dispc.registered_isr[i];
+                if (isr_data->isr == isr && isr_data->arg == arg &&
+                                isr_data->mask == mask) {
+                        ret = -EINVAL;
+                        goto err;
+                }
+        }
+
+        isr_data = NULL;
+        ret = -EBUSY;
+
+        for (i = 0; i < DISPC_MAX_NR_ISRS; i++) {
+                isr_data = &dispc.registered_isr[i];
+
+                if (isr_data->isr != NULL)
+                        continue;
+
+                isr_data->isr = isr;
+                isr_data->arg = arg;
+                isr_data->mask = mask;
+                ret = 0;
+
+                break;
+        }
+
+        _omap_dispc_set_irqs();
+
+        spin_unlock_irqrestore(&dispc.irq_lock, flags);
+
+        return 0;
+err:
+        spin_unlock_irqrestore(&dispc.irq_lock, flags);
+
+        return ret;
+}
+EXPORT_SYMBOL(omap_dispc_register_isr);
+
+int omap_dispc_unregister_isr(omap_dispc_isr_t isr, void *arg, u32 mask)
+{
+        int i;
+        unsigned long flags;
+        int ret = -EINVAL;
+        struct omap_dispc_isr_data *isr_data;
+
+        spin_lock_irqsave(&dispc.irq_lock, flags);
+
+        for (i = 0; i < DISPC_MAX_NR_ISRS; i++) {
+                isr_data = &dispc.registered_isr[i];
+                if (isr_data->isr != isr || isr_data->arg != arg ||
+                                isr_data->mask != mask)
+                        continue;
+
+                /* found the correct isr */
+
+                isr_data->isr = NULL;
+                isr_data->arg = NULL;
+                isr_data->mask = 0;
+
+                ret = 0;
+                break;
+        }
+
+        if (ret == 0)
+                _omap_dispc_set_irqs();
+
+        spin_unlock_irqrestore(&dispc.irq_lock, flags);
+
+        return ret;
+}
+EXPORT_SYMBOL(omap_dispc_unregister_isr);
+
+#ifdef DEBUG
+static void print_irq_status(u32 status)
+{
+        if ((status & dispc.irq_error_mask) == 0)
+                return;
+
+        printk(KERN_DEBUG "DISPC IRQ: 0x%x: ", status);
+
+#define PIS(x) \
+        if (status & DISPC_IRQ_##x) \
+                printk(#x " ");
+        PIS(GFX_FIFO_UNDERFLOW);
+        PIS(OCP_ERR);
+        PIS(VID1_FIFO_UNDERFLOW);
+        PIS(VID2_FIFO_UNDERFLOW);
+        PIS(SYNC_LOST);
+        PIS(SYNC_LOST_DIGIT);
+#undef PIS
+
+        printk("\n");
+}
+#endif
+
+/* Called from dss.c. Note that we don't touch clocks here,
+ * but we presume they are on because we got an IRQ. However,
+ * an irq handler may turn the clocks off, so we may not have
+ * clock later in the function. */
+void dispc_irq_handler(void)
+{
+        int i;
+        u32 irqstatus;
+        u32 handledirqs = 0;
+        u32 unhandled_errors;
+        struct omap_dispc_isr_data *isr_data;
+        struct omap_dispc_isr_data registered_isr[DISPC_MAX_NR_ISRS];
+
+        spin_lock(&dispc.irq_lock);
+
+        irqstatus = dispc_read_reg(DISPC_IRQSTATUS);
+
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+        spin_lock(&dispc.irq_stats_lock);
+        dispc.irq_stats.irq_count++;
+        dss_collect_irq_stats(irqstatus, dispc.irq_stats.irqs);
+        spin_unlock(&dispc.irq_stats_lock);
+#endif
+
+#ifdef DEBUG
+        if (dss_debug)
+                print_irq_status(irqstatus);
+#endif
+        /* Ack the interrupt. Do it here before clocks are possibly turned
+         * off */
+        dispc_write_reg(DISPC_IRQSTATUS, irqstatus);
+        /* flush posted write */
+        dispc_read_reg(DISPC_IRQSTATUS);
+
+        /* make a copy and unlock, so that isrs can unregister
+         * themselves */
+        memcpy(registered_isr, dispc.registered_isr,
+                        sizeof(registered_isr));
+
+        spin_unlock(&dispc.irq_lock);
+
+        for (i = 0; i < DISPC_MAX_NR_ISRS; i++) {
+                isr_data = &registered_isr[i];
+
+                if (!isr_data->isr)
+                        continue;
+
+                if (isr_data->mask & irqstatus) {
+                        isr_data->isr(isr_data->arg, irqstatus);
+                        handledirqs |= isr_data->mask;
+                }
+        }
+
+        spin_lock(&dispc.irq_lock);
+
+        unhandled_errors = irqstatus & ~handledirqs & dispc.irq_error_mask;
+
+        if (unhandled_errors) {
+                dispc.error_irqs |= unhandled_errors;
+
+                dispc.irq_error_mask &= ~unhandled_errors;
+                _omap_dispc_set_irqs();
+
+                schedule_work(&dispc.error_work);
+        }
+
+        spin_unlock(&dispc.irq_lock);
+}
+
+static void dispc_error_worker(struct work_struct *work)
+{
+        int i;
+        u32 errors;
+        unsigned long flags;
+
+        spin_lock_irqsave(&dispc.irq_lock, flags);
+        errors = dispc.error_irqs;
+        dispc.error_irqs = 0;
+        spin_unlock_irqrestore(&dispc.irq_lock, flags);
+
+        if (errors & DISPC_IRQ_GFX_FIFO_UNDERFLOW) {
+                DSSERR("GFX_FIFO_UNDERFLOW, disabling GFX\n");
+                for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
+                        struct omap_overlay *ovl;
+                        ovl = omap_dss_get_overlay(i);
+
+                        if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC))
+                                continue;
+
+                        if (ovl->id == 0) {
+                                dispc_enable_plane(ovl->id, 0);
+                                dispc_go(ovl->manager->id);
+                                mdelay(50);
+                                break;
+                        }
+                }
+        }
+
+        if (errors & DISPC_IRQ_VID1_FIFO_UNDERFLOW) {
+                DSSERR("VID1_FIFO_UNDERFLOW, disabling VID1\n");
+                for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
+                        struct omap_overlay *ovl;
+                        ovl = omap_dss_get_overlay(i);
+
+                        if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC))
+                                continue;
+
+                        if (ovl->id == 1) {
+                                dispc_enable_plane(ovl->id, 0);
+                                dispc_go(ovl->manager->id);
+                                mdelay(50);
+                                break;
+                        }
+                }
+        }
+
+        if (errors & DISPC_IRQ_VID2_FIFO_UNDERFLOW) {
+                DSSERR("VID2_FIFO_UNDERFLOW, disabling VID2\n");
+                for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
+                        struct omap_overlay *ovl;
+                        ovl = omap_dss_get_overlay(i);
+
+                        if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC))
+                                continue;
+
+                        if (ovl->id == 2) {
+                                dispc_enable_plane(ovl->id, 0);
+                                dispc_go(ovl->manager->id);
+                                mdelay(50);
+                                break;
+                        }
+                }
+        }
+
+        if (errors & DISPC_IRQ_SYNC_LOST) {
+                struct omap_overlay_manager *manager = NULL;
+                bool enable = false;
+
+                DSSERR("SYNC_LOST, disabling LCD\n");
+
+                for (i = 0; i < omap_dss_get_num_overlay_managers(); ++i) {
+                        struct omap_overlay_manager *mgr;
+                        mgr = omap_dss_get_overlay_manager(i);
+
+                        if (mgr->id == OMAP_DSS_CHANNEL_LCD) {
+                                manager = mgr;
+                                enable = mgr->device->state ==
+                                                OMAP_DSS_DISPLAY_ACTIVE;
+                                mgr->device->driver->disable(mgr->device);
+                                break;
+                        }
+                }
+
+                if (manager) {
+                        struct omap_dss_device *dssdev = manager->device;
+                        for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
+                                struct omap_overlay *ovl;
+                                ovl = omap_dss_get_overlay(i);
+
+                                if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC))
+                                        continue;
+
+                                if (ovl->id != 0 && ovl->manager == manager)
+                                        dispc_enable_plane(ovl->id, 0);
+                        }
+
+                        dispc_go(manager->id);
+                        mdelay(50);
+                        if (enable)
+                                dssdev->driver->enable(dssdev);
+                }
+        }
+
+        if (errors & DISPC_IRQ_SYNC_LOST_DIGIT) {
+                struct omap_overlay_manager *manager = NULL;
+                bool enable = false;
+
+                DSSERR("SYNC_LOST_DIGIT, disabling TV\n");
+
+                for (i = 0; i < omap_dss_get_num_overlay_managers(); ++i) {
+                        struct omap_overlay_manager *mgr;
+                        mgr = omap_dss_get_overlay_manager(i);
+
+                        if (mgr->id == OMAP_DSS_CHANNEL_DIGIT) {
+                                manager = mgr;
+                                enable = mgr->device->state ==
+                                                OMAP_DSS_DISPLAY_ACTIVE;
+                                mgr->device->driver->disable(mgr->device);
+                                break;
+                        }
+                }
+
+                if (manager) {
+                        struct omap_dss_device *dssdev = manager->device;
+                        for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
+                                struct omap_overlay *ovl;
+                                ovl = omap_dss_get_overlay(i);
+
+                                if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC))
+                                        continue;
+
+                                if (ovl->id != 0 && ovl->manager == manager)
+                                        dispc_enable_plane(ovl->id, 0);
+                        }
+
+                        dispc_go(manager->id);
+                        mdelay(50);
+                        if (enable)
+                                dssdev->driver->enable(dssdev);
+                }
+        }
+
+        if (errors & DISPC_IRQ_OCP_ERR) {
+                DSSERR("OCP_ERR\n");
+                for (i = 0; i < omap_dss_get_num_overlay_managers(); ++i) {
+                        struct omap_overlay_manager *mgr;
+                        mgr = omap_dss_get_overlay_manager(i);
+
+                        if (mgr->caps & OMAP_DSS_OVL_CAP_DISPC)
+                                mgr->device->driver->disable(mgr->device);
+                }
+        }
+
+        spin_lock_irqsave(&dispc.irq_lock, flags);
+        dispc.irq_error_mask |= errors;
+        _omap_dispc_set_irqs();
+        spin_unlock_irqrestore(&dispc.irq_lock, flags);
+}
+
+int omap_dispc_wait_for_irq_timeout(u32 irqmask, unsigned long timeout)
+{
+        void dispc_irq_wait_handler(void *data, u32 mask)
+        {
+                complete((struct completion *)data);
+        }
+
+        int r;
+        DECLARE_COMPLETION_ONSTACK(completion);
+
+        r = omap_dispc_register_isr(dispc_irq_wait_handler, &completion,
+                        irqmask);
+
+        if (r)
+                return r;
+
+        timeout = wait_for_completion_timeout(&completion, timeout);
+
+        omap_dispc_unregister_isr(dispc_irq_wait_handler, &completion, irqmask);
+
+        if (timeout == 0)
+                return -ETIMEDOUT;
+
+        if (timeout == -ERESTARTSYS)
+                return -ERESTARTSYS;
+
+        return 0;
+}
+
+int omap_dispc_wait_for_irq_interruptible_timeout(u32 irqmask,
+                unsigned long timeout)
+{
+        void dispc_irq_wait_handler(void *data, u32 mask)
+        {
+                complete((struct completion *)data);
+        }
+
+        int r;
+        DECLARE_COMPLETION_ONSTACK(completion);
+
+        r = omap_dispc_register_isr(dispc_irq_wait_handler, &completion,
+                        irqmask);
+
+        if (r)
+                return r;
+
+        timeout = wait_for_completion_interruptible_timeout(&completion,
+                        timeout);
+
+        omap_dispc_unregister_isr(dispc_irq_wait_handler, &completion, irqmask);
+
+        if (timeout == 0)
+                return -ETIMEDOUT;
+
+        if (timeout == -ERESTARTSYS)
+                return -ERESTARTSYS;
+
+        return 0;
+}
+
+#ifdef CONFIG_OMAP2_DSS_FAKE_VSYNC
+void dispc_fake_vsync_irq(void)
+{
+        u32 irqstatus = DISPC_IRQ_VSYNC;
+        int i;
+
+        local_irq_disable();
+
+        for (i = 0; i < DISPC_MAX_NR_ISRS; i++) {
+                struct omap_dispc_isr_data *isr_data;
+                isr_data = &dispc.registered_isr[i];
+
+                if (!isr_data->isr)
+                        continue;
+
+                if (isr_data->mask & irqstatus)
+                        isr_data->isr(isr_data->arg, irqstatus);
+        }
+
+        local_irq_enable();
+}
+#endif
+
+static void _omap_dispc_initialize_irq(void)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&dispc.irq_lock, flags);
+
+        memset(dispc.registered_isr, 0, sizeof(dispc.registered_isr));
+
+        dispc.irq_error_mask = DISPC_IRQ_MASK_ERROR;
+
+        /* there's SYNC_LOST_DIGIT waiting after enabling the DSS,
+         * so clear it */
+        dispc_write_reg(DISPC_IRQSTATUS, dispc_read_reg(DISPC_IRQSTATUS));
+
+        _omap_dispc_set_irqs();
+
+        spin_unlock_irqrestore(&dispc.irq_lock, flags);
+}
+
+void dispc_enable_sidle(void)
+{
+        REG_FLD_MOD(DISPC_SYSCONFIG, 2, 4, 3);  /* SIDLEMODE: smart idle */
+}
+
+void dispc_disable_sidle(void)
+{
+        REG_FLD_MOD(DISPC_SYSCONFIG, 1, 4, 3);  /* SIDLEMODE: no idle */
+}
+
+static void _omap_dispc_initial_config(void)
+{
+        u32 l;
+
+        l = dispc_read_reg(DISPC_SYSCONFIG);
+        l = FLD_MOD(l, 2, 13, 12);      /* MIDLEMODE: smart standby */
+        l = FLD_MOD(l, 2, 4, 3);        /* SIDLEMODE: smart idle */
+        l = FLD_MOD(l, 1, 2, 2);        /* ENWAKEUP */
+        l = FLD_MOD(l, 1, 0, 0);        /* AUTOIDLE */
+        dispc_write_reg(DISPC_SYSCONFIG, l);
+
+        /* FUNCGATED */
+        REG_FLD_MOD(DISPC_CONFIG, 1, 9, 9);
+
+        /* L3 firewall setting: enable access to OCM RAM */
+        /* XXX this should be somewhere in plat-omap */
+        if (cpu_is_omap24xx())
+                __raw_writel(0x402000b0, OMAP2_L3_IO_ADDRESS(0x680050a0));
+
+        _dispc_setup_color_conv_coef();
+
+        dispc_set_loadmode(OMAP_DSS_LOAD_FRAME_ONLY);
+
+        dispc_read_plane_fifo_sizes();
+}
+
+int dispc_init(void)
+{
+        u32 rev;
+
+        spin_lock_init(&dispc.irq_lock);
+
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+        spin_lock_init(&dispc.irq_stats_lock);
+        dispc.irq_stats.last_reset = jiffies;
+#endif
+
+        INIT_WORK(&dispc.error_work, dispc_error_worker);
+
+        dispc.base = ioremap(DISPC_BASE, DISPC_SZ_REGS);
+        if (!dispc.base) {
+                DSSERR("can't ioremap DISPC\n");
+                return -ENOMEM;
+        }
+
+        enable_clocks(1);
+
+        _omap_dispc_initial_config();
+
+        _omap_dispc_initialize_irq();
+
+        dispc_save_context();
+
+        rev = dispc_read_reg(DISPC_REVISION);
+        printk(KERN_INFO "OMAP DISPC rev %d.%d\n",
+               FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0));
+
+        enable_clocks(0);
+
+        return 0;
+}
+
+void dispc_exit(void)
+{
+        iounmap(dispc.base);
+}
+
+int dispc_enable_plane(enum omap_plane plane, bool enable)
+{
+        DSSDBG("dispc_enable_plane %d, %d\n", plane, enable);
+
+        enable_clocks(1);
+        _dispc_enable_plane(plane, enable);
+        enable_clocks(0);
+
+        return 0;
+}
+
+int dispc_setup_plane(enum omap_plane plane,
+                       u32 paddr, u16 screen_width,
+                       u16 pos_x, u16 pos_y,
+                       u16 width, u16 height,
+                       u16 out_width, u16 out_height,
+                       enum omap_color_mode color_mode,
+                       bool ilace,
+                       enum omap_dss_rotation_type rotation_type,
+                       u8 rotation, bool mirror, u8 global_alpha)
+{
+        int r = 0;
+
+        DSSDBG("dispc_setup_plane %d, pa %x, sw %d, %d,%d, %dx%d -> "
+               "%dx%d, ilace %d, cmode %x, rot %d, mir %d\n",
+               plane, paddr, screen_width, pos_x, pos_y,
+               width, height,
+               out_width, out_height,
+               ilace, color_mode,
+               rotation, mirror);
+
+        enable_clocks(1);
+
+        r = _dispc_setup_plane(plane,
+                           paddr, screen_width,
+                           pos_x, pos_y,
+                           width, height,
+                           out_width, out_height,
+                           color_mode, ilace,
+                           rotation_type,
+                           rotation, mirror,
+                           global_alpha);
+
+        enable_clocks(0);
+
+        return r;
+}
diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c
new file mode 100644
index 000000000000..6a74ea116d29
--- /dev/null
+++ b/drivers/video/omap2/dss/display.c
@@ -0,0 +1,626 @@
+/*
+ * linux/drivers/video/omap2/dss/display.c
+ *
+ * Copyright (C) 2009 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * Some code and ideas taken from drivers/video/omap/ driver
+ * by Imre Deak.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define DSS_SUBSYS_NAME "DISPLAY"
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/jiffies.h>
+#include <linux/list.h>
+#include <linux/platform_device.h>
+
+#include <plat/display.h>
+#include "dss.h"
+
+static LIST_HEAD(display_list);
+
+static ssize_t display_enabled_show(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+        bool enabled = dssdev->state != OMAP_DSS_DISPLAY_DISABLED;
+
+        return snprintf(buf, PAGE_SIZE, "%d\n", enabled);
+}
+
+static ssize_t display_enabled_store(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf, size_t size)
+{
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+        bool enabled, r;
+
+        enabled = simple_strtoul(buf, NULL, 10);
+
+        if (enabled != (dssdev->state != OMAP_DSS_DISPLAY_DISABLED)) {
+                if (enabled) {
+                        r = dssdev->driver->enable(dssdev);
+                        if (r)
+                                return r;
+                } else {
+                        dssdev->driver->disable(dssdev);
+                }
+        }
+
+        return size;
+}
+
+static ssize_t display_upd_mode_show(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+        enum omap_dss_update_mode mode = OMAP_DSS_UPDATE_AUTO;
+        if (dssdev->driver->get_update_mode)
+                mode = dssdev->driver->get_update_mode(dssdev);
+        return snprintf(buf, PAGE_SIZE, "%d\n", mode);
+}
+
+static ssize_t display_upd_mode_store(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf, size_t size)
+{
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+        int val, r;
+        enum omap_dss_update_mode mode;
+
+        val = simple_strtoul(buf, NULL, 10);
+
+        switch (val) {
+        case OMAP_DSS_UPDATE_DISABLED:
+        case OMAP_DSS_UPDATE_AUTO:
+        case OMAP_DSS_UPDATE_MANUAL:
+                mode = (enum omap_dss_update_mode)val;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        r = dssdev->driver->set_update_mode(dssdev, mode);
+        if (r)
+                return r;
+
+        return size;
+}
+
+static ssize_t display_tear_show(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+        return snprintf(buf, PAGE_SIZE, "%d\n",
+                        dssdev->driver->get_te ?
+                        dssdev->driver->get_te(dssdev) : 0);
+}
+
+static ssize_t display_tear_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t size)
+{
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+        unsigned long te;
+        int r;
+
+        if (!dssdev->driver->enable_te || !dssdev->driver->get_te)
+                return -ENOENT;
+
+        te = simple_strtoul(buf, NULL, 0);
+
+        r = dssdev->driver->enable_te(dssdev, te);
+        if (r)
+                return r;
+
+        return size;
+}
+
+static ssize_t display_timings_show(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+        struct omap_video_timings t;
+
+        if (!dssdev->driver->get_timings)
+                return -ENOENT;
+
+        dssdev->driver->get_timings(dssdev, &t);
+
+        return snprintf(buf, PAGE_SIZE, "%u,%u/%u/%u/%u,%u/%u/%u/%u\n",
+                        t.pixel_clock,
+                        t.x_res, t.hfp, t.hbp, t.hsw,
+                        t.y_res, t.vfp, t.vbp, t.vsw);
+}
+
+static ssize_t display_timings_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t size)
+{
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+        struct omap_video_timings t;
+        int r, found;
+
+        if (!dssdev->driver->set_timings || !dssdev->driver->check_timings)
+                return -ENOENT;
+
+        found = 0;
+#ifdef CONFIG_OMAP2_DSS_VENC
+        if (strncmp("pal", buf, 3) == 0) {
+                t = omap_dss_pal_timings;
+                found = 1;
+        } else if (strncmp("ntsc", buf, 4) == 0) {
+                t = omap_dss_ntsc_timings;
+                found = 1;
+        }
+#endif
+        if (!found && sscanf(buf, "%u,%hu/%hu/%hu/%hu,%hu/%hu/%hu/%hu",
+                                &t.pixel_clock,
+                                &t.x_res, &t.hfp, &t.hbp, &t.hsw,
+                                &t.y_res, &t.vfp, &t.vbp, &t.vsw) != 9)
+                return -EINVAL;
+
+        r = dssdev->driver->check_timings(dssdev, &t);
+        if (r)
+                return r;
+
+        dssdev->driver->set_timings(dssdev, &t);
+
+        return size;
+}
+
+static ssize_t display_rotate_show(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+        int rotate;
+        if (!dssdev->driver->get_rotate)
+                return -ENOENT;
+        rotate = dssdev->driver->get_rotate(dssdev);
+        return snprintf(buf, PAGE_SIZE, "%u\n", rotate);
+}
+
+static ssize_t display_rotate_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t size)
+{
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+        unsigned long rot;
+        int r;
+
+        if (!dssdev->driver->set_rotate || !dssdev->driver->get_rotate)
+                return -ENOENT;
+
+        rot = simple_strtoul(buf, NULL, 0);
+
+        r = dssdev->driver->set_rotate(dssdev, rot);
+        if (r)
+                return r;
+
+        return size;
+}
+
+static ssize_t display_mirror_show(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+        int mirror;
+        if (!dssdev->driver->get_mirror)
+                return -ENOENT;
+        mirror = dssdev->driver->get_mirror(dssdev);
+        return snprintf(buf, PAGE_SIZE, "%u\n", mirror);
+}
+
+static ssize_t display_mirror_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t size)
+{
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+        unsigned long mirror;
+        int r;
+
+        if (!dssdev->driver->set_mirror || !dssdev->driver->get_mirror)
+                return -ENOENT;
+
+        mirror = simple_strtoul(buf, NULL, 0);
+
+        r = dssdev->driver->set_mirror(dssdev, mirror);
+        if (r)
+                return r;
+
+        return size;
+}
+
+static ssize_t display_wss_show(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+        unsigned int wss;
+
+        if (!dssdev->driver->get_wss)
+                return -ENOENT;
+
+        wss = dssdev->driver->get_wss(dssdev);
+
+        return snprintf(buf, PAGE_SIZE, "0x%05x\n", wss);
+}
+
+static ssize_t display_wss_store(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t size)
+{
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+        unsigned long wss;
+        int r;
+
+        if (!dssdev->driver->get_wss || !dssdev->driver->set_wss)
+                return -ENOENT;
+
+        if (strict_strtoul(buf, 0, &wss))
+                return -EINVAL;
+
+        if (wss > 0xfffff)
+                return -EINVAL;
+
+        r = dssdev->driver->set_wss(dssdev, wss);
+        if (r)
+                return r;
+
+        return size;
+}
+
+static DEVICE_ATTR(enabled, S_IRUGO|S_IWUSR,
+                display_enabled_show, display_enabled_store);
+static DEVICE_ATTR(update_mode, S_IRUGO|S_IWUSR,
+                display_upd_mode_show, display_upd_mode_store);
+static DEVICE_ATTR(tear_elim, S_IRUGO|S_IWUSR,
+                display_tear_show, display_tear_store);
+static DEVICE_ATTR(timings, S_IRUGO|S_IWUSR,
+                display_timings_show, display_timings_store);
+static DEVICE_ATTR(rotate, S_IRUGO|S_IWUSR,
+                display_rotate_show, display_rotate_store);
+static DEVICE_ATTR(mirror, S_IRUGO|S_IWUSR,
+                display_mirror_show, display_mirror_store);
+static DEVICE_ATTR(wss, S_IRUGO|S_IWUSR,
+                display_wss_show, display_wss_store);
+
+static struct device_attribute *display_sysfs_attrs[] = {
+        &dev_attr_enabled,
+        &dev_attr_update_mode,
+        &dev_attr_tear_elim,
+        &dev_attr_timings,
+        &dev_attr_rotate,
+        &dev_attr_mirror,
+        &dev_attr_wss,
+        NULL
+};
+
+void omapdss_default_get_resolution(struct omap_dss_device *dssdev,
+                        u16 *xres, u16 *yres)
+{
+        *xres = dssdev->panel.timings.x_res;
+        *yres = dssdev->panel.timings.y_res;
+}
+EXPORT_SYMBOL(omapdss_default_get_resolution);
+
+void default_get_overlay_fifo_thresholds(enum omap_plane plane,
+                u32 fifo_size, enum omap_burst_size *burst_size,
+                u32 *fifo_low, u32 *fifo_high)
+{
+        unsigned burst_size_bytes;
+
+        *burst_size = OMAP_DSS_BURST_16x32;
+        burst_size_bytes = 16 * 32 / 8;
+
+        *fifo_high = fifo_size - 1;
+        *fifo_low = fifo_size - burst_size_bytes;
+}
+
+int omapdss_default_get_recommended_bpp(struct omap_dss_device *dssdev)
+{
+        switch (dssdev->type) {
+        case OMAP_DISPLAY_TYPE_DPI:
+                if (dssdev->phy.dpi.data_lines == 24)
+                        return 24;
+                else
+                        return 16;
+
+        case OMAP_DISPLAY_TYPE_DBI:
+        case OMAP_DISPLAY_TYPE_DSI:
+                if (dssdev->ctrl.pixel_size == 24)
+                        return 24;
+                else
+                        return 16;
+        case OMAP_DISPLAY_TYPE_VENC:
+        case OMAP_DISPLAY_TYPE_SDI:
+                return 24;
+                return 24;
+        default:
+                BUG();
+        }
+}
+EXPORT_SYMBOL(omapdss_default_get_recommended_bpp);
+
+/* Checks if replication logic should be used. Only use for active matrix,
+ * when overlay is in RGB12U or RGB16 mode, and LCD interface is
+ * 18bpp or 24bpp */
+bool dss_use_replication(struct omap_dss_device *dssdev,
+                enum omap_color_mode mode)
+{
+        int bpp;
+
+        if (mode != OMAP_DSS_COLOR_RGB12U && mode != OMAP_DSS_COLOR_RGB16)
+                return false;
+
+        if (dssdev->type == OMAP_DISPLAY_TYPE_DPI &&
+                        (dssdev->panel.config & OMAP_DSS_LCD_TFT) == 0)
+                return false;
+
+        switch (dssdev->type) {
+        case OMAP_DISPLAY_TYPE_DPI:
+                bpp = dssdev->phy.dpi.data_lines;
+                break;
+        case OMAP_DISPLAY_TYPE_VENC:
+        case OMAP_DISPLAY_TYPE_SDI:
+                bpp = 24;
+                break;
+        case OMAP_DISPLAY_TYPE_DBI:
+        case OMAP_DISPLAY_TYPE_DSI:
+                bpp = dssdev->ctrl.pixel_size;
+                break;
+        default:
+                BUG();
+        }
+
+        return bpp > 16;
+}
+
+void dss_init_device(struct platform_device *pdev,
+                struct omap_dss_device *dssdev)
+{
+        struct device_attribute *attr;
+        int i;
+        int r;
+
+        switch (dssdev->type) {
+        case OMAP_DISPLAY_TYPE_DPI:
+#ifdef CONFIG_OMAP2_DSS_RFBI
+        case OMAP_DISPLAY_TYPE_DBI:
+#endif
+#ifdef CONFIG_OMAP2_DSS_SDI
+        case OMAP_DISPLAY_TYPE_SDI:
+#endif
+#ifdef CONFIG_OMAP2_DSS_DSI
+        case OMAP_DISPLAY_TYPE_DSI:
+#endif
+#ifdef CONFIG_OMAP2_DSS_VENC
+        case OMAP_DISPLAY_TYPE_VENC:
+#endif
+                break;
+        default:
+                DSSERR("Support for display '%s' not compiled in.\n",
+                                dssdev->name);
+                return;
+        }
+
+        switch (dssdev->type) {
+        case OMAP_DISPLAY_TYPE_DPI:
+                r = dpi_init_display(dssdev);
+                break;
+#ifdef CONFIG_OMAP2_DSS_RFBI
+        case OMAP_DISPLAY_TYPE_DBI:
+                r = rfbi_init_display(dssdev);
+                break;
+#endif
+#ifdef CONFIG_OMAP2_DSS_VENC
+        case OMAP_DISPLAY_TYPE_VENC:
+                r = venc_init_display(dssdev);
+                break;
+#endif
+#ifdef CONFIG_OMAP2_DSS_SDI
+        case OMAP_DISPLAY_TYPE_SDI:
+                r = sdi_init_display(dssdev);
+                break;
+#endif
+#ifdef CONFIG_OMAP2_DSS_DSI
+        case OMAP_DISPLAY_TYPE_DSI:
+                r = dsi_init_display(dssdev);
+                break;
+#endif
+        default:
+                BUG();
+        }
+
+        if (r) {
+                DSSERR("failed to init display %s\n", dssdev->name);
+                return;
+        }
+
+        /* create device sysfs files */
+        i = 0;
+        while ((attr = display_sysfs_attrs[i++]) != NULL) {
+                r = device_create_file(&dssdev->dev, attr);
+                if (r)
+                        DSSERR("failed to create sysfs file\n");
+        }
+
+        /* create display? sysfs links */
+        r = sysfs_create_link(&pdev->dev.kobj, &dssdev->dev.kobj,
+                        dev_name(&dssdev->dev));
+        if (r)
+                DSSERR("failed to create sysfs display link\n");
+}
+
+void dss_uninit_device(struct platform_device *pdev,
+                struct omap_dss_device *dssdev)
+{
+        struct device_attribute *attr;
+        int i = 0;
+
+        sysfs_remove_link(&pdev->dev.kobj, dev_name(&dssdev->dev));
+
+        while ((attr = display_sysfs_attrs[i++]) != NULL)
+                device_remove_file(&dssdev->dev, attr);
+
+        if (dssdev->manager)
+                dssdev->manager->unset_device(dssdev->manager);
+}
+
+static int dss_suspend_device(struct device *dev, void *data)
+{
+        int r;
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+
+        if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) {
+                dssdev->activate_after_resume = false;
+                return 0;
+        }
+
+        if (!dssdev->driver->suspend) {
+                DSSERR("display '%s' doesn't implement suspend\n",
+                                dssdev->name);
+                return -ENOSYS;
+        }
+
+        r = dssdev->driver->suspend(dssdev);
+        if (r)
+                return r;
+
+        dssdev->activate_after_resume = true;
+
+        return 0;
+}
+
+int dss_suspend_all_devices(void)
+{
+        int r;
+        struct bus_type *bus = dss_get_bus();
+
+        r = bus_for_each_dev(bus, NULL, NULL, dss_suspend_device);
+        if (r) {
+                /* resume all displays that were suspended */
+                dss_resume_all_devices();
+                return r;
+        }
+
+        return 0;
+}
+
+static int dss_resume_device(struct device *dev, void *data)
+{
+        int r;
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+
+        if (dssdev->activate_after_resume && dssdev->driver->resume) {
+                r = dssdev->driver->resume(dssdev);
+                if (r)
+                        return r;
+        }
+
+        dssdev->activate_after_resume = false;
+
+        return 0;
+}
+
+int dss_resume_all_devices(void)
+{
+        struct bus_type *bus = dss_get_bus();
+
+        return bus_for_each_dev(bus, NULL, NULL, dss_resume_device);
+}
+
+static int dss_disable_device(struct device *dev, void *data)
+{
+        struct omap_dss_device *dssdev = to_dss_device(dev);
+        dssdev->driver->disable(dssdev);
+        return 0;
+}
+
+void dss_disable_all_devices(void)
+{
+        struct bus_type *bus = dss_get_bus();
+        bus_for_each_dev(bus, NULL, NULL, dss_disable_device);
+}
+
+
+void omap_dss_get_device(struct omap_dss_device *dssdev)
+{
+        get_device(&dssdev->dev);
+}
+EXPORT_SYMBOL(omap_dss_get_device);
+
+void omap_dss_put_device(struct omap_dss_device *dssdev)
+{
+        put_device(&dssdev->dev);
+}
+EXPORT_SYMBOL(omap_dss_put_device);
+
+/* ref count of the found device is incremented. ref count
+ * of from-device is decremented. */
+struct omap_dss_device *omap_dss_get_next_device(struct omap_dss_device *from)
+{
+        struct device *dev;
+        struct device *dev_start = NULL;
+        struct omap_dss_device *dssdev = NULL;
+
+        int match(struct device *dev, void *data)
+        {
+                return 1;
+        }
+
+        if (from)
+                dev_start = &from->dev;
+        dev = bus_find_device(dss_get_bus(), dev_start, NULL, match);
+        if (dev)
+                dssdev = to_dss_device(dev);
+        if (from)
+                put_device(&from->dev);
+
+        return dssdev;
+}
+EXPORT_SYMBOL(omap_dss_get_next_device);
+
+struct omap_dss_device *omap_dss_find_device(void *data,
+                int (*match)(struct omap_dss_device *dssdev, void *data))
+{
+        struct omap_dss_device *dssdev = NULL;
+
+        while ((dssdev = omap_dss_get_next_device(dssdev)) != NULL) {
+                if (match(dssdev, data))
+                        return dssdev;
+        }
+
+        return NULL;
+}
+EXPORT_SYMBOL(omap_dss_find_device);
+
+int omap_dss_start_device(struct omap_dss_device *dssdev)
+{
+        if (!dssdev->driver) {
+                DSSDBG("no driver\n");
+                return -ENODEV;
+        }
+
+        if (!try_module_get(dssdev->dev.driver->owner)) {
+                return -ENODEV;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL(omap_dss_start_device);
+
+void omap_dss_stop_device(struct omap_dss_device *dssdev)
+{
+        module_put(dssdev->dev.driver->owner);
+}
+EXPORT_SYMBOL(omap_dss_stop_device);
+
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
new file mode 100644
index 000000000000..960e977a8bf0
--- /dev/null
+++ b/drivers/video/omap2/dss/dpi.c
@@ -0,0 +1,321 @@
+/*
+ * linux/drivers/video/omap2/dss/dpi.c
+ *
+ * Copyright (C) 2009 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * Some code and ideas taken from drivers/video/omap/ driver
+ * by Imre Deak.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define DSS_SUBSYS_NAME "DPI"
+
+#include <linux/kernel.h>
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/errno.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/consumer.h>
+
+#include <plat/display.h>
+#include <plat/cpu.h>
+
+#include "dss.h"
+
+static struct {
+        struct regulator *vdds_dsi_reg;
+} dpi;
+
+#ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL
+static int dpi_set_dsi_clk(bool is_tft, unsigned long pck_req,
+                unsigned long *fck, int *lck_div, int *pck_div)
+{
+        struct dsi_clock_info dsi_cinfo;
+        struct dispc_clock_info dispc_cinfo;
+        int r;
+
+        r = dsi_pll_calc_clock_div_pck(is_tft, pck_req, &dsi_cinfo,
+                        &dispc_cinfo);
+        if (r)
+                return r;
+
+        r = dsi_pll_set_clock_div(&dsi_cinfo);
+        if (r)
+                return r;
+
+        dss_select_dispc_clk_source(DSS_SRC_DSI1_PLL_FCLK);
+
+        r = dispc_set_clock_div(&dispc_cinfo);
+        if (r)
+                return r;
+
+        *fck = dsi_cinfo.dsi1_pll_fclk;
+        *lck_div = dispc_cinfo.lck_div;
+        *pck_div = dispc_cinfo.pck_div;
+
+        return 0;
+}
+#else
+static int dpi_set_dispc_clk(bool is_tft, unsigned long pck_req,
+                unsigned long *fck, int *lck_div, int *pck_div)
+{
+        struct dss_clock_info dss_cinfo;
+        struct dispc_clock_info dispc_cinfo;
+        int r;
+
+        r = dss_calc_clock_div(is_tft, pck_req, &dss_cinfo, &dispc_cinfo);
+        if (r)
+                return r;
+
+        r = dss_set_clock_div(&dss_cinfo);
+        if (r)
+                return r;
+
+        r = dispc_set_clock_div(&dispc_cinfo);
+        if (r)
+                return r;
+
+        *fck = dss_cinfo.fck;
+        *lck_div = dispc_cinfo.lck_div;
+        *pck_div = dispc_cinfo.pck_div;
+
+        return 0;
+}
+#endif
+
+static int dpi_set_mode(struct omap_dss_device *dssdev)
+{
+        struct omap_video_timings *t = &dssdev->panel.timings;
+        int lck_div, pck_div;
+        unsigned long fck;
+        unsigned long pck;
+        bool is_tft;
+        int r = 0;
+
+        dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
+
+        dispc_set_pol_freq(dssdev->panel.config, dssdev->panel.acbi,
+                        dssdev->panel.acb);
+
+        is_tft = (dssdev->panel.config & OMAP_DSS_LCD_TFT) != 0;
+
+#ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL
+        r = dpi_set_dsi_clk(is_tft, t->pixel_clock * 1000,
+                        &fck, &lck_div, &pck_div);
+#else
+        r = dpi_set_dispc_clk(is_tft, t->pixel_clock * 1000,
+                        &fck, &lck_div, &pck_div);
+#endif
+        if (r)
+                goto err0;
+
+        pck = fck / lck_div / pck_div / 1000;
+
+        if (pck != t->pixel_clock) {
+                DSSWARN("Could not find exact pixel clock. "
+                                "Requested %d kHz, got %lu kHz\n",
+                                t->pixel_clock, pck);
+
+                t->pixel_clock = pck;
+        }
+
+        dispc_set_lcd_timings(t);
+
+err0:
+        dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
+        return r;
+}
+
+static int dpi_basic_init(struct omap_dss_device *dssdev)
+{
+        bool is_tft;
+
+        is_tft = (dssdev->panel.config & OMAP_DSS_LCD_TFT) != 0;
+
+        dispc_set_parallel_interface_mode(OMAP_DSS_PARALLELMODE_BYPASS);
+        dispc_set_lcd_display_type(is_tft ? OMAP_DSS_LCD_DISPLAY_TFT :
+                        OMAP_DSS_LCD_DISPLAY_STN);
+        dispc_set_tft_data_lines(dssdev->phy.dpi.data_lines);
+
+        return 0;
+}
+
+int omapdss_dpi_display_enable(struct omap_dss_device *dssdev)
+{
+        int r;
+
+        r = omap_dss_start_device(dssdev);
+        if (r) {
+                DSSERR("failed to start device\n");
+                goto err0;
+        }
+
+        if (cpu_is_omap34xx()) {
+                r = regulator_enable(dpi.vdds_dsi_reg);
+                if (r)
+                        goto err1;
+        }
+
+        dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
+
+        r = dpi_basic_init(dssdev);
+        if (r)
+                goto err2;
+
+#ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL
+        dss_clk_enable(DSS_CLK_FCK2);
+        r = dsi_pll_init(dssdev, 0, 1);
+        if (r)
+                goto err3;
+#endif
+        r = dpi_set_mode(dssdev);
+        if (r)
+                goto err4;
+
+        mdelay(2);
+
+        dssdev->manager->enable(dssdev->manager);
+
+        return 0;
+
+err4:
+#ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL
+        dsi_pll_uninit();
+err3:
+        dss_clk_disable(DSS_CLK_FCK2);
+#endif
+err2:
+        dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
+        if (cpu_is_omap34xx())
+                regulator_disable(dpi.vdds_dsi_reg);
+err1:
+        omap_dss_stop_device(dssdev);
+err0:
+        return r;
+}
+EXPORT_SYMBOL(omapdss_dpi_display_enable);
+
+void omapdss_dpi_display_disable(struct omap_dss_device *dssdev)
+{
+        dssdev->manager->disable(dssdev->manager);
+
+#ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL
+        dss_select_dispc_clk_source(DSS_SRC_DSS1_ALWON_FCLK);
+        dsi_pll_uninit();
+        dss_clk_disable(DSS_CLK_FCK2);
+#endif
+
+        dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
+
+        if (cpu_is_omap34xx())
+                regulator_disable(dpi.vdds_dsi_reg);
+
+        omap_dss_stop_device(dssdev);
+}
+EXPORT_SYMBOL(omapdss_dpi_display_disable);
+
+void dpi_set_timings(struct omap_dss_device *dssdev,
+                        struct omap_video_timings *timings)
+{
+        DSSDBG("dpi_set_timings\n");
+        dssdev->panel.timings = *timings;
+        if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) {
+                dpi_set_mode(dssdev);
+                dispc_go(OMAP_DSS_CHANNEL_LCD);
+        }
+}
+EXPORT_SYMBOL(dpi_set_timings);
+
+int dpi_check_timings(struct omap_dss_device *dssdev,
+                        struct omap_video_timings *timings)
+{
+        bool is_tft;
+        int r;
+        int lck_div, pck_div;
+        unsigned long fck;
+        unsigned long pck;
+
+        if (!dispc_lcd_timings_ok(timings))
+                return -EINVAL;
+
+        if (timings->pixel_clock == 0)
+                return -EINVAL;
+
+        is_tft = (dssdev->panel.config & OMAP_DSS_LCD_TFT) != 0;
+
+#ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL
+        {
+                struct dsi_clock_info dsi_cinfo;
+                struct dispc_clock_info dispc_cinfo;
+                r = dsi_pll_calc_clock_div_pck(is_tft,
+                                timings->pixel_clock * 1000,
+                                &dsi_cinfo, &dispc_cinfo);
+
+                if (r)
+                        return r;
+
+                fck = dsi_cinfo.dsi1_pll_fclk;
+                lck_div = dispc_cinfo.lck_div;
+                pck_div = dispc_cinfo.pck_div;
+        }
+#else
+        {
+                struct dss_clock_info dss_cinfo;
+                struct dispc_clock_info dispc_cinfo;
+                r = dss_calc_clock_div(is_tft, timings->pixel_clock * 1000,
+                                &dss_cinfo, &dispc_cinfo);
+
+                if (r)
+                        return r;
+
+                fck = dss_cinfo.fck;
+                lck_div = dispc_cinfo.lck_div;
+                pck_div = dispc_cinfo.pck_div;
+        }
+#endif
+
+        pck = fck / lck_div / pck_div / 1000;
+
+        timings->pixel_clock = pck;
+
+        return 0;
+}
+EXPORT_SYMBOL(dpi_check_timings);
+
+int dpi_init_display(struct omap_dss_device *dssdev)
+{
+        DSSDBG("init_display\n");
+
+        return 0;
+}
+
+int dpi_init(struct platform_device *pdev)
+{
+        if (cpu_is_omap34xx()) {
+                dpi.vdds_dsi_reg = dss_get_vdds_dsi();
+                if (IS_ERR(dpi.vdds_dsi_reg)) {
+                        DSSERR("can't get VDDS_DSI regulator\n");
+                        return PTR_ERR(dpi.vdds_dsi_reg);
+                }
+        }
+
+        return 0;
+}
+
+void dpi_exit(void)
+{
+}
+
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
new file mode 100644
index 000000000000..3af207b2bde3
--- /dev/null
+++ b/drivers/video/omap2/dss/dsi.c
@@ -0,0 +1,3340 @@
+/*
+ * linux/drivers/video/omap2/dss/dsi.c
+ *
+ * Copyright (C) 2009 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define DSS_SUBSYS_NAME "DSI"
+
+#include <linux/kernel.h>
+#include <linux/io.h>
+#include <linux/clk.h>
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+#include <linux/mutex.h>
+#include <linux/semaphore.h>
+#include <linux/seq_file.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/consumer.h>
+#include <linux/wait.h>
+#include <linux/workqueue.h>
+
+#include <plat/display.h>
+#include <plat/clock.h>
+
+#include "dss.h"
+
+/*#define VERBOSE_IRQ*/
+#define DSI_CATCH_MISSING_TE
+
+#define DSI_BASE                0x4804FC00
+
+struct dsi_reg { u16 idx; };
+
+#define DSI_REG(idx)            ((const struct dsi_reg) { idx })
+
+#define DSI_SZ_REGS             SZ_1K
+/* DSI Protocol Engine */
+
+#define DSI_REVISION                    DSI_REG(0x0000)
+#define DSI_SYSCONFIG                   DSI_REG(0x0010)
+#define DSI_SYSSTATUS                   DSI_REG(0x0014)
+#define DSI_IRQSTATUS                   DSI_REG(0x0018)
+#define DSI_IRQENABLE                   DSI_REG(0x001C)
+#define DSI_CTRL                        DSI_REG(0x0040)
+#define DSI_COMPLEXIO_CFG1              DSI_REG(0x0048)
+#define DSI_COMPLEXIO_IRQ_STATUS        DSI_REG(0x004C)
+#define DSI_COMPLEXIO_IRQ_ENABLE        DSI_REG(0x0050)
+#define DSI_CLK_CTRL                    DSI_REG(0x0054)
+#define DSI_TIMING1                     DSI_REG(0x0058)
+#define DSI_TIMING2                     DSI_REG(0x005C)
+#define DSI_VM_TIMING1                  DSI_REG(0x0060)
+#define DSI_VM_TIMING2                  DSI_REG(0x0064)
+#define DSI_VM_TIMING3                  DSI_REG(0x0068)
+#define DSI_CLK_TIMING                  DSI_REG(0x006C)
+#define DSI_TX_FIFO_VC_SIZE             DSI_REG(0x0070)
+#define DSI_RX_FIFO_VC_SIZE             DSI_REG(0x0074)
+#define DSI_COMPLEXIO_CFG2              DSI_REG(0x0078)
+#define DSI_RX_FIFO_VC_FULLNESS         DSI_REG(0x007C)
+#define DSI_VM_TIMING4                  DSI_REG(0x0080)
+#define DSI_TX_FIFO_VC_EMPTINESS        DSI_REG(0x0084)
+#define DSI_VM_TIMING5                  DSI_REG(0x0088)
+#define DSI_VM_TIMING6                  DSI_REG(0x008C)
+#define DSI_VM_TIMING7                  DSI_REG(0x0090)
+#define DSI_STOPCLK_TIMING              DSI_REG(0x0094)
+#define DSI_VC_CTRL(n)                  DSI_REG(0x0100 + (n * 0x20))
+#define DSI_VC_TE(n)                    DSI_REG(0x0104 + (n * 0x20))
+#define DSI_VC_LONG_PACKET_HEADER(n)    DSI_REG(0x0108 + (n * 0x20))
+#define DSI_VC_LONG_PACKET_PAYLOAD(n)   DSI_REG(0x010C + (n * 0x20))
+#define DSI_VC_SHORT_PACKET_HEADER(n)   DSI_REG(0x0110 + (n * 0x20))
+#define DSI_VC_IRQSTATUS(n)             DSI_REG(0x0118 + (n * 0x20))
+#define DSI_VC_IRQENABLE(n)             DSI_REG(0x011C + (n * 0x20))
+
+/* DSIPHY_SCP */
+
+#define DSI_DSIPHY_CFG0                 DSI_REG(0x200 + 0x0000)
+#define DSI_DSIPHY_CFG1                 DSI_REG(0x200 + 0x0004)
+#define DSI_DSIPHY_CFG2                 DSI_REG(0x200 + 0x0008)
+#define DSI_DSIPHY_CFG5                 DSI_REG(0x200 + 0x0014)
+
+/* DSI_PLL_CTRL_SCP */
+
+#define DSI_PLL_CONTROL                 DSI_REG(0x300 + 0x0000)
+#define DSI_PLL_STATUS                  DSI_REG(0x300 + 0x0004)
+#define DSI_PLL_GO                      DSI_REG(0x300 + 0x0008)
+#define DSI_PLL_CONFIGURATION1          DSI_REG(0x300 + 0x000C)
+#define DSI_PLL_CONFIGURATION2          DSI_REG(0x300 + 0x0010)
+
+#define REG_GET(idx, start, end) \
+        FLD_GET(dsi_read_reg(idx), start, end)
+
+#define REG_FLD_MOD(idx, val, start, end) \
+        dsi_write_reg(idx, FLD_MOD(dsi_read_reg(idx), val, start, end))
+
+/* Global interrupts */
+#define DSI_IRQ_VC0             (1 << 0)
+#define DSI_IRQ_VC1             (1 << 1)
+#define DSI_IRQ_VC2             (1 << 2)
+#define DSI_IRQ_VC3             (1 << 3)
+#define DSI_IRQ_WAKEUP          (1 << 4)
+#define DSI_IRQ_RESYNC          (1 << 5)
+#define DSI_IRQ_PLL_LOCK        (1 << 7)
+#define DSI_IRQ_PLL_UNLOCK      (1 << 8)
+#define DSI_IRQ_PLL_RECALL      (1 << 9)
+#define DSI_IRQ_COMPLEXIO_ERR   (1 << 10)
+#define DSI_IRQ_HS_TX_TIMEOUT   (1 << 14)
+#define DSI_IRQ_LP_RX_TIMEOUT   (1 << 15)
+#define DSI_IRQ_TE_TRIGGER      (1 << 16)
+#define DSI_IRQ_ACK_TRIGGER     (1 << 17)
+#define DSI_IRQ_SYNC_LOST       (1 << 18)
+#define DSI_IRQ_LDO_POWER_GOOD  (1 << 19)
+#define DSI_IRQ_TA_TIMEOUT      (1 << 20)
+#define DSI_IRQ_ERROR_MASK \
+        (DSI_IRQ_HS_TX_TIMEOUT | DSI_IRQ_LP_RX_TIMEOUT | DSI_IRQ_SYNC_LOST | \
+        DSI_IRQ_TA_TIMEOUT)
+#define DSI_IRQ_CHANNEL_MASK    0xf
+
+/* Virtual channel interrupts */
+#define DSI_VC_IRQ_CS           (1 << 0)
+#define DSI_VC_IRQ_ECC_CORR     (1 << 1)
+#define DSI_VC_IRQ_PACKET_SENT  (1 << 2)
+#define DSI_VC_IRQ_FIFO_TX_OVF  (1 << 3)
+#define DSI_VC_IRQ_FIFO_RX_OVF  (1 << 4)
+#define DSI_VC_IRQ_BTA          (1 << 5)
+#define DSI_VC_IRQ_ECC_NO_CORR  (1 << 6)
+#define DSI_VC_IRQ_FIFO_TX_UDF  (1 << 7)
+#define DSI_VC_IRQ_PP_BUSY_CHANGE (1 << 8)
+#define DSI_VC_IRQ_ERROR_MASK \
+        (DSI_VC_IRQ_CS | DSI_VC_IRQ_ECC_CORR | DSI_VC_IRQ_FIFO_TX_OVF | \
+        DSI_VC_IRQ_FIFO_RX_OVF | DSI_VC_IRQ_ECC_NO_CORR | \
+        DSI_VC_IRQ_FIFO_TX_UDF)
+
+/* ComplexIO interrupts */
+#define DSI_CIO_IRQ_ERRSYNCESC1         (1 << 0)
+#define DSI_CIO_IRQ_ERRSYNCESC2         (1 << 1)
+#define DSI_CIO_IRQ_ERRSYNCESC3         (1 << 2)
+#define DSI_CIO_IRQ_ERRESC1             (1 << 5)
+#define DSI_CIO_IRQ_ERRESC2             (1 << 6)
+#define DSI_CIO_IRQ_ERRESC3             (1 << 7)
+#define DSI_CIO_IRQ_ERRCONTROL1         (1 << 10)
+#define DSI_CIO_IRQ_ERRCONTROL2         (1 << 11)
+#define DSI_CIO_IRQ_ERRCONTROL3         (1 << 12)
+#define DSI_CIO_IRQ_STATEULPS1          (1 << 15)
+#define DSI_CIO_IRQ_STATEULPS2          (1 << 16)
+#define DSI_CIO_IRQ_STATEULPS3          (1 << 17)
+#define DSI_CIO_IRQ_ERRCONTENTIONLP0_1  (1 << 20)
+#define DSI_CIO_IRQ_ERRCONTENTIONLP1_1  (1 << 21)
+#define DSI_CIO_IRQ_ERRCONTENTIONLP0_2  (1 << 22)
+#define DSI_CIO_IRQ_ERRCONTENTIONLP1_2  (1 << 23)
+#define DSI_CIO_IRQ_ERRCONTENTIONLP0_3  (1 << 24)
+#define DSI_CIO_IRQ_ERRCONTENTIONLP1_3  (1 << 25)
+#define DSI_CIO_IRQ_ULPSACTIVENOT_ALL0  (1 << 30)
+#define DSI_CIO_IRQ_ULPSACTIVENOT_ALL1  (1 << 31)
+
+#define DSI_DT_DCS_SHORT_WRITE_0        0x05
+#define DSI_DT_DCS_SHORT_WRITE_1        0x15
+#define DSI_DT_DCS_READ                 0x06
+#define DSI_DT_SET_MAX_RET_PKG_SIZE     0x37
+#define DSI_DT_NULL_PACKET              0x09
+#define DSI_DT_DCS_LONG_WRITE           0x39
+
+#define DSI_DT_RX_ACK_WITH_ERR          0x02
+#define DSI_DT_RX_DCS_LONG_READ         0x1c
+#define DSI_DT_RX_SHORT_READ_1          0x21
+#define DSI_DT_RX_SHORT_READ_2          0x22
+
+#define FINT_MAX 2100000
+#define FINT_MIN 750000
+#define REGN_MAX (1 << 7)
+#define REGM_MAX ((1 << 11) - 1)
+#define REGM3_MAX (1 << 4)
+#define REGM4_MAX (1 << 4)
+#define LP_DIV_MAX ((1 << 13) - 1)
+
+enum fifo_size {
+        DSI_FIFO_SIZE_0         = 0,
+        DSI_FIFO_SIZE_32        = 1,
+        DSI_FIFO_SIZE_64        = 2,
+        DSI_FIFO_SIZE_96        = 3,
+        DSI_FIFO_SIZE_128       = 4,
+};
+
+enum dsi_vc_mode {
+        DSI_VC_MODE_L4 = 0,
+        DSI_VC_MODE_VP,
+};
+
+struct dsi_update_region {
+        u16 x, y, w, h;
+        struct omap_dss_device *device;
+};
+
+struct dsi_irq_stats {
+        unsigned long last_reset;
+        unsigned irq_count;
+        unsigned dsi_irqs[32];
+        unsigned vc_irqs[4][32];
+        unsigned cio_irqs[32];
+};
+
+static struct
+{
+        void __iomem    *base;
+
+        struct dsi_clock_info current_cinfo;
+
+        struct regulator *vdds_dsi_reg;
+
+        struct {
+                enum dsi_vc_mode mode;
+                struct omap_dss_device *dssdev;
+                enum fifo_size fifo_size;
+        } vc[4];
+
+        struct mutex lock;
+        struct semaphore bus_lock;
+
+        unsigned pll_locked;
+
+        struct completion bta_completion;
+
+        int update_channel;
+        struct dsi_update_region update_region;
+
+        bool te_enabled;
+
+        struct work_struct framedone_work;
+        void (*framedone_callback)(int, void *);
+        void *framedone_data;
+
+        struct delayed_work framedone_timeout_work;
+
+#ifdef DSI_CATCH_MISSING_TE
+        struct timer_list te_timer;
+#endif
+
+        unsigned long cache_req_pck;
+        unsigned long cache_clk_freq;
+        struct dsi_clock_info cache_cinfo;
+
+        u32             errors;
+        spinlock_t      errors_lock;
+#ifdef DEBUG
+        ktime_t perf_setup_time;
+        ktime_t perf_start_time;
+#endif
+        int debug_read;
+        int debug_write;
+
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+        spinlock_t irq_stats_lock;
+        struct dsi_irq_stats irq_stats;
+#endif
+} dsi;
+
+#ifdef DEBUG
+static unsigned int dsi_perf;
+module_param_named(dsi_perf, dsi_perf, bool, 0644);
+#endif
+
+static inline void dsi_write_reg(const struct dsi_reg idx, u32 val)
+{
+        __raw_writel(val, dsi.base + idx.idx);
+}
+
+static inline u32 dsi_read_reg(const struct dsi_reg idx)
+{
+        return __raw_readl(dsi.base + idx.idx);
+}
+
+
+void dsi_save_context(void)
+{
+}
+
+void dsi_restore_context(void)
+{
+}
+
+void dsi_bus_lock(void)
+{
+        down(&dsi.bus_lock);
+}
+EXPORT_SYMBOL(dsi_bus_lock);
+
+void dsi_bus_unlock(void)
+{
+        up(&dsi.bus_lock);
+}
+EXPORT_SYMBOL(dsi_bus_unlock);
+
+static bool dsi_bus_is_locked(void)
+{
+        return dsi.bus_lock.count == 0;
+}
+
+static inline int wait_for_bit_change(const struct dsi_reg idx, int bitnum,
+                int value)
+{
+        int t = 100000;
+
+        while (REG_GET(idx, bitnum, bitnum) != value) {
+                if (--t == 0)
+                        return !value;
+        }
+
+        return value;
+}
+
+#ifdef DEBUG
+static void dsi_perf_mark_setup(void)
+{
+        dsi.perf_setup_time = ktime_get();
+}
+
+static void dsi_perf_mark_start(void)
+{
+        dsi.perf_start_time = ktime_get();
+}
+
+static void dsi_perf_show(const char *name)
+{
+        ktime_t t, setup_time, trans_time;
+        u32 total_bytes;
+        u32 setup_us, trans_us, total_us;
+
+        if (!dsi_perf)
+                return;
+
+        t = ktime_get();
+
+        setup_time = ktime_sub(dsi.perf_start_time, dsi.perf_setup_time);
+        setup_us = (u32)ktime_to_us(setup_time);
+        if (setup_us == 0)
+                setup_us = 1;
+
+        trans_time = ktime_sub(t, dsi.perf_start_time);
+        trans_us = (u32)ktime_to_us(trans_time);
+        if (trans_us == 0)
+                trans_us = 1;
+
+        total_us = setup_us + trans_us;
+
+        total_bytes = dsi.update_region.w *
+                dsi.update_region.h *
+                dsi.update_region.device->ctrl.pixel_size / 8;
+
+        printk(KERN_INFO "DSI(%s): %u us + %u us = %u us (%uHz), "
+                        "%u bytes, %u kbytes/sec\n",
+                        name,
+                        setup_us,
+                        trans_us,
+                        total_us,
+                        1000*1000 / total_us,
+                        total_bytes,
+                        total_bytes * 1000 / total_us);
+}
+#else
+#define dsi_perf_mark_setup()
+#define dsi_perf_mark_start()
+#define dsi_perf_show(x)
+#endif
+
+static void print_irq_status(u32 status)
+{
+#ifndef VERBOSE_IRQ
+        if ((status & ~DSI_IRQ_CHANNEL_MASK) == 0)
+                return;
+#endif
+        printk(KERN_DEBUG "DSI IRQ: 0x%x: ", status);
+
+#define PIS(x) \
+        if (status & DSI_IRQ_##x) \
+                printk(#x " ");
+#ifdef VERBOSE_IRQ
+        PIS(VC0);
+        PIS(VC1);
+        PIS(VC2);
+        PIS(VC3);
+#endif
+        PIS(WAKEUP);
+        PIS(RESYNC);
+        PIS(PLL_LOCK);
+        PIS(PLL_UNLOCK);
+        PIS(PLL_RECALL);
+        PIS(COMPLEXIO_ERR);
+        PIS(HS_TX_TIMEOUT);
+        PIS(LP_RX_TIMEOUT);
+        PIS(TE_TRIGGER);
+        PIS(ACK_TRIGGER);
+        PIS(SYNC_LOST);
+        PIS(LDO_POWER_GOOD);
+        PIS(TA_TIMEOUT);
+#undef PIS
+
+        printk("\n");
+}
+
+static void print_irq_status_vc(int channel, u32 status)
+{
+#ifndef VERBOSE_IRQ
+        if ((status & ~DSI_VC_IRQ_PACKET_SENT) == 0)
+                return;
+#endif
+        printk(KERN_DEBUG "DSI VC(%d) IRQ 0x%x: ", channel, status);
+
+#define PIS(x) \
+        if (status & DSI_VC_IRQ_##x) \
+                printk(#x " ");
+        PIS(CS);
+        PIS(ECC_CORR);
+#ifdef VERBOSE_IRQ
+        PIS(PACKET_SENT);
+#endif
+        PIS(FIFO_TX_OVF);
+        PIS(FIFO_RX_OVF);
+        PIS(BTA);
+        PIS(ECC_NO_CORR);
+        PIS(FIFO_TX_UDF);
+        PIS(PP_BUSY_CHANGE);
+#undef PIS
+        printk("\n");
+}
+
+static void print_irq_status_cio(u32 status)
+{
+        printk(KERN_DEBUG "DSI CIO IRQ 0x%x: ", status);
+
+#define PIS(x) \
+        if (status & DSI_CIO_IRQ_##x) \
+                printk(#x " ");
+        PIS(ERRSYNCESC1);
+        PIS(ERRSYNCESC2);
+        PIS(ERRSYNCESC3);
+        PIS(ERRESC1);
+        PIS(ERRESC2);
+        PIS(ERRESC3);
+        PIS(ERRCONTROL1);
+        PIS(ERRCONTROL2);
+        PIS(ERRCONTROL3);
+        PIS(STATEULPS1);
+        PIS(STATEULPS2);
+        PIS(STATEULPS3);
+        PIS(ERRCONTENTIONLP0_1);
+        PIS(ERRCONTENTIONLP1_1);
+        PIS(ERRCONTENTIONLP0_2);
+        PIS(ERRCONTENTIONLP1_2);
+        PIS(ERRCONTENTIONLP0_3);
+        PIS(ERRCONTENTIONLP1_3);
+        PIS(ULPSACTIVENOT_ALL0);
+        PIS(ULPSACTIVENOT_ALL1);
+#undef PIS
+
+        printk("\n");
+}
+
+static int debug_irq;
+
+/* called from dss */
+void dsi_irq_handler(void)
+{
+        u32 irqstatus, vcstatus, ciostatus;
+        int i;
+
+        irqstatus = dsi_read_reg(DSI_IRQSTATUS);
+
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+        spin_lock(&dsi.irq_stats_lock);
+        dsi.irq_stats.irq_count++;
+        dss_collect_irq_stats(irqstatus, dsi.irq_stats.dsi_irqs);
+#endif
+
+        if (irqstatus & DSI_IRQ_ERROR_MASK) {
+                DSSERR("DSI error, irqstatus %x\n", irqstatus);
+                print_irq_status(irqstatus);
+                spin_lock(&dsi.errors_lock);
+                dsi.errors |= irqstatus & DSI_IRQ_ERROR_MASK;
+                spin_unlock(&dsi.errors_lock);
+        } else if (debug_irq) {
+                print_irq_status(irqstatus);
+        }
+
+#ifdef DSI_CATCH_MISSING_TE
+        if (irqstatus & DSI_IRQ_TE_TRIGGER)
+                del_timer(&dsi.te_timer);
+#endif
+
+        for (i = 0; i < 4; ++i) {
+                if ((irqstatus & (1<<i)) == 0)
+                        continue;
+
+                vcstatus = dsi_read_reg(DSI_VC_IRQSTATUS(i));
+
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+                dss_collect_irq_stats(vcstatus, dsi.irq_stats.vc_irqs[i]);
+#endif
+
+                if (vcstatus & DSI_VC_IRQ_BTA)
+                        complete(&dsi.bta_completion);
+
+                if (vcstatus & DSI_VC_IRQ_ERROR_MASK) {
+                        DSSERR("DSI VC(%d) error, vc irqstatus %x\n",
+                                       i, vcstatus);
+                        print_irq_status_vc(i, vcstatus);
+                } else if (debug_irq) {
+                        print_irq_status_vc(i, vcstatus);
+                }
+
+                dsi_write_reg(DSI_VC_IRQSTATUS(i), vcstatus);
+                /* flush posted write */
+                dsi_read_reg(DSI_VC_IRQSTATUS(i));
+        }
+
+        if (irqstatus & DSI_IRQ_COMPLEXIO_ERR) {
+                ciostatus = dsi_read_reg(DSI_COMPLEXIO_IRQ_STATUS);
+
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+                dss_collect_irq_stats(ciostatus, dsi.irq_stats.cio_irqs);
+#endif
+
+                dsi_write_reg(DSI_COMPLEXIO_IRQ_STATUS, ciostatus);
+                /* flush posted write */
+                dsi_read_reg(DSI_COMPLEXIO_IRQ_STATUS);
+
+                DSSERR("DSI CIO error, cio irqstatus %x\n", ciostatus);
+                print_irq_status_cio(ciostatus);
+        }
+
+        dsi_write_reg(DSI_IRQSTATUS, irqstatus & ~DSI_IRQ_CHANNEL_MASK);
+        /* flush posted write */
+        dsi_read_reg(DSI_IRQSTATUS);
+
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+        spin_unlock(&dsi.irq_stats_lock);
+#endif
+}
+
+
+static void _dsi_initialize_irq(void)
+{
+        u32 l;
+        int i;
+
+        /* disable all interrupts */
+        dsi_write_reg(DSI_IRQENABLE, 0);
+        for (i = 0; i < 4; ++i)
+                dsi_write_reg(DSI_VC_IRQENABLE(i), 0);
+        dsi_write_reg(DSI_COMPLEXIO_IRQ_ENABLE, 0);
+
+        /* clear interrupt status */
+        l = dsi_read_reg(DSI_IRQSTATUS);
+        dsi_write_reg(DSI_IRQSTATUS, l & ~DSI_IRQ_CHANNEL_MASK);
+
+        for (i = 0; i < 4; ++i) {
+                l = dsi_read_reg(DSI_VC_IRQSTATUS(i));
+                dsi_write_reg(DSI_VC_IRQSTATUS(i), l);
+        }
+
+        l = dsi_read_reg(DSI_COMPLEXIO_IRQ_STATUS);
+        dsi_write_reg(DSI_COMPLEXIO_IRQ_STATUS, l);
+
+        /* enable error irqs */
+        l = DSI_IRQ_ERROR_MASK;
+#ifdef DSI_CATCH_MISSING_TE
+        l |= DSI_IRQ_TE_TRIGGER;
+#endif
+        dsi_write_reg(DSI_IRQENABLE, l);
+
+        l = DSI_VC_IRQ_ERROR_MASK;
+        for (i = 0; i < 4; ++i)
+                dsi_write_reg(DSI_VC_IRQENABLE(i), l);
+
+        /* XXX zonda responds incorrectly, causing control error:
+           Exit from LP-ESC mode to LP11 uses wrong transition states on the
+           data lines LP0 and LN0. */
+        dsi_write_reg(DSI_COMPLEXIO_IRQ_ENABLE,
+                        -1 & (~DSI_CIO_IRQ_ERRCONTROL2));
+}
+
+static u32 dsi_get_errors(void)
+{
+        unsigned long flags;
+        u32 e;
+        spin_lock_irqsave(&dsi.errors_lock, flags);
+        e = dsi.errors;
+        dsi.errors = 0;
+        spin_unlock_irqrestore(&dsi.errors_lock, flags);
+        return e;
+}
+
+static void dsi_vc_enable_bta_irq(int channel)
+{
+        u32 l;
+
+        dsi_write_reg(DSI_VC_IRQSTATUS(channel), DSI_VC_IRQ_BTA);
+
+        l = dsi_read_reg(DSI_VC_IRQENABLE(channel));
+        l |= DSI_VC_IRQ_BTA;
+        dsi_write_reg(DSI_VC_IRQENABLE(channel), l);
+}
+
+static void dsi_vc_disable_bta_irq(int channel)
+{
+        u32 l;
+
+        l = dsi_read_reg(DSI_VC_IRQENABLE(channel));
+        l &= ~DSI_VC_IRQ_BTA;
+        dsi_write_reg(DSI_VC_IRQENABLE(channel), l);
+}
+
+/* DSI func clock. this could also be DSI2_PLL_FCLK */
+static inline void enable_clocks(bool enable)
+{
+        if (enable)
+                dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
+        else
+                dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
+}
+
+/* source clock for DSI PLL. this could also be PCLKFREE */
+static inline void dsi_enable_pll_clock(bool enable)
+{
+        if (enable)
+                dss_clk_enable(DSS_CLK_FCK2);
+        else
+                dss_clk_disable(DSS_CLK_FCK2);
+
+        if (enable && dsi.pll_locked) {
+                if (wait_for_bit_change(DSI_PLL_STATUS, 1, 1) != 1)
+                        DSSERR("cannot lock PLL when enabling clocks\n");
+        }
+}
+
+#ifdef DEBUG
+static void _dsi_print_reset_status(void)
+{
+        u32 l;
+
+        if (!dss_debug)
+                return;
+
+        /* A dummy read using the SCP interface to any DSIPHY register is
+         * required after DSIPHY reset to complete the reset of the DSI complex
+         * I/O. */
+        l = dsi_read_reg(DSI_DSIPHY_CFG5);
+
+        printk(KERN_DEBUG "DSI resets: ");
+
+        l = dsi_read_reg(DSI_PLL_STATUS);
+        printk("PLL (%d) ", FLD_GET(l, 0, 0));
+
+        l = dsi_read_reg(DSI_COMPLEXIO_CFG1);
+        printk("CIO (%d) ", FLD_GET(l, 29, 29));
+
+        l = dsi_read_reg(DSI_DSIPHY_CFG5);
+        printk("PHY (%x, %d, %d, %d)\n",
+                        FLD_GET(l, 28, 26),
+                        FLD_GET(l, 29, 29),
+                        FLD_GET(l, 30, 30),
+                        FLD_GET(l, 31, 31));
+}
+#else
+#define _dsi_print_reset_status()
+#endif
+
+static inline int dsi_if_enable(bool enable)
+{
+        DSSDBG("dsi_if_enable(%d)\n", enable);
+
+        enable = enable ? 1 : 0;
+        REG_FLD_MOD(DSI_CTRL, enable, 0, 0); /* IF_EN */
+
+        if (wait_for_bit_change(DSI_CTRL, 0, enable) != enable) {
+                        DSSERR("Failed to set dsi_if_enable to %d\n", enable);
+                        return -EIO;
+        }
+
+        return 0;
+}
+
+unsigned long dsi_get_dsi1_pll_rate(void)
+{
+        return dsi.current_cinfo.dsi1_pll_fclk;
+}
+
+static unsigned long dsi_get_dsi2_pll_rate(void)
+{
+        return dsi.current_cinfo.dsi2_pll_fclk;
+}
+
+static unsigned long dsi_get_txbyteclkhs(void)
+{
+        return dsi.current_cinfo.clkin4ddr / 16;
+}
+
+static unsigned long dsi_fclk_rate(void)
+{
+        unsigned long r;
+
+        if (dss_get_dsi_clk_source() == DSS_SRC_DSS1_ALWON_FCLK) {
+                /* DSI FCLK source is DSS1_ALWON_FCK, which is dss1_fck */
+                r = dss_clk_get_rate(DSS_CLK_FCK1);
+        } else {
+                /* DSI FCLK source is DSI2_PLL_FCLK */
+                r = dsi_get_dsi2_pll_rate();
+        }
+
+        return r;
+}
+
+static int dsi_set_lp_clk_divisor(struct omap_dss_device *dssdev)
+{
+        unsigned long dsi_fclk;
+        unsigned lp_clk_div;
+        unsigned long lp_clk;
+
+        lp_clk_div = dssdev->phy.dsi.div.lp_clk_div;
+
+        if (lp_clk_div == 0 || lp_clk_div > LP_DIV_MAX)
+                return -EINVAL;
+
+        dsi_fclk = dsi_fclk_rate();
+
+        lp_clk = dsi_fclk / 2 / lp_clk_div;
+
+        DSSDBG("LP_CLK_DIV %u, LP_CLK %lu\n", lp_clk_div, lp_clk);
+        dsi.current_cinfo.lp_clk = lp_clk;
+        dsi.current_cinfo.lp_clk_div = lp_clk_div;
+
+        REG_FLD_MOD(DSI_CLK_CTRL, lp_clk_div, 12, 0);   /* LP_CLK_DIVISOR */
+
+        REG_FLD_MOD(DSI_CLK_CTRL, dsi_fclk > 30000000 ? 1 : 0,
+                        21, 21);                /* LP_RX_SYNCHRO_ENABLE */
+
+        return 0;
+}
+
+
+enum dsi_pll_power_state {
+        DSI_PLL_POWER_OFF       = 0x0,
+        DSI_PLL_POWER_ON_HSCLK  = 0x1,
+        DSI_PLL_POWER_ON_ALL    = 0x2,
+        DSI_PLL_POWER_ON_DIV    = 0x3,
+};
+
+static int dsi_pll_power(enum dsi_pll_power_state state)
+{
+        int t = 0;
+
+        REG_FLD_MOD(DSI_CLK_CTRL, state, 31, 30);       /* PLL_PWR_CMD */
+
+        /* PLL_PWR_STATUS */
+        while (FLD_GET(dsi_read_reg(DSI_CLK_CTRL), 29, 28) != state) {
+                if (++t > 1000) {
+                        DSSERR("Failed to set DSI PLL power mode to %d\n",
+                                        state);
+                        return -ENODEV;
+                }
+                udelay(1);
+        }
+
+        return 0;
+}
+
+/* calculate clock rates using dividers in cinfo */
+static int dsi_calc_clock_rates(struct dsi_clock_info *cinfo)
+{
+        if (cinfo->regn == 0 || cinfo->regn > REGN_MAX)
+                return -EINVAL;
+
+        if (cinfo->regm == 0 || cinfo->regm > REGM_MAX)
+                return -EINVAL;
+
+        if (cinfo->regm3 > REGM3_MAX)
+                return -EINVAL;
+
+        if (cinfo->regm4 > REGM4_MAX)
+                return -EINVAL;
+
+        if (cinfo->use_dss2_fck) {
+                cinfo->clkin = dss_clk_get_rate(DSS_CLK_FCK2);
+                /* XXX it is unclear if highfreq should be used
+                 * with DSS2_FCK source also */
+                cinfo->highfreq = 0;
+        } else {
+                cinfo->clkin = dispc_pclk_rate();
+
+                if (cinfo->clkin < 32000000)
+                        cinfo->highfreq = 0;
+                else
+                        cinfo->highfreq = 1;
+        }
+
+        cinfo->fint = cinfo->clkin / (cinfo->regn * (cinfo->highfreq ? 2 : 1));
+
+        if (cinfo->fint > FINT_MAX || cinfo->fint < FINT_MIN)
+                return -EINVAL;
+
+        cinfo->clkin4ddr = 2 * cinfo->regm * cinfo->fint;
+
+        if (cinfo->clkin4ddr > 1800 * 1000 * 1000)
+                return -EINVAL;
+
+        if (cinfo->regm3 > 0)
+                cinfo->dsi1_pll_fclk = cinfo->clkin4ddr / cinfo->regm3;
+        else
+                cinfo->dsi1_pll_fclk = 0;
+
+        if (cinfo->regm4 > 0)
+                cinfo->dsi2_pll_fclk = cinfo->clkin4ddr / cinfo->regm4;
+        else
+                cinfo->dsi2_pll_fclk = 0;
+
+        return 0;
+}
+
+int dsi_pll_calc_clock_div_pck(bool is_tft, unsigned long req_pck,
+                struct dsi_clock_info *dsi_cinfo,
+                struct dispc_clock_info *dispc_cinfo)
+{
+        struct dsi_clock_info cur, best;
+        struct dispc_clock_info best_dispc;
+        int min_fck_per_pck;
+        int match = 0;
+        unsigned long dss_clk_fck2;
+
+        dss_clk_fck2 = dss_clk_get_rate(DSS_CLK_FCK2);
+
+        if (req_pck == dsi.cache_req_pck &&
+                        dsi.cache_cinfo.clkin == dss_clk_fck2) {
+                DSSDBG("DSI clock info found from cache\n");
+                *dsi_cinfo = dsi.cache_cinfo;
+                dispc_find_clk_divs(is_tft, req_pck, dsi_cinfo->dsi1_pll_fclk,
+                                dispc_cinfo);
+                return 0;
+        }
+
+        min_fck_per_pck = CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK;
+
+        if (min_fck_per_pck &&
+                req_pck * min_fck_per_pck > DISPC_MAX_FCK) {
+                DSSERR("Requested pixel clock not possible with the current "
+                                "OMAP2_DSS_MIN_FCK_PER_PCK setting. Turning "
+                                "the constraint off.\n");
+                min_fck_per_pck = 0;
+        }
+
+        DSSDBG("dsi_pll_calc\n");
+
+retry:
+        memset(&best, 0, sizeof(best));
+        memset(&best_dispc, 0, sizeof(best_dispc));
+
+        memset(&cur, 0, sizeof(cur));
+        cur.clkin = dss_clk_fck2;
+        cur.use_dss2_fck = 1;
+        cur.highfreq = 0;
+
+        /* no highfreq: 0.75MHz < Fint = clkin / regn < 2.1MHz */
+        /* highfreq: 0.75MHz < Fint = clkin / (2*regn) < 2.1MHz */
+        /* To reduce PLL lock time, keep Fint high (around 2 MHz) */
+        for (cur.regn = 1; cur.regn < REGN_MAX; ++cur.regn) {
+                if (cur.highfreq == 0)
+                        cur.fint = cur.clkin / cur.regn;
+                else
+                        cur.fint = cur.clkin / (2 * cur.regn);
+
+                if (cur.fint > FINT_MAX || cur.fint < FINT_MIN)
+                        continue;
+
+                /* DSIPHY(MHz) = (2 * regm / regn) * (clkin / (highfreq + 1)) */
+                for (cur.regm = 1; cur.regm < REGM_MAX; ++cur.regm) {
+                        unsigned long a, b;
+
+                        a = 2 * cur.regm * (cur.clkin/1000);
+                        b = cur.regn * (cur.highfreq + 1);
+                        cur.clkin4ddr = a / b * 1000;
+
+                        if (cur.clkin4ddr > 1800 * 1000 * 1000)
+                                break;
+
+                        /* DSI1_PLL_FCLK(MHz) = DSIPHY(MHz) / regm3  < 173MHz */
+                        for (cur.regm3 = 1; cur.regm3 < REGM3_MAX;
+                                        ++cur.regm3) {
+                                struct dispc_clock_info cur_dispc;
+                                cur.dsi1_pll_fclk = cur.clkin4ddr / cur.regm3;
+
+                                /* this will narrow down the search a bit,
+                                 * but still give pixclocks below what was
+                                 * requested */
+                                if (cur.dsi1_pll_fclk  < req_pck)
+                                        break;
+
+                                if (cur.dsi1_pll_fclk > DISPC_MAX_FCK)
+                                        continue;
+
+                                if (min_fck_per_pck &&
+                                        cur.dsi1_pll_fclk <
+                                                req_pck * min_fck_per_pck)
+                                        continue;
+
+                                match = 1;
+
+                                dispc_find_clk_divs(is_tft, req_pck,
+                                                cur.dsi1_pll_fclk,
+                                                &cur_dispc);
+
+                                if (abs(cur_dispc.pck - req_pck) <
+                                                abs(best_dispc.pck - req_pck)) {
+                                        best = cur;
+                                        best_dispc = cur_dispc;
+
+                                        if (cur_dispc.pck == req_pck)
+                                                goto found;
+                                }
+                        }
+                }
+        }
+found:
+        if (!match) {
+                if (min_fck_per_pck) {
+                        DSSERR("Could not find suitable clock settings.\n"
+                                        "Turning FCK/PCK constraint off and"
+                                        "trying again.\n");
+                        min_fck_per_pck = 0;
+                        goto retry;
+                }
+
+                DSSERR("Could not find suitable clock settings.\n");
+
+                return -EINVAL;
+        }
+
+        /* DSI2_PLL_FCLK (regm4) is not used */
+        best.regm4 = 0;
+        best.dsi2_pll_fclk = 0;
+
+        if (dsi_cinfo)
+                *dsi_cinfo = best;
+        if (dispc_cinfo)
+                *dispc_cinfo = best_dispc;
+
+        dsi.cache_req_pck = req_pck;
+        dsi.cache_clk_freq = 0;
+        dsi.cache_cinfo = best;
+
+        return 0;
+}
+
+int dsi_pll_set_clock_div(struct dsi_clock_info *cinfo)
+{
+        int r = 0;
+        u32 l;
+        int f;
+
+        DSSDBGF();
+
+        dsi.current_cinfo.fint = cinfo->fint;
+        dsi.current_cinfo.clkin4ddr = cinfo->clkin4ddr;
+        dsi.current_cinfo.dsi1_pll_fclk = cinfo->dsi1_pll_fclk;
+        dsi.current_cinfo.dsi2_pll_fclk = cinfo->dsi2_pll_fclk;
+
+        dsi.current_cinfo.regn = cinfo->regn;
+        dsi.current_cinfo.regm = cinfo->regm;
+        dsi.current_cinfo.regm3 = cinfo->regm3;
+        dsi.current_cinfo.regm4 = cinfo->regm4;
+
+        DSSDBG("DSI Fint %ld\n", cinfo->fint);
+
+        DSSDBG("clkin (%s) rate %ld, highfreq %d\n",
+                        cinfo->use_dss2_fck ? "dss2_fck" : "pclkfree",
+                        cinfo->clkin,
+                        cinfo->highfreq);
+
+        /* DSIPHY == CLKIN4DDR */
+        DSSDBG("CLKIN4DDR = 2 * %d / %d * %lu / %d = %lu\n",
+                        cinfo->regm,
+                        cinfo->regn,
+                        cinfo->clkin,
+                        cinfo->highfreq + 1,
+                        cinfo->clkin4ddr);
+
+        DSSDBG("Data rate on 1 DSI lane %ld Mbps\n",
+                        cinfo->clkin4ddr / 1000 / 1000 / 2);
+
+        DSSDBG("Clock lane freq %ld Hz\n", cinfo->clkin4ddr / 4);
+
+        DSSDBG("regm3 = %d, dsi1_pll_fclk = %lu\n",
+                        cinfo->regm3, cinfo->dsi1_pll_fclk);
+        DSSDBG("regm4 = %d, dsi2_pll_fclk = %lu\n",
+                        cinfo->regm4, cinfo->dsi2_pll_fclk);
+
+        REG_FLD_MOD(DSI_PLL_CONTROL, 0, 0, 0); /* DSI_PLL_AUTOMODE = manual */
+
+        l = dsi_read_reg(DSI_PLL_CONFIGURATION1);
+        l = FLD_MOD(l, 1, 0, 0);                /* DSI_PLL_STOPMODE */
+        l = FLD_MOD(l, cinfo->regn - 1, 7, 1);  /* DSI_PLL_REGN */
+        l = FLD_MOD(l, cinfo->regm, 18, 8);     /* DSI_PLL_REGM */
+        l = FLD_MOD(l, cinfo->regm3 > 0 ? cinfo->regm3 - 1 : 0,
+                        22, 19);                /* DSI_CLOCK_DIV */
+        l = FLD_MOD(l, cinfo->regm4 > 0 ? cinfo->regm4 - 1 : 0,
+                        26, 23);                /* DSIPROTO_CLOCK_DIV */
+        dsi_write_reg(DSI_PLL_CONFIGURATION1, l);
+
+        BUG_ON(cinfo->fint < 750000 || cinfo->fint > 2100000);
+        if (cinfo->fint < 1000000)
+                f = 0x3;
+        else if (cinfo->fint < 1250000)
+                f = 0x4;
+        else if (cinfo->fint < 1500000)
+                f = 0x5;
+        else if (cinfo->fint < 1750000)
+                f = 0x6;
+        else
+                f = 0x7;
+
+        l = dsi_read_reg(DSI_PLL_CONFIGURATION2);
+        l = FLD_MOD(l, f, 4, 1);                /* DSI_PLL_FREQSEL */
+        l = FLD_MOD(l, cinfo->use_dss2_fck ? 0 : 1,
+                        11, 11);                /* DSI_PLL_CLKSEL */
+        l = FLD_MOD(l, cinfo->highfreq,
+                        12, 12);                /* DSI_PLL_HIGHFREQ */
+        l = FLD_MOD(l, 1, 13, 13);              /* DSI_PLL_REFEN */
+        l = FLD_MOD(l, 0, 14, 14);              /* DSIPHY_CLKINEN */
+        l = FLD_MOD(l, 1, 20, 20);              /* DSI_HSDIVBYPASS */
+        dsi_write_reg(DSI_PLL_CONFIGURATION2, l);
+
+        REG_FLD_MOD(DSI_PLL_GO, 1, 0, 0);       /* DSI_PLL_GO */
+
+        if (wait_for_bit_change(DSI_PLL_GO, 0, 0) != 0) {
+                DSSERR("dsi pll go bit not going down.\n");
+                r = -EIO;
+                goto err;
+        }
+
+        if (wait_for_bit_change(DSI_PLL_STATUS, 1, 1) != 1) {
+                DSSERR("cannot lock PLL\n");
+                r = -EIO;
+                goto err;
+        }
+
+        dsi.pll_locked = 1;
+
+        l = dsi_read_reg(DSI_PLL_CONFIGURATION2);
+        l = FLD_MOD(l, 0, 0, 0);        /* DSI_PLL_IDLE */
+        l = FLD_MOD(l, 0, 5, 5);        /* DSI_PLL_PLLLPMODE */
+        l = FLD_MOD(l, 0, 6, 6);        /* DSI_PLL_LOWCURRSTBY */
+        l = FLD_MOD(l, 0, 7, 7);        /* DSI_PLL_TIGHTPHASELOCK */
+        l = FLD_MOD(l, 0, 8, 8);        /* DSI_PLL_DRIFTGUARDEN */
+        l = FLD_MOD(l, 0, 10, 9);       /* DSI_PLL_LOCKSEL */
+        l = FLD_MOD(l, 1, 13, 13);      /* DSI_PLL_REFEN */
+        l = FLD_MOD(l, 1, 14, 14);      /* DSIPHY_CLKINEN */
+        l = FLD_MOD(l, 0, 15, 15);      /* DSI_BYPASSEN */
+        l = FLD_MOD(l, 1, 16, 16);      /* DSS_CLOCK_EN */
+        l = FLD_MOD(l, 0, 17, 17);      /* DSS_CLOCK_PWDN */
+        l = FLD_MOD(l, 1, 18, 18);      /* DSI_PROTO_CLOCK_EN */
+        l = FLD_MOD(l, 0, 19, 19);      /* DSI_PROTO_CLOCK_PWDN */
+        l = FLD_MOD(l, 0, 20, 20);      /* DSI_HSDIVBYPASS */
+        dsi_write_reg(DSI_PLL_CONFIGURATION2, l);
+
+        DSSDBG("PLL config done\n");
+err:
+        return r;
+}
+
+int dsi_pll_init(struct omap_dss_device *dssdev, bool enable_hsclk,
+                bool enable_hsdiv)
+{
+        int r = 0;
+        enum dsi_pll_power_state pwstate;
+
+        DSSDBG("PLL init\n");
+
+        enable_clocks(1);
+        dsi_enable_pll_clock(1);
+
+        r = regulator_enable(dsi.vdds_dsi_reg);
+        if (r)
+                goto err0;
+
+        /* XXX PLL does not come out of reset without this... */
+        dispc_pck_free_enable(1);
+
+        if (wait_for_bit_change(DSI_PLL_STATUS, 0, 1) != 1) {
+                DSSERR("PLL not coming out of reset.\n");
+                r = -ENODEV;
+                goto err1;
+        }
+
+        /* XXX ... but if left on, we get problems when planes do not
+         * fill the whole display. No idea about this */
+        dispc_pck_free_enable(0);
+
+        if (enable_hsclk && enable_hsdiv)
+                pwstate = DSI_PLL_POWER_ON_ALL;
+        else if (enable_hsclk)
+                pwstate = DSI_PLL_POWER_ON_HSCLK;
+        else if (enable_hsdiv)
+                pwstate = DSI_PLL_POWER_ON_DIV;
+        else
+                pwstate = DSI_PLL_POWER_OFF;
+
+        r = dsi_pll_power(pwstate);
+
+        if (r)
+                goto err1;
+
+        DSSDBG("PLL init done\n");
+
+        return 0;
+err1:
+        regulator_disable(dsi.vdds_dsi_reg);
+err0:
+        enable_clocks(0);
+        dsi_enable_pll_clock(0);
+        return r;
+}
+
+void dsi_pll_uninit(void)
+{
+        enable_clocks(0);
+        dsi_enable_pll_clock(0);
+
+        dsi.pll_locked = 0;
+        dsi_pll_power(DSI_PLL_POWER_OFF);
+        regulator_disable(dsi.vdds_dsi_reg);
+        DSSDBG("PLL uninit done\n");
+}
+
+void dsi_dump_clocks(struct seq_file *s)
+{
+        int clksel;
+        struct dsi_clock_info *cinfo = &dsi.current_cinfo;
+
+        enable_clocks(1);
+
+        clksel = REG_GET(DSI_PLL_CONFIGURATION2, 11, 11);
+
+        seq_printf(s,   "- DSI PLL -\n");
+
+        seq_printf(s,   "dsi pll source = %s\n",
+                        clksel == 0 ?
+                        "dss2_alwon_fclk" : "pclkfree");
+
+        seq_printf(s,   "Fint\t\t%-16luregn %u\n", cinfo->fint, cinfo->regn);
+
+        seq_printf(s,   "CLKIN4DDR\t%-16luregm %u\n",
+                        cinfo->clkin4ddr, cinfo->regm);
+
+        seq_printf(s,   "dsi1_pll_fck\t%-16luregm3 %u\t(%s)\n",
+                        cinfo->dsi1_pll_fclk,
+                        cinfo->regm3,
+                        dss_get_dispc_clk_source() == DSS_SRC_DSS1_ALWON_FCLK ?
+                        "off" : "on");
+
+        seq_printf(s,   "dsi2_pll_fck\t%-16luregm4 %u\t(%s)\n",
+                        cinfo->dsi2_pll_fclk,
+                        cinfo->regm4,
+                        dss_get_dsi_clk_source() == DSS_SRC_DSS1_ALWON_FCLK ?
+                        "off" : "on");
+
+        seq_printf(s,   "- DSI -\n");
+
+        seq_printf(s,   "dsi fclk source = %s\n",
+                        dss_get_dsi_clk_source() == DSS_SRC_DSS1_ALWON_FCLK ?
+                        "dss1_alwon_fclk" : "dsi2_pll_fclk");
+
+        seq_printf(s,   "DSI_FCLK\t%lu\n", dsi_fclk_rate());
+
+        seq_printf(s,   "DDR_CLK\t\t%lu\n",
+                        cinfo->clkin4ddr / 4);
+
+        seq_printf(s,   "TxByteClkHS\t%lu\n", dsi_get_txbyteclkhs());
+
+        seq_printf(s,   "LP_CLK\t\t%lu\n", cinfo->lp_clk);
+
+        seq_printf(s,   "VP_CLK\t\t%lu\n"
+                        "VP_PCLK\t\t%lu\n",
+                        dispc_lclk_rate(),
+                        dispc_pclk_rate());
+
+        enable_clocks(0);
+}
+
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+void dsi_dump_irqs(struct seq_file *s)
+{
+        unsigned long flags;
+        struct dsi_irq_stats stats;
+
+        spin_lock_irqsave(&dsi.irq_stats_lock, flags);
+
+        stats = dsi.irq_stats;
+        memset(&dsi.irq_stats, 0, sizeof(dsi.irq_stats));
+        dsi.irq_stats.last_reset = jiffies;
+
+        spin_unlock_irqrestore(&dsi.irq_stats_lock, flags);
+
+        seq_printf(s, "period %u ms\n",
+                        jiffies_to_msecs(jiffies - stats.last_reset));
+
+        seq_printf(s, "irqs %d\n", stats.irq_count);
+#define PIS(x) \
+        seq_printf(s, "%-20s %10d\n", #x, stats.dsi_irqs[ffs(DSI_IRQ_##x)-1]);
+
+        seq_printf(s, "-- DSI interrupts --\n");
+        PIS(VC0);
+        PIS(VC1);
+        PIS(VC2);
+        PIS(VC3);
+        PIS(WAKEUP);
+        PIS(RESYNC);
+        PIS(PLL_LOCK);
+        PIS(PLL_UNLOCK);
+        PIS(PLL_RECALL);
+        PIS(COMPLEXIO_ERR);
+        PIS(HS_TX_TIMEOUT);
+        PIS(LP_RX_TIMEOUT);
+        PIS(TE_TRIGGER);
+        PIS(ACK_TRIGGER);
+        PIS(SYNC_LOST);
+        PIS(LDO_POWER_GOOD);
+        PIS(TA_TIMEOUT);
+#undef PIS
+
+#define PIS(x) \
+        seq_printf(s, "%-20s %10d %10d %10d %10d\n", #x, \
+                        stats.vc_irqs[0][ffs(DSI_VC_IRQ_##x)-1], \
+                        stats.vc_irqs[1][ffs(DSI_VC_IRQ_##x)-1], \
+                        stats.vc_irqs[2][ffs(DSI_VC_IRQ_##x)-1], \
+                        stats.vc_irqs[3][ffs(DSI_VC_IRQ_##x)-1]);
+
+        seq_printf(s, "-- VC interrupts --\n");
+        PIS(CS);
+        PIS(ECC_CORR);
+        PIS(PACKET_SENT);
+        PIS(FIFO_TX_OVF);
+        PIS(FIFO_RX_OVF);
+        PIS(BTA);
+        PIS(ECC_NO_CORR);
+        PIS(FIFO_TX_UDF);
+        PIS(PP_BUSY_CHANGE);
+#undef PIS
+
+#define PIS(x) \
+        seq_printf(s, "%-20s %10d\n", #x, \
+                        stats.cio_irqs[ffs(DSI_CIO_IRQ_##x)-1]);
+
+        seq_printf(s, "-- CIO interrupts --\n");
+        PIS(ERRSYNCESC1);
+        PIS(ERRSYNCESC2);
+        PIS(ERRSYNCESC3);
+        PIS(ERRESC1);
+        PIS(ERRESC2);
+        PIS(ERRESC3);
+        PIS(ERRCONTROL1);
+        PIS(ERRCONTROL2);
+        PIS(ERRCONTROL3);
+        PIS(STATEULPS1);
+        PIS(STATEULPS2);
+        PIS(STATEULPS3);
+        PIS(ERRCONTENTIONLP0_1);
+        PIS(ERRCONTENTIONLP1_1);
+        PIS(ERRCONTENTIONLP0_2);
+        PIS(ERRCONTENTIONLP1_2);
+        PIS(ERRCONTENTIONLP0_3);
+        PIS(ERRCONTENTIONLP1_3);
+        PIS(ULPSACTIVENOT_ALL0);
+        PIS(ULPSACTIVENOT_ALL1);
+#undef PIS
+}
+#endif
+
+void dsi_dump_regs(struct seq_file *s)
+{
+#define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, dsi_read_reg(r))
+
+        dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
+
+        DUMPREG(DSI_REVISION);
+        DUMPREG(DSI_SYSCONFIG);
+        DUMPREG(DSI_SYSSTATUS);
+        DUMPREG(DSI_IRQSTATUS);
+        DUMPREG(DSI_IRQENABLE);
+        DUMPREG(DSI_CTRL);
+        DUMPREG(DSI_COMPLEXIO_CFG1);
+        DUMPREG(DSI_COMPLEXIO_IRQ_STATUS);
+        DUMPREG(DSI_COMPLEXIO_IRQ_ENABLE);
+        DUMPREG(DSI_CLK_CTRL);
+        DUMPREG(DSI_TIMING1);
+        DUMPREG(DSI_TIMING2);
+        DUMPREG(DSI_VM_TIMING1);
+        DUMPREG(DSI_VM_TIMING2);
+        DUMPREG(DSI_VM_TIMING3);
+        DUMPREG(DSI_CLK_TIMING);
+        DUMPREG(DSI_TX_FIFO_VC_SIZE);
+        DUMPREG(DSI_RX_FIFO_VC_SIZE);
+        DUMPREG(DSI_COMPLEXIO_CFG2);
+        DUMPREG(DSI_RX_FIFO_VC_FULLNESS);
+        DUMPREG(DSI_VM_TIMING4);
+        DUMPREG(DSI_TX_FIFO_VC_EMPTINESS);
+        DUMPREG(DSI_VM_TIMING5);
+        DUMPREG(DSI_VM_TIMING6);
+        DUMPREG(DSI_VM_TIMING7);
+        DUMPREG(DSI_STOPCLK_TIMING);
+
+        DUMPREG(DSI_VC_CTRL(0));
+        DUMPREG(DSI_VC_TE(0));
+        DUMPREG(DSI_VC_LONG_PACKET_HEADER(0));
+        DUMPREG(DSI_VC_LONG_PACKET_PAYLOAD(0));
+        DUMPREG(DSI_VC_SHORT_PACKET_HEADER(0));
+        DUMPREG(DSI_VC_IRQSTATUS(0));
+        DUMPREG(DSI_VC_IRQENABLE(0));
+
+        DUMPREG(DSI_VC_CTRL(1));
+        DUMPREG(DSI_VC_TE(1));
+        DUMPREG(DSI_VC_LONG_PACKET_HEADER(1));
+        DUMPREG(DSI_VC_LONG_PACKET_PAYLOAD(1));
+        DUMPREG(DSI_VC_SHORT_PACKET_HEADER(1));
+        DUMPREG(DSI_VC_IRQSTATUS(1));
+        DUMPREG(DSI_VC_IRQENABLE(1));
+
+        DUMPREG(DSI_VC_CTRL(2));
+        DUMPREG(DSI_VC_TE(2));
+        DUMPREG(DSI_VC_LONG_PACKET_HEADER(2));
+        DUMPREG(DSI_VC_LONG_PACKET_PAYLOAD(2));
+        DUMPREG(DSI_VC_SHORT_PACKET_HEADER(2));
+        DUMPREG(DSI_VC_IRQSTATUS(2));
+        DUMPREG(DSI_VC_IRQENABLE(2));
+
+        DUMPREG(DSI_VC_CTRL(3));
+        DUMPREG(DSI_VC_TE(3));
+        DUMPREG(DSI_VC_LONG_PACKET_HEADER(3));
+        DUMPREG(DSI_VC_LONG_PACKET_PAYLOAD(3));
+        DUMPREG(DSI_VC_SHORT_PACKET_HEADER(3));
+        DUMPREG(DSI_VC_IRQSTATUS(3));
+        DUMPREG(DSI_VC_IRQENABLE(3));
+
+        DUMPREG(DSI_DSIPHY_CFG0);
+        DUMPREG(DSI_DSIPHY_CFG1);
+        DUMPREG(DSI_DSIPHY_CFG2);
+        DUMPREG(DSI_DSIPHY_CFG5);
+
+        DUMPREG(DSI_PLL_CONTROL);
+        DUMPREG(DSI_PLL_STATUS);
+        DUMPREG(DSI_PLL_GO);
+        DUMPREG(DSI_PLL_CONFIGURATION1);
+        DUMPREG(DSI_PLL_CONFIGURATION2);
+
+        dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
+#undef DUMPREG
+}
+
+enum dsi_complexio_power_state {
+        DSI_COMPLEXIO_POWER_OFF         = 0x0,
+        DSI_COMPLEXIO_POWER_ON          = 0x1,
+        DSI_COMPLEXIO_POWER_ULPS        = 0x2,
+};
+
+static int dsi_complexio_power(enum dsi_complexio_power_state state)
+{
+        int t = 0;
+
+        /* PWR_CMD */
+        REG_FLD_MOD(DSI_COMPLEXIO_CFG1, state, 28, 27);
+
+        /* PWR_STATUS */
+        while (FLD_GET(dsi_read_reg(DSI_COMPLEXIO_CFG1), 26, 25) != state) {
+                if (++t > 1000) {
+                        DSSERR("failed to set complexio power state to "
+                                        "%d\n", state);
+                        return -ENODEV;
+                }
+                udelay(1);
+        }
+
+        return 0;
+}
+
+static void dsi_complexio_config(struct omap_dss_device *dssdev)
+{
+        u32 r;
+
+        int clk_lane   = dssdev->phy.dsi.clk_lane;
+        int data1_lane = dssdev->phy.dsi.data1_lane;
+        int data2_lane = dssdev->phy.dsi.data2_lane;
+        int clk_pol    = dssdev->phy.dsi.clk_pol;
+        int data1_pol  = dssdev->phy.dsi.data1_pol;
+        int data2_pol  = dssdev->phy.dsi.data2_pol;
+
+        r = dsi_read_reg(DSI_COMPLEXIO_CFG1);
+        r = FLD_MOD(r, clk_lane, 2, 0);
+        r = FLD_MOD(r, clk_pol, 3, 3);
+        r = FLD_MOD(r, data1_lane, 6, 4);
+        r = FLD_MOD(r, data1_pol, 7, 7);
+        r = FLD_MOD(r, data2_lane, 10, 8);
+        r = FLD_MOD(r, data2_pol, 11, 11);
+        dsi_write_reg(DSI_COMPLEXIO_CFG1, r);
+
+        /* The configuration of the DSI complex I/O (number of data lanes,
+           position, differential order) should not be changed while
+           DSS.DSI_CLK_CRTRL[20] LP_CLK_ENABLE bit is set to 1. In order for
+           the hardware to take into account a new configuration of the complex
+           I/O (done in DSS.DSI_COMPLEXIO_CFG1 register), it is recommended to
+           follow this sequence: First set the DSS.DSI_CTRL[0] IF_EN bit to 1,
+           then reset the DSS.DSI_CTRL[0] IF_EN to 0, then set
+           DSS.DSI_CLK_CTRL[20] LP_CLK_ENABLE to 1 and finally set again the
+           DSS.DSI_CTRL[0] IF_EN bit to 1. If the sequence is not followed, the
+           DSI complex I/O configuration is unknown. */
+
+        /*
+        REG_FLD_MOD(DSI_CTRL, 1, 0, 0);
+        REG_FLD_MOD(DSI_CTRL, 0, 0, 0);
+        REG_FLD_MOD(DSI_CLK_CTRL, 1, 20, 20);
+        REG_FLD_MOD(DSI_CTRL, 1, 0, 0);
+        */
+}
+
+static inline unsigned ns2ddr(unsigned ns)
+{
+        /* convert time in ns to ddr ticks, rounding up */
+        unsigned long ddr_clk = dsi.current_cinfo.clkin4ddr / 4;
+        return (ns * (ddr_clk / 1000 / 1000) + 999) / 1000;
+}
+
+static inline unsigned ddr2ns(unsigned ddr)
+{
+        unsigned long ddr_clk = dsi.current_cinfo.clkin4ddr / 4;
+        return ddr * 1000 * 1000 / (ddr_clk / 1000);
+}
+
+static void dsi_complexio_timings(void)
+{
+        u32 r;
+        u32 ths_prepare, ths_prepare_ths_zero, ths_trail, ths_exit;
+        u32 tlpx_half, tclk_trail, tclk_zero;
+        u32 tclk_prepare;
+
+        /* calculate timings */
+
+        /* 1 * DDR_CLK = 2 * UI */
+
+        /* min 40ns + 4*UI      max 85ns + 6*UI */
+        ths_prepare = ns2ddr(70) + 2;
+
+        /* min 145ns + 10*UI */
+        ths_prepare_ths_zero = ns2ddr(175) + 2;
+
+        /* min max(8*UI, 60ns+4*UI) */
+        ths_trail = ns2ddr(60) + 5;
+
+        /* min 100ns */
+        ths_exit = ns2ddr(145);
+
+        /* tlpx min 50n */
+        tlpx_half = ns2ddr(25);
+
+        /* min 60ns */
+        tclk_trail = ns2ddr(60) + 2;
+
+        /* min 38ns, max 95ns */
+        tclk_prepare = ns2ddr(65);
+
+        /* min tclk-prepare + tclk-zero = 300ns */
+        tclk_zero = ns2ddr(260);
+
+        DSSDBG("ths_prepare %u (%uns), ths_prepare_ths_zero %u (%uns)\n",
+                ths_prepare, ddr2ns(ths_prepare),
+                ths_prepare_ths_zero, ddr2ns(ths_prepare_ths_zero));
+        DSSDBG("ths_trail %u (%uns), ths_exit %u (%uns)\n",
+                        ths_trail, ddr2ns(ths_trail),
+                        ths_exit, ddr2ns(ths_exit));
+
+        DSSDBG("tlpx_half %u (%uns), tclk_trail %u (%uns), "
+                        "tclk_zero %u (%uns)\n",
+                        tlpx_half, ddr2ns(tlpx_half),
+                        tclk_trail, ddr2ns(tclk_trail),
+                        tclk_zero, ddr2ns(tclk_zero));
+        DSSDBG("tclk_prepare %u (%uns)\n",
+                        tclk_prepare, ddr2ns(tclk_prepare));
+
+        /* program timings */
+
+        r = dsi_read_reg(DSI_DSIPHY_CFG0);
+        r = FLD_MOD(r, ths_prepare, 31, 24);
+        r = FLD_MOD(r, ths_prepare_ths_zero, 23, 16);
+        r = FLD_MOD(r, ths_trail, 15, 8);
+        r = FLD_MOD(r, ths_exit, 7, 0);
+        dsi_write_reg(DSI_DSIPHY_CFG0, r);
+
+        r = dsi_read_reg(DSI_DSIPHY_CFG1);
+        r = FLD_MOD(r, tlpx_half, 22, 16);
+        r = FLD_MOD(r, tclk_trail, 15, 8);
+        r = FLD_MOD(r, tclk_zero, 7, 0);
+        dsi_write_reg(DSI_DSIPHY_CFG1, r);
+
+        r = dsi_read_reg(DSI_DSIPHY_CFG2);
+        r = FLD_MOD(r, tclk_prepare, 7, 0);
+        dsi_write_reg(DSI_DSIPHY_CFG2, r);
+}
+
+
+static int dsi_complexio_init(struct omap_dss_device *dssdev)
+{
+        int r = 0;
+
+        DSSDBG("dsi_complexio_init\n");
+
+        /* CIO_CLK_ICG, enable L3 clk to CIO */
+        REG_FLD_MOD(DSI_CLK_CTRL, 1, 14, 14);
+
+        /* A dummy read using the SCP interface to any DSIPHY register is
+         * required after DSIPHY reset to complete the reset of the DSI complex
+         * I/O. */
+        dsi_read_reg(DSI_DSIPHY_CFG5);
+
+        if (wait_for_bit_change(DSI_DSIPHY_CFG5, 30, 1) != 1) {
+                DSSERR("ComplexIO PHY not coming out of reset.\n");
+                r = -ENODEV;
+                goto err;
+        }
+
+        dsi_complexio_config(dssdev);
+
+        r = dsi_complexio_power(DSI_COMPLEXIO_POWER_ON);
+
+        if (r)
+                goto err;
+
+        if (wait_for_bit_change(DSI_COMPLEXIO_CFG1, 29, 1) != 1) {
+                DSSERR("ComplexIO not coming out of reset.\n");
+                r = -ENODEV;
+                goto err;
+        }
+
+        if (wait_for_bit_change(DSI_COMPLEXIO_CFG1, 21, 1) != 1) {
+                DSSERR("ComplexIO LDO power down.\n");
+                r = -ENODEV;
+                goto err;
+        }
+
+        dsi_complexio_timings();
+
+        /*
+           The configuration of the DSI complex I/O (number of data lanes,
+           position, differential order) should not be changed while
+           DSS.DSI_CLK_CRTRL[20] LP_CLK_ENABLE bit is set to 1. For the
+           hardware to recognize a new configuration of the complex I/O (done
+           in DSS.DSI_COMPLEXIO_CFG1 register), it is recommended to follow
+           this sequence: First set the DSS.DSI_CTRL[0] IF_EN bit to 1, next
+           reset the DSS.DSI_CTRL[0] IF_EN to 0, then set DSS.DSI_CLK_CTRL[20]
+           LP_CLK_ENABLE to 1, and finally, set again the DSS.DSI_CTRL[0] IF_EN
+           bit to 1. If the sequence is not followed, the DSi complex I/O
+           configuration is undetermined.
+           */
+        dsi_if_enable(1);
+        dsi_if_enable(0);
+        REG_FLD_MOD(DSI_CLK_CTRL, 1, 20, 20); /* LP_CLK_ENABLE */
+        dsi_if_enable(1);
+        dsi_if_enable(0);
+
+        DSSDBG("CIO init done\n");
+err:
+        return r;
+}
+
+static void dsi_complexio_uninit(void)
+{
+        dsi_complexio_power(DSI_COMPLEXIO_POWER_OFF);
+}
+
+static int _dsi_wait_reset(void)
+{
+        int t = 0;
+
+        while (REG_GET(DSI_SYSSTATUS, 0, 0) == 0) {
+                if (++t > 5) {
+                        DSSERR("soft reset failed\n");
+                        return -ENODEV;
+                }
+                udelay(1);
+        }
+
+        return 0;
+}
+
+static int _dsi_reset(void)
+{
+        /* Soft reset */
+        REG_FLD_MOD(DSI_SYSCONFIG, 1, 1, 1);
+        return _dsi_wait_reset();
+}
+
+static void dsi_reset_tx_fifo(int channel)
+{
+        u32 mask;
+        u32 l;
+
+        /* set fifosize of the channel to 0, then return the old size */
+        l = dsi_read_reg(DSI_TX_FIFO_VC_SIZE);
+
+        mask = FLD_MASK((8 * channel) + 7, (8 * channel) + 4);
+        dsi_write_reg(DSI_TX_FIFO_VC_SIZE, l & ~mask);
+
+        dsi_write_reg(DSI_TX_FIFO_VC_SIZE, l);
+}
+
+static void dsi_config_tx_fifo(enum fifo_size size1, enum fifo_size size2,
+                enum fifo_size size3, enum fifo_size size4)
+{
+        u32 r = 0;
+        int add = 0;
+        int i;
+
+        dsi.vc[0].fifo_size = size1;
+        dsi.vc[1].fifo_size = size2;
+        dsi.vc[2].fifo_size = size3;
+        dsi.vc[3].fifo_size = size4;
+
+        for (i = 0; i < 4; i++) {
+                u8 v;
+                int size = dsi.vc[i].fifo_size;
+
+                if (add + size > 4) {
+                        DSSERR("Illegal FIFO configuration\n");
+                        BUG();
+                }
+
+                v = FLD_VAL(add, 2, 0) | FLD_VAL(size, 7, 4);
+                r |= v << (8 * i);
+                /*DSSDBG("TX FIFO vc %d: size %d, add %d\n", i, size, add); */
+                add += size;
+        }
+
+        dsi_write_reg(DSI_TX_FIFO_VC_SIZE, r);
+}
+
+static void dsi_config_rx_fifo(enum fifo_size size1, enum fifo_size size2,
+                enum fifo_size size3, enum fifo_size size4)
+{
+        u32 r = 0;
+        int add = 0;
+        int i;
+
+        dsi.vc[0].fifo_size = size1;
+        dsi.vc[1].fifo_size = size2;
+        dsi.vc[2].fifo_size = size3;
+        dsi.vc[3].fifo_size = size4;
+
+        for (i = 0; i < 4; i++) {
+                u8 v;
+                int size = dsi.vc[i].fifo_size;
+
+                if (add + size > 4) {
+                        DSSERR("Illegal FIFO configuration\n");
+                        BUG();
+                }
+
+                v = FLD_VAL(add, 2, 0) | FLD_VAL(size, 7, 4);
+                r |= v << (8 * i);
+                /*DSSDBG("RX FIFO vc %d: size %d, add %d\n", i, size, add); */
+                add += size;
+        }
+
+        dsi_write_reg(DSI_RX_FIFO_VC_SIZE, r);
+}
+
+static int dsi_force_tx_stop_mode_io(void)
+{
+        u32 r;
+
+        r = dsi_read_reg(DSI_TIMING1);
+        r = FLD_MOD(r, 1, 15, 15);      /* FORCE_TX_STOP_MODE_IO */
+        dsi_write_reg(DSI_TIMING1, r);
+
+        if (wait_for_bit_change(DSI_TIMING1, 15, 0) != 0) {
+                DSSERR("TX_STOP bit not going down\n");
+                return -EIO;
+        }
+
+        return 0;
+}
+
+static int dsi_vc_enable(int channel, bool enable)
+{
+        DSSDBG("dsi_vc_enable channel %d, enable %d\n",
+                        channel, enable);
+
+        enable = enable ? 1 : 0;
+
+        REG_FLD_MOD(DSI_VC_CTRL(channel), enable, 0, 0);
+
+        if (wait_for_bit_change(DSI_VC_CTRL(channel), 0, enable) != enable) {
+                        DSSERR("Failed to set dsi_vc_enable to %d\n", enable);
+                        return -EIO;
+        }
+
+        return 0;
+}
+
+static void dsi_vc_initial_config(int channel)
+{
+        u32 r;
+
+        DSSDBGF("%d", channel);
+
+        r = dsi_read_reg(DSI_VC_CTRL(channel));
+
+        if (FLD_GET(r, 15, 15)) /* VC_BUSY */
+                DSSERR("VC(%d) busy when trying to configure it!\n",
+                                channel);
+
+        r = FLD_MOD(r, 0, 1, 1); /* SOURCE, 0 = L4 */
+        r = FLD_MOD(r, 0, 2, 2); /* BTA_SHORT_EN  */
+        r = FLD_MOD(r, 0, 3, 3); /* BTA_LONG_EN */
+        r = FLD_MOD(r, 0, 4, 4); /* MODE, 0 = command */
+        r = FLD_MOD(r, 1, 7, 7); /* CS_TX_EN */
+        r = FLD_MOD(r, 1, 8, 8); /* ECC_TX_EN */
+        r = FLD_MOD(r, 0, 9, 9); /* MODE_SPEED, high speed on/off */
+
+        r = FLD_MOD(r, 4, 29, 27); /* DMA_RX_REQ_NB = no dma */
+        r = FLD_MOD(r, 4, 23, 21); /* DMA_TX_REQ_NB = no dma */
+
+        dsi_write_reg(DSI_VC_CTRL(channel), r);
+
+        dsi.vc[channel].mode = DSI_VC_MODE_L4;
+}
+
+static void dsi_vc_config_l4(int channel)
+{
+        if (dsi.vc[channel].mode == DSI_VC_MODE_L4)
+                return;
+
+        DSSDBGF("%d", channel);
+
+        dsi_vc_enable(channel, 0);
+
+        if (REG_GET(DSI_VC_CTRL(channel), 15, 15)) /* VC_BUSY */
+                DSSERR("vc(%d) busy when trying to config for L4\n", channel);
+
+        REG_FLD_MOD(DSI_VC_CTRL(channel), 0, 1, 1); /* SOURCE, 0 = L4 */
+
+        dsi_vc_enable(channel, 1);
+
+        dsi.vc[channel].mode = DSI_VC_MODE_L4;
+}
+
+static void dsi_vc_config_vp(int channel)
+{
+        if (dsi.vc[channel].mode == DSI_VC_MODE_VP)
+                return;
+
+        DSSDBGF("%d", channel);
+
+        dsi_vc_enable(channel, 0);
+
+        if (REG_GET(DSI_VC_CTRL(channel), 15, 15)) /* VC_BUSY */
+                DSSERR("vc(%d) busy when trying to config for VP\n", channel);
+
+        REG_FLD_MOD(DSI_VC_CTRL(channel), 1, 1, 1); /* SOURCE, 1 = video port */
+
+        dsi_vc_enable(channel, 1);
+
+        dsi.vc[channel].mode = DSI_VC_MODE_VP;
+}
+
+
+void omapdss_dsi_vc_enable_hs(int channel, bool enable)
+{
+        DSSDBG("dsi_vc_enable_hs(%d, %d)\n", channel, enable);
+
+        WARN_ON(!dsi_bus_is_locked());
+
+        dsi_vc_enable(channel, 0);
+        dsi_if_enable(0);
+
+        REG_FLD_MOD(DSI_VC_CTRL(channel), enable, 9, 9);
+
+        dsi_vc_enable(channel, 1);
+        dsi_if_enable(1);
+
+        dsi_force_tx_stop_mode_io();
+}
+EXPORT_SYMBOL(omapdss_dsi_vc_enable_hs);
+
+static void dsi_vc_flush_long_data(int channel)
+{
+        while (REG_GET(DSI_VC_CTRL(channel), 20, 20)) {
+                u32 val;
+                val = dsi_read_reg(DSI_VC_SHORT_PACKET_HEADER(channel));
+                DSSDBG("\t\tb1 %#02x b2 %#02x b3 %#02x b4 %#02x\n",
+                                (val >> 0) & 0xff,
+                                (val >> 8) & 0xff,
+                                (val >> 16) & 0xff,
+                                (val >> 24) & 0xff);
+        }
+}
+
+static void dsi_show_rx_ack_with_err(u16 err)
+{
+        DSSERR("\tACK with ERROR (%#x):\n", err);
+        if (err & (1 << 0))
+                DSSERR("\t\tSoT Error\n");
+        if (err & (1 << 1))
+                DSSERR("\t\tSoT Sync Error\n");
+        if (err & (1 << 2))
+                DSSERR("\t\tEoT Sync Error\n");
+        if (err & (1 << 3))
+                DSSERR("\t\tEscape Mode Entry Command Error\n");
+        if (err & (1 << 4))
+                DSSERR("\t\tLP Transmit Sync Error\n");
+        if (err & (1 << 5))
+                DSSERR("\t\tHS Receive Timeout Error\n");
+        if (err & (1 << 6))
+                DSSERR("\t\tFalse Control Error\n");
+        if (err & (1 << 7))
+                DSSERR("\t\t(reserved7)\n");
+        if (err & (1 << 8))
+                DSSERR("\t\tECC Error, single-bit (corrected)\n");
+        if (err & (1 << 9))
+                DSSERR("\t\tECC Error, multi-bit (not corrected)\n");
+        if (err & (1 << 10))
+                DSSERR("\t\tChecksum Error\n");
+        if (err & (1 << 11))
+                DSSERR("\t\tData type not recognized\n");
+        if (err & (1 << 12))
+                DSSERR("\t\tInvalid VC ID\n");
+        if (err & (1 << 13))
+                DSSERR("\t\tInvalid Transmission Length\n");
+        if (err & (1 << 14))
+                DSSERR("\t\t(reserved14)\n");
+        if (err & (1 << 15))
+                DSSERR("\t\tDSI Protocol Violation\n");
+}
+
+static u16 dsi_vc_flush_receive_data(int channel)
+{
+        /* RX_FIFO_NOT_EMPTY */
+        while (REG_GET(DSI_VC_CTRL(channel), 20, 20)) {
+                u32 val;
+                u8 dt;
+                val = dsi_read_reg(DSI_VC_SHORT_PACKET_HEADER(channel));
+                DSSDBG("\trawval %#08x\n", val);
+                dt = FLD_GET(val, 5, 0);
+                if (dt == DSI_DT_RX_ACK_WITH_ERR) {
+                        u16 err = FLD_GET(val, 23, 8);
+                        dsi_show_rx_ack_with_err(err);
+                } else if (dt == DSI_DT_RX_SHORT_READ_1) {
+                        DSSDBG("\tDCS short response, 1 byte: %#x\n",
+                                        FLD_GET(val, 23, 8));
+                } else if (dt == DSI_DT_RX_SHORT_READ_2) {
+                        DSSDBG("\tDCS short response, 2 byte: %#x\n",
+                                        FLD_GET(val, 23, 8));
+                } else if (dt == DSI_DT_RX_DCS_LONG_READ) {
+                        DSSDBG("\tDCS long response, len %d\n",
+                                        FLD_GET(val, 23, 8));
+                        dsi_vc_flush_long_data(channel);
+                } else {
+                        DSSERR("\tunknown datatype 0x%02x\n", dt);
+                }
+        }
+        return 0;
+}
+
+static int dsi_vc_send_bta(int channel)
+{
+        if (dsi.debug_write || dsi.debug_read)
+                DSSDBG("dsi_vc_send_bta %d\n", channel);
+
+        WARN_ON(!dsi_bus_is_locked());
+
+        if (REG_GET(DSI_VC_CTRL(channel), 20, 20)) {    /* RX_FIFO_NOT_EMPTY */
+                DSSERR("rx fifo not empty when sending BTA, dumping data:\n");
+                dsi_vc_flush_receive_data(channel);
+        }
+
+        REG_FLD_MOD(DSI_VC_CTRL(channel), 1, 6, 6); /* BTA_EN */
+
+        return 0;
+}
+
+int dsi_vc_send_bta_sync(int channel)
+{
+        int r = 0;
+        u32 err;
+
+        INIT_COMPLETION(dsi.bta_completion);
+
+        dsi_vc_enable_bta_irq(channel);
+
+        r = dsi_vc_send_bta(channel);
+        if (r)
+                goto err;
+
+        if (wait_for_completion_timeout(&dsi.bta_completion,
+                                msecs_to_jiffies(500)) == 0) {
+                DSSERR("Failed to receive BTA\n");
+                r = -EIO;
+                goto err;
+        }
+
+        err = dsi_get_errors();
+        if (err) {
+                DSSERR("Error while sending BTA: %x\n", err);
+                r = -EIO;
+                goto err;
+        }
+err:
+        dsi_vc_disable_bta_irq(channel);
+
+        return r;
+}
+EXPORT_SYMBOL(dsi_vc_send_bta_sync);
+
+static inline void dsi_vc_write_long_header(int channel, u8 data_type,
+                u16 len, u8 ecc)
+{
+        u32 val;
+        u8 data_id;
+
+        WARN_ON(!dsi_bus_is_locked());
+
+        data_id = data_type | channel << 6;
+
+        val = FLD_VAL(data_id, 7, 0) | FLD_VAL(len, 23, 8) |
+                FLD_VAL(ecc, 31, 24);
+
+        dsi_write_reg(DSI_VC_LONG_PACKET_HEADER(channel), val);
+}
+
+static inline void dsi_vc_write_long_payload(int channel,
+                u8 b1, u8 b2, u8 b3, u8 b4)
+{
+        u32 val;
+
+        val = b4 << 24 | b3 << 16 | b2 << 8  | b1 << 0;
+
+/*      DSSDBG("\twriting %02x, %02x, %02x, %02x (%#010x)\n",
+                        b1, b2, b3, b4, val); */
+
+        dsi_write_reg(DSI_VC_LONG_PACKET_PAYLOAD(channel), val);
+}
+
+static int dsi_vc_send_long(int channel, u8 data_type, u8 *data, u16 len,
+                u8 ecc)
+{
+        /*u32 val; */
+        int i;
+        u8 *p;
+        int r = 0;
+        u8 b1, b2, b3, b4;
+
+        if (dsi.debug_write)
+                DSSDBG("dsi_vc_send_long, %d bytes\n", len);
+
+        /* len + header */
+        if (dsi.vc[channel].fifo_size * 32 * 4 < len + 4) {
+                DSSERR("unable to send long packet: packet too long.\n");
+                return -EINVAL;
+        }
+
+        dsi_vc_config_l4(channel);
+
+        dsi_vc_write_long_header(channel, data_type, len, ecc);
+
+        p = data;
+        for (i = 0; i < len >> 2; i++) {
+                if (dsi.debug_write)
+                        DSSDBG("\tsending full packet %d\n", i);
+
+                b1 = *p++;
+                b2 = *p++;
+                b3 = *p++;
+                b4 = *p++;
+
+                dsi_vc_write_long_payload(channel, b1, b2, b3, b4);
+        }
+
+        i = len % 4;
+        if (i) {
+                b1 = 0; b2 = 0; b3 = 0;
+
+                if (dsi.debug_write)
+                        DSSDBG("\tsending remainder bytes %d\n", i);
+
+                switch (i) {
+                case 3:
+                        b1 = *p++;
+                        b2 = *p++;
+                        b3 = *p++;
+                        break;
+                case 2:
+                        b1 = *p++;
+                        b2 = *p++;
+                        break;
+                case 1:
+                        b1 = *p++;
+                        break;
+                }
+
+                dsi_vc_write_long_payload(channel, b1, b2, b3, 0);
+        }
+
+        return r;
+}
+
+static int dsi_vc_send_short(int channel, u8 data_type, u16 data, u8 ecc)
+{
+        u32 r;
+        u8 data_id;
+
+        WARN_ON(!dsi_bus_is_locked());
+
+        if (dsi.debug_write)
+                DSSDBG("dsi_vc_send_short(ch%d, dt %#x, b1 %#x, b2 %#x)\n",
+                                channel,
+                                data_type, data & 0xff, (data >> 8) & 0xff);
+
+        dsi_vc_config_l4(channel);
+
+        if (FLD_GET(dsi_read_reg(DSI_VC_CTRL(channel)), 16, 16)) {
+                DSSERR("ERROR FIFO FULL, aborting transfer\n");
+                return -EINVAL;
+        }
+
+        data_id = data_type | channel << 6;
+
+        r = (data_id << 0) | (data << 8) | (ecc << 24);
+
+        dsi_write_reg(DSI_VC_SHORT_PACKET_HEADER(channel), r);
+
+        return 0;
+}
+
+int dsi_vc_send_null(int channel)
+{
+        u8 nullpkg[] = {0, 0, 0, 0};
+        return dsi_vc_send_long(channel, DSI_DT_NULL_PACKET, nullpkg, 4, 0);
+}
+EXPORT_SYMBOL(dsi_vc_send_null);
+
+int dsi_vc_dcs_write_nosync(int channel, u8 *data, int len)
+{
+        int r;
+
+        BUG_ON(len == 0);
+
+        if (len == 1) {
+                r = dsi_vc_send_short(channel, DSI_DT_DCS_SHORT_WRITE_0,
+                                data[0], 0);
+        } else if (len == 2) {
+                r = dsi_vc_send_short(channel, DSI_DT_DCS_SHORT_WRITE_1,
+                                data[0] | (data[1] << 8), 0);
+        } else {
+                /* 0x39 = DCS Long Write */
+                r = dsi_vc_send_long(channel, DSI_DT_DCS_LONG_WRITE,
+                                data, len, 0);
+        }
+
+        return r;
+}
+EXPORT_SYMBOL(dsi_vc_dcs_write_nosync);
+
+int dsi_vc_dcs_write(int channel, u8 *data, int len)
+{
+        int r;
+
+        r = dsi_vc_dcs_write_nosync(channel, data, len);
+        if (r)
+                goto err;
+
+        r = dsi_vc_send_bta_sync(channel);
+        if (r)
+                goto err;
+
+        return 0;
+err:
+        DSSERR("dsi_vc_dcs_write(ch %d, cmd 0x%02x, len %d) failed\n",
+                        channel, data[0], len);
+        return r;
+}
+EXPORT_SYMBOL(dsi_vc_dcs_write);
+
+int dsi_vc_dcs_write_0(int channel, u8 dcs_cmd)
+{
+        return dsi_vc_dcs_write(channel, &dcs_cmd, 1);
+}
+EXPORT_SYMBOL(dsi_vc_dcs_write_0);
+
+int dsi_vc_dcs_write_1(int channel, u8 dcs_cmd, u8 param)
+{
+        u8 buf[2];
+        buf[0] = dcs_cmd;
+        buf[1] = param;
+        return dsi_vc_dcs_write(channel, buf, 2);
+}
+EXPORT_SYMBOL(dsi_vc_dcs_write_1);
+
+int dsi_vc_dcs_read(int channel, u8 dcs_cmd, u8 *buf, int buflen)
+{
+        u32 val;
+        u8 dt;
+        int r;
+
+        if (dsi.debug_read)
+                DSSDBG("dsi_vc_dcs_read(ch%d, dcs_cmd %x)\n", channel, dcs_cmd);
+
+        r = dsi_vc_send_short(channel, DSI_DT_DCS_READ, dcs_cmd, 0);
+        if (r)
+                goto err;
+
+        r = dsi_vc_send_bta_sync(channel);
+        if (r)
+                goto err;
+
+        /* RX_FIFO_NOT_EMPTY */
+        if (REG_GET(DSI_VC_CTRL(channel), 20, 20) == 0) {
+                DSSERR("RX fifo empty when trying to read.\n");
+                r = -EIO;
+                goto err;
+        }
+
+        val = dsi_read_reg(DSI_VC_SHORT_PACKET_HEADER(channel));
+        if (dsi.debug_read)
+                DSSDBG("\theader: %08x\n", val);
+        dt = FLD_GET(val, 5, 0);
+        if (dt == DSI_DT_RX_ACK_WITH_ERR) {
+                u16 err = FLD_GET(val, 23, 8);
+                dsi_show_rx_ack_with_err(err);
+                r = -EIO;
+                goto err;
+
+        } else if (dt == DSI_DT_RX_SHORT_READ_1) {
+                u8 data = FLD_GET(val, 15, 8);
+                if (dsi.debug_read)
+                        DSSDBG("\tDCS short response, 1 byte: %02x\n", data);
+
+                if (buflen < 1) {
+                        r = -EIO;
+                        goto err;
+                }
+
+                buf[0] = data;
+
+                return 1;
+        } else if (dt == DSI_DT_RX_SHORT_READ_2) {
+                u16 data = FLD_GET(val, 23, 8);
+                if (dsi.debug_read)
+                        DSSDBG("\tDCS short response, 2 byte: %04x\n", data);
+
+                if (buflen < 2) {
+                        r = -EIO;
+                        goto err;
+                }
+
+                buf[0] = data & 0xff;
+                buf[1] = (data >> 8) & 0xff;
+
+                return 2;
+        } else if (dt == DSI_DT_RX_DCS_LONG_READ) {
+                int w;
+                int len = FLD_GET(val, 23, 8);
+                if (dsi.debug_read)
+                        DSSDBG("\tDCS long response, len %d\n", len);
+
+                if (len > buflen) {
+                        r = -EIO;
+                        goto err;
+                }
+
+                /* two byte checksum ends the packet, not included in len */
+                for (w = 0; w < len + 2;) {
+                        int b;
+                        val = dsi_read_reg(DSI_VC_SHORT_PACKET_HEADER(channel));
+                        if (dsi.debug_read)
+                                DSSDBG("\t\t%02x %02x %02x %02x\n",
+                                                (val >> 0) & 0xff,
+                                                (val >> 8) & 0xff,
+                                                (val >> 16) & 0xff,
+                                                (val >> 24) & 0xff);
+
+                        for (b = 0; b < 4; ++b) {
+                                if (w < len)
+                                        buf[w] = (val >> (b * 8)) & 0xff;
+                                /* we discard the 2 byte checksum */
+                                ++w;
+                        }
+                }
+
+                return len;
+        } else {
+                DSSERR("\tunknown datatype 0x%02x\n", dt);
+                r = -EIO;
+                goto err;
+        }
+
+        BUG();
+err:
+        DSSERR("dsi_vc_dcs_read(ch %d, cmd 0x%02x) failed\n",
+                        channel, dcs_cmd);
+        return r;
+
+}
+EXPORT_SYMBOL(dsi_vc_dcs_read);
+
+int dsi_vc_dcs_read_1(int channel, u8 dcs_cmd, u8 *data)
+{
+        int r;
+
+        r = dsi_vc_dcs_read(channel, dcs_cmd, data, 1);
+
+        if (r < 0)
+                return r;
+
+        if (r != 1)
+                return -EIO;
+
+        return 0;
+}
+EXPORT_SYMBOL(dsi_vc_dcs_read_1);
+
+int dsi_vc_dcs_read_2(int channel, u8 dcs_cmd, u16 *data)
+{
+        int r;
+
+        r = dsi_vc_dcs_read(channel, dcs_cmd, (u8 *)data, 2);
+
+        if (r < 0)
+                return r;
+
+        if (r != 2)
+                return -EIO;
+
+        return 0;
+}
+EXPORT_SYMBOL(dsi_vc_dcs_read_2);
+
+int dsi_vc_set_max_rx_packet_size(int channel, u16 len)
+{
+        int r;
+        r = dsi_vc_send_short(channel, DSI_DT_SET_MAX_RET_PKG_SIZE,
+                        len, 0);
+
+        if (r)
+                return r;
+
+        r = dsi_vc_send_bta_sync(channel);
+
+        return r;
+}
+EXPORT_SYMBOL(dsi_vc_set_max_rx_packet_size);
+
+static void dsi_set_lp_rx_timeout(unsigned long ns)
+{
+        u32 r;
+        unsigned x4, x16;
+        unsigned long fck;
+        unsigned long ticks;
+
+        /* ticks in DSI_FCK */
+
+        fck = dsi_fclk_rate();
+        ticks = (fck / 1000 / 1000) * ns / 1000;
+        x4 = 0;
+        x16 = 0;
+
+        if (ticks > 0x1fff) {
+                ticks = (fck / 1000 / 1000) * ns / 1000 / 4;
+                x4 = 1;
+                x16 = 0;
+        }
+
+        if (ticks > 0x1fff) {
+                ticks = (fck / 1000 / 1000) * ns / 1000 / 16;
+                x4 = 0;
+                x16 = 1;
+        }
+
+        if (ticks > 0x1fff) {
+                ticks = (fck / 1000 / 1000) * ns / 1000 / (4 * 16);
+                x4 = 1;
+                x16 = 1;
+        }
+
+        if (ticks > 0x1fff) {
+                DSSWARN("LP_TX_TO over limit, setting it to max\n");
+                ticks = 0x1fff;
+                x4 = 1;
+                x16 = 1;
+        }
+
+        r = dsi_read_reg(DSI_TIMING2);
+        r = FLD_MOD(r, 1, 15, 15);      /* LP_RX_TO */
+        r = FLD_MOD(r, x16, 14, 14);    /* LP_RX_TO_X16 */
+        r = FLD_MOD(r, x4, 13, 13);     /* LP_RX_TO_X4 */
+        r = FLD_MOD(r, ticks, 12, 0);   /* LP_RX_COUNTER */
+        dsi_write_reg(DSI_TIMING2, r);
+
+        DSSDBG("LP_RX_TO %lu ns (%#lx ticks%s%s)\n",
+                        (ticks * (x16 ? 16 : 1) * (x4 ? 4 : 1) * 1000) /
+                        (fck / 1000 / 1000),
+                        ticks, x4 ? " x4" : "", x16 ? " x16" : "");
+}
+
+static void dsi_set_ta_timeout(unsigned long ns)
+{
+        u32 r;
+        unsigned x8, x16;
+        unsigned long fck;
+        unsigned long ticks;
+
+        /* ticks in DSI_FCK */
+        fck = dsi_fclk_rate();
+        ticks = (fck / 1000 / 1000) * ns / 1000;
+        x8 = 0;
+        x16 = 0;
+
+        if (ticks > 0x1fff) {
+                ticks = (fck / 1000 / 1000) * ns / 1000 / 8;
+                x8 = 1;
+                x16 = 0;
+        }
+
+        if (ticks > 0x1fff) {
+                ticks = (fck / 1000 / 1000) * ns / 1000 / 16;
+                x8 = 0;
+                x16 = 1;
+        }
+
+        if (ticks > 0x1fff) {
+                ticks = (fck / 1000 / 1000) * ns / 1000 / (8 * 16);
+                x8 = 1;
+                x16 = 1;
+        }
+
+        if (ticks > 0x1fff) {
+                DSSWARN("TA_TO over limit, setting it to max\n");
+                ticks = 0x1fff;
+                x8 = 1;
+                x16 = 1;
+        }
+
+        r = dsi_read_reg(DSI_TIMING1);
+        r = FLD_MOD(r, 1, 31, 31);      /* TA_TO */
+        r = FLD_MOD(r, x16, 30, 30);    /* TA_TO_X16 */
+        r = FLD_MOD(r, x8, 29, 29);     /* TA_TO_X8 */
+        r = FLD_MOD(r, ticks, 28, 16);  /* TA_TO_COUNTER */
+        dsi_write_reg(DSI_TIMING1, r);
+
+        DSSDBG("TA_TO %lu ns (%#lx ticks%s%s)\n",
+                        (ticks * (x16 ? 16 : 1) * (x8 ? 8 : 1) * 1000) /
+                        (fck / 1000 / 1000),
+                        ticks, x8 ? " x8" : "", x16 ? " x16" : "");
+}
+
+static void dsi_set_stop_state_counter(unsigned long ns)
+{
+        u32 r;
+        unsigned x4, x16;
+        unsigned long fck;
+        unsigned long ticks;
+
+        /* ticks in DSI_FCK */
+
+        fck = dsi_fclk_rate();
+        ticks = (fck / 1000 / 1000) * ns / 1000;
+        x4 = 0;
+        x16 = 0;
+
+        if (ticks > 0x1fff) {
+                ticks = (fck / 1000 / 1000) * ns / 1000 / 4;
+                x4 = 1;
+                x16 = 0;
+        }
+
+        if (ticks > 0x1fff) {
+                ticks = (fck / 1000 / 1000) * ns / 1000 / 16;
+                x4 = 0;
+                x16 = 1;
+        }
+
+        if (ticks > 0x1fff) {
+                ticks = (fck / 1000 / 1000) * ns / 1000 / (4 * 16);
+                x4 = 1;
+                x16 = 1;
+        }
+
+        if (ticks > 0x1fff) {
+                DSSWARN("STOP_STATE_COUNTER_IO over limit, "
+                                "setting it to max\n");
+                ticks = 0x1fff;
+                x4 = 1;
+                x16 = 1;
+        }
+
+        r = dsi_read_reg(DSI_TIMING1);
+        r = FLD_MOD(r, 1, 15, 15);      /* FORCE_TX_STOP_MODE_IO */
+        r = FLD_MOD(r, x16, 14, 14);    /* STOP_STATE_X16_IO */
+        r = FLD_MOD(r, x4, 13, 13);     /* STOP_STATE_X4_IO */
+        r = FLD_MOD(r, ticks, 12, 0);   /* STOP_STATE_COUNTER_IO */
+        dsi_write_reg(DSI_TIMING1, r);
+
+        DSSDBG("STOP_STATE_COUNTER %lu ns (%#lx ticks%s%s)\n",
+                        (ticks * (x16 ? 16 : 1) * (x4 ? 4 : 1) * 1000) /
+                        (fck / 1000 / 1000),
+                        ticks, x4 ? " x4" : "", x16 ? " x16" : "");
+}
+
+static void dsi_set_hs_tx_timeout(unsigned long ns)
+{
+        u32 r;
+        unsigned x4, x16;
+        unsigned long fck;
+        unsigned long ticks;
+
+        /* ticks in TxByteClkHS */
+
+        fck = dsi_get_txbyteclkhs();
+        ticks = (fck / 1000 / 1000) * ns / 1000;
+        x4 = 0;
+        x16 = 0;
+
+        if (ticks > 0x1fff) {
+                ticks = (fck / 1000 / 1000) * ns / 1000 / 4;
+                x4 = 1;
+                x16 = 0;
+        }
+
+        if (ticks > 0x1fff) {
+                ticks = (fck / 1000 / 1000) * ns / 1000 / 16;
+                x4 = 0;
+                x16 = 1;
+        }
+
+        if (ticks > 0x1fff) {
+                ticks = (fck / 1000 / 1000) * ns / 1000 / (4 * 16);
+                x4 = 1;
+                x16 = 1;
+        }
+
+        if (ticks > 0x1fff) {
+                DSSWARN("HS_TX_TO over limit, setting it to max\n");
+                ticks = 0x1fff;
+                x4 = 1;
+                x16 = 1;
+        }
+
+        r = dsi_read_reg(DSI_TIMING2);
+        r = FLD_MOD(r, 1, 31, 31);      /* HS_TX_TO */
+        r = FLD_MOD(r, x16, 30, 30);    /* HS_TX_TO_X16 */
+        r = FLD_MOD(r, x4, 29, 29);     /* HS_TX_TO_X8 (4 really) */
+        r = FLD_MOD(r, ticks, 28, 16);  /* HS_TX_TO_COUNTER */
+        dsi_write_reg(DSI_TIMING2, r);
+
+        DSSDBG("HS_TX_TO %lu ns (%#lx ticks%s%s)\n",
+                        (ticks * (x16 ? 16 : 1) * (x4 ? 4 : 1) * 1000) /
+                        (fck / 1000 / 1000),
+                        ticks, x4 ? " x4" : "", x16 ? " x16" : "");
+}
+static int dsi_proto_config(struct omap_dss_device *dssdev)
+{
+        u32 r;
+        int buswidth = 0;
+
+        dsi_config_tx_fifo(DSI_FIFO_SIZE_32,
+                        DSI_FIFO_SIZE_32,
+                        DSI_FIFO_SIZE_32,
+                        DSI_FIFO_SIZE_32);
+
+        dsi_config_rx_fifo(DSI_FIFO_SIZE_32,
+                        DSI_FIFO_SIZE_32,
+                        DSI_FIFO_SIZE_32,
+                        DSI_FIFO_SIZE_32);
+
+        /* XXX what values for the timeouts? */
+        dsi_set_stop_state_counter(1000);
+        dsi_set_ta_timeout(6400000);
+        dsi_set_lp_rx_timeout(48000);
+        dsi_set_hs_tx_timeout(1000000);
+
+        switch (dssdev->ctrl.pixel_size) {
+        case 16:
+                buswidth = 0;
+                break;
+        case 18:
+                buswidth = 1;
+                break;
+        case 24:
+                buswidth = 2;
+                break;
+        default:
+                BUG();
+        }
+
+        r = dsi_read_reg(DSI_CTRL);
+        r = FLD_MOD(r, 1, 1, 1);        /* CS_RX_EN */
+        r = FLD_MOD(r, 1, 2, 2);        /* ECC_RX_EN */
+        r = FLD_MOD(r, 1, 3, 3);        /* TX_FIFO_ARBITRATION */
+        r = FLD_MOD(r, 1, 4, 4);        /* VP_CLK_RATIO, always 1, see errata*/
+        r = FLD_MOD(r, buswidth, 7, 6); /* VP_DATA_BUS_WIDTH */
+        r = FLD_MOD(r, 0, 8, 8);        /* VP_CLK_POL */
+        r = FLD_MOD(r, 2, 13, 12);      /* LINE_BUFFER, 2 lines */
+        r = FLD_MOD(r, 1, 14, 14);      /* TRIGGER_RESET_MODE */
+        r = FLD_MOD(r, 1, 19, 19);      /* EOT_ENABLE */
+        r = FLD_MOD(r, 1, 24, 24);      /* DCS_CMD_ENABLE */
+        r = FLD_MOD(r, 0, 25, 25);      /* DCS_CMD_CODE, 1=start, 0=continue */
+
+        dsi_write_reg(DSI_CTRL, r);
+
+        dsi_vc_initial_config(0);
+        dsi_vc_initial_config(1);
+        dsi_vc_initial_config(2);
+        dsi_vc_initial_config(3);
+
+        return 0;
+}
+
+static void dsi_proto_timings(struct omap_dss_device *dssdev)
+{
+        unsigned tlpx, tclk_zero, tclk_prepare, tclk_trail;
+        unsigned tclk_pre, tclk_post;
+        unsigned ths_prepare, ths_prepare_ths_zero, ths_zero;
+        unsigned ths_trail, ths_exit;
+        unsigned ddr_clk_pre, ddr_clk_post;
+        unsigned enter_hs_mode_lat, exit_hs_mode_lat;
+        unsigned ths_eot;
+        u32 r;
+
+        r = dsi_read_reg(DSI_DSIPHY_CFG0);
+        ths_prepare = FLD_GET(r, 31, 24);
+        ths_prepare_ths_zero = FLD_GET(r, 23, 16);
+        ths_zero = ths_prepare_ths_zero - ths_prepare;
+        ths_trail = FLD_GET(r, 15, 8);
+        ths_exit = FLD_GET(r, 7, 0);
+
+        r = dsi_read_reg(DSI_DSIPHY_CFG1);
+        tlpx = FLD_GET(r, 22, 16) * 2;
+        tclk_trail = FLD_GET(r, 15, 8);
+        tclk_zero = FLD_GET(r, 7, 0);
+
+        r = dsi_read_reg(DSI_DSIPHY_CFG2);
+        tclk_prepare = FLD_GET(r, 7, 0);
+
+        /* min 8*UI */
+        tclk_pre = 20;
+        /* min 60ns + 52*UI */
+        tclk_post = ns2ddr(60) + 26;
+
+        /* ths_eot is 2 for 2 datalanes and 4 for 1 datalane */
+        if (dssdev->phy.dsi.data1_lane != 0 &&
+                        dssdev->phy.dsi.data2_lane != 0)
+                ths_eot = 2;
+        else
+                ths_eot = 4;
+
+        ddr_clk_pre = DIV_ROUND_UP(tclk_pre + tlpx + tclk_zero + tclk_prepare,
+                        4);
+        ddr_clk_post = DIV_ROUND_UP(tclk_post + ths_trail, 4) + ths_eot;
+
+        BUG_ON(ddr_clk_pre == 0 || ddr_clk_pre > 255);
+        BUG_ON(ddr_clk_post == 0 || ddr_clk_post > 255);
+
+        r = dsi_read_reg(DSI_CLK_TIMING);
+        r = FLD_MOD(r, ddr_clk_pre, 15, 8);
+        r = FLD_MOD(r, ddr_clk_post, 7, 0);
+        dsi_write_reg(DSI_CLK_TIMING, r);
+
+        DSSDBG("ddr_clk_pre %u, ddr_clk_post %u\n",
+                        ddr_clk_pre,
+                        ddr_clk_post);
+
+        enter_hs_mode_lat = 1 + DIV_ROUND_UP(tlpx, 4) +
+                DIV_ROUND_UP(ths_prepare, 4) +
+                DIV_ROUND_UP(ths_zero + 3, 4);
+
+        exit_hs_mode_lat = DIV_ROUND_UP(ths_trail + ths_exit, 4) + 1 + ths_eot;
+
+        r = FLD_VAL(enter_hs_mode_lat, 31, 16) |
+                FLD_VAL(exit_hs_mode_lat, 15, 0);
+        dsi_write_reg(DSI_VM_TIMING7, r);
+
+        DSSDBG("enter_hs_mode_lat %u, exit_hs_mode_lat %u\n",
+                        enter_hs_mode_lat, exit_hs_mode_lat);
+}
+
+
+#define DSI_DECL_VARS \
+        int __dsi_cb = 0; u32 __dsi_cv = 0;
+
+#define DSI_FLUSH(ch) \
+        if (__dsi_cb > 0) { \
+                /*DSSDBG("sending long packet %#010x\n", __dsi_cv);*/ \
+                dsi_write_reg(DSI_VC_LONG_PACKET_PAYLOAD(ch), __dsi_cv); \
+                __dsi_cb = __dsi_cv = 0; \
+        }
+
+#define DSI_PUSH(ch, data) \
+        do { \
+                __dsi_cv |= (data) << (__dsi_cb * 8); \
+                /*DSSDBG("cv = %#010x, cb = %d\n", __dsi_cv, __dsi_cb);*/ \
+                if (++__dsi_cb > 3) \
+                        DSI_FLUSH(ch); \
+        } while (0)
+
+static int dsi_update_screen_l4(struct omap_dss_device *dssdev,
+                        int x, int y, int w, int h)
+{
+        /* Note: supports only 24bit colors in 32bit container */
+        int first = 1;
+        int fifo_stalls = 0;
+        int max_dsi_packet_size;
+        int max_data_per_packet;
+        int max_pixels_per_packet;
+        int pixels_left;
+        int bytespp = dssdev->ctrl.pixel_size / 8;
+        int scr_width;
+        u32 __iomem *data;
+        int start_offset;
+        int horiz_inc;
+        int current_x;
+        struct omap_overlay *ovl;
+
+        debug_irq = 0;
+
+        DSSDBG("dsi_update_screen_l4 (%d,%d %dx%d)\n",
+                        x, y, w, h);
+
+        ovl = dssdev->manager->overlays[0];
+
+        if (ovl->info.color_mode != OMAP_DSS_COLOR_RGB24U)
+                return -EINVAL;
+
+        if (dssdev->ctrl.pixel_size != 24)
+                return -EINVAL;
+
+        scr_width = ovl->info.screen_width;
+        data = ovl->info.vaddr;
+
+        start_offset = scr_width * y + x;
+        horiz_inc = scr_width - w;
+        current_x = x;
+
+        /* We need header(4) + DCSCMD(1) + pixels(numpix*bytespp) bytes
+         * in fifo */
+
+        /* When using CPU, max long packet size is TX buffer size */
+        max_dsi_packet_size = dsi.vc[0].fifo_size * 32 * 4;
+
+        /* we seem to get better perf if we divide the tx fifo to half,
+           and while the other half is being sent, we fill the other half
+           max_dsi_packet_size /= 2; */
+
+        max_data_per_packet = max_dsi_packet_size - 4 - 1;
+
+        max_pixels_per_packet = max_data_per_packet / bytespp;
+
+        DSSDBG("max_pixels_per_packet %d\n", max_pixels_per_packet);
+
+        pixels_left = w * h;
+
+        DSSDBG("total pixels %d\n", pixels_left);
+
+        data += start_offset;
+
+        while (pixels_left > 0) {
+                /* 0x2c = write_memory_start */
+                /* 0x3c = write_memory_continue */
+                u8 dcs_cmd = first ? 0x2c : 0x3c;
+                int pixels;
+                DSI_DECL_VARS;
+                first = 0;
+
+#if 1
+                /* using fifo not empty */
+                /* TX_FIFO_NOT_EMPTY */
+                while (FLD_GET(dsi_read_reg(DSI_VC_CTRL(0)), 5, 5)) {
+                        fifo_stalls++;
+                        if (fifo_stalls > 0xfffff) {
+                                DSSERR("fifo stalls overflow, pixels left %d\n",
+                                                pixels_left);
+                                dsi_if_enable(0);
+                                return -EIO;
+                        }
+                        udelay(1);
+                }
+#elif 1
+                /* using fifo emptiness */
+                while ((REG_GET(DSI_TX_FIFO_VC_EMPTINESS, 7, 0)+1)*4 <
+                                max_dsi_packet_size) {
+                        fifo_stalls++;
+                        if (fifo_stalls > 0xfffff) {
+                                DSSERR("fifo stalls overflow, pixels left %d\n",
+                                               pixels_left);
+                                dsi_if_enable(0);
+                                return -EIO;
+                        }
+                }
+#else
+                while ((REG_GET(DSI_TX_FIFO_VC_EMPTINESS, 7, 0)+1)*4 == 0) {
+                        fifo_stalls++;
+                        if (fifo_stalls > 0xfffff) {
+                                DSSERR("fifo stalls overflow, pixels left %d\n",
+                                               pixels_left);
+                                dsi_if_enable(0);
+                                return -EIO;
+                        }
+                }
+#endif
+                pixels = min(max_pixels_per_packet, pixels_left);
+
+                pixels_left -= pixels;
+
+                dsi_vc_write_long_header(0, DSI_DT_DCS_LONG_WRITE,
+                                1 + pixels * bytespp, 0);
+
+                DSI_PUSH(0, dcs_cmd);
+
+                while (pixels-- > 0) {
+                        u32 pix = __raw_readl(data++);
+
+                        DSI_PUSH(0, (pix >> 16) & 0xff);
+                        DSI_PUSH(0, (pix >> 8) & 0xff);
+                        DSI_PUSH(0, (pix >> 0) & 0xff);
+
+                        current_x++;
+                        if (current_x == x+w) {
+                                current_x = x;
+                                data += horiz_inc;
+                        }
+                }
+
+                DSI_FLUSH(0);
+        }
+
+        return 0;
+}
+
+static void dsi_update_screen_dispc(struct omap_dss_device *dssdev,
+                u16 x, u16 y, u16 w, u16 h)
+{
+        unsigned bytespp;
+        unsigned bytespl;
+        unsigned bytespf;
+        unsigned total_len;
+        unsigned packet_payload;
+        unsigned packet_len;
+        u32 l;
+        const unsigned channel = dsi.update_channel;
+        /* line buffer is 1024 x 24bits */
+        /* XXX: for some reason using full buffer size causes considerable TX
+         * slowdown with update sizes that fill the whole buffer */
+        const unsigned line_buf_size = 1023 * 3;
+
+        DSSDBG("dsi_update_screen_dispc(%d,%d %dx%d)\n",
+                        x, y, w, h);
+
+        dsi_vc_config_vp(channel);
+
+        bytespp = dssdev->ctrl.pixel_size / 8;
+        bytespl = w * bytespp;
+        bytespf = bytespl * h;
+
+        /* NOTE: packet_payload has to be equal to N * bytespl, where N is
+         * number of lines in a packet.  See errata about VP_CLK_RATIO */
+
+        if (bytespf < line_buf_size)
+                packet_payload = bytespf;
+        else
+                packet_payload = (line_buf_size) / bytespl * bytespl;
+
+        packet_len = packet_payload + 1;        /* 1 byte for DCS cmd */
+        total_len = (bytespf / packet_payload) * packet_len;
+
+        if (bytespf % packet_payload)
+                total_len += (bytespf % packet_payload) + 1;
+
+        l = FLD_VAL(total_len, 23, 0); /* TE_SIZE */
+        dsi_write_reg(DSI_VC_TE(channel), l);
+
+        dsi_vc_write_long_header(channel, DSI_DT_DCS_LONG_WRITE, packet_len, 0);
+
+        if (dsi.te_enabled)
+                l = FLD_MOD(l, 1, 30, 30); /* TE_EN */
+        else
+                l = FLD_MOD(l, 1, 31, 31); /* TE_START */
+        dsi_write_reg(DSI_VC_TE(channel), l);
+
+        /* We put SIDLEMODE to no-idle for the duration of the transfer,
+         * because DSS interrupts are not capable of waking up the CPU and the
+         * framedone interrupt could be delayed for quite a long time. I think
+         * the same goes for any DSS interrupts, but for some reason I have not
+         * seen the problem anywhere else than here.
+         */
+        dispc_disable_sidle();
+
+        dsi_perf_mark_start();
+
+        schedule_delayed_work(&dsi.framedone_timeout_work,
+                        msecs_to_jiffies(250));
+
+        dss_start_update(dssdev);
+
+        if (dsi.te_enabled) {
+                /* disable LP_RX_TO, so that we can receive TE.  Time to wait
+                 * for TE is longer than the timer allows */
+                REG_FLD_MOD(DSI_TIMING2, 0, 15, 15); /* LP_RX_TO */
+
+                dsi_vc_send_bta(channel);
+
+#ifdef DSI_CATCH_MISSING_TE
+                mod_timer(&dsi.te_timer, jiffies + msecs_to_jiffies(250));
+#endif
+        }
+}
+
+#ifdef DSI_CATCH_MISSING_TE
+static void dsi_te_timeout(unsigned long arg)
+{
+        DSSERR("TE not received for 250ms!\n");
+}
+#endif
+
+static void dsi_framedone_timeout_work_callback(struct work_struct *work)
+{
+        int r;
+        const int channel = dsi.update_channel;
+
+        DSSERR("Framedone not received for 250ms!\n");
+
+        /* SIDLEMODE back to smart-idle */
+        dispc_enable_sidle();
+
+        if (dsi.te_enabled) {
+                /* enable LP_RX_TO again after the TE */
+                REG_FLD_MOD(DSI_TIMING2, 1, 15, 15); /* LP_RX_TO */
+        }
+
+        /* Send BTA after the frame. We need this for the TE to work, as TE
+         * trigger is only sent for BTAs without preceding packet. Thus we need
+         * to BTA after the pixel packets so that next BTA will cause TE
+         * trigger.
+         *
+         * This is not needed when TE is not in use, but we do it anyway to
+         * make sure that the transfer has been completed. It would be more
+         * optimal, but more complex, to wait only just before starting next
+         * transfer. */
+        r = dsi_vc_send_bta_sync(channel);
+        if (r)
+                DSSERR("BTA after framedone failed\n");
+
+        /* RX_FIFO_NOT_EMPTY */
+        if (REG_GET(DSI_VC_CTRL(channel), 20, 20)) {
+                DSSERR("Received error during frame transfer:\n");
+                dsi_vc_flush_receive_data(channel);
+        }
+
+        dsi.framedone_callback(-ETIMEDOUT, dsi.framedone_data);
+}
+
+static void dsi_framedone_irq_callback(void *data, u32 mask)
+{
+        /* Note: We get FRAMEDONE when DISPC has finished sending pixels and
+         * turns itself off. However, DSI still has the pixels in its buffers,
+         * and is sending the data.
+         */
+
+        /* SIDLEMODE back to smart-idle */
+        dispc_enable_sidle();
+
+        schedule_work(&dsi.framedone_work);
+}
+
+static void dsi_handle_framedone(void)
+{
+        int r;
+        const int channel = dsi.update_channel;
+
+        DSSDBG("FRAMEDONE\n");
+
+        if (dsi.te_enabled) {
+                /* enable LP_RX_TO again after the TE */
+                REG_FLD_MOD(DSI_TIMING2, 1, 15, 15); /* LP_RX_TO */
+        }
+
+        /* Send BTA after the frame. We need this for the TE to work, as TE
+         * trigger is only sent for BTAs without preceding packet. Thus we need
+         * to BTA after the pixel packets so that next BTA will cause TE
+         * trigger.
+         *
+         * This is not needed when TE is not in use, but we do it anyway to
+         * make sure that the transfer has been completed. It would be more
+         * optimal, but more complex, to wait only just before starting next
+         * transfer. */
+        r = dsi_vc_send_bta_sync(channel);
+        if (r)
+                DSSERR("BTA after framedone failed\n");
+
+        /* RX_FIFO_NOT_EMPTY */
+        if (REG_GET(DSI_VC_CTRL(channel), 20, 20)) {
+                DSSERR("Received error during frame transfer:\n");
+                dsi_vc_flush_receive_data(channel);
+        }
+
+#ifdef CONFIG_OMAP2_DSS_FAKE_VSYNC
+        dispc_fake_vsync_irq();
+#endif
+}
+
+static void dsi_framedone_work_callback(struct work_struct *work)
+{
+        DSSDBGF();
+
+        cancel_delayed_work_sync(&dsi.framedone_timeout_work);
+
+        dsi_handle_framedone();
+
+        dsi_perf_show("DISPC");
+
+        dsi.framedone_callback(0, dsi.framedone_data);
+}
+
+int omap_dsi_prepare_update(struct omap_dss_device *dssdev,
+                                    u16 *x, u16 *y, u16 *w, u16 *h)
+{
+        u16 dw, dh;
+
+        dssdev->driver->get_resolution(dssdev, &dw, &dh);
+
+        if  (*x > dw || *y > dh)
+                return -EINVAL;
+
+        if (*x + *w > dw)
+                return -EINVAL;
+
+        if (*y + *h > dh)
+                return -EINVAL;
+
+        if (*w == 1)
+                return -EINVAL;
+
+        if (*w == 0 || *h == 0)
+                return -EINVAL;
+
+        dsi_perf_mark_setup();
+
+        if (dssdev->manager->caps & OMAP_DSS_OVL_MGR_CAP_DISPC) {
+                dss_setup_partial_planes(dssdev, x, y, w, h);
+                dispc_set_lcd_size(*w, *h);
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL(omap_dsi_prepare_update);
+
+int omap_dsi_update(struct omap_dss_device *dssdev,
+                int channel,
+                u16 x, u16 y, u16 w, u16 h,
+                void (*callback)(int, void *), void *data)
+{
+        dsi.update_channel = channel;
+
+        if (dssdev->manager->caps & OMAP_DSS_OVL_MGR_CAP_DISPC) {
+                dsi.framedone_callback = callback;
+                dsi.framedone_data = data;
+
+                dsi.update_region.x = x;
+                dsi.update_region.y = y;
+                dsi.update_region.w = w;
+                dsi.update_region.h = h;
+                dsi.update_region.device = dssdev;
+
+                dsi_update_screen_dispc(dssdev, x, y, w, h);
+        } else {
+                dsi_update_screen_l4(dssdev, x, y, w, h);
+                dsi_perf_show("L4");
+                callback(0, data);
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL(omap_dsi_update);
+
+/* Display funcs */
+
+static int dsi_display_init_dispc(struct omap_dss_device *dssdev)
+{
+        int r;
+
+        r = omap_dispc_register_isr(dsi_framedone_irq_callback, NULL,
+                        DISPC_IRQ_FRAMEDONE);
+        if (r) {
+                DSSERR("can't get FRAMEDONE irq\n");
+                return r;
+        }
+
+        dispc_set_lcd_display_type(OMAP_DSS_LCD_DISPLAY_TFT);
+
+        dispc_set_parallel_interface_mode(OMAP_DSS_PARALLELMODE_DSI);
+        dispc_enable_fifohandcheck(1);
+
+        dispc_set_tft_data_lines(dssdev->ctrl.pixel_size);
+
+        {
+                struct omap_video_timings timings = {
+                        .hsw            = 1,
+                        .hfp            = 1,
+                        .hbp            = 1,
+                        .vsw            = 1,
+                        .vfp            = 0,
+                        .vbp            = 0,
+                };
+
+                dispc_set_lcd_timings(&timings);
+        }
+
+        return 0;
+}
+
+static void dsi_display_uninit_dispc(struct omap_dss_device *dssdev)
+{
+        omap_dispc_unregister_isr(dsi_framedone_irq_callback, NULL,
+                        DISPC_IRQ_FRAMEDONE);
+}
+
+static int dsi_configure_dsi_clocks(struct omap_dss_device *dssdev)
+{
+        struct dsi_clock_info cinfo;
+        int r;
+
+        /* we always use DSS2_FCK as input clock */
+        cinfo.use_dss2_fck = true;
+        cinfo.regn  = dssdev->phy.dsi.div.regn;
+        cinfo.regm  = dssdev->phy.dsi.div.regm;
+        cinfo.regm3 = dssdev->phy.dsi.div.regm3;
+        cinfo.regm4 = dssdev->phy.dsi.div.regm4;
+        r = dsi_calc_clock_rates(&cinfo);
+        if (r)
+                return r;
+
+        r = dsi_pll_set_clock_div(&cinfo);
+        if (r) {
+                DSSERR("Failed to set dsi clocks\n");
+                return r;
+        }
+
+        return 0;
+}
+
+static int dsi_configure_dispc_clocks(struct omap_dss_device *dssdev)
+{
+        struct dispc_clock_info dispc_cinfo;
+        int r;
+        unsigned long long fck;
+
+        fck = dsi_get_dsi1_pll_rate();
+
+        dispc_cinfo.lck_div = dssdev->phy.dsi.div.lck_div;
+        dispc_cinfo.pck_div = dssdev->phy.dsi.div.pck_div;
+
+        r = dispc_calc_clock_rates(fck, &dispc_cinfo);
+        if (r) {
+                DSSERR("Failed to calc dispc clocks\n");
+                return r;
+        }
+
+        r = dispc_set_clock_div(&dispc_cinfo);
+        if (r) {
+                DSSERR("Failed to set dispc clocks\n");
+                return r;
+        }
+
+        return 0;
+}
+
+static int dsi_display_init_dsi(struct omap_dss_device *dssdev)
+{
+        int r;
+
+        _dsi_print_reset_status();
+
+        r = dsi_pll_init(dssdev, true, true);
+        if (r)
+                goto err0;
+
+        r = dsi_configure_dsi_clocks(dssdev);
+        if (r)
+                goto err1;
+
+        dss_select_dispc_clk_source(DSS_SRC_DSI1_PLL_FCLK);
+        dss_select_dsi_clk_source(DSS_SRC_DSI2_PLL_FCLK);
+
+        DSSDBG("PLL OK\n");
+
+        r = dsi_configure_dispc_clocks(dssdev);
+        if (r)
+                goto err2;
+
+        r = dsi_complexio_init(dssdev);
+        if (r)
+                goto err2;
+
+        _dsi_print_reset_status();
+
+        dsi_proto_timings(dssdev);
+        dsi_set_lp_clk_divisor(dssdev);
+
+        if (1)
+                _dsi_print_reset_status();
+
+        r = dsi_proto_config(dssdev);
+        if (r)
+                goto err3;
+
+        /* enable interface */
+        dsi_vc_enable(0, 1);
+        dsi_vc_enable(1, 1);
+        dsi_vc_enable(2, 1);
+        dsi_vc_enable(3, 1);
+        dsi_if_enable(1);
+        dsi_force_tx_stop_mode_io();
+
+        return 0;
+err3:
+        dsi_complexio_uninit();
+err2:
+        dss_select_dispc_clk_source(DSS_SRC_DSS1_ALWON_FCLK);
+        dss_select_dsi_clk_source(DSS_SRC_DSS1_ALWON_FCLK);
+err1:
+        dsi_pll_uninit();
+err0:
+        return r;
+}
+
+static void dsi_display_uninit_dsi(struct omap_dss_device *dssdev)
+{
+        dss_select_dispc_clk_source(DSS_SRC_DSS1_ALWON_FCLK);
+        dss_select_dsi_clk_source(DSS_SRC_DSS1_ALWON_FCLK);
+        dsi_complexio_uninit();
+        dsi_pll_uninit();
+}
+
+static int dsi_core_init(void)
+{
+        /* Autoidle */
+        REG_FLD_MOD(DSI_SYSCONFIG, 1, 0, 0);
+
+        /* ENWAKEUP */
+        REG_FLD_MOD(DSI_SYSCONFIG, 1, 2, 2);
+
+        /* SIDLEMODE smart-idle */
+        REG_FLD_MOD(DSI_SYSCONFIG, 2, 4, 3);
+
+        _dsi_initialize_irq();
+
+        return 0;
+}
+
+int omapdss_dsi_display_enable(struct omap_dss_device *dssdev)
+{
+        int r = 0;
+
+        DSSDBG("dsi_display_enable\n");
+
+        WARN_ON(!dsi_bus_is_locked());
+
+        mutex_lock(&dsi.lock);
+
+        r = omap_dss_start_device(dssdev);
+        if (r) {
+                DSSERR("failed to start device\n");
+                goto err0;
+        }
+
+        enable_clocks(1);
+        dsi_enable_pll_clock(1);
+
+        r = _dsi_reset();
+        if (r)
+                goto err1;
+
+        dsi_core_init();
+
+        r = dsi_display_init_dispc(dssdev);
+        if (r)
+                goto err1;
+
+        r = dsi_display_init_dsi(dssdev);
+        if (r)
+                goto err2;
+
+        mutex_unlock(&dsi.lock);
+
+        return 0;
+
+err2:
+        dsi_display_uninit_dispc(dssdev);
+err1:
+        enable_clocks(0);
+        dsi_enable_pll_clock(0);
+        omap_dss_stop_device(dssdev);
+err0:
+        mutex_unlock(&dsi.lock);
+        DSSDBG("dsi_display_enable FAILED\n");
+        return r;
+}
+EXPORT_SYMBOL(omapdss_dsi_display_enable);
+
+void omapdss_dsi_display_disable(struct omap_dss_device *dssdev)
+{
+        DSSDBG("dsi_display_disable\n");
+
+        WARN_ON(!dsi_bus_is_locked());
+
+        mutex_lock(&dsi.lock);
+
+        dsi_display_uninit_dispc(dssdev);
+
+        dsi_display_uninit_dsi(dssdev);
+
+        enable_clocks(0);
+        dsi_enable_pll_clock(0);
+
+        omap_dss_stop_device(dssdev);
+
+        mutex_unlock(&dsi.lock);
+}
+EXPORT_SYMBOL(omapdss_dsi_display_disable);
+
+int omapdss_dsi_enable_te(struct omap_dss_device *dssdev, bool enable)
+{
+        dsi.te_enabled = enable;
+        return 0;
+}
+EXPORT_SYMBOL(omapdss_dsi_enable_te);
+
+void dsi_get_overlay_fifo_thresholds(enum omap_plane plane,
+                u32 fifo_size, enum omap_burst_size *burst_size,
+                u32 *fifo_low, u32 *fifo_high)
+{
+        unsigned burst_size_bytes;
+
+        *burst_size = OMAP_DSS_BURST_16x32;
+        burst_size_bytes = 16 * 32 / 8;
+
+        *fifo_high = fifo_size - burst_size_bytes;
+        *fifo_low = fifo_size - burst_size_bytes * 8;
+}
+
+int dsi_init_display(struct omap_dss_device *dssdev)
+{
+        DSSDBG("DSI init\n");
+
+        /* XXX these should be figured out dynamically */
+        dssdev->caps = OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE |
+                OMAP_DSS_DISPLAY_CAP_TEAR_ELIM;
+
+        dsi.vc[0].dssdev = dssdev;
+        dsi.vc[1].dssdev = dssdev;
+
+        return 0;
+}
+
+int dsi_init(struct platform_device *pdev)
+{
+        u32 rev;
+        int r;
+
+        spin_lock_init(&dsi.errors_lock);
+        dsi.errors = 0;
+
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+        spin_lock_init(&dsi.irq_stats_lock);
+        dsi.irq_stats.last_reset = jiffies;
+#endif
+
+        init_completion(&dsi.bta_completion);
+
+        mutex_init(&dsi.lock);
+        sema_init(&dsi.bus_lock, 1);
+
+        INIT_WORK(&dsi.framedone_work, dsi_framedone_work_callback);
+        INIT_DELAYED_WORK_DEFERRABLE(&dsi.framedone_timeout_work,
+                        dsi_framedone_timeout_work_callback);
+
+#ifdef DSI_CATCH_MISSING_TE
+        init_timer(&dsi.te_timer);
+        dsi.te_timer.function = dsi_te_timeout;
+        dsi.te_timer.data = 0;
+#endif
+        dsi.base = ioremap(DSI_BASE, DSI_SZ_REGS);
+        if (!dsi.base) {
+                DSSERR("can't ioremap DSI\n");
+                r = -ENOMEM;
+                goto err1;
+        }
+
+        dsi.vdds_dsi_reg = dss_get_vdds_dsi();
+        if (IS_ERR(dsi.vdds_dsi_reg)) {
+                iounmap(dsi.base);
+                DSSERR("can't get VDDS_DSI regulator\n");
+                r = PTR_ERR(dsi.vdds_dsi_reg);
+                goto err2;
+        }
+
+        enable_clocks(1);
+
+        rev = dsi_read_reg(DSI_REVISION);
+        printk(KERN_INFO "OMAP DSI rev %d.%d\n",
+               FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0));
+
+        enable_clocks(0);
+
+        return 0;
+err2:
+        iounmap(dsi.base);
+err1:
+        return r;
+}
+
+void dsi_exit(void)
+{
+        iounmap(dsi.base);
+
+        DSSDBG("omap_dsi_exit\n");
+}
+
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
new file mode 100644
index 000000000000..54344184dd73
--- /dev/null
+++ b/drivers/video/omap2/dss/dss.c
@@ -0,0 +1,621 @@
+/*
+ * linux/drivers/video/omap2/dss/dss.c
+ *
+ * Copyright (C) 2009 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * Some code and ideas taken from drivers/video/omap/ driver
+ * by Imre Deak.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define DSS_SUBSYS_NAME "DSS"
+
+#include <linux/kernel.h>
+#include <linux/io.h>
+#include <linux/err.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/seq_file.h>
+#include <linux/clk.h>
+
+#include <plat/display.h>
+#include "dss.h"
+
+#define DSS_BASE                        0x48050000
+
+#define DSS_SZ_REGS                     SZ_512
+
+struct dss_reg {
+        u16 idx;
+};
+
+#define DSS_REG(idx)                    ((const struct dss_reg) { idx })
+
+#define DSS_REVISION                    DSS_REG(0x0000)
+#define DSS_SYSCONFIG                   DSS_REG(0x0010)
+#define DSS_SYSSTATUS                   DSS_REG(0x0014)
+#define DSS_IRQSTATUS                   DSS_REG(0x0018)
+#define DSS_CONTROL                     DSS_REG(0x0040)
+#define DSS_SDI_CONTROL                 DSS_REG(0x0044)
+#define DSS_PLL_CONTROL                 DSS_REG(0x0048)
+#define DSS_SDI_STATUS                  DSS_REG(0x005C)
+
+#define REG_GET(idx, start, end) \
+        FLD_GET(dss_read_reg(idx), start, end)
+
+#define REG_FLD_MOD(idx, val, start, end) \
+        dss_write_reg(idx, FLD_MOD(dss_read_reg(idx), val, start, end))
+
+static struct {
+        void __iomem    *base;
+
+        struct clk      *dpll4_m4_ck;
+
+        unsigned long   cache_req_pck;
+        unsigned long   cache_prate;
+        struct dss_clock_info cache_dss_cinfo;
+        struct dispc_clock_info cache_dispc_cinfo;
+
+        enum dss_clk_source dsi_clk_source;
+        enum dss_clk_source dispc_clk_source;
+
+        u32             ctx[DSS_SZ_REGS / sizeof(u32)];
+} dss;
+
+static int _omap_dss_wait_reset(void);
+
+static inline void dss_write_reg(const struct dss_reg idx, u32 val)
+{
+        __raw_writel(val, dss.base + idx.idx);
+}
+
+static inline u32 dss_read_reg(const struct dss_reg idx)
+{
+        return __raw_readl(dss.base + idx.idx);
+}
+
+#define SR(reg) \
+        dss.ctx[(DSS_##reg).idx / sizeof(u32)] = dss_read_reg(DSS_##reg)
+#define RR(reg) \
+        dss_write_reg(DSS_##reg, dss.ctx[(DSS_##reg).idx / sizeof(u32)])
+
+void dss_save_context(void)
+{
+        if (cpu_is_omap24xx())
+                return;
+
+        SR(SYSCONFIG);
+        SR(CONTROL);
+
+#ifdef CONFIG_OMAP2_DSS_SDI
+        SR(SDI_CONTROL);
+        SR(PLL_CONTROL);
+#endif
+}
+
+void dss_restore_context(void)
+{
+        if (_omap_dss_wait_reset())
+                DSSERR("DSS not coming out of reset after sleep\n");
+
+        RR(SYSCONFIG);
+        RR(CONTROL);
+
+#ifdef CONFIG_OMAP2_DSS_SDI
+        RR(SDI_CONTROL);
+        RR(PLL_CONTROL);
+#endif
+}
+
+#undef SR
+#undef RR
+
+void dss_sdi_init(u8 datapairs)
+{
+        u32 l;
+
+        BUG_ON(datapairs > 3 || datapairs < 1);
+
+        l = dss_read_reg(DSS_SDI_CONTROL);
+        l = FLD_MOD(l, 0xf, 19, 15);            /* SDI_PDIV */
+        l = FLD_MOD(l, datapairs-1, 3, 2);      /* SDI_PRSEL */
+        l = FLD_MOD(l, 2, 1, 0);                /* SDI_BWSEL */
+        dss_write_reg(DSS_SDI_CONTROL, l);
+
+        l = dss_read_reg(DSS_PLL_CONTROL);
+        l = FLD_MOD(l, 0x7, 25, 22);    /* SDI_PLL_FREQSEL */
+        l = FLD_MOD(l, 0xb, 16, 11);    /* SDI_PLL_REGN */
+        l = FLD_MOD(l, 0xb4, 10, 1);    /* SDI_PLL_REGM */
+        dss_write_reg(DSS_PLL_CONTROL, l);
+}
+
+int dss_sdi_enable(void)
+{
+        unsigned long timeout;
+
+        dispc_pck_free_enable(1);
+
+        /* Reset SDI PLL */
+        REG_FLD_MOD(DSS_PLL_CONTROL, 1, 18, 18); /* SDI_PLL_SYSRESET */
+        udelay(1);      /* wait 2x PCLK */
+
+        /* Lock SDI PLL */
+        REG_FLD_MOD(DSS_PLL_CONTROL, 1, 28, 28); /* SDI_PLL_GOBIT */
+
+        /* Waiting for PLL lock request to complete */
+        timeout = jiffies + msecs_to_jiffies(500);
+        while (dss_read_reg(DSS_SDI_STATUS) & (1 << 6)) {
+                if (time_after_eq(jiffies, timeout)) {
+                        DSSERR("PLL lock request timed out\n");
+                        goto err1;
+                }
+        }
+
+        /* Clearing PLL_GO bit */
+        REG_FLD_MOD(DSS_PLL_CONTROL, 0, 28, 28);
+
+        /* Waiting for PLL to lock */
+        timeout = jiffies + msecs_to_jiffies(500);
+        while (!(dss_read_reg(DSS_SDI_STATUS) & (1 << 5))) {
+                if (time_after_eq(jiffies, timeout)) {
+                        DSSERR("PLL lock timed out\n");
+                        goto err1;
+                }
+        }
+
+        dispc_lcd_enable_signal(1);
+
+        /* Waiting for SDI reset to complete */
+        timeout = jiffies + msecs_to_jiffies(500);
+        while (!(dss_read_reg(DSS_SDI_STATUS) & (1 << 2))) {
+                if (time_after_eq(jiffies, timeout)) {
+                        DSSERR("SDI reset timed out\n");
+                        goto err2;
+                }
+        }
+
+        return 0;
+
+ err2:
+        dispc_lcd_enable_signal(0);
+ err1:
+        /* Reset SDI PLL */
+        REG_FLD_MOD(DSS_PLL_CONTROL, 0, 18, 18); /* SDI_PLL_SYSRESET */
+
+        dispc_pck_free_enable(0);
+
+        return -ETIMEDOUT;
+}
+
+void dss_sdi_disable(void)
+{
+        dispc_lcd_enable_signal(0);
+
+        dispc_pck_free_enable(0);
+
+        /* Reset SDI PLL */
+        REG_FLD_MOD(DSS_PLL_CONTROL, 0, 18, 18); /* SDI_PLL_SYSRESET */
+}
+
+void dss_dump_clocks(struct seq_file *s)
+{
+        unsigned long dpll4_ck_rate;
+        unsigned long dpll4_m4_ck_rate;
+
+        dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
+
+        dpll4_ck_rate = clk_get_rate(clk_get_parent(dss.dpll4_m4_ck));
+        dpll4_m4_ck_rate = clk_get_rate(dss.dpll4_m4_ck);
+
+        seq_printf(s, "- DSS -\n");
+
+        seq_printf(s, "dpll4_ck %lu\n", dpll4_ck_rate);
+
+        seq_printf(s, "dss1_alwon_fclk = %lu / %lu * 2 = %lu\n",
+                        dpll4_ck_rate,
+                        dpll4_ck_rate / dpll4_m4_ck_rate,
+                        dss_clk_get_rate(DSS_CLK_FCK1));
+
+        dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
+}
+
+void dss_dump_regs(struct seq_file *s)
+{
+#define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, dss_read_reg(r))
+
+        dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
+
+        DUMPREG(DSS_REVISION);
+        DUMPREG(DSS_SYSCONFIG);
+        DUMPREG(DSS_SYSSTATUS);
+        DUMPREG(DSS_IRQSTATUS);
+        DUMPREG(DSS_CONTROL);
+        DUMPREG(DSS_SDI_CONTROL);
+        DUMPREG(DSS_PLL_CONTROL);
+        DUMPREG(DSS_SDI_STATUS);
+
+        dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
+#undef DUMPREG
+}
+
+void dss_select_dispc_clk_source(enum dss_clk_source clk_src)
+{
+        int b;
+
+        BUG_ON(clk_src != DSS_SRC_DSI1_PLL_FCLK &&
+                        clk_src != DSS_SRC_DSS1_ALWON_FCLK);
+
+        b = clk_src == DSS_SRC_DSS1_ALWON_FCLK ? 0 : 1;
+
+        REG_FLD_MOD(DSS_CONTROL, b, 0, 0);      /* DISPC_CLK_SWITCH */
+
+        dss.dispc_clk_source = clk_src;
+}
+
+void dss_select_dsi_clk_source(enum dss_clk_source clk_src)
+{
+        int b;
+
+        BUG_ON(clk_src != DSS_SRC_DSI2_PLL_FCLK &&
+                        clk_src != DSS_SRC_DSS1_ALWON_FCLK);
+
+        b = clk_src == DSS_SRC_DSS1_ALWON_FCLK ? 0 : 1;
+
+        REG_FLD_MOD(DSS_CONTROL, b, 1, 1);      /* DSI_CLK_SWITCH */
+
+        dss.dsi_clk_source = clk_src;
+}
+
+enum dss_clk_source dss_get_dispc_clk_source(void)
+{
+        return dss.dispc_clk_source;
+}
+
+enum dss_clk_source dss_get_dsi_clk_source(void)
+{
+        return dss.dsi_clk_source;
+}
+
+/* calculate clock rates using dividers in cinfo */
+int dss_calc_clock_rates(struct dss_clock_info *cinfo)
+{
+        unsigned long prate;
+
+        if (cinfo->fck_div > 16 || cinfo->fck_div == 0)
+                return -EINVAL;
+
+        prate = clk_get_rate(clk_get_parent(dss.dpll4_m4_ck));
+
+        cinfo->fck = prate / cinfo->fck_div;
+
+        return 0;
+}
+
+int dss_set_clock_div(struct dss_clock_info *cinfo)
+{
+        unsigned long prate;
+        int r;
+
+        if (cpu_is_omap34xx()) {
+                prate = clk_get_rate(clk_get_parent(dss.dpll4_m4_ck));
+                DSSDBG("dpll4_m4 = %ld\n", prate);
+
+                r = clk_set_rate(dss.dpll4_m4_ck, prate / cinfo->fck_div);
+                if (r)
+                        return r;
+        }
+
+        DSSDBG("fck = %ld (%d)\n", cinfo->fck, cinfo->fck_div);
+
+        return 0;
+}
+
+int dss_get_clock_div(struct dss_clock_info *cinfo)
+{
+        cinfo->fck = dss_clk_get_rate(DSS_CLK_FCK1);
+
+        if (cpu_is_omap34xx()) {
+                unsigned long prate;
+                prate = clk_get_rate(clk_get_parent(dss.dpll4_m4_ck));
+                cinfo->fck_div = prate / (cinfo->fck / 2);
+        } else {
+                cinfo->fck_div = 0;
+        }
+
+        return 0;
+}
+
+unsigned long dss_get_dpll4_rate(void)
+{
+        if (cpu_is_omap34xx())
+                return clk_get_rate(clk_get_parent(dss.dpll4_m4_ck));
+        else
+                return 0;
+}
+
+int dss_calc_clock_div(bool is_tft, unsigned long req_pck,
+                struct dss_clock_info *dss_cinfo,
+                struct dispc_clock_info *dispc_cinfo)
+{
+        unsigned long prate;
+        struct dss_clock_info best_dss;
+        struct dispc_clock_info best_dispc;
+
+        unsigned long fck;
+
+        u16 fck_div;
+
+        int match = 0;
+        int min_fck_per_pck;
+
+        prate = dss_get_dpll4_rate();
+
+        fck = dss_clk_get_rate(DSS_CLK_FCK1);
+        if (req_pck == dss.cache_req_pck &&
+                        ((cpu_is_omap34xx() && prate == dss.cache_prate) ||
+                         dss.cache_dss_cinfo.fck == fck)) {
+                DSSDBG("dispc clock info found from cache.\n");
+                *dss_cinfo = dss.cache_dss_cinfo;
+                *dispc_cinfo = dss.cache_dispc_cinfo;
+                return 0;
+        }
+
+        min_fck_per_pck = CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK;
+
+        if (min_fck_per_pck &&
+                req_pck * min_fck_per_pck > DISPC_MAX_FCK) {
+                DSSERR("Requested pixel clock not possible with the current "
+                                "OMAP2_DSS_MIN_FCK_PER_PCK setting. Turning "
+                                "the constraint off.\n");
+                min_fck_per_pck = 0;
+        }
+
+retry:
+        memset(&best_dss, 0, sizeof(best_dss));
+        memset(&best_dispc, 0, sizeof(best_dispc));
+
+        if (cpu_is_omap24xx()) {
+                struct dispc_clock_info cur_dispc;
+                /* XXX can we change the clock on omap2? */
+                fck = dss_clk_get_rate(DSS_CLK_FCK1);
+                fck_div = 1;
+
+                dispc_find_clk_divs(is_tft, req_pck, fck, &cur_dispc);
+                match = 1;
+
+                best_dss.fck = fck;
+                best_dss.fck_div = fck_div;
+
+                best_dispc = cur_dispc;
+
+                goto found;
+        } else if (cpu_is_omap34xx()) {
+                for (fck_div = 16; fck_div > 0; --fck_div) {
+                        struct dispc_clock_info cur_dispc;
+
+                        fck = prate / fck_div * 2;
+
+                        if (fck > DISPC_MAX_FCK)
+                                continue;
+
+                        if (min_fck_per_pck &&
+                                        fck < req_pck * min_fck_per_pck)
+                                continue;
+
+                        match = 1;
+
+                        dispc_find_clk_divs(is_tft, req_pck, fck, &cur_dispc);
+
+                        if (abs(cur_dispc.pck - req_pck) <
+                                        abs(best_dispc.pck - req_pck)) {
+
+                                best_dss.fck = fck;
+                                best_dss.fck_div = fck_div;
+
+                                best_dispc = cur_dispc;
+
+                                if (cur_dispc.pck == req_pck)
+                                        goto found;
+                        }
+                }
+        } else {
+                BUG();
+        }
+
+found:
+        if (!match) {
+                if (min_fck_per_pck) {
+                        DSSERR("Could not find suitable clock settings.\n"
+                                        "Turning FCK/PCK constraint off and"
+                                        "trying again.\n");
+                        min_fck_per_pck = 0;
+                        goto retry;
+                }
+
+                DSSERR("Could not find suitable clock settings.\n");
+
+                return -EINVAL;
+        }
+
+        if (dss_cinfo)
+                *dss_cinfo = best_dss;
+        if (dispc_cinfo)
+                *dispc_cinfo = best_dispc;
+
+        dss.cache_req_pck = req_pck;
+        dss.cache_prate = prate;
+        dss.cache_dss_cinfo = best_dss;
+        dss.cache_dispc_cinfo = best_dispc;
+
+        return 0;
+}
+
+
+
+static irqreturn_t dss_irq_handler_omap2(int irq, void *arg)
+{
+        dispc_irq_handler();
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t dss_irq_handler_omap3(int irq, void *arg)
+{
+        u32 irqstatus;
+
+        irqstatus = dss_read_reg(DSS_IRQSTATUS);
+
+        if (irqstatus & (1<<0)) /* DISPC_IRQ */
+                dispc_irq_handler();
+#ifdef CONFIG_OMAP2_DSS_DSI
+        if (irqstatus & (1<<1)) /* DSI_IRQ */
+                dsi_irq_handler();
+#endif
+
+        return IRQ_HANDLED;
+}
+
+static int _omap_dss_wait_reset(void)
+{
+        int t = 0;
+
+        while (REG_GET(DSS_SYSSTATUS, 0, 0) == 0) {
+                if (++t > 1000) {
+                        DSSERR("soft reset failed\n");
+                        return -ENODEV;
+                }
+                udelay(1);
+        }
+
+        return 0;
+}
+
+static int _omap_dss_reset(void)
+{
+        /* Soft reset */
+        REG_FLD_MOD(DSS_SYSCONFIG, 1, 1, 1);
+        return _omap_dss_wait_reset();
+}
+
+void dss_set_venc_output(enum omap_dss_venc_type type)
+{
+        int l = 0;
+
+        if (type == OMAP_DSS_VENC_TYPE_COMPOSITE)
+                l = 0;
+        else if (type == OMAP_DSS_VENC_TYPE_SVIDEO)
+                l = 1;
+        else
+                BUG();
+
+        /* venc out selection. 0 = comp, 1 = svideo */
+        REG_FLD_MOD(DSS_CONTROL, l, 6, 6);
+}
+
+void dss_set_dac_pwrdn_bgz(bool enable)
+{
+        REG_FLD_MOD(DSS_CONTROL, enable, 5, 5); /* DAC Power-Down Control */
+}
+
+int dss_init(bool skip_init)
+{
+        int r;
+        u32 rev;
+
+        dss.base = ioremap(DSS_BASE, DSS_SZ_REGS);
+        if (!dss.base) {
+                DSSERR("can't ioremap DSS\n");
+                r = -ENOMEM;
+                goto fail0;
+        }
+
+        if (!skip_init) {
+                /* disable LCD and DIGIT output. This seems to fix the synclost
+                 * problem that we get, if the bootloader starts the DSS and
+                 * the kernel resets it */
+                omap_writel(omap_readl(0x48050440) & ~0x3, 0x48050440);
+
+                /* We need to wait here a bit, otherwise we sometimes start to
+                 * get synclost errors, and after that only power cycle will
+                 * restore DSS functionality. I have no idea why this happens.
+                 * And we have to wait _before_ resetting the DSS, but after
+                 * enabling clocks.
+                 */
+                msleep(50);
+
+                _omap_dss_reset();
+        }
+
+        /* autoidle */
+        REG_FLD_MOD(DSS_SYSCONFIG, 1, 0, 0);
+
+        /* Select DPLL */
+        REG_FLD_MOD(DSS_CONTROL, 0, 0, 0);
+
+#ifdef CONFIG_OMAP2_DSS_VENC
+        REG_FLD_MOD(DSS_CONTROL, 1, 4, 4);      /* venc dac demen */
+        REG_FLD_MOD(DSS_CONTROL, 1, 3, 3);      /* venc clock 4x enable */
+        REG_FLD_MOD(DSS_CONTROL, 0, 2, 2);      /* venc clock mode = normal */
+#endif
+
+        r = request_irq(INT_24XX_DSS_IRQ,
+                        cpu_is_omap24xx()
+                        ? dss_irq_handler_omap2
+                        : dss_irq_handler_omap3,
+                        0, "OMAP DSS", NULL);
+
+        if (r < 0) {
+                DSSERR("omap2 dss: request_irq failed\n");
+                goto fail1;
+        }
+
+        if (cpu_is_omap34xx()) {
+                dss.dpll4_m4_ck = clk_get(NULL, "dpll4_m4_ck");
+                if (IS_ERR(dss.dpll4_m4_ck)) {
+                        DSSERR("Failed to get dpll4_m4_ck\n");
+                        r = PTR_ERR(dss.dpll4_m4_ck);
+                        goto fail2;
+                }
+        }
+
+        dss.dsi_clk_source = DSS_SRC_DSS1_ALWON_FCLK;
+        dss.dispc_clk_source = DSS_SRC_DSS1_ALWON_FCLK;
+
+        dss_save_context();
+
+        rev = dss_read_reg(DSS_REVISION);
+        printk(KERN_INFO "OMAP DSS rev %d.%d\n",
+                        FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0));
+
+        return 0;
+
+fail2:
+        free_irq(INT_24XX_DSS_IRQ, NULL);
+fail1:
+        iounmap(dss.base);
+fail0:
+        return r;
+}
+
+void dss_exit(void)
+{
+        if (cpu_is_omap34xx())
+                clk_put(dss.dpll4_m4_ck);
+
+        free_irq(INT_24XX_DSS_IRQ, NULL);
+
+        iounmap(dss.base);
+}
+
diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
new file mode 100644
index 000000000000..24326a5fd292
--- /dev/null
+++ b/drivers/video/omap2/dss/dss.h
@@ -0,0 +1,395 @@
+/*
+ * linux/drivers/video/omap2/dss/dss.h
+ *
+ * Copyright (C) 2009 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * Some code and ideas taken from drivers/video/omap/ driver
+ * by Imre Deak.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __OMAP2_DSS_H
+#define __OMAP2_DSS_H
+
+#ifdef CONFIG_OMAP2_DSS_DEBUG_SUPPORT
+#define DEBUG
+#endif
+
+#ifdef DEBUG
+extern unsigned int dss_debug;
+#ifdef DSS_SUBSYS_NAME
+#define DSSDBG(format, ...) \
+        if (dss_debug) \
+                printk(KERN_DEBUG "omapdss " DSS_SUBSYS_NAME ": " format, \
+                ## __VA_ARGS__)
+#else
+#define DSSDBG(format, ...) \
+        if (dss_debug) \
+                printk(KERN_DEBUG "omapdss: " format, ## __VA_ARGS__)
+#endif
+
+#ifdef DSS_SUBSYS_NAME
+#define DSSDBGF(format, ...) \
+        if (dss_debug) \
+                printk(KERN_DEBUG "omapdss " DSS_SUBSYS_NAME \
+                                ": %s(" format ")\n", \
+                                __func__, \
+                                ## __VA_ARGS__)
+#else
+#define DSSDBGF(format, ...) \
+        if (dss_debug) \
+                printk(KERN_DEBUG "omapdss: " \
+                                ": %s(" format ")\n", \
+                                __func__, \
+                                ## __VA_ARGS__)
+#endif
+
+#else /* DEBUG */
+#define DSSDBG(format, ...)
+#define DSSDBGF(format, ...)
+#endif
+
+
+#ifdef DSS_SUBSYS_NAME
+#define DSSERR(format, ...) \
+        printk(KERN_ERR "omapdss " DSS_SUBSYS_NAME " error: " format, \
+        ## __VA_ARGS__)
+#else
+#define DSSERR(format, ...) \
+        printk(KERN_ERR "omapdss error: " format, ## __VA_ARGS__)
+#endif
+
+#ifdef DSS_SUBSYS_NAME
+#define DSSINFO(format, ...) \
+        printk(KERN_INFO "omapdss " DSS_SUBSYS_NAME ": " format, \
+        ## __VA_ARGS__)
+#else
+#define DSSINFO(format, ...) \
+        printk(KERN_INFO "omapdss: " format, ## __VA_ARGS__)
+#endif
+
+#ifdef DSS_SUBSYS_NAME
+#define DSSWARN(format, ...) \
+        printk(KERN_WARNING "omapdss " DSS_SUBSYS_NAME ": " format, \
+        ## __VA_ARGS__)
+#else
+#define DSSWARN(format, ...) \
+        printk(KERN_WARNING "omapdss: " format, ## __VA_ARGS__)
+#endif
+
+/* OMAP TRM gives bitfields as start:end, where start is the higher bit
+   number. For example 7:0 */
+#define FLD_MASK(start, end)    (((1 << ((start) - (end) + 1)) - 1) << (end))
+#define FLD_VAL(val, start, end) (((val) << (end)) & FLD_MASK(start, end))
+#define FLD_GET(val, start, end) (((val) & FLD_MASK(start, end)) >> (end))
+#define FLD_MOD(orig, val, start, end) \
+        (((orig) & ~FLD_MASK(start, end)) | FLD_VAL(val, start, end))
+
+#define DISPC_MAX_FCK 173000000
+
+enum omap_burst_size {
+        OMAP_DSS_BURST_4x32 = 0,
+        OMAP_DSS_BURST_8x32 = 1,
+        OMAP_DSS_BURST_16x32 = 2,
+};
+
+enum omap_parallel_interface_mode {
+        OMAP_DSS_PARALLELMODE_BYPASS,           /* MIPI DPI */
+        OMAP_DSS_PARALLELMODE_RFBI,             /* MIPI DBI */
+        OMAP_DSS_PARALLELMODE_DSI,
+};
+
+enum dss_clock {
+        DSS_CLK_ICK     = 1 << 0,
+        DSS_CLK_FCK1    = 1 << 1,
+        DSS_CLK_FCK2    = 1 << 2,
+        DSS_CLK_54M     = 1 << 3,
+        DSS_CLK_96M     = 1 << 4,
+};
+
+enum dss_clk_source {
+        DSS_SRC_DSI1_PLL_FCLK,
+        DSS_SRC_DSI2_PLL_FCLK,
+        DSS_SRC_DSS1_ALWON_FCLK,
+};
+
+struct dss_clock_info {
+        /* rates that we get with dividers below */
+        unsigned long fck;
+
+        /* dividers */
+        u16 fck_div;
+};
+
+struct dispc_clock_info {
+        /* rates that we get with dividers below */
+        unsigned long lck;
+        unsigned long pck;
+
+        /* dividers */
+        u16 lck_div;
+        u16 pck_div;
+};
+
+struct dsi_clock_info {
+        /* rates that we get with dividers below */
+        unsigned long fint;
+        unsigned long clkin4ddr;
+        unsigned long clkin;
+        unsigned long dsi1_pll_fclk;
+        unsigned long dsi2_pll_fclk;
+
+        unsigned long lp_clk;
+
+        /* dividers */
+        u16 regn;
+        u16 regm;
+        u16 regm3;
+        u16 regm4;
+
+        u16 lp_clk_div;
+
+        u8 highfreq;
+        bool use_dss2_fck;
+};
+
+struct seq_file;
+struct platform_device;
+
+/* core */
+void dss_clk_enable(enum dss_clock clks);
+void dss_clk_disable(enum dss_clock clks);
+unsigned long dss_clk_get_rate(enum dss_clock clk);
+int dss_need_ctx_restore(void);
+void dss_dump_clocks(struct seq_file *s);
+struct bus_type *dss_get_bus(void);
+struct regulator *dss_get_vdds_dsi(void);
+struct regulator *dss_get_vdds_sdi(void);
+struct regulator *dss_get_vdda_dac(void);
+
+/* display */
+int dss_suspend_all_devices(void);
+int dss_resume_all_devices(void);
+void dss_disable_all_devices(void);
+
+void dss_init_device(struct platform_device *pdev,
+                struct omap_dss_device *dssdev);
+void dss_uninit_device(struct platform_device *pdev,
+                struct omap_dss_device *dssdev);
+bool dss_use_replication(struct omap_dss_device *dssdev,
+                enum omap_color_mode mode);
+void default_get_overlay_fifo_thresholds(enum omap_plane plane,
+                u32 fifo_size, enum omap_burst_size *burst_size,
+                u32 *fifo_low, u32 *fifo_high);
+
+/* manager */
+int dss_init_overlay_managers(struct platform_device *pdev);
+void dss_uninit_overlay_managers(struct platform_device *pdev);
+int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl);
+void dss_setup_partial_planes(struct omap_dss_device *dssdev,
+                                u16 *x, u16 *y, u16 *w, u16 *h);
+void dss_start_update(struct omap_dss_device *dssdev);
+
+/* overlay */
+void dss_init_overlays(struct platform_device *pdev);
+void dss_uninit_overlays(struct platform_device *pdev);
+int dss_check_overlay(struct omap_overlay *ovl, struct omap_dss_device *dssdev);
+void dss_overlay_setup_dispc_manager(struct omap_overlay_manager *mgr);
+#ifdef L4_EXAMPLE
+void dss_overlay_setup_l4_manager(struct omap_overlay_manager *mgr);
+#endif
+void dss_recheck_connections(struct omap_dss_device *dssdev, bool force);
+
+/* DSS */
+int dss_init(bool skip_init);
+void dss_exit(void);
+
+void dss_save_context(void);
+void dss_restore_context(void);
+
+void dss_dump_regs(struct seq_file *s);
+
+void dss_sdi_init(u8 datapairs);
+int dss_sdi_enable(void);
+void dss_sdi_disable(void);
+
+void dss_select_dispc_clk_source(enum dss_clk_source clk_src);
+void dss_select_dsi_clk_source(enum dss_clk_source clk_src);
+enum dss_clk_source dss_get_dispc_clk_source(void);
+enum dss_clk_source dss_get_dsi_clk_source(void);
+
+void dss_set_venc_output(enum omap_dss_venc_type type);
+void dss_set_dac_pwrdn_bgz(bool enable);
+
+unsigned long dss_get_dpll4_rate(void);
+int dss_calc_clock_rates(struct dss_clock_info *cinfo);
+int dss_set_clock_div(struct dss_clock_info *cinfo);
+int dss_get_clock_div(struct dss_clock_info *cinfo);
+int dss_calc_clock_div(bool is_tft, unsigned long req_pck,
+                struct dss_clock_info *dss_cinfo,
+                struct dispc_clock_info *dispc_cinfo);
+
+/* SDI */
+int sdi_init(bool skip_init);
+void sdi_exit(void);
+int sdi_init_display(struct omap_dss_device *display);
+
+/* DSI */
+int dsi_init(struct platform_device *pdev);
+void dsi_exit(void);
+
+void dsi_dump_clocks(struct seq_file *s);
+void dsi_dump_irqs(struct seq_file *s);
+void dsi_dump_regs(struct seq_file *s);
+
+void dsi_save_context(void);
+void dsi_restore_context(void);
+
+int dsi_init_display(struct omap_dss_device *display);
+void dsi_irq_handler(void);
+unsigned long dsi_get_dsi1_pll_rate(void);
+int dsi_pll_set_clock_div(struct dsi_clock_info *cinfo);
+int dsi_pll_calc_clock_div_pck(bool is_tft, unsigned long req_pck,
+                struct dsi_clock_info *cinfo,
+                struct dispc_clock_info *dispc_cinfo);
+int dsi_pll_init(struct omap_dss_device *dssdev, bool enable_hsclk,
+                bool enable_hsdiv);
+void dsi_pll_uninit(void);
+void dsi_get_overlay_fifo_thresholds(enum omap_plane plane,
+                u32 fifo_size, enum omap_burst_size *burst_size,
+                u32 *fifo_low, u32 *fifo_high);
+
+/* DPI */
+int dpi_init(struct platform_device *pdev);
+void dpi_exit(void);
+int dpi_init_display(struct omap_dss_device *dssdev);
+
+/* DISPC */
+int dispc_init(void);
+void dispc_exit(void);
+void dispc_dump_clocks(struct seq_file *s);
+void dispc_dump_irqs(struct seq_file *s);
+void dispc_dump_regs(struct seq_file *s);
+void dispc_irq_handler(void);
+void dispc_fake_vsync_irq(void);
+
+void dispc_save_context(void);
+void dispc_restore_context(void);
+
+void dispc_enable_sidle(void);
+void dispc_disable_sidle(void);
+
+void dispc_lcd_enable_signal_polarity(bool act_high);
+void dispc_lcd_enable_signal(bool enable);
+void dispc_pck_free_enable(bool enable);
+void dispc_enable_fifohandcheck(bool enable);
+
+void dispc_set_lcd_size(u16 width, u16 height);
+void dispc_set_digit_size(u16 width, u16 height);
+u32 dispc_get_plane_fifo_size(enum omap_plane plane);
+void dispc_setup_plane_fifo(enum omap_plane plane, u32 low, u32 high);
+void dispc_enable_fifomerge(bool enable);
+void dispc_set_burst_size(enum omap_plane plane,
+                enum omap_burst_size burst_size);
+
+void dispc_set_plane_ba0(enum omap_plane plane, u32 paddr);
+void dispc_set_plane_ba1(enum omap_plane plane, u32 paddr);
+void dispc_set_plane_pos(enum omap_plane plane, u16 x, u16 y);
+void dispc_set_plane_size(enum omap_plane plane, u16 width, u16 height);
+void dispc_set_channel_out(enum omap_plane plane,
+                enum omap_channel channel_out);
+
+int dispc_setup_plane(enum omap_plane plane,
+                      u32 paddr, u16 screen_width,
+                      u16 pos_x, u16 pos_y,
+                      u16 width, u16 height,
+                      u16 out_width, u16 out_height,
+                      enum omap_color_mode color_mode,
+                      bool ilace,
+                      enum omap_dss_rotation_type rotation_type,
+                      u8 rotation, bool mirror,
+                      u8 global_alpha);
+
+bool dispc_go_busy(enum omap_channel channel);
+void dispc_go(enum omap_channel channel);
+void dispc_enable_channel(enum omap_channel channel, bool enable);
+bool dispc_is_channel_enabled(enum omap_channel channel);
+int dispc_enable_plane(enum omap_plane plane, bool enable);
+void dispc_enable_replication(enum omap_plane plane, bool enable);
+
+void dispc_set_parallel_interface_mode(enum omap_parallel_interface_mode mode);
+void dispc_set_tft_data_lines(u8 data_lines);
+void dispc_set_lcd_display_type(enum omap_lcd_display_type type);
+void dispc_set_loadmode(enum omap_dss_load_mode mode);
+
+void dispc_set_default_color(enum omap_channel channel, u32 color);
+u32 dispc_get_default_color(enum omap_channel channel);
+void dispc_set_trans_key(enum omap_channel ch,
+                enum omap_dss_trans_key_type type,
+                u32 trans_key);
+void dispc_get_trans_key(enum omap_channel ch,
+                enum omap_dss_trans_key_type *type,
+                u32 *trans_key);
+void dispc_enable_trans_key(enum omap_channel ch, bool enable);
+void dispc_enable_alpha_blending(enum omap_channel ch, bool enable);
+bool dispc_trans_key_enabled(enum omap_channel ch);
+bool dispc_alpha_blending_enabled(enum omap_channel ch);
+
+bool dispc_lcd_timings_ok(struct omap_video_timings *timings);
+void dispc_set_lcd_timings(struct omap_video_timings *timings);
+unsigned long dispc_fclk_rate(void);
+unsigned long dispc_lclk_rate(void);
+unsigned long dispc_pclk_rate(void);
+void dispc_set_pol_freq(enum omap_panel_config config, u8 acbi, u8 acb);
+void dispc_find_clk_divs(bool is_tft, unsigned long req_pck, unsigned long fck,
+                struct dispc_clock_info *cinfo);
+int dispc_calc_clock_rates(unsigned long dispc_fclk_rate,
+                struct dispc_clock_info *cinfo);
+int dispc_set_clock_div(struct dispc_clock_info *cinfo);
+int dispc_get_clock_div(struct dispc_clock_info *cinfo);
+
+
+/* VENC */
+int venc_init(struct platform_device *pdev);
+void venc_exit(void);
+void venc_dump_regs(struct seq_file *s);
+int venc_init_display(struct omap_dss_device *display);
+
+/* RFBI */
+int rfbi_init(void);
+void rfbi_exit(void);
+void rfbi_dump_regs(struct seq_file *s);
+
+int rfbi_configure(int rfbi_module, int bpp, int lines);
+void rfbi_enable_rfbi(bool enable);
+void rfbi_transfer_area(u16 width, u16 height,
+                             void (callback)(void *data), void *data);
+void rfbi_set_timings(int rfbi_module, struct rfbi_timings *t);
+unsigned long rfbi_get_max_tx_rate(void);
+int rfbi_init_display(struct omap_dss_device *display);
+
+
+#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS
+static inline void dss_collect_irq_stats(u32 irqstatus, unsigned *irq_arr)
+{
+        int b;
+        for (b = 0; b < 32; ++b) {
+                if (irqstatus & (1 << b))
+                        irq_arr[b]++;
+        }
+}
+#endif
+
+#endif
diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c
new file mode 100644
index 000000000000..0820986d4a68
--- /dev/null
+++ b/drivers/video/omap2/dss/manager.c
@@ -0,0 +1,1520 @@
+/*
+ * linux/drivers/video/omap2/dss/manager.c
+ *
+ * Copyright (C) 2009 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * Some code and ideas taken from drivers/video/omap/ driver
+ * by Imre Deak.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define DSS_SUBSYS_NAME "MANAGER"
+
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/spinlock.h>
+#include <linux/jiffies.h>
+
+#include <plat/display.h>
+#include <plat/cpu.h>
+
+#include "dss.h"
+
+static int num_managers;
+static struct list_head manager_list;
+
+static ssize_t manager_name_show(struct omap_overlay_manager *mgr, char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%s\n", mgr->name);
+}
+
+static ssize_t manager_display_show(struct omap_overlay_manager *mgr, char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%s\n",
+                        mgr->device ? mgr->device->name : "<none>");
+}
+
+static ssize_t manager_display_store(struct omap_overlay_manager *mgr,
+                const char *buf, size_t size)
+{
+        int r = 0;
+        size_t len = size;
+        struct omap_dss_device *dssdev = NULL;
+
+        int match(struct omap_dss_device *dssdev, void *data)
+        {
+                const char *str = data;
+                return sysfs_streq(dssdev->name, str);
+        }
+
+        if (buf[size-1] == '\n')
+                --len;
+
+        if (len > 0)
+                dssdev = omap_dss_find_device((void *)buf, match);
+
+        if (len > 0 && dssdev == NULL)
+                return -EINVAL;
+
+        if (dssdev)
+                DSSDBG("display %s found\n", dssdev->name);
+
+        if (mgr->device) {
+                r = mgr->unset_device(mgr);
+                if (r) {
+                        DSSERR("failed to unset display\n");
+                        goto put_device;
+                }
+        }
+
+        if (dssdev) {
+                r = mgr->set_device(mgr, dssdev);
+                if (r) {
+                        DSSERR("failed to set manager\n");
+                        goto put_device;
+                }
+
+                r = mgr->apply(mgr);
+                if (r) {
+                        DSSERR("failed to apply dispc config\n");
+                        goto put_device;
+                }
+        }
+
+put_device:
+        if (dssdev)
+                omap_dss_put_device(dssdev);
+
+        return r ? r : size;
+}
+
+static ssize_t manager_default_color_show(struct omap_overlay_manager *mgr,
+                                          char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%d\n", mgr->info.default_color);
+}
+
+static ssize_t manager_default_color_store(struct omap_overlay_manager *mgr,
+                                           const char *buf, size_t size)
+{
+        struct omap_overlay_manager_info info;
+        u32 color;
+        int r;
+
+        if (sscanf(buf, "%d", &color) != 1)
+                return -EINVAL;
+
+        mgr->get_manager_info(mgr, &info);
+
+        info.default_color = color;
+
+        r = mgr->set_manager_info(mgr, &info);
+        if (r)
+                return r;
+
+        r = mgr->apply(mgr);
+        if (r)
+                return r;
+
+        return size;
+}
+
+static const char *trans_key_type_str[] = {
+        "gfx-destination",
+        "video-source",
+};
+
+static ssize_t manager_trans_key_type_show(struct omap_overlay_manager *mgr,
+                                           char *buf)
+{
+        enum omap_dss_trans_key_type key_type;
+
+        key_type = mgr->info.trans_key_type;
+        BUG_ON(key_type >= ARRAY_SIZE(trans_key_type_str));
+
+        return snprintf(buf, PAGE_SIZE, "%s\n", trans_key_type_str[key_type]);
+}
+
+static ssize_t manager_trans_key_type_store(struct omap_overlay_manager *mgr,
+                                            const char *buf, size_t size)
+{
+        enum omap_dss_trans_key_type key_type;
+        struct omap_overlay_manager_info info;
+        int r;
+
+        for (key_type = OMAP_DSS_COLOR_KEY_GFX_DST;
+                        key_type < ARRAY_SIZE(trans_key_type_str); key_type++) {
+                if (sysfs_streq(buf, trans_key_type_str[key_type]))
+                        break;
+        }
+
+        if (key_type == ARRAY_SIZE(trans_key_type_str))
+                return -EINVAL;
+
+        mgr->get_manager_info(mgr, &info);
+
+        info.trans_key_type = key_type;
+
+        r = mgr->set_manager_info(mgr, &info);
+        if (r)
+                return r;
+
+        r = mgr->apply(mgr);
+        if (r)
+                return r;
+
+        return size;
+}
+
+static ssize_t manager_trans_key_value_show(struct omap_overlay_manager *mgr,
+                                            char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%d\n", mgr->info.trans_key);
+}
+
+static ssize_t manager_trans_key_value_store(struct omap_overlay_manager *mgr,
+                                             const char *buf, size_t size)
+{
+        struct omap_overlay_manager_info info;
+        u32 key_value;
+        int r;
+
+        if (sscanf(buf, "%d", &key_value) != 1)
+                return -EINVAL;
+
+        mgr->get_manager_info(mgr, &info);
+
+        info.trans_key = key_value;
+
+        r = mgr->set_manager_info(mgr, &info);
+        if (r)
+                return r;
+
+        r = mgr->apply(mgr);
+        if (r)
+                return r;
+
+        return size;
+}
+
+static ssize_t manager_trans_key_enabled_show(struct omap_overlay_manager *mgr,
+                                              char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%d\n", mgr->info.trans_enabled);
+}
+
+static ssize_t manager_trans_key_enabled_store(struct omap_overlay_manager *mgr,
+                                               const char *buf, size_t size)
+{
+        struct omap_overlay_manager_info info;
+        int enable;
+        int r;
+
+        if (sscanf(buf, "%d", &enable) != 1)
+                return -EINVAL;
+
+        mgr->get_manager_info(mgr, &info);
+
+        info.trans_enabled = enable ? true : false;
+
+        r = mgr->set_manager_info(mgr, &info);
+        if (r)
+                return r;
+
+        r = mgr->apply(mgr);
+        if (r)
+                return r;
+
+        return size;
+}
+
+static ssize_t manager_alpha_blending_enabled_show(
+                struct omap_overlay_manager *mgr, char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%d\n", mgr->info.alpha_enabled);
+}
+
+static ssize_t manager_alpha_blending_enabled_store(
+                struct omap_overlay_manager *mgr,
+                const char *buf, size_t size)
+{
+        struct omap_overlay_manager_info info;
+        int enable;
+        int r;
+
+        if (sscanf(buf, "%d", &enable) != 1)
+                return -EINVAL;
+
+        mgr->get_manager_info(mgr, &info);
+
+        info.alpha_enabled = enable ? true : false;
+
+        r = mgr->set_manager_info(mgr, &info);
+        if (r)
+                return r;
+
+        r = mgr->apply(mgr);
+        if (r)
+                return r;
+
+        return size;
+}
+
+struct manager_attribute {
+        struct attribute attr;
+        ssize_t (*show)(struct omap_overlay_manager *, char *);
+        ssize_t (*store)(struct omap_overlay_manager *, const char *, size_t);
+};
+
+#define MANAGER_ATTR(_name, _mode, _show, _store) \
+        struct manager_attribute manager_attr_##_name = \
+        __ATTR(_name, _mode, _show, _store)
+
+static MANAGER_ATTR(name, S_IRUGO, manager_name_show, NULL);
+static MANAGER_ATTR(display, S_IRUGO|S_IWUSR,
+                manager_display_show, manager_display_store);
+static MANAGER_ATTR(default_color, S_IRUGO|S_IWUSR,
+                manager_default_color_show, manager_default_color_store);
+static MANAGER_ATTR(trans_key_type, S_IRUGO|S_IWUSR,
+                manager_trans_key_type_show, manager_trans_key_type_store);
+static MANAGER_ATTR(trans_key_value, S_IRUGO|S_IWUSR,
+                manager_trans_key_value_show, manager_trans_key_value_store);
+static MANAGER_ATTR(trans_key_enabled, S_IRUGO|S_IWUSR,
+                manager_trans_key_enabled_show,
+                manager_trans_key_enabled_store);
+static MANAGER_ATTR(alpha_blending_enabled, S_IRUGO|S_IWUSR,
+                manager_alpha_blending_enabled_show,
+                manager_alpha_blending_enabled_store);
+
+
+static struct attribute *manager_sysfs_attrs[] = {
+        &manager_attr_name.attr,
+        &manager_attr_display.attr,
+        &manager_attr_default_color.attr,
+        &manager_attr_trans_key_type.attr,
+        &manager_attr_trans_key_value.attr,
+        &manager_attr_trans_key_enabled.attr,
+        &manager_attr_alpha_blending_enabled.attr,
+        NULL
+};
+
+static ssize_t manager_attr_show(struct kobject *kobj, struct attribute *attr,
+                char *buf)
+{
+        struct omap_overlay_manager *manager;
+        struct manager_attribute *manager_attr;
+
+        manager = container_of(kobj, struct omap_overlay_manager, kobj);
+        manager_attr = container_of(attr, struct manager_attribute, attr);
+
+        if (!manager_attr->show)
+                return -ENOENT;
+
+        return manager_attr->show(manager, buf);
+}
+
+static ssize_t manager_attr_store(struct kobject *kobj, struct attribute *attr,
+                const char *buf, size_t size)
+{
+        struct omap_overlay_manager *manager;
+        struct manager_attribute *manager_attr;
+
+        manager = container_of(kobj, struct omap_overlay_manager, kobj);
+        manager_attr = container_of(attr, struct manager_attribute, attr);
+
+        if (!manager_attr->store)
+                return -ENOENT;
+
+        return manager_attr->store(manager, buf, size);
+}
+
+static const struct sysfs_ops manager_sysfs_ops = {
+        .show = manager_attr_show,
+        .store = manager_attr_store,
+};
+
+static struct kobj_type manager_ktype = {
+        .sysfs_ops = &manager_sysfs_ops,
+        .default_attrs = manager_sysfs_attrs,
+};
+
+/*
+ * We have 4 levels of cache for the dispc settings. First two are in SW and
+ * the latter two in HW.
+ *
+ * +--------------------+
+ * |overlay/manager_info|
+ * +--------------------+
+ *          v
+ *        apply()
+ *          v
+ * +--------------------+
+ * |     dss_cache      |
+ * +--------------------+
+ *          v
+ *      configure()
+ *          v
+ * +--------------------+
+ * |  shadow registers  |
+ * +--------------------+
+ *          v
+ * VFP or lcd/digit_enable
+ *          v
+ * +--------------------+
+ * |      registers     |
+ * +--------------------+
+ */
+
+struct overlay_cache_data {
+        /* If true, cache changed, but not written to shadow registers. Set
+         * in apply(), cleared when registers written. */
+        bool dirty;
+        /* If true, shadow registers contain changed values not yet in real
+         * registers. Set when writing to shadow registers, cleared at
+         * VSYNC/EVSYNC */
+        bool shadow_dirty;
+
+        bool enabled;
+
+        u32 paddr;
+        void __iomem *vaddr;
+        u16 screen_width;
+        u16 width;
+        u16 height;
+        enum omap_color_mode color_mode;
+        u8 rotation;
+        enum omap_dss_rotation_type rotation_type;
+        bool mirror;
+
+        u16 pos_x;
+        u16 pos_y;
+        u16 out_width;  /* if 0, out_width == width */
+        u16 out_height; /* if 0, out_height == height */
+        u8 global_alpha;
+
+        enum omap_channel channel;
+        bool replication;
+        bool ilace;
+
+        enum omap_burst_size burst_size;
+        u32 fifo_low;
+        u32 fifo_high;
+
+        bool manual_update;
+};
+
+struct manager_cache_data {
+        /* If true, cache changed, but not written to shadow registers. Set
+         * in apply(), cleared when registers written. */
+        bool dirty;
+        /* If true, shadow registers contain changed values not yet in real
+         * registers. Set when writing to shadow registers, cleared at
+         * VSYNC/EVSYNC */
+        bool shadow_dirty;
+
+        u32 default_color;
+
+        enum omap_dss_trans_key_type trans_key_type;
+        u32 trans_key;
+        bool trans_enabled;
+
+        bool alpha_enabled;
+
+        bool manual_upd_display;
+        bool manual_update;
+        bool do_manual_update;
+
+        /* manual update region */
+        u16 x, y, w, h;
+};
+
+static struct {
+        spinlock_t lock;
+        struct overlay_cache_data overlay_cache[3];
+        struct manager_cache_data manager_cache[2];
+
+        bool irq_enabled;
+} dss_cache;
+
+
+
+static int omap_dss_set_device(struct omap_overlay_manager *mgr,
+                struct omap_dss_device *dssdev)
+{
+        int i;
+        int r;
+
+        if (dssdev->manager) {
+                DSSERR("display '%s' already has a manager '%s'\n",
+                               dssdev->name, dssdev->manager->name);
+                return -EINVAL;
+        }
+
+        if ((mgr->supported_displays & dssdev->type) == 0) {
+                DSSERR("display '%s' does not support manager '%s'\n",
+                               dssdev->name, mgr->name);
+                return -EINVAL;
+        }
+
+        for (i = 0; i < mgr->num_overlays; i++) {
+                struct omap_overlay *ovl = mgr->overlays[i];
+
+                if (ovl->manager != mgr || !ovl->info.enabled)
+                        continue;
+
+                r = dss_check_overlay(ovl, dssdev);
+                if (r)
+                        return r;
+        }
+
+        dssdev->manager = mgr;
+        mgr->device = dssdev;
+        mgr->device_changed = true;
+
+        return 0;
+}
+
+static int omap_dss_unset_device(struct omap_overlay_manager *mgr)
+{
+        if (!mgr->device) {
+                DSSERR("failed to unset display, display not set.\n");
+                return -EINVAL;
+        }
+
+        mgr->device->manager = NULL;
+        mgr->device = NULL;
+        mgr->device_changed = true;
+
+        return 0;
+}
+
+static int dss_mgr_wait_for_vsync(struct omap_overlay_manager *mgr)
+{
+        unsigned long timeout = msecs_to_jiffies(500);
+        u32 irq;
+
+        if (mgr->device->type == OMAP_DISPLAY_TYPE_VENC)
+                irq = DISPC_IRQ_EVSYNC_ODD;
+        else
+                irq = DISPC_IRQ_VSYNC;
+
+        return omap_dispc_wait_for_irq_interruptible_timeout(irq, timeout);
+}
+
+static int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr)
+{
+        unsigned long timeout = msecs_to_jiffies(500);
+        struct manager_cache_data *mc;
+        enum omap_channel channel;
+        u32 irq;
+        int r;
+        int i;
+        struct omap_dss_device *dssdev = mgr->device;
+
+        if (!dssdev)
+                return 0;
+
+        if (dssdev->type == OMAP_DISPLAY_TYPE_VENC) {
+                irq = DISPC_IRQ_EVSYNC_ODD | DISPC_IRQ_EVSYNC_EVEN;
+                channel = OMAP_DSS_CHANNEL_DIGIT;
+        } else {
+                if (dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
+                        enum omap_dss_update_mode mode;
+                        mode = dssdev->driver->get_update_mode(dssdev);
+                        if (mode != OMAP_DSS_UPDATE_AUTO)
+                                return 0;
+
+                        irq = DISPC_IRQ_FRAMEDONE;
+                } else {
+                        irq = DISPC_IRQ_VSYNC;
+                }
+                channel = OMAP_DSS_CHANNEL_LCD;
+        }
+
+        mc = &dss_cache.manager_cache[mgr->id];
+        i = 0;
+        while (1) {
+                unsigned long flags;
+                bool shadow_dirty, dirty;
+
+                spin_lock_irqsave(&dss_cache.lock, flags);
+                dirty = mc->dirty;
+                shadow_dirty = mc->shadow_dirty;
+                spin_unlock_irqrestore(&dss_cache.lock, flags);
+
+                if (!dirty && !shadow_dirty) {
+                        r = 0;
+                        break;
+                }
+
+                /* 4 iterations is the worst case:
+                 * 1 - initial iteration, dirty = true (between VFP and VSYNC)
+                 * 2 - first VSYNC, dirty = true
+                 * 3 - dirty = false, shadow_dirty = true
+                 * 4 - shadow_dirty = false */
+                if (i++ == 3) {
+                        DSSERR("mgr(%d)->wait_for_go() not finishing\n",
+                                        mgr->id);
+                        r = 0;
+                        break;
+                }
+
+                r = omap_dispc_wait_for_irq_interruptible_timeout(irq, timeout);
+                if (r == -ERESTARTSYS)
+                        break;
+
+                if (r) {
+                        DSSERR("mgr(%d)->wait_for_go() timeout\n", mgr->id);
+                        break;
+                }
+        }
+
+        return r;
+}
+
+int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl)
+{
+        unsigned long timeout = msecs_to_jiffies(500);
+        enum omap_channel channel;
+        struct overlay_cache_data *oc;
+        struct omap_dss_device *dssdev;
+        u32 irq;
+        int r;
+        int i;
+
+        if (!ovl->manager || !ovl->manager->device)
+                return 0;
+
+        dssdev = ovl->manager->device;
+
+        if (dssdev->type == OMAP_DISPLAY_TYPE_VENC) {
+                irq = DISPC_IRQ_EVSYNC_ODD | DISPC_IRQ_EVSYNC_EVEN;
+                channel = OMAP_DSS_CHANNEL_DIGIT;
+        } else {
+                if (dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
+                        enum omap_dss_update_mode mode;
+                        mode = dssdev->driver->get_update_mode(dssdev);
+                        if (mode != OMAP_DSS_UPDATE_AUTO)
+                                return 0;
+
+                        irq = DISPC_IRQ_FRAMEDONE;
+                } else {
+                        irq = DISPC_IRQ_VSYNC;
+                }
+                channel = OMAP_DSS_CHANNEL_LCD;
+        }
+
+        oc = &dss_cache.overlay_cache[ovl->id];
+        i = 0;
+        while (1) {
+                unsigned long flags;
+                bool shadow_dirty, dirty;
+
+                spin_lock_irqsave(&dss_cache.lock, flags);
+                dirty = oc->dirty;
+                shadow_dirty = oc->shadow_dirty;
+                spin_unlock_irqrestore(&dss_cache.lock, flags);
+
+                if (!dirty && !shadow_dirty) {
+                        r = 0;
+                        break;
+                }
+
+                /* 4 iterations is the worst case:
+                 * 1 - initial iteration, dirty = true (between VFP and VSYNC)
+                 * 2 - first VSYNC, dirty = true
+                 * 3 - dirty = false, shadow_dirty = true
+                 * 4 - shadow_dirty = false */
+                if (i++ == 3) {
+                        DSSERR("ovl(%d)->wait_for_go() not finishing\n",
+                                        ovl->id);
+                        r = 0;
+                        break;
+                }
+
+                r = omap_dispc_wait_for_irq_interruptible_timeout(irq, timeout);
+                if (r == -ERESTARTSYS)
+                        break;
+
+                if (r) {
+                        DSSERR("ovl(%d)->wait_for_go() timeout\n", ovl->id);
+                        break;
+                }
+        }
+
+        return r;
+}
+
+static int overlay_enabled(struct omap_overlay *ovl)
+{
+        return ovl->info.enabled && ovl->manager && ovl->manager->device;
+}
+
+/* Is rect1 a subset of rect2? */
+static bool rectangle_subset(int x1, int y1, int w1, int h1,
+                int x2, int y2, int w2, int h2)
+{
+        if (x1 < x2 || y1 < y2)
+                return false;
+
+        if (x1 + w1 > x2 + w2)
+                return false;
+
+        if (y1 + h1 > y2 + h2)
+                return false;
+
+        return true;
+}
+
+/* Do rect1 and rect2 overlap? */
+static bool rectangle_intersects(int x1, int y1, int w1, int h1,
+                int x2, int y2, int w2, int h2)
+{
+        if (x1 >= x2 + w2)
+                return false;
+
+        if (x2 >= x1 + w1)
+                return false;
+
+        if (y1 >= y2 + h2)
+                return false;
+
+        if (y2 >= y1 + h1)
+                return false;
+
+        return true;
+}
+
+static bool dispc_is_overlay_scaled(struct overlay_cache_data *oc)
+{
+        if (oc->out_width != 0 && oc->width != oc->out_width)
+                return true;
+
+        if (oc->out_height != 0 && oc->height != oc->out_height)
+                return true;
+
+        return false;
+}
+
+static int configure_overlay(enum omap_plane plane)
+{
+        struct overlay_cache_data *c;
+        struct manager_cache_data *mc;
+        u16 outw, outh;
+        u16 x, y, w, h;
+        u32 paddr;
+        int r;
+
+        DSSDBGF("%d", plane);
+
+        c = &dss_cache.overlay_cache[plane];
+
+        if (!c->enabled) {
+                dispc_enable_plane(plane, 0);
+                return 0;
+        }
+
+        mc = &dss_cache.manager_cache[c->channel];
+
+        x = c->pos_x;
+        y = c->pos_y;
+        w = c->width;
+        h = c->height;
+        outw = c->out_width == 0 ? c->width : c->out_width;
+        outh = c->out_height == 0 ? c->height : c->out_height;
+        paddr = c->paddr;
+
+        if (c->manual_update && mc->do_manual_update) {
+                unsigned bpp;
+                /* If the overlay is outside the update region, disable it */
+                if (!rectangle_intersects(mc->x, mc->y, mc->w, mc->h,
+                                        x, y, outw, outh)) {
+                        dispc_enable_plane(plane, 0);
+                        return 0;
+                }
+
+                switch (c->color_mode) {
+                case OMAP_DSS_COLOR_RGB16:
+                case OMAP_DSS_COLOR_ARGB16:
+                case OMAP_DSS_COLOR_YUV2:
+                case OMAP_DSS_COLOR_UYVY:
+                        bpp = 16;
+                        break;
+
+                case OMAP_DSS_COLOR_RGB24P:
+                        bpp = 24;
+                        break;
+
+                case OMAP_DSS_COLOR_RGB24U:
+                case OMAP_DSS_COLOR_ARGB32:
+                case OMAP_DSS_COLOR_RGBA32:
+                case OMAP_DSS_COLOR_RGBX32:
+                        bpp = 32;
+                        break;
+
+                default:
+                        BUG();
+                }
+
+                if (dispc_is_overlay_scaled(c)) {
+                        /* If the overlay is scaled, the update area has
+                         * already been enlarged to cover the whole overlay. We
+                         * only need to adjust x/y here */
+                        x = c->pos_x - mc->x;
+                        y = c->pos_y - mc->y;
+                } else {
+                        if (mc->x > c->pos_x) {
+                                x = 0;
+                                w -= (mc->x - c->pos_x);
+                                paddr += (mc->x - c->pos_x) * bpp / 8;
+                        } else {
+                                x = c->pos_x - mc->x;
+                        }
+
+                        if (mc->y > c->pos_y) {
+                                y = 0;
+                                h -= (mc->y - c->pos_y);
+                                paddr += (mc->y - c->pos_y) * c->screen_width *
+                                        bpp / 8;
+                        } else {
+                                y = c->pos_y - mc->y;
+                        }
+
+                        if (mc->w < (x+w))
+                                w -= (x+w) - (mc->w);
+
+                        if (mc->h < (y+h))
+                                h -= (y+h) - (mc->h);
+
+                        outw = w;
+                        outh = h;
+                }
+        }
+
+        r = dispc_setup_plane(plane,
+                        paddr,
+                        c->screen_width,
+                        x, y,
+                        w, h,
+                        outw, outh,
+                        c->color_mode,
+                        c->ilace,
+                        c->rotation_type,
+                        c->rotation,
+                        c->mirror,
+                        c->global_alpha);
+
+        if (r) {
+                /* this shouldn't happen */
+                DSSERR("dispc_setup_plane failed for ovl %d\n", plane);
+                dispc_enable_plane(plane, 0);
+                return r;
+        }
+
+        dispc_enable_replication(plane, c->replication);
+
+        dispc_set_burst_size(plane, c->burst_size);
+        dispc_setup_plane_fifo(plane, c->fifo_low, c->fifo_high);
+
+        dispc_enable_plane(plane, 1);
+
+        return 0;
+}
+
+static void configure_manager(enum omap_channel channel)
+{
+        struct manager_cache_data *c;
+
+        DSSDBGF("%d", channel);
+
+        c = &dss_cache.manager_cache[channel];
+
+        dispc_set_trans_key(channel, c->trans_key_type, c->trans_key);
+        dispc_enable_trans_key(channel, c->trans_enabled);
+        dispc_enable_alpha_blending(channel, c->alpha_enabled);
+}
+
+/* configure_dispc() tries to write values from cache to shadow registers.
+ * It writes only to those managers/overlays that are not busy.
+ * returns 0 if everything could be written to shadow registers.
+ * returns 1 if not everything could be written to shadow registers. */
+static int configure_dispc(void)
+{
+        struct overlay_cache_data *oc;
+        struct manager_cache_data *mc;
+        const int num_ovls = ARRAY_SIZE(dss_cache.overlay_cache);
+        const int num_mgrs = ARRAY_SIZE(dss_cache.manager_cache);
+        int i;
+        int r;
+        bool mgr_busy[2];
+        bool mgr_go[2];
+        bool busy;
+
+        r = 0;
+        busy = false;
+
+        mgr_busy[0] = dispc_go_busy(0);
+        mgr_busy[1] = dispc_go_busy(1);
+        mgr_go[0] = false;
+        mgr_go[1] = false;
+
+        /* Commit overlay settings */
+        for (i = 0; i < num_ovls; ++i) {
+                oc = &dss_cache.overlay_cache[i];
+                mc = &dss_cache.manager_cache[oc->channel];
+
+                if (!oc->dirty)
+                        continue;
+
+                if (oc->manual_update && !mc->do_manual_update)
+                        continue;
+
+                if (mgr_busy[oc->channel]) {
+                        busy = true;
+                        continue;
+                }
+
+                r = configure_overlay(i);
+                if (r)
+                        DSSERR("configure_overlay %d failed\n", i);
+
+                oc->dirty = false;
+                oc->shadow_dirty = true;
+                mgr_go[oc->channel] = true;
+        }
+
+        /* Commit manager settings */
+        for (i = 0; i < num_mgrs; ++i) {
+                mc = &dss_cache.manager_cache[i];
+
+                if (!mc->dirty)
+                        continue;
+
+                if (mc->manual_update && !mc->do_manual_update)
+                        continue;
+
+                if (mgr_busy[i]) {
+                        busy = true;
+                        continue;
+                }
+
+                configure_manager(i);
+                mc->dirty = false;
+                mc->shadow_dirty = true;
+                mgr_go[i] = true;
+        }
+
+        /* set GO */
+        for (i = 0; i < num_mgrs; ++i) {
+                mc = &dss_cache.manager_cache[i];
+
+                if (!mgr_go[i])
+                        continue;
+
+                /* We don't need GO with manual update display. LCD iface will
+                 * always be turned off after frame, and new settings will be
+                 * taken in to use at next update */
+                if (!mc->manual_upd_display)
+                        dispc_go(i);
+        }
+
+        if (busy)
+                r = 1;
+        else
+                r = 0;
+
+        return r;
+}
+
+/* Configure dispc for partial update. Return possibly modified update
+ * area */
+void dss_setup_partial_planes(struct omap_dss_device *dssdev,
+                u16 *xi, u16 *yi, u16 *wi, u16 *hi)
+{
+        struct overlay_cache_data *oc;
+        struct manager_cache_data *mc;
+        const int num_ovls = ARRAY_SIZE(dss_cache.overlay_cache);
+        struct omap_overlay_manager *mgr;
+        int i;
+        u16 x, y, w, h;
+        unsigned long flags;
+
+        x = *xi;
+        y = *yi;
+        w = *wi;
+        h = *hi;
+
+        DSSDBG("dispc_setup_partial_planes %d,%d %dx%d\n",
+                *xi, *yi, *wi, *hi);
+
+        mgr = dssdev->manager;
+
+        if (!mgr) {
+                DSSDBG("no manager\n");
+                return;
+        }
+
+        spin_lock_irqsave(&dss_cache.lock, flags);
+
+        /* We need to show the whole overlay if it is scaled. So look for
+         * those, and make the update area larger if found.
+         * Also mark the overlay cache dirty */
+        for (i = 0; i < num_ovls; ++i) {
+                unsigned x1, y1, x2, y2;
+                unsigned outw, outh;
+
+                oc = &dss_cache.overlay_cache[i];
+
+                if (oc->channel != mgr->id)
+                        continue;
+
+                oc->dirty = true;
+
+                if (!oc->enabled)
+                        continue;
+
+                if (!dispc_is_overlay_scaled(oc))
+                        continue;
+
+                outw = oc->out_width == 0 ? oc->width : oc->out_width;
+                outh = oc->out_height == 0 ? oc->height : oc->out_height;
+
+                /* is the overlay outside the update region? */
+                if (!rectangle_intersects(x, y, w, h,
+                                        oc->pos_x, oc->pos_y,
+                                        outw, outh))
+                        continue;
+
+                /* if the overlay totally inside the update region? */
+                if (rectangle_subset(oc->pos_x, oc->pos_y, outw, outh,
+                                        x, y, w, h))
+                        continue;
+
+                if (x > oc->pos_x)
+                        x1 = oc->pos_x;
+                else
+                        x1 = x;
+
+                if (y > oc->pos_y)
+                        y1 = oc->pos_y;
+                else
+                        y1 = y;
+
+                if ((x + w) < (oc->pos_x + outw))
+                        x2 = oc->pos_x + outw;
+                else
+                        x2 = x + w;
+
+                if ((y + h) < (oc->pos_y + outh))
+                        y2 = oc->pos_y + outh;
+                else
+                        y2 = y + h;
+
+                x = x1;
+                y = y1;
+                w = x2 - x1;
+                h = y2 - y1;
+
+                DSSDBG("changing upd area due to ovl(%d) scaling %d,%d %dx%d\n",
+                                i, x, y, w, h);
+        }
+
+        mc = &dss_cache.manager_cache[mgr->id];
+        mc->do_manual_update = true;
+        mc->x = x;
+        mc->y = y;
+        mc->w = w;
+        mc->h = h;
+
+        configure_dispc();
+
+        mc->do_manual_update = false;
+
+        spin_unlock_irqrestore(&dss_cache.lock, flags);
+
+        *xi = x;
+        *yi = y;
+        *wi = w;
+        *hi = h;
+}
+
+void dss_start_update(struct omap_dss_device *dssdev)
+{
+        struct manager_cache_data *mc;
+        struct overlay_cache_data *oc;
+        const int num_ovls = ARRAY_SIZE(dss_cache.overlay_cache);
+        const int num_mgrs = ARRAY_SIZE(dss_cache.manager_cache);
+        struct omap_overlay_manager *mgr;
+        int i;
+
+        mgr = dssdev->manager;
+
+        for (i = 0; i < num_ovls; ++i) {
+                oc = &dss_cache.overlay_cache[i];
+                if (oc->channel != mgr->id)
+                        continue;
+
+                oc->shadow_dirty = false;
+        }
+
+        for (i = 0; i < num_mgrs; ++i) {
+                mc = &dss_cache.manager_cache[i];
+                if (mgr->id != i)
+                        continue;
+
+                mc->shadow_dirty = false;
+        }
+
+        dssdev->manager->enable(dssdev->manager);
+}
+
+static void dss_apply_irq_handler(void *data, u32 mask)
+{
+        struct manager_cache_data *mc;
+        struct overlay_cache_data *oc;
+        const int num_ovls = ARRAY_SIZE(dss_cache.overlay_cache);
+        const int num_mgrs = ARRAY_SIZE(dss_cache.manager_cache);
+        int i, r;
+        bool mgr_busy[2];
+
+        mgr_busy[0] = dispc_go_busy(0);
+        mgr_busy[1] = dispc_go_busy(1);
+
+        spin_lock(&dss_cache.lock);
+
+        for (i = 0; i < num_ovls; ++i) {
+                oc = &dss_cache.overlay_cache[i];
+                if (!mgr_busy[oc->channel])
+                        oc->shadow_dirty = false;
+        }
+
+        for (i = 0; i < num_mgrs; ++i) {
+                mc = &dss_cache.manager_cache[i];
+                if (!mgr_busy[i])
+                        mc->shadow_dirty = false;
+        }
+
+        r = configure_dispc();
+        if (r == 1)
+                goto end;
+
+        /* re-read busy flags */
+        mgr_busy[0] = dispc_go_busy(0);
+        mgr_busy[1] = dispc_go_busy(1);
+
+        /* keep running as long as there are busy managers, so that
+         * we can collect overlay-applied information */
+        for (i = 0; i < num_mgrs; ++i) {
+                if (mgr_busy[i])
+                        goto end;
+        }
+
+        omap_dispc_unregister_isr(dss_apply_irq_handler, NULL,
+                        DISPC_IRQ_VSYNC | DISPC_IRQ_EVSYNC_ODD |
+                        DISPC_IRQ_EVSYNC_EVEN);
+        dss_cache.irq_enabled = false;
+
+end:
+        spin_unlock(&dss_cache.lock);
+}
+
+static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
+{
+        struct overlay_cache_data *oc;
+        struct manager_cache_data *mc;
+        int i;
+        struct omap_overlay *ovl;
+        int num_planes_enabled = 0;
+        bool use_fifomerge;
+        unsigned long flags;
+        int r;
+
+        DSSDBG("omap_dss_mgr_apply(%s)\n", mgr->name);
+
+        spin_lock_irqsave(&dss_cache.lock, flags);
+
+        /* Configure overlays */
+        for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
+                struct omap_dss_device *dssdev;
+
+                ovl = omap_dss_get_overlay(i);
+
+                if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC))
+                        continue;
+
+                oc = &dss_cache.overlay_cache[ovl->id];
+
+                if (!overlay_enabled(ovl)) {
+                        if (oc->enabled) {
+                                oc->enabled = false;
+                                oc->dirty = true;
+                        }
+                        continue;
+                }
+
+                if (!ovl->info_dirty) {
+                        if (oc->enabled)
+                                ++num_planes_enabled;
+                        continue;
+                }
+
+                dssdev = ovl->manager->device;
+
+                if (dss_check_overlay(ovl, dssdev)) {
+                        if (oc->enabled) {
+                                oc->enabled = false;
+                                oc->dirty = true;
+                        }
+                        continue;
+                }
+
+                ovl->info_dirty = false;
+                oc->dirty = true;
+
+                oc->paddr = ovl->info.paddr;
+                oc->vaddr = ovl->info.vaddr;
+                oc->screen_width = ovl->info.screen_width;
+                oc->width = ovl->info.width;
+                oc->height = ovl->info.height;
+                oc->color_mode = ovl->info.color_mode;
+                oc->rotation = ovl->info.rotation;
+                oc->rotation_type = ovl->info.rotation_type;
+                oc->mirror = ovl->info.mirror;
+                oc->pos_x = ovl->info.pos_x;
+                oc->pos_y = ovl->info.pos_y;
+                oc->out_width = ovl->info.out_width;
+                oc->out_height = ovl->info.out_height;
+                oc->global_alpha = ovl->info.global_alpha;
+
+                oc->replication =
+                        dss_use_replication(dssdev, ovl->info.color_mode);
+
+                oc->ilace = dssdev->type == OMAP_DISPLAY_TYPE_VENC;
+
+                oc->channel = ovl->manager->id;
+
+                oc->enabled = true;
+
+                oc->manual_update =
+                        dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE &&
+                        dssdev->driver->get_update_mode(dssdev) !=
+                                OMAP_DSS_UPDATE_AUTO;
+
+                ++num_planes_enabled;
+        }
+
+        /* Configure managers */
+        list_for_each_entry(mgr, &manager_list, list) {
+                struct omap_dss_device *dssdev;
+
+                if (!(mgr->caps & OMAP_DSS_OVL_MGR_CAP_DISPC))
+                        continue;
+
+                mc = &dss_cache.manager_cache[mgr->id];
+
+                if (mgr->device_changed) {
+                        mgr->device_changed = false;
+                        mgr->info_dirty  = true;
+                }
+
+                if (!mgr->info_dirty)
+                        continue;
+
+                if (!mgr->device)
+                        continue;
+
+                dssdev = mgr->device;
+
+                mgr->info_dirty = false;
+                mc->dirty = true;
+
+                mc->default_color = mgr->info.default_color;
+                mc->trans_key_type = mgr->info.trans_key_type;
+                mc->trans_key = mgr->info.trans_key;
+                mc->trans_enabled = mgr->info.trans_enabled;
+                mc->alpha_enabled = mgr->info.alpha_enabled;
+
+                mc->manual_upd_display =
+                        dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE;
+
+                mc->manual_update =
+                        dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE &&
+                        dssdev->driver->get_update_mode(dssdev) !=
+                                OMAP_DSS_UPDATE_AUTO;
+        }
+
+        /* XXX TODO: Try to get fifomerge working. The problem is that it
+         * affects both managers, not individually but at the same time. This
+         * means the change has to be well synchronized. I guess the proper way
+         * is to have a two step process for fifo merge:
+         *        fifomerge enable:
+         *             1. disable other planes, leaving one plane enabled
+         *             2. wait until the planes are disabled on HW
+         *             3. config merged fifo thresholds, enable fifomerge
+         *        fifomerge disable:
+         *             1. config unmerged fifo thresholds, disable fifomerge
+         *             2. wait until fifo changes are in HW
+         *             3. enable planes
+         */
+        use_fifomerge = false;
+
+        /* Configure overlay fifos */
+        for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
+                struct omap_dss_device *dssdev;
+                u32 size;
+
+                ovl = omap_dss_get_overlay(i);
+
+                if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC))
+                        continue;
+
+                oc = &dss_cache.overlay_cache[ovl->id];
+
+                if (!oc->enabled)
+                        continue;
+
+                dssdev = ovl->manager->device;
+
+                size = dispc_get_plane_fifo_size(ovl->id);
+                if (use_fifomerge)
+                        size *= 3;
+
+                switch (dssdev->type) {
+                case OMAP_DISPLAY_TYPE_DPI:
+                case OMAP_DISPLAY_TYPE_DBI:
+                case OMAP_DISPLAY_TYPE_SDI:
+                case OMAP_DISPLAY_TYPE_VENC:
+                        default_get_overlay_fifo_thresholds(ovl->id, size,
+                                        &oc->burst_size, &oc->fifo_low,
+                                        &oc->fifo_high);
+                        break;
+#ifdef CONFIG_OMAP2_DSS_DSI
+                case OMAP_DISPLAY_TYPE_DSI:
+                        dsi_get_overlay_fifo_thresholds(ovl->id, size,
+                                        &oc->burst_size, &oc->fifo_low,
+                                        &oc->fifo_high);
+                        break;
+#endif
+                default:
+                        BUG();
+                }
+        }
+
+        r = 0;
+        dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
+        if (!dss_cache.irq_enabled) {
+                r = omap_dispc_register_isr(dss_apply_irq_handler, NULL,
+                                DISPC_IRQ_VSYNC | DISPC_IRQ_EVSYNC_ODD |
+                                DISPC_IRQ_EVSYNC_EVEN);
+                dss_cache.irq_enabled = true;
+        }
+        configure_dispc();
+        dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
+
+        spin_unlock_irqrestore(&dss_cache.lock, flags);
+
+        return r;
+}
+
+static int dss_check_manager(struct omap_overlay_manager *mgr)
+{
+        /* OMAP supports only graphics source transparency color key and alpha
+         * blending simultaneously. See TRM 15.4.2.4.2.2 Alpha Mode */
+
+        if (mgr->info.alpha_enabled && mgr->info.trans_enabled &&
+                        mgr->info.trans_key_type != OMAP_DSS_COLOR_KEY_GFX_DST)
+                return -EINVAL;
+
+        return 0;
+}
+
+static int omap_dss_mgr_set_info(struct omap_overlay_manager *mgr,
+                struct omap_overlay_manager_info *info)
+{
+        int r;
+        struct omap_overlay_manager_info old_info;
+
+        old_info = mgr->info;
+        mgr->info = *info;
+
+        r = dss_check_manager(mgr);
+        if (r) {
+                mgr->info = old_info;
+                return r;
+        }
+
+        mgr->info_dirty = true;
+
+        return 0;
+}
+
+static void omap_dss_mgr_get_info(struct omap_overlay_manager *mgr,
+                struct omap_overlay_manager_info *info)
+{
+        *info = mgr->info;
+}
+
+static int dss_mgr_enable(struct omap_overlay_manager *mgr)
+{
+        dispc_enable_channel(mgr->id, 1);
+        return 0;
+}
+
+static int dss_mgr_disable(struct omap_overlay_manager *mgr)
+{
+        dispc_enable_channel(mgr->id, 0);
+        return 0;
+}
+
+static void omap_dss_add_overlay_manager(struct omap_overlay_manager *manager)
+{
+        ++num_managers;
+        list_add_tail(&manager->list, &manager_list);
+}
+
+int dss_init_overlay_managers(struct platform_device *pdev)
+{
+        int i, r;
+
+        spin_lock_init(&dss_cache.lock);
+
+        INIT_LIST_HEAD(&manager_list);
+
+        num_managers = 0;
+
+        for (i = 0; i < 2; ++i) {
+                struct omap_overlay_manager *mgr;
+                mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
+
+                BUG_ON(mgr == NULL);
+
+                switch (i) {
+                case 0:
+                        mgr->name = "lcd";
+                        mgr->id = OMAP_DSS_CHANNEL_LCD;
+                        mgr->supported_displays =
+                                OMAP_DISPLAY_TYPE_DPI | OMAP_DISPLAY_TYPE_DBI |
+                                OMAP_DISPLAY_TYPE_SDI | OMAP_DISPLAY_TYPE_DSI;
+                        break;
+                case 1:
+                        mgr->name = "tv";
+                        mgr->id = OMAP_DSS_CHANNEL_DIGIT;
+                        mgr->supported_displays = OMAP_DISPLAY_TYPE_VENC;
+                        break;
+                }
+
+                mgr->set_device = &omap_dss_set_device;
+                mgr->unset_device = &omap_dss_unset_device;
+                mgr->apply = &omap_dss_mgr_apply;
+                mgr->set_manager_info = &omap_dss_mgr_set_info;
+                mgr->get_manager_info = &omap_dss_mgr_get_info;
+                mgr->wait_for_go = &dss_mgr_wait_for_go;
+                mgr->wait_for_vsync = &dss_mgr_wait_for_vsync;
+
+                mgr->enable = &dss_mgr_enable;
+                mgr->disable = &dss_mgr_disable;
+
+                mgr->caps = OMAP_DSS_OVL_MGR_CAP_DISPC;
+
+                dss_overlay_setup_dispc_manager(mgr);
+
+                omap_dss_add_overlay_manager(mgr);
+
+                r = kobject_init_and_add(&mgr->kobj, &manager_ktype,
+                                &pdev->dev.kobj, "manager%d", i);
+
+                if (r) {
+                        DSSERR("failed to create sysfs file\n");
+                        continue;
+                }
+        }
+
+#ifdef L4_EXAMPLE
+        {
+                int omap_dss_mgr_apply_l4(struct omap_overlay_manager *mgr)
+                {
+                        DSSDBG("omap_dss_mgr_apply_l4(%s)\n", mgr->name);
+
+                        return 0;
+                }
+
+                struct omap_overlay_manager *mgr;
+                mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
+
+                BUG_ON(mgr == NULL);
+
+                mgr->name = "l4";
+                mgr->supported_displays =
+                        OMAP_DISPLAY_TYPE_DBI | OMAP_DISPLAY_TYPE_DSI;
+
+                mgr->set_device = &omap_dss_set_device;
+                mgr->unset_device = &omap_dss_unset_device;
+                mgr->apply = &omap_dss_mgr_apply_l4;
+                mgr->set_manager_info = &omap_dss_mgr_set_info;
+                mgr->get_manager_info = &omap_dss_mgr_get_info;
+
+                dss_overlay_setup_l4_manager(mgr);
+
+                omap_dss_add_overlay_manager(mgr);
+
+                r = kobject_init_and_add(&mgr->kobj, &manager_ktype,
+                                &pdev->dev.kobj, "managerl4");
+
+                if (r)
+                        DSSERR("failed to create sysfs file\n");
+        }
+#endif
+
+        return 0;
+}
+
+void dss_uninit_overlay_managers(struct platform_device *pdev)
+{
+        struct omap_overlay_manager *mgr;
+
+        while (!list_empty(&manager_list)) {
+                mgr = list_first_entry(&manager_list,
+                                struct omap_overlay_manager, list);
+                list_del(&mgr->list);
+                kobject_del(&mgr->kobj);
+                kobject_put(&mgr->kobj);
+                kfree(mgr);
+        }
+
+        num_managers = 0;
+}
+
+int omap_dss_get_num_overlay_managers(void)
+{
+        return num_managers;
+}
+EXPORT_SYMBOL(omap_dss_get_num_overlay_managers);
+
+struct omap_overlay_manager *omap_dss_get_overlay_manager(int num)
+{
+        int i = 0;
+        struct omap_overlay_manager *mgr;
+
+        list_for_each_entry(mgr, &manager_list, list) {
+                if (i++ == num)
+                        return mgr;
+        }
+
+        return NULL;
+}
+EXPORT_SYMBOL(omap_dss_get_overlay_manager);
+
diff --git a/drivers/video/omap2/dss/overlay.c b/drivers/video/omap2/dss/overlay.c
new file mode 100644
index 000000000000..82336583adef
--- /dev/null
+++ b/drivers/video/omap2/dss/overlay.c
@@ -0,0 +1,681 @@
+/*
+ * linux/drivers/video/omap2/dss/overlay.c
+ *
+ * Copyright (C) 2009 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * Some code and ideas taken from drivers/video/omap/ driver
+ * by Imre Deak.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define DSS_SUBSYS_NAME "OVERLAY"
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/err.h>
+#include <linux/sysfs.h>
+#include <linux/kobject.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+
+#include <plat/display.h>
+#include <plat/cpu.h>
+
+#include "dss.h"
+
+static int num_overlays;
+static struct list_head overlay_list;
+
+static ssize_t overlay_name_show(struct omap_overlay *ovl, char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%s\n", ovl->name);
+}
+
+static ssize_t overlay_manager_show(struct omap_overlay *ovl, char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%s\n",
+                        ovl->manager ? ovl->manager->name : "<none>");
+}
+
+static ssize_t overlay_manager_store(struct omap_overlay *ovl, const char *buf,
+                size_t size)
+{
+        int i, r;
+        struct omap_overlay_manager *mgr = NULL;
+        struct omap_overlay_manager *old_mgr;
+        int len = size;
+
+        if (buf[size-1] == '\n')
+                --len;
+
+        if (len > 0) {
+                for (i = 0; i < omap_dss_get_num_overlay_managers(); ++i) {
+                        mgr = omap_dss_get_overlay_manager(i);
+
+                        if (strncmp(buf, mgr->name, len) == 0)
+                                break;
+
+                        mgr = NULL;
+                }
+        }
+
+        if (len > 0 && mgr == NULL)
+                return -EINVAL;
+
+        if (mgr)
+                DSSDBG("manager %s found\n", mgr->name);
+
+        if (mgr == ovl->manager)
+                return size;
+
+        old_mgr = ovl->manager;
+
+        /* detach old manager */
+        if (old_mgr) {
+                r = ovl->unset_manager(ovl);
+                if (r) {
+                        DSSERR("detach failed\n");
+                        return r;
+                }
+
+                r = old_mgr->apply(old_mgr);
+                if (r)
+                        return r;
+        }
+
+        if (mgr) {
+                r = ovl->set_manager(ovl, mgr);
+                if (r) {
+                        DSSERR("Failed to attach overlay\n");
+                        return r;
+                }
+
+                r = mgr->apply(mgr);
+                if (r)
+                        return r;
+        }
+
+        return size;
+}
+
+static ssize_t overlay_input_size_show(struct omap_overlay *ovl, char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%d,%d\n",
+                        ovl->info.width, ovl->info.height);
+}
+
+static ssize_t overlay_screen_width_show(struct omap_overlay *ovl, char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%d\n", ovl->info.screen_width);
+}
+
+static ssize_t overlay_position_show(struct omap_overlay *ovl, char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%d,%d\n",
+                        ovl->info.pos_x, ovl->info.pos_y);
+}
+
+static ssize_t overlay_position_store(struct omap_overlay *ovl,
+                const char *buf, size_t size)
+{
+        int r;
+        char *last;
+        struct omap_overlay_info info;
+
+        ovl->get_overlay_info(ovl, &info);
+
+        info.pos_x = simple_strtoul(buf, &last, 10);
+        ++last;
+        if (last - buf >= size)
+                return -EINVAL;
+
+        info.pos_y = simple_strtoul(last, &last, 10);
+
+        r = ovl->set_overlay_info(ovl, &info);
+        if (r)
+                return r;
+
+        if (ovl->manager) {
+                r = ovl->manager->apply(ovl->manager);
+                if (r)
+                        return r;
+        }
+
+        return size;
+}
+
+static ssize_t overlay_output_size_show(struct omap_overlay *ovl, char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%d,%d\n",
+                        ovl->info.out_width, ovl->info.out_height);
+}
+
+static ssize_t overlay_output_size_store(struct omap_overlay *ovl,
+                const char *buf, size_t size)
+{
+        int r;
+        char *last;
+        struct omap_overlay_info info;
+
+        ovl->get_overlay_info(ovl, &info);
+
+        info.out_width = simple_strtoul(buf, &last, 10);
+        ++last;
+        if (last - buf >= size)
+                return -EINVAL;
+
+        info.out_height = simple_strtoul(last, &last, 10);
+
+        r = ovl->set_overlay_info(ovl, &info);
+        if (r)
+                return r;
+
+        if (ovl->manager) {
+                r = ovl->manager->apply(ovl->manager);
+                if (r)
+                        return r;
+        }
+
+        return size;
+}
+
+static ssize_t overlay_enabled_show(struct omap_overlay *ovl, char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%d\n", ovl->info.enabled);
+}
+
+static ssize_t overlay_enabled_store(struct omap_overlay *ovl, const char *buf,
+                size_t size)
+{
+        int r;
+        struct omap_overlay_info info;
+
+        ovl->get_overlay_info(ovl, &info);
+
+        info.enabled = simple_strtoul(buf, NULL, 10);
+
+        r = ovl->set_overlay_info(ovl, &info);
+        if (r)
+                return r;
+
+        if (ovl->manager) {
+                r = ovl->manager->apply(ovl->manager);
+                if (r)
+                        return r;
+        }
+
+        return size;
+}
+
+static ssize_t overlay_global_alpha_show(struct omap_overlay *ovl, char *buf)
+{
+        return snprintf(buf, PAGE_SIZE, "%d\n",
+                        ovl->info.global_alpha);
+}
+
+static ssize_t overlay_global_alpha_store(struct omap_overlay *ovl,
+                const char *buf, size_t size)
+{
+        int r;
+        struct omap_overlay_info info;
+
+        ovl->get_overlay_info(ovl, &info);
+
+        /* Video1 plane does not support global alpha
+         * to always make it 255 completely opaque
+         */
+        if (ovl->id == OMAP_DSS_VIDEO1)
+                info.global_alpha = 255;
+        else
+                info.global_alpha = simple_strtoul(buf, NULL, 10);
+
+        r = ovl->set_overlay_info(ovl, &info);
+        if (r)
+                return r;
+
+        if (ovl->manager) {
+                r = ovl->manager->apply(ovl->manager);
+                if (r)
+                        return r;
+        }
+
+        return size;
+}
+
+struct overlay_attribute {
+        struct attribute attr;
+        ssize_t (*show)(struct omap_overlay *, char *);
+        ssize_t (*store)(struct omap_overlay *, const char *, size_t);
+};
+
+#define OVERLAY_ATTR(_name, _mode, _show, _store) \
+        struct overlay_attribute overlay_attr_##_name = \
+        __ATTR(_name, _mode, _show, _store)
+
+static OVERLAY_ATTR(name, S_IRUGO, overlay_name_show, NULL);
+static OVERLAY_ATTR(manager, S_IRUGO|S_IWUSR,
+                overlay_manager_show, overlay_manager_store);
+static OVERLAY_ATTR(input_size, S_IRUGO, overlay_input_size_show, NULL);
+static OVERLAY_ATTR(screen_width, S_IRUGO, overlay_screen_width_show, NULL);
+static OVERLAY_ATTR(position, S_IRUGO|S_IWUSR,
+                overlay_position_show, overlay_position_store);
+static OVERLAY_ATTR(output_size, S_IRUGO|S_IWUSR,
+                overlay_output_size_show, overlay_output_size_store);
+static OVERLAY_ATTR(enabled, S_IRUGO|S_IWUSR,
+                overlay_enabled_show, overlay_enabled_store);
+static OVERLAY_ATTR(global_alpha, S_IRUGO|S_IWUSR,
+                overlay_global_alpha_show, overlay_global_alpha_store);
+
+static struct attribute *overlay_sysfs_attrs[] = {
+        &overlay_attr_name.attr,
+        &overlay_attr_manager.attr,
+        &overlay_attr_input_size.attr,
+        &overlay_attr_screen_width.attr,
+        &overlay_attr_position.attr,
+        &overlay_attr_output_size.attr,
+        &overlay_attr_enabled.attr,
+        &overlay_attr_global_alpha.attr,
+        NULL
+};
+
+static ssize_t overlay_attr_show(struct kobject *kobj, struct attribute *attr,
+                char *buf)
+{
+        struct omap_overlay *overlay;
+        struct overlay_attribute *overlay_attr;
+
+        overlay = container_of(kobj, struct omap_overlay, kobj);
+        overlay_attr = container_of(attr, struct overlay_attribute, attr);
+
+        if (!overlay_attr->show)
+                return -ENOENT;
+
+        return overlay_attr->show(overlay, buf);
+}
+
+static ssize_t overlay_attr_store(struct kobject *kobj, struct attribute *attr,
+                const char *buf, size_t size)
+{
+        struct omap_overlay *overlay;
+        struct overlay_attribute *overlay_attr;
+
+        overlay = container_of(kobj, struct omap_overlay, kobj);
+        overlay_attr = container_of(attr, struct overlay_attribute, attr);
+
+        if (!overlay_attr->store)
+                return -ENOENT;
+
+        return overlay_attr->store(overlay, buf, size);
+}
+
+static const struct sysfs_ops overlay_sysfs_ops = {
+        .show = overlay_attr_show,
+        .store = overlay_attr_store,
+};
+
+static struct kobj_type overlay_ktype = {
+        .sysfs_ops = &overlay_sysfs_ops,
+        .default_attrs = overlay_sysfs_attrs,
+};
+
+/* Check if overlay parameters are compatible with display */
+int dss_check_overlay(struct omap_overlay *ovl, struct omap_dss_device *dssdev)
+{
+        struct omap_overlay_info *info;
+        u16 outw, outh;
+        u16 dw, dh;
+
+        if (!dssdev)
+                return 0;
+
+        if (!ovl->info.enabled)
+                return 0;
+
+        info = &ovl->info;
+
+        if (info->paddr == 0) {
+                DSSDBG("check_overlay failed: paddr 0\n");
+                return -EINVAL;
+        }
+
+        dssdev->driver->get_resolution(dssdev, &dw, &dh);
+
+        DSSDBG("check_overlay %d: (%d,%d %dx%d -> %dx%d) disp (%dx%d)\n",
+                        ovl->id,
+                        info->pos_x, info->pos_y,
+                        info->width, info->height,
+                        info->out_width, info->out_height,
+                        dw, dh);
+
+        if ((ovl->caps & OMAP_DSS_OVL_CAP_SCALE) == 0) {
+                outw = info->width;
+                outh = info->height;
+        } else {
+                if (info->out_width == 0)
+                        outw = info->width;
+                else
+                        outw = info->out_width;
+
+                if (info->out_height == 0)
+                        outh = info->height;
+                else
+                        outh = info->out_height;
+        }
+
+        if (dw < info->pos_x + outw) {
+                DSSDBG("check_overlay failed 1: %d < %d + %d\n",
+                                dw, info->pos_x, outw);
+                return -EINVAL;
+        }
+
+        if (dh < info->pos_y + outh) {
+                DSSDBG("check_overlay failed 2: %d < %d + %d\n",
+                                dh, info->pos_y, outh);
+                return -EINVAL;
+        }
+
+        if ((ovl->supported_modes & info->color_mode) == 0) {
+                DSSERR("overlay doesn't support mode %d\n", info->color_mode);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int dss_ovl_set_overlay_info(struct omap_overlay *ovl,
+                struct omap_overlay_info *info)
+{
+        int r;
+        struct omap_overlay_info old_info;
+
+        old_info = ovl->info;
+        ovl->info = *info;
+
+        if (ovl->manager) {
+                r = dss_check_overlay(ovl, ovl->manager->device);
+                if (r) {
+                        ovl->info = old_info;
+                        return r;
+                }
+        }
+
+        ovl->info_dirty = true;
+
+        return 0;
+}
+
+static void dss_ovl_get_overlay_info(struct omap_overlay *ovl,
+                struct omap_overlay_info *info)
+{
+        *info = ovl->info;
+}
+
+static int dss_ovl_wait_for_go(struct omap_overlay *ovl)
+{
+        return dss_mgr_wait_for_go_ovl(ovl);
+}
+
+static int omap_dss_set_manager(struct omap_overlay *ovl,
+                struct omap_overlay_manager *mgr)
+{
+        if (!mgr)
+                return -EINVAL;
+
+        if (ovl->manager) {
+                DSSERR("overlay '%s' already has a manager '%s'\n",
+                                ovl->name, ovl->manager->name);
+                return -EINVAL;
+        }
+
+        if (ovl->info.enabled) {
+                DSSERR("overlay has to be disabled to change the manager\n");
+                return -EINVAL;
+        }
+
+        ovl->manager = mgr;
+
+        dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
+        /* XXX: on manual update display, in auto update mode, a bug happens
+         * here. When an overlay is first enabled on LCD, then it's disabled,
+         * and the manager is changed to TV, we sometimes get SYNC_LOST_DIGIT
+         * errors. Waiting before changing the channel_out fixes it. I'm
+         * guessing that the overlay is still somehow being used for the LCD,
+         * but I don't understand how or why. */
+        msleep(40);
+        dispc_set_channel_out(ovl->id, mgr->id);
+        dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
+
+        return 0;
+}
+
+static int omap_dss_unset_manager(struct omap_overlay *ovl)
+{
+        int r;
+
+        if (!ovl->manager) {
+                DSSERR("failed to detach overlay: manager not set\n");
+                return -EINVAL;
+        }
+
+        if (ovl->info.enabled) {
+                DSSERR("overlay has to be disabled to unset the manager\n");
+                return -EINVAL;
+        }
+
+        r = ovl->wait_for_go(ovl);
+        if (r)
+                return r;
+
+        ovl->manager = NULL;
+
+        return 0;
+}
+
+int omap_dss_get_num_overlays(void)
+{
+        return num_overlays;
+}
+EXPORT_SYMBOL(omap_dss_get_num_overlays);
+
+struct omap_overlay *omap_dss_get_overlay(int num)
+{
+        int i = 0;
+        struct omap_overlay *ovl;
+
+        list_for_each_entry(ovl, &overlay_list, list) {
+                if (i++ == num)
+                        return ovl;
+        }
+
+        return NULL;
+}
+EXPORT_SYMBOL(omap_dss_get_overlay);
+
+static void omap_dss_add_overlay(struct omap_overlay *overlay)
+{
+        ++num_overlays;
+        list_add_tail(&overlay->list, &overlay_list);
+}
+
+static struct omap_overlay *dispc_overlays[3];
+
+void dss_overlay_setup_dispc_manager(struct omap_overlay_manager *mgr)
+{
+        mgr->num_overlays = 3;
+        mgr->overlays = dispc_overlays;
+}
+
+#ifdef L4_EXAMPLE
+static struct omap_overlay *l4_overlays[1];
+void dss_overlay_setup_l4_manager(struct omap_overlay_manager *mgr)
+{
+        mgr->num_overlays = 1;
+        mgr->overlays = l4_overlays;
+}
+#endif
+
+void dss_init_overlays(struct platform_device *pdev)
+{
+        int i, r;
+
+        INIT_LIST_HEAD(&overlay_list);
+
+        num_overlays = 0;
+
+        for (i = 0; i < 3; ++i) {
+                struct omap_overlay *ovl;
+                ovl = kzalloc(sizeof(*ovl), GFP_KERNEL);
+
+                BUG_ON(ovl == NULL);
+
+                switch (i) {
+                case 0:
+                        ovl->name = "gfx";
+                        ovl->id = OMAP_DSS_GFX;
+                        ovl->supported_modes = cpu_is_omap34xx() ?
+                                OMAP_DSS_COLOR_GFX_OMAP3 :
+                                OMAP_DSS_COLOR_GFX_OMAP2;
+                        ovl->caps = OMAP_DSS_OVL_CAP_DISPC;
+                        ovl->info.global_alpha = 255;
+                        break;
+                case 1:
+                        ovl->name = "vid1";
+                        ovl->id = OMAP_DSS_VIDEO1;
+                        ovl->supported_modes = cpu_is_omap34xx() ?
+                                OMAP_DSS_COLOR_VID1_OMAP3 :
+                                OMAP_DSS_COLOR_VID_OMAP2;
+                        ovl->caps = OMAP_DSS_OVL_CAP_SCALE |
+                                OMAP_DSS_OVL_CAP_DISPC;
+                        ovl->info.global_alpha = 255;
+                        break;
+                case 2:
+                        ovl->name = "vid2";
+                        ovl->id = OMAP_DSS_VIDEO2;
+                        ovl->supported_modes = cpu_is_omap34xx() ?
+                                OMAP_DSS_COLOR_VID2_OMAP3 :
+                                OMAP_DSS_COLOR_VID_OMAP2;
+                        ovl->caps = OMAP_DSS_OVL_CAP_SCALE |
+                                OMAP_DSS_OVL_CAP_DISPC;
+                        ovl->info.global_alpha = 255;
+                        break;
+                }
+
+                ovl->set_manager = &omap_dss_set_manager;
+                ovl->unset_manager = &omap_dss_unset_manager;
+                ovl->set_overlay_info = &dss_ovl_set_overlay_info;
+                ovl->get_overlay_info = &dss_ovl_get_overlay_info;
+                ovl->wait_for_go = &dss_ovl_wait_for_go;
+
+                omap_dss_add_overlay(ovl);
+
+                r = kobject_init_and_add(&ovl->kobj, &overlay_ktype,
+                                &pdev->dev.kobj, "overlay%d", i);
+
+                if (r) {
+                        DSSERR("failed to create sysfs file\n");
+                        continue;
+                }
+
+                dispc_overlays[i] = ovl;
+        }
+
+#ifdef L4_EXAMPLE
+        {
+                struct omap_overlay *ovl;
+                ovl = kzalloc(sizeof(*ovl), GFP_KERNEL);
+
+                BUG_ON(ovl == NULL);
+
+                ovl->name = "l4";
+                ovl->supported_modes = OMAP_DSS_COLOR_RGB24U;
+
+                ovl->set_manager = &omap_dss_set_manager;
+                ovl->unset_manager = &omap_dss_unset_manager;
+                ovl->set_overlay_info = &dss_ovl_set_overlay_info;
+                ovl->get_overlay_info = &dss_ovl_get_overlay_info;
+
+                omap_dss_add_overlay(ovl);
+
+                r = kobject_init_and_add(&ovl->kobj, &overlay_ktype,
+                                &pdev->dev.kobj, "overlayl4");
+
+                if (r)
+                        DSSERR("failed to create sysfs file\n");
+
+                l4_overlays[0] = ovl;
+        }
+#endif
+}
+
+/* connect overlays to the new device, if not already connected. if force
+ * selected, connect always. */
+void dss_recheck_connections(struct omap_dss_device *dssdev, bool force)
+{
+        int i;
+        struct omap_overlay_manager *lcd_mgr;
+        struct omap_overlay_manager *tv_mgr;
+        struct omap_overlay_manager *mgr = NULL;
+
+        lcd_mgr = omap_dss_get_overlay_manager(OMAP_DSS_OVL_MGR_LCD);
+        tv_mgr = omap_dss_get_overlay_manager(OMAP_DSS_OVL_MGR_TV);
+
+        if (dssdev->type != OMAP_DISPLAY_TYPE_VENC) {
+                if (!lcd_mgr->device || force) {
+                        if (lcd_mgr->device)
+                                lcd_mgr->unset_device(lcd_mgr);
+                        lcd_mgr->set_device(lcd_mgr, dssdev);
+                        mgr = lcd_mgr;
+                }
+        }
+
+        if (dssdev->type == OMAP_DISPLAY_TYPE_VENC) {
+                if (!tv_mgr->device || force) {
+                        if (tv_mgr->device)
+                                tv_mgr->unset_device(tv_mgr);
+                        tv_mgr->set_device(tv_mgr, dssdev);
+                        mgr = tv_mgr;
+                }
+        }
+
+        if (mgr) {
+                for (i = 0; i < 3; i++) {
+                        struct omap_overlay *ovl;
+                        ovl = omap_dss_get_overlay(i);
+                        if (!ovl->manager || force) {
+                                if (ovl->manager)
+                                        omap_dss_unset_manager(ovl);
+                                omap_dss_set_manager(ovl, mgr);
+                        }
+                }
+        }
+}
+
+void dss_uninit_overlays(struct platform_device *pdev)
+{
+        struct omap_overlay *ovl;
+
+        while (!list_empty(&overlay_list)) {
+                ovl = list_first_entry(&overlay_list,
+                                struct omap_overlay, list);
+                list_del(&ovl->list);
+                kobject_del(&ovl->kobj);
+                kobject_put(&ovl->kobj);
+                kfree(ovl);
+        }
+
+        num_overlays = 0;
+}
+
diff --git a/drivers/video/omap2/dss/rfbi.c b/drivers/video/omap2/dss/rfbi.c
new file mode 100644
index 000000000000..cc23f53cc62d
--- /dev/null
+++ b/drivers/video/omap2/dss/rfbi.c
@@ -0,0 +1,1056 @@
+/*
+ * linux/drivers/video/omap2/dss/rfbi.c
+ *
+ * Copyright (C) 2009 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * Some code and ideas taken from drivers/video/omap/ driver
+ * by Imre Deak.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define DSS_SUBSYS_NAME "RFBI"
+
+#include <linux/kernel.h>
+#include <linux/dma-mapping.h>
+#include <linux/vmalloc.h>
+#include <linux/clk.h>
+#include <linux/io.h>
+#include <linux/delay.h>
+#include <linux/kfifo.h>
+#include <linux/ktime.h>
+#include <linux/hrtimer.h>
+#include <linux/seq_file.h>
+
+#include <plat/display.h>
+#include "dss.h"
+
+#define RFBI_BASE               0x48050800
+
+struct rfbi_reg { u16 idx; };
+
+#define RFBI_REG(idx)           ((const struct rfbi_reg) { idx })
+
+#define RFBI_REVISION           RFBI_REG(0x0000)
+#define RFBI_SYSCONFIG          RFBI_REG(0x0010)
+#define RFBI_SYSSTATUS          RFBI_REG(0x0014)
+#define RFBI_CONTROL            RFBI_REG(0x0040)
+#define RFBI_PIXEL_CNT          RFBI_REG(0x0044)
+#define RFBI_LINE_NUMBER        RFBI_REG(0x0048)
+#define RFBI_CMD                RFBI_REG(0x004c)
+#define RFBI_PARAM              RFBI_REG(0x0050)
+#define RFBI_DATA               RFBI_REG(0x0054)
+#define RFBI_READ               RFBI_REG(0x0058)
+#define RFBI_STATUS             RFBI_REG(0x005c)
+
+#define RFBI_CONFIG(n)          RFBI_REG(0x0060 + (n)*0x18)
+#define RFBI_ONOFF_TIME(n)      RFBI_REG(0x0064 + (n)*0x18)
+#define RFBI_CYCLE_TIME(n)      RFBI_REG(0x0068 + (n)*0x18)
+#define RFBI_DATA_CYCLE1(n)     RFBI_REG(0x006c + (n)*0x18)
+#define RFBI_DATA_CYCLE2(n)     RFBI_REG(0x0070 + (n)*0x18)
+#define RFBI_DATA_CYCLE3(n)     RFBI_REG(0x0074 + (n)*0x18)
+
+#define RFBI_VSYNC_WIDTH        RFBI_REG(0x0090)
+#define RFBI_HSYNC_WIDTH        RFBI_REG(0x0094)
+
+#define REG_FLD_MOD(idx, val, start, end) \
+        rfbi_write_reg(idx, FLD_MOD(rfbi_read_reg(idx), val, start, end))
+
+/* To work around an RFBI transfer rate limitation */
+#define OMAP_RFBI_RATE_LIMIT    1
+
+enum omap_rfbi_cycleformat {
+        OMAP_DSS_RFBI_CYCLEFORMAT_1_1 = 0,
+        OMAP_DSS_RFBI_CYCLEFORMAT_2_1 = 1,
+        OMAP_DSS_RFBI_CYCLEFORMAT_3_1 = 2,
+        OMAP_DSS_RFBI_CYCLEFORMAT_3_2 = 3,
+};
+
+enum omap_rfbi_datatype {
+        OMAP_DSS_RFBI_DATATYPE_12 = 0,
+        OMAP_DSS_RFBI_DATATYPE_16 = 1,
+        OMAP_DSS_RFBI_DATATYPE_18 = 2,
+        OMAP_DSS_RFBI_DATATYPE_24 = 3,
+};
+
+enum omap_rfbi_parallelmode {
+        OMAP_DSS_RFBI_PARALLELMODE_8 = 0,
+        OMAP_DSS_RFBI_PARALLELMODE_9 = 1,
+        OMAP_DSS_RFBI_PARALLELMODE_12 = 2,
+        OMAP_DSS_RFBI_PARALLELMODE_16 = 3,
+};
+
+enum update_cmd {
+        RFBI_CMD_UPDATE = 0,
+        RFBI_CMD_SYNC   = 1,
+};
+
+static int rfbi_convert_timings(struct rfbi_timings *t);
+static void rfbi_get_clk_info(u32 *clk_period, u32 *max_clk_div);
+
+static struct {
+        void __iomem    *base;
+
+        unsigned long   l4_khz;
+
+        enum omap_rfbi_datatype datatype;
+        enum omap_rfbi_parallelmode parallelmode;
+
+        enum omap_rfbi_te_mode te_mode;
+        int te_enabled;
+
+        void (*framedone_callback)(void *data);
+        void *framedone_callback_data;
+
+        struct omap_dss_device *dssdev[2];
+
+        struct kfifo      cmd_fifo;
+        spinlock_t        cmd_lock;
+        struct completion cmd_done;
+        atomic_t          cmd_fifo_full;
+        atomic_t          cmd_pending;
+} rfbi;
+
+struct update_region {
+        u16     x;
+        u16     y;
+        u16     w;
+        u16     h;
+};
+
+static inline void rfbi_write_reg(const struct rfbi_reg idx, u32 val)
+{
+        __raw_writel(val, rfbi.base + idx.idx);
+}
+
+static inline u32 rfbi_read_reg(const struct rfbi_reg idx)
+{
+        return __raw_readl(rfbi.base + idx.idx);
+}
+
+static void rfbi_enable_clocks(bool enable)
+{
+        if (enable)
+                dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
+        else
+                dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
+}
+
+void omap_rfbi_write_command(const void *buf, u32 len)
+{
+        rfbi_enable_clocks(1);
+        switch (rfbi.parallelmode) {
+        case OMAP_DSS_RFBI_PARALLELMODE_8:
+        {
+                const u8 *b = buf;
+                for (; len; len--)
+                        rfbi_write_reg(RFBI_CMD, *b++);
+                break;
+        }
+
+        case OMAP_DSS_RFBI_PARALLELMODE_16:
+        {
+                const u16 *w = buf;
+                BUG_ON(len & 1);
+                for (; len; len -= 2)
+                        rfbi_write_reg(RFBI_CMD, *w++);
+                break;
+        }
+
+        case OMAP_DSS_RFBI_PARALLELMODE_9:
+        case OMAP_DSS_RFBI_PARALLELMODE_12:
+        default:
+                BUG();
+        }
+        rfbi_enable_clocks(0);
+}
+EXPORT_SYMBOL(omap_rfbi_write_command);
+
+void omap_rfbi_read_data(void *buf, u32 len)
+{
+        rfbi_enable_clocks(1);
+        switch (rfbi.parallelmode) {
+        case OMAP_DSS_RFBI_PARALLELMODE_8:
+        {
+                u8 *b = buf;
+                for (; len; len--) {
+                        rfbi_write_reg(RFBI_READ, 0);
+                        *b++ = rfbi_read_reg(RFBI_READ);
+                }
+                break;
+        }
+
+        case OMAP_DSS_RFBI_PARALLELMODE_16:
+        {
+                u16 *w = buf;
+                BUG_ON(len & ~1);
+                for (; len; len -= 2) {
+                        rfbi_write_reg(RFBI_READ, 0);
+                        *w++ = rfbi_read_reg(RFBI_READ);
+                }
+                break;
+        }
+
+        case OMAP_DSS_RFBI_PARALLELMODE_9:
+        case OMAP_DSS_RFBI_PARALLELMODE_12:
+        default:
+                BUG();
+        }
+        rfbi_enable_clocks(0);
+}
+EXPORT_SYMBOL(omap_rfbi_read_data);
+
+void omap_rfbi_write_data(const void *buf, u32 len)
+{
+        rfbi_enable_clocks(1);
+        switch (rfbi.parallelmode) {
+        case OMAP_DSS_RFBI_PARALLELMODE_8:
+        {
+                const u8 *b = buf;
+                for (; len; len--)
+                        rfbi_write_reg(RFBI_PARAM, *b++);
+                break;
+        }
+
+        case OMAP_DSS_RFBI_PARALLELMODE_16:
+        {
+                const u16 *w = buf;
+                BUG_ON(len & 1);
+                for (; len; len -= 2)
+                        rfbi_write_reg(RFBI_PARAM, *w++);
+                break;
+        }
+
+        case OMAP_DSS_RFBI_PARALLELMODE_9:
+        case OMAP_DSS_RFBI_PARALLELMODE_12:
+        default:
+                BUG();
+
+        }
+        rfbi_enable_clocks(0);
+}
+EXPORT_SYMBOL(omap_rfbi_write_data);
+
+void omap_rfbi_write_pixels(const void __iomem *buf, int scr_width,
+                u16 x, u16 y,
+                u16 w, u16 h)
+{
+        int start_offset = scr_width * y + x;
+        int horiz_offset = scr_width - w;
+        int i;
+
+        rfbi_enable_clocks(1);
+
+        if (rfbi.datatype == OMAP_DSS_RFBI_DATATYPE_16 &&
+           rfbi.parallelmode == OMAP_DSS_RFBI_PARALLELMODE_8) {
+                const u16 __iomem *pd = buf;
+                pd += start_offset;
+
+                for (; h; --h) {
+                        for (i = 0; i < w; ++i) {
+                                const u8 __iomem *b = (const u8 __iomem *)pd;
+                                rfbi_write_reg(RFBI_PARAM, __raw_readb(b+1));
+                                rfbi_write_reg(RFBI_PARAM, __raw_readb(b+0));
+                                ++pd;
+                        }
+                        pd += horiz_offset;
+                }
+        } else if (rfbi.datatype == OMAP_DSS_RFBI_DATATYPE_24 &&
+           rfbi.parallelmode == OMAP_DSS_RFBI_PARALLELMODE_8) {
+                const u32 __iomem *pd = buf;
+                pd += start_offset;
+
+                for (; h; --h) {
+                        for (i = 0; i < w; ++i) {
+                                const u8 __iomem *b = (const u8 __iomem *)pd;
+                                rfbi_write_reg(RFBI_PARAM, __raw_readb(b+2));
+                                rfbi_write_reg(RFBI_PARAM, __raw_readb(b+1));
+                                rfbi_write_reg(RFBI_PARAM, __raw_readb(b+0));
+                                ++pd;
+                        }
+                        pd += horiz_offset;
+                }
+        } else if (rfbi.datatype == OMAP_DSS_RFBI_DATATYPE_16 &&
+           rfbi.parallelmode == OMAP_DSS_RFBI_PARALLELMODE_16) {
+                const u16 __iomem *pd = buf;
+                pd += start_offset;
+
+                for (; h; --h) {
+                        for (i = 0; i < w; ++i) {
+                                rfbi_write_reg(RFBI_PARAM, __raw_readw(pd));
+                                ++pd;
+                        }
+                        pd += horiz_offset;
+                }
+        } else {
+                BUG();
+        }
+
+        rfbi_enable_clocks(0);
+}
+EXPORT_SYMBOL(omap_rfbi_write_pixels);
+
+void rfbi_transfer_area(u16 width, u16 height,
+                             void (callback)(void *data), void *data)
+{
+        u32 l;
+
+        /*BUG_ON(callback == 0);*/
+        BUG_ON(rfbi.framedone_callback != NULL);
+
+        DSSDBG("rfbi_transfer_area %dx%d\n", width, height);
+
+        dispc_set_lcd_size(width, height);
+
+        dispc_enable_channel(OMAP_DSS_CHANNEL_LCD, true);
+
+        rfbi.framedone_callback = callback;
+        rfbi.framedone_callback_data = data;
+
+        rfbi_enable_clocks(1);
+
+        rfbi_write_reg(RFBI_PIXEL_CNT, width * height);
+
+        l = rfbi_read_reg(RFBI_CONTROL);
+        l = FLD_MOD(l, 1, 0, 0); /* enable */
+        if (!rfbi.te_enabled)
+                l = FLD_MOD(l, 1, 4, 4); /* ITE */
+
+        rfbi_write_reg(RFBI_CONTROL, l);
+}
+
+static void framedone_callback(void *data, u32 mask)
+{
+        void (*callback)(void *data);
+
+        DSSDBG("FRAMEDONE\n");
+
+        REG_FLD_MOD(RFBI_CONTROL, 0, 0, 0);
+
+        rfbi_enable_clocks(0);
+
+        callback = rfbi.framedone_callback;
+        rfbi.framedone_callback = NULL;
+
+        if (callback != NULL)
+                callback(rfbi.framedone_callback_data);
+
+        atomic_set(&rfbi.cmd_pending, 0);
+}
+
+#if 1 /* VERBOSE */
+static void rfbi_print_timings(void)
+{
+        u32 l;
+        u32 time;
+
+        l = rfbi_read_reg(RFBI_CONFIG(0));
+        time = 1000000000 / rfbi.l4_khz;
+        if (l & (1 << 4))
+                time *= 2;
+
+        DSSDBG("Tick time %u ps\n", time);
+        l = rfbi_read_reg(RFBI_ONOFF_TIME(0));
+        DSSDBG("CSONTIME %d, CSOFFTIME %d, WEONTIME %d, WEOFFTIME %d, "
+                "REONTIME %d, REOFFTIME %d\n",
+                l & 0x0f, (l >> 4) & 0x3f, (l >> 10) & 0x0f, (l >> 14) & 0x3f,
+                (l >> 20) & 0x0f, (l >> 24) & 0x3f);
+
+        l = rfbi_read_reg(RFBI_CYCLE_TIME(0));
+        DSSDBG("WECYCLETIME %d, RECYCLETIME %d, CSPULSEWIDTH %d, "
+                "ACCESSTIME %d\n",
+                (l & 0x3f), (l >> 6) & 0x3f, (l >> 12) & 0x3f,
+                (l >> 22) & 0x3f);
+}
+#else
+static void rfbi_print_timings(void) {}
+#endif
+
+
+
+
+static u32 extif_clk_period;
+
+static inline unsigned long round_to_extif_ticks(unsigned long ps, int div)
+{
+        int bus_tick = extif_clk_period * div;
+        return (ps + bus_tick - 1) / bus_tick * bus_tick;
+}
+
+static int calc_reg_timing(struct rfbi_timings *t, int div)
+{
+        t->clk_div = div;
+
+        t->cs_on_time = round_to_extif_ticks(t->cs_on_time, div);
+
+        t->we_on_time = round_to_extif_ticks(t->we_on_time, div);
+        t->we_off_time = round_to_extif_ticks(t->we_off_time, div);
+        t->we_cycle_time = round_to_extif_ticks(t->we_cycle_time, div);
+
+        t->re_on_time = round_to_extif_ticks(t->re_on_time, div);
+        t->re_off_time = round_to_extif_ticks(t->re_off_time, div);
+        t->re_cycle_time = round_to_extif_ticks(t->re_cycle_time, div);
+
+        t->access_time = round_to_extif_ticks(t->access_time, div);
+        t->cs_off_time = round_to_extif_ticks(t->cs_off_time, div);
+        t->cs_pulse_width = round_to_extif_ticks(t->cs_pulse_width, div);
+
+        DSSDBG("[reg]cson %d csoff %d reon %d reoff %d\n",
+               t->cs_on_time, t->cs_off_time, t->re_on_time, t->re_off_time);
+        DSSDBG("[reg]weon %d weoff %d recyc %d wecyc %d\n",
+               t->we_on_time, t->we_off_time, t->re_cycle_time,
+               t->we_cycle_time);
+        DSSDBG("[reg]rdaccess %d cspulse %d\n",
+               t->access_time, t->cs_pulse_width);
+
+        return rfbi_convert_timings(t);
+}
+
+static int calc_extif_timings(struct rfbi_timings *t)
+{
+        u32 max_clk_div;
+        int div;
+
+        rfbi_get_clk_info(&extif_clk_period, &max_clk_div);
+        for (div = 1; div <= max_clk_div; div++) {
+                if (calc_reg_timing(t, div) == 0)
+                        break;
+        }
+
+        if (div <= max_clk_div)
+                return 0;
+
+        DSSERR("can't setup timings\n");
+        return -1;
+}
+
+
+void rfbi_set_timings(int rfbi_module, struct rfbi_timings *t)
+{
+        int r;
+
+        if (!t->converted) {
+                r = calc_extif_timings(t);
+                if (r < 0)
+                        DSSERR("Failed to calc timings\n");
+        }
+
+        BUG_ON(!t->converted);
+
+        rfbi_enable_clocks(1);
+        rfbi_write_reg(RFBI_ONOFF_TIME(rfbi_module), t->tim[0]);
+        rfbi_write_reg(RFBI_CYCLE_TIME(rfbi_module), t->tim[1]);
+
+        /* TIMEGRANULARITY */
+        REG_FLD_MOD(RFBI_CONFIG(rfbi_module),
+                    (t->tim[2] ? 1 : 0), 4, 4);
+
+        rfbi_print_timings();
+        rfbi_enable_clocks(0);
+}
+
+static int ps_to_rfbi_ticks(int time, int div)
+{
+        unsigned long tick_ps;
+        int ret;
+
+        /* Calculate in picosecs to yield more exact results */
+        tick_ps = 1000000000 / (rfbi.l4_khz) * div;
+
+        ret = (time + tick_ps - 1) / tick_ps;
+
+        return ret;
+}
+
+#ifdef OMAP_RFBI_RATE_LIMIT
+unsigned long rfbi_get_max_tx_rate(void)
+{
+        unsigned long   l4_rate, dss1_rate;
+        int             min_l4_ticks = 0;
+        int             i;
+
+        /* According to TI this can't be calculated so make the
+         * adjustments for a couple of known frequencies and warn for
+         * others.
+         */
+        static const struct {
+                unsigned long l4_clk;           /* HZ */
+                unsigned long dss1_clk;         /* HZ */
+                unsigned long min_l4_ticks;
+        } ftab[] = {
+                { 55,   132,    7, },           /* 7.86 MPix/s */
+                { 110,  110,    12, },          /* 9.16 MPix/s */
+                { 110,  132,    10, },          /* 11   Mpix/s */
+                { 120,  120,    10, },          /* 12   Mpix/s */
+                { 133,  133,    10, },          /* 13.3 Mpix/s */
+        };
+
+        l4_rate = rfbi.l4_khz / 1000;
+        dss1_rate = dss_clk_get_rate(DSS_CLK_FCK1) / 1000000;
+
+        for (i = 0; i < ARRAY_SIZE(ftab); i++) {
+                /* Use a window instead of an exact match, to account
+                 * for different DPLL multiplier / divider pairs.
+                 */
+                if (abs(ftab[i].l4_clk - l4_rate) < 3 &&
+                    abs(ftab[i].dss1_clk - dss1_rate) < 3) {
+                        min_l4_ticks = ftab[i].min_l4_ticks;
+                        break;
+                }
+        }
+        if (i == ARRAY_SIZE(ftab)) {
+                /* Can't be sure, return anyway the maximum not
+                 * rate-limited. This might cause a problem only for the
+                 * tearing synchronisation.
+                 */
+                DSSERR("can't determine maximum RFBI transfer rate\n");
+                return rfbi.l4_khz * 1000;
+        }
+        return rfbi.l4_khz * 1000 / min_l4_ticks;
+}
+#else
+int rfbi_get_max_tx_rate(void)
+{
+        return rfbi.l4_khz * 1000;
+}
+#endif
+
+static void rfbi_get_clk_info(u32 *clk_period, u32 *max_clk_div)
+{
+        *clk_period = 1000000000 / rfbi.l4_khz;
+        *max_clk_div = 2;
+}
+
+static int rfbi_convert_timings(struct rfbi_timings *t)
+{
+        u32 l;
+        int reon, reoff, weon, weoff, cson, csoff, cs_pulse;
+        int actim, recyc, wecyc;
+        int div = t->clk_div;
+
+        if (div <= 0 || div > 2)
+                return -1;
+
+        /* Make sure that after conversion it still holds that:
+         * weoff > weon, reoff > reon, recyc >= reoff, wecyc >= weoff,
+         * csoff > cson, csoff >= max(weoff, reoff), actim > reon
+         */
+        weon = ps_to_rfbi_ticks(t->we_on_time, div);
+        weoff = ps_to_rfbi_ticks(t->we_off_time, div);
+        if (weoff <= weon)
+                weoff = weon + 1;
+        if (weon > 0x0f)
+                return -1;
+        if (weoff > 0x3f)
+                return -1;
+
+        reon = ps_to_rfbi_ticks(t->re_on_time, div);
+        reoff = ps_to_rfbi_ticks(t->re_off_time, div);
+        if (reoff <= reon)
+                reoff = reon + 1;
+        if (reon > 0x0f)
+                return -1;
+        if (reoff > 0x3f)
+                return -1;
+
+        cson = ps_to_rfbi_ticks(t->cs_on_time, div);
+        csoff = ps_to_rfbi_ticks(t->cs_off_time, div);
+        if (csoff <= cson)
+                csoff = cson + 1;
+        if (csoff < max(weoff, reoff))
+                csoff = max(weoff, reoff);
+        if (cson > 0x0f)
+                return -1;
+        if (csoff > 0x3f)
+                return -1;
+
+        l =  cson;
+        l |= csoff << 4;
+        l |= weon  << 10;
+        l |= weoff << 14;
+        l |= reon  << 20;
+        l |= reoff << 24;
+
+        t->tim[0] = l;
+
+        actim = ps_to_rfbi_ticks(t->access_time, div);
+        if (actim <= reon)
+                actim = reon + 1;
+        if (actim > 0x3f)
+                return -1;
+
+        wecyc = ps_to_rfbi_ticks(t->we_cycle_time, div);
+        if (wecyc < weoff)
+                wecyc = weoff;
+        if (wecyc > 0x3f)
+                return -1;
+
+        recyc = ps_to_rfbi_ticks(t->re_cycle_time, div);
+        if (recyc < reoff)
+                recyc = reoff;
+        if (recyc > 0x3f)
+                return -1;
+
+        cs_pulse = ps_to_rfbi_ticks(t->cs_pulse_width, div);
+        if (cs_pulse > 0x3f)
+                return -1;
+
+        l =  wecyc;
+        l |= recyc    << 6;
+        l |= cs_pulse << 12;
+        l |= actim    << 22;
+
+        t->tim[1] = l;
+
+        t->tim[2] = div - 1;
+
+        t->converted = 1;
+
+        return 0;
+}
+
+/* xxx FIX module selection missing */
+int omap_rfbi_setup_te(enum omap_rfbi_te_mode mode,
+                             unsigned hs_pulse_time, unsigned vs_pulse_time,
+                             int hs_pol_inv, int vs_pol_inv, int extif_div)
+{
+        int hs, vs;
+        int min;
+        u32 l;
+
+        hs = ps_to_rfbi_ticks(hs_pulse_time, 1);
+        vs = ps_to_rfbi_ticks(vs_pulse_time, 1);
+        if (hs < 2)
+                return -EDOM;
+        if (mode == OMAP_DSS_RFBI_TE_MODE_2)
+                min = 2;
+        else /* OMAP_DSS_RFBI_TE_MODE_1 */
+                min = 4;
+        if (vs < min)
+                return -EDOM;
+        if (vs == hs)
+                return -EINVAL;
+        rfbi.te_mode = mode;
+        DSSDBG("setup_te: mode %d hs %d vs %d hs_inv %d vs_inv %d\n",
+                mode, hs, vs, hs_pol_inv, vs_pol_inv);
+
+        rfbi_enable_clocks(1);
+        rfbi_write_reg(RFBI_HSYNC_WIDTH, hs);
+        rfbi_write_reg(RFBI_VSYNC_WIDTH, vs);
+
+        l = rfbi_read_reg(RFBI_CONFIG(0));
+        if (hs_pol_inv)
+                l &= ~(1 << 21);
+        else
+                l |= 1 << 21;
+        if (vs_pol_inv)
+                l &= ~(1 << 20);
+        else
+                l |= 1 << 20;
+        rfbi_enable_clocks(0);
+
+        return 0;
+}
+EXPORT_SYMBOL(omap_rfbi_setup_te);
+
+/* xxx FIX module selection missing */
+int omap_rfbi_enable_te(bool enable, unsigned line)
+{
+        u32 l;
+
+        DSSDBG("te %d line %d mode %d\n", enable, line, rfbi.te_mode);
+        if (line > (1 << 11) - 1)
+                return -EINVAL;
+
+        rfbi_enable_clocks(1);
+        l = rfbi_read_reg(RFBI_CONFIG(0));
+        l &= ~(0x3 << 2);
+        if (enable) {
+                rfbi.te_enabled = 1;
+                l |= rfbi.te_mode << 2;
+        } else
+                rfbi.te_enabled = 0;
+        rfbi_write_reg(RFBI_CONFIG(0), l);
+        rfbi_write_reg(RFBI_LINE_NUMBER, line);
+        rfbi_enable_clocks(0);
+
+        return 0;
+}
+EXPORT_SYMBOL(omap_rfbi_enable_te);
+
+#if 0
+static void rfbi_enable_config(int enable1, int enable2)
+{
+        u32 l;
+        int cs = 0;
+
+        if (enable1)
+                cs |= 1<<0;
+        if (enable2)
+                cs |= 1<<1;
+
+        rfbi_enable_clocks(1);
+
+        l = rfbi_read_reg(RFBI_CONTROL);
+
+        l = FLD_MOD(l, cs, 3, 2);
+        l = FLD_MOD(l, 0, 1, 1);
+
+        rfbi_write_reg(RFBI_CONTROL, l);
+
+
+        l = rfbi_read_reg(RFBI_CONFIG(0));
+        l = FLD_MOD(l, 0, 3, 2); /* TRIGGERMODE: ITE */
+        /*l |= FLD_VAL(2, 8, 7); */ /* L4FORMAT, 2pix/L4 */
+        /*l |= FLD_VAL(0, 8, 7); */ /* L4FORMAT, 1pix/L4 */
+
+        l = FLD_MOD(l, 0, 16, 16); /* A0POLARITY */
+        l = FLD_MOD(l, 1, 20, 20); /* TE_VSYNC_POLARITY */
+        l = FLD_MOD(l, 1, 21, 21); /* HSYNCPOLARITY */
+
+        l = FLD_MOD(l, OMAP_DSS_RFBI_PARALLELMODE_8, 1, 0);
+        rfbi_write_reg(RFBI_CONFIG(0), l);
+
+        rfbi_enable_clocks(0);
+}
+#endif
+
+int rfbi_configure(int rfbi_module, int bpp, int lines)
+{
+        u32 l;
+        int cycle1 = 0, cycle2 = 0, cycle3 = 0;
+        enum omap_rfbi_cycleformat cycleformat;
+        enum omap_rfbi_datatype datatype;
+        enum omap_rfbi_parallelmode parallelmode;
+
+        switch (bpp) {
+        case 12:
+                datatype = OMAP_DSS_RFBI_DATATYPE_12;
+                break;
+        case 16:
+                datatype = OMAP_DSS_RFBI_DATATYPE_16;
+                break;
+        case 18:
+                datatype = OMAP_DSS_RFBI_DATATYPE_18;
+                break;
+        case 24:
+                datatype = OMAP_DSS_RFBI_DATATYPE_24;
+                break;
+        default:
+                BUG();
+                return 1;
+        }
+        rfbi.datatype = datatype;
+
+        switch (lines) {
+        case 8:
+                parallelmode = OMAP_DSS_RFBI_PARALLELMODE_8;
+                break;
+        case 9:
+                parallelmode = OMAP_DSS_RFBI_PARALLELMODE_9;
+                break;
+        case 12:
+                parallelmode = OMAP_DSS_RFBI_PARALLELMODE_12;
+                break;
+        case 16:
+                parallelmode = OMAP_DSS_RFBI_PARALLELMODE_16;
+                break;
+        default:
+                BUG();
+                return 1;
+        }
+        rfbi.parallelmode = parallelmode;
+
+        if ((bpp % lines) == 0) {
+                switch (bpp / lines) {
+                case 1:
+                        cycleformat = OMAP_DSS_RFBI_CYCLEFORMAT_1_1;
+                        break;
+                case 2:
+                        cycleformat = OMAP_DSS_RFBI_CYCLEFORMAT_2_1;
+                        break;
+                case 3:
+                        cycleformat = OMAP_DSS_RFBI_CYCLEFORMAT_3_1;
+                        break;
+                default:
+                        BUG();
+                        return 1;
+                }
+        } else if ((2 * bpp % lines) == 0) {
+                if ((2 * bpp / lines) == 3)
+                        cycleformat = OMAP_DSS_RFBI_CYCLEFORMAT_3_2;
+                else {
+                        BUG();
+                        return 1;
+                }
+        } else {
+                BUG();
+                return 1;
+        }
+
+        switch (cycleformat) {
+        case OMAP_DSS_RFBI_CYCLEFORMAT_1_1:
+                cycle1 = lines;
+                break;
+
+        case OMAP_DSS_RFBI_CYCLEFORMAT_2_1:
+                cycle1 = lines;
+                cycle2 = lines;
+                break;
+
+        case OMAP_DSS_RFBI_CYCLEFORMAT_3_1:
+                cycle1 = lines;
+                cycle2 = lines;
+                cycle3 = lines;
+                break;
+
+        case OMAP_DSS_RFBI_CYCLEFORMAT_3_2:
+                cycle1 = lines;
+                cycle2 = (lines / 2) | ((lines / 2) << 16);
+                cycle3 = (lines << 16);
+                break;
+        }
+
+        rfbi_enable_clocks(1);
+
+        REG_FLD_MOD(RFBI_CONTROL, 0, 3, 2); /* clear CS */
+
+        l = 0;
+        l |= FLD_VAL(parallelmode, 1, 0);
+        l |= FLD_VAL(0, 3, 2);          /* TRIGGERMODE: ITE */
+        l |= FLD_VAL(0, 4, 4);          /* TIMEGRANULARITY */
+        l |= FLD_VAL(datatype, 6, 5);
+        /* l |= FLD_VAL(2, 8, 7); */    /* L4FORMAT, 2pix/L4 */
+        l |= FLD_VAL(0, 8, 7);  /* L4FORMAT, 1pix/L4 */
+        l |= FLD_VAL(cycleformat, 10, 9);
+        l |= FLD_VAL(0, 12, 11);        /* UNUSEDBITS */
+        l |= FLD_VAL(0, 16, 16);        /* A0POLARITY */
+        l |= FLD_VAL(0, 17, 17);        /* REPOLARITY */
+        l |= FLD_VAL(0, 18, 18);        /* WEPOLARITY */
+        l |= FLD_VAL(0, 19, 19);        /* CSPOLARITY */
+        l |= FLD_VAL(1, 20, 20);        /* TE_VSYNC_POLARITY */
+        l |= FLD_VAL(1, 21, 21);        /* HSYNCPOLARITY */
+        rfbi_write_reg(RFBI_CONFIG(rfbi_module), l);
+
+        rfbi_write_reg(RFBI_DATA_CYCLE1(rfbi_module), cycle1);
+        rfbi_write_reg(RFBI_DATA_CYCLE2(rfbi_module), cycle2);
+        rfbi_write_reg(RFBI_DATA_CYCLE3(rfbi_module), cycle3);
+
+
+        l = rfbi_read_reg(RFBI_CONTROL);
+        l = FLD_MOD(l, rfbi_module+1, 3, 2); /* Select CSx */
+        l = FLD_MOD(l, 0, 1, 1); /* clear bypass */
+        rfbi_write_reg(RFBI_CONTROL, l);
+
+
+        DSSDBG("RFBI config: bpp %d, lines %d, cycles: 0x%x 0x%x 0x%x\n",
+               bpp, lines, cycle1, cycle2, cycle3);
+
+        rfbi_enable_clocks(0);
+
+        return 0;
+}
+EXPORT_SYMBOL(rfbi_configure);
+
+int omap_rfbi_prepare_update(struct omap_dss_device *dssdev,
+                u16 *x, u16 *y, u16 *w, u16 *h)
+{
+        u16 dw, dh;
+
+        dssdev->driver->get_resolution(dssdev, &dw, &dh);
+
+        if  (*x > dw || *y > dh)
+                return -EINVAL;
+
+        if (*x + *w > dw)
+                return -EINVAL;
+
+        if (*y + *h > dh)
+                return -EINVAL;
+
+        if (*w == 1)
+                return -EINVAL;
+
+        if (*w == 0 || *h == 0)
+                return -EINVAL;
+
+        if (dssdev->manager->caps & OMAP_DSS_OVL_MGR_CAP_DISPC) {
+                dss_setup_partial_planes(dssdev, x, y, w, h);
+                dispc_set_lcd_size(*w, *h);
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL(omap_rfbi_prepare_update);
+
+int omap_rfbi_update(struct omap_dss_device *dssdev,
+                u16 x, u16 y, u16 w, u16 h,
+                void (*callback)(void *), void *data)
+{
+        if (dssdev->manager->caps & OMAP_DSS_OVL_MGR_CAP_DISPC) {
+                rfbi_transfer_area(w, h, callback, data);
+        } else {
+                struct omap_overlay *ovl;
+                void __iomem *addr;
+                int scr_width;
+
+                ovl = dssdev->manager->overlays[0];
+                scr_width = ovl->info.screen_width;
+                addr = ovl->info.vaddr;
+
+                omap_rfbi_write_pixels(addr, scr_width, x, y, w, h);
+
+                callback(data);
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL(omap_rfbi_update);
+
+void rfbi_dump_regs(struct seq_file *s)
+{
+#define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, rfbi_read_reg(r))
+
+        dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
+
+        DUMPREG(RFBI_REVISION);
+        DUMPREG(RFBI_SYSCONFIG);
+        DUMPREG(RFBI_SYSSTATUS);
+        DUMPREG(RFBI_CONTROL);
+        DUMPREG(RFBI_PIXEL_CNT);
+        DUMPREG(RFBI_LINE_NUMBER);
+        DUMPREG(RFBI_CMD);
+        DUMPREG(RFBI_PARAM);
+        DUMPREG(RFBI_DATA);
+        DUMPREG(RFBI_READ);
+        DUMPREG(RFBI_STATUS);
+
+        DUMPREG(RFBI_CONFIG(0));
+        DUMPREG(RFBI_ONOFF_TIME(0));
+        DUMPREG(RFBI_CYCLE_TIME(0));
+        DUMPREG(RFBI_DATA_CYCLE1(0));
+        DUMPREG(RFBI_DATA_CYCLE2(0));
+        DUMPREG(RFBI_DATA_CYCLE3(0));
+
+        DUMPREG(RFBI_CONFIG(1));
+        DUMPREG(RFBI_ONOFF_TIME(1));
+        DUMPREG(RFBI_CYCLE_TIME(1));
+        DUMPREG(RFBI_DATA_CYCLE1(1));
+        DUMPREG(RFBI_DATA_CYCLE2(1));
+        DUMPREG(RFBI_DATA_CYCLE3(1));
+
+        DUMPREG(RFBI_VSYNC_WIDTH);
+        DUMPREG(RFBI_HSYNC_WIDTH);
+
+        dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
+#undef DUMPREG
+}
+
+int rfbi_init(void)
+{
+        u32 rev;
+        u32 l;
+
+        spin_lock_init(&rfbi.cmd_lock);
+
+        init_completion(&rfbi.cmd_done);
+        atomic_set(&rfbi.cmd_fifo_full, 0);
+        atomic_set(&rfbi.cmd_pending, 0);
+
+        rfbi.base = ioremap(RFBI_BASE, SZ_256);
+        if (!rfbi.base) {
+                DSSERR("can't ioremap RFBI\n");
+                return -ENOMEM;
+        }
+
+        rfbi_enable_clocks(1);
+
+        msleep(10);
+
+        rfbi.l4_khz = dss_clk_get_rate(DSS_CLK_ICK) / 1000;
+
+        /* Enable autoidle and smart-idle */
+        l = rfbi_read_reg(RFBI_SYSCONFIG);
+        l |= (1 << 0) | (2 << 3);
+        rfbi_write_reg(RFBI_SYSCONFIG, l);
+
+        rev = rfbi_read_reg(RFBI_REVISION);
+        printk(KERN_INFO "OMAP RFBI rev %d.%d\n",
+               FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0));
+
+        rfbi_enable_clocks(0);
+
+        return 0;
+}
+
+void rfbi_exit(void)
+{
+        DSSDBG("rfbi_exit\n");
+
+        iounmap(rfbi.base);
+}
+
+int omapdss_rfbi_display_enable(struct omap_dss_device *dssdev)
+{
+        int r;
+
+        r = omap_dss_start_device(dssdev);
+        if (r) {
+                DSSERR("failed to start device\n");
+                goto err0;
+        }
+
+        r = omap_dispc_register_isr(framedone_callback, NULL,
+                        DISPC_IRQ_FRAMEDONE);
+        if (r) {
+                DSSERR("can't get FRAMEDONE irq\n");
+                goto err1;
+        }
+
+        dispc_set_lcd_display_type(OMAP_DSS_LCD_DISPLAY_TFT);
+
+        dispc_set_parallel_interface_mode(OMAP_DSS_PARALLELMODE_RFBI);
+
+        dispc_set_tft_data_lines(dssdev->ctrl.pixel_size);
+
+        rfbi_configure(dssdev->phy.rfbi.channel,
+                               dssdev->ctrl.pixel_size,
+                               dssdev->phy.rfbi.data_lines);
+
+        rfbi_set_timings(dssdev->phy.rfbi.channel,
+                         &dssdev->ctrl.rfbi_timings);
+
+
+        return 0;
+err1:
+        omap_dss_stop_device(dssdev);
+err0:
+        return r;
+}
+EXPORT_SYMBOL(omapdss_rfbi_display_enable);
+
+void omapdss_rfbi_display_disable(struct omap_dss_device *dssdev)
+{
+        omap_dispc_unregister_isr(framedone_callback, NULL,
+                        DISPC_IRQ_FRAMEDONE);
+        omap_dss_stop_device(dssdev);
+}
+EXPORT_SYMBOL(omapdss_rfbi_display_disable);
+
+int rfbi_init_display(struct omap_dss_device *dssdev)
+{
+        rfbi.dssdev[dssdev->phy.rfbi.channel] = dssdev;
+        dssdev->caps = OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE;
+        return 0;
+}
diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c
new file mode 100644
index 000000000000..12eb4042dd82
--- /dev/null
+++ b/drivers/video/omap2/dss/sdi.c
@@ -0,0 +1,176 @@
+/*
+ * linux/drivers/video/omap2/dss/sdi.c
+ *
+ * Copyright (C) 2009 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define DSS_SUBSYS_NAME "SDI"
+
+#include <linux/kernel.h>
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/err.h>
+
+#include <plat/display.h>
+#include "dss.h"
+
+static struct {
+        bool skip_init;
+        bool update_enabled;
+} sdi;
+
+static void sdi_basic_init(void)
+{
+        dispc_set_parallel_interface_mode(OMAP_DSS_PARALLELMODE_BYPASS);
+
+        dispc_set_lcd_display_type(OMAP_DSS_LCD_DISPLAY_TFT);
+        dispc_set_tft_data_lines(24);
+        dispc_lcd_enable_signal_polarity(1);
+}
+
+int omapdss_sdi_display_enable(struct omap_dss_device *dssdev)
+{
+        struct omap_video_timings *t = &dssdev->panel.timings;
+        struct dss_clock_info dss_cinfo;
+        struct dispc_clock_info dispc_cinfo;
+        u16 lck_div, pck_div;
+        unsigned long fck;
+        unsigned long pck;
+        int r;
+
+        r = omap_dss_start_device(dssdev);
+        if (r) {
+                DSSERR("failed to start device\n");
+                goto err0;
+        }
+
+        /* In case of skip_init sdi_init has already enabled the clocks */
+        if (!sdi.skip_init)
+                dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
+
+        sdi_basic_init();
+
+        /* 15.5.9.1.2 */
+        dssdev->panel.config |= OMAP_DSS_LCD_RF | OMAP_DSS_LCD_ONOFF;
+
+        dispc_set_pol_freq(dssdev->panel.config, dssdev->panel.acbi,
+                        dssdev->panel.acb);
+
+        if (!sdi.skip_init) {
+                r = dss_calc_clock_div(1, t->pixel_clock * 1000,
+                                &dss_cinfo, &dispc_cinfo);
+        } else {
+                r = dss_get_clock_div(&dss_cinfo);
+                r = dispc_get_clock_div(&dispc_cinfo);
+        }
+
+        if (r)
+                goto err2;
+
+        fck = dss_cinfo.fck;
+        lck_div = dispc_cinfo.lck_div;
+        pck_div = dispc_cinfo.pck_div;
+
+        pck = fck / lck_div / pck_div / 1000;
+
+        if (pck != t->pixel_clock) {
+                DSSWARN("Could not find exact pixel clock. Requested %d kHz, "
+                                "got %lu kHz\n",
+                                t->pixel_clock, pck);
+
+                t->pixel_clock = pck;
+        }
+
+
+        dispc_set_lcd_timings(t);
+
+        r = dss_set_clock_div(&dss_cinfo);
+        if (r)
+                goto err2;
+
+        r = dispc_set_clock_div(&dispc_cinfo);
+        if (r)
+                goto err2;
+
+        if (!sdi.skip_init) {
+                dss_sdi_init(dssdev->phy.sdi.datapairs);
+                r = dss_sdi_enable();
+                if (r)
+                        goto err1;
+                mdelay(2);
+        }
+
+        dssdev->manager->enable(dssdev->manager);
+
+        if (dssdev->driver->enable) {
+                r = dssdev->driver->enable(dssdev);
+                if (r)
+                        goto err3;
+        }
+
+        sdi.skip_init = 0;
+
+        return 0;
+err3:
+        dssdev->manager->disable(dssdev->manager);
+err2:
+        dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
+err1:
+        omap_dss_stop_device(dssdev);
+err0:
+        return r;
+}
+EXPORT_SYMBOL(omapdss_sdi_display_enable);
+
+void omapdss_sdi_display_disable(struct omap_dss_device *dssdev)
+{
+        if (dssdev->driver->disable)
+                dssdev->driver->disable(dssdev);
+
+        dssdev->manager->disable(dssdev->manager);
+
+        dss_sdi_disable();
+
+        dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
+
+        omap_dss_stop_device(dssdev);
+}
+EXPORT_SYMBOL(omapdss_sdi_display_disable);
+
+int sdi_init_display(struct omap_dss_device *dssdev)
+{
+        DSSDBG("SDI init\n");
+
+        return 0;
+}
+
+int sdi_init(bool skip_init)
+{
+        /* we store this for first display enable, then clear it */
+        sdi.skip_init = skip_init;
+
+        /*
+         * Enable clocks already here, otherwise there would be a toggle
+         * of them until sdi_display_enable is called.
+         */
+        if (skip_init)
+                dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
+        return 0;
+}
+
+void sdi_exit(void)
+{
+}
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
new file mode 100644
index 000000000000..f0ba5732d84a
--- /dev/null
+++ b/drivers/video/omap2/dss/venc.c
@@ -0,0 +1,755 @@
+/*
+ * linux/drivers/video/omap2/dss/venc.c
+ *
+ * Copyright (C) 2009 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * VENC settings from TI's DSS driver
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define DSS_SUBSYS_NAME "VENC"
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/mutex.h>
+#include <linux/completion.h>
+#include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/seq_file.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/consumer.h>
+
+#include <plat/display.h>
+#include <plat/cpu.h>
+
+#include "dss.h"
+
+#define VENC_BASE       0x48050C00
+
+/* Venc registers */
+#define VENC_REV_ID                             0x00
+#define VENC_STATUS                             0x04
+#define VENC_F_CONTROL                          0x08
+#define VENC_VIDOUT_CTRL                        0x10
+#define VENC_SYNC_CTRL                          0x14
+#define VENC_LLEN                               0x1C
+#define VENC_FLENS                              0x20
+#define VENC_HFLTR_CTRL                         0x24
+#define VENC_CC_CARR_WSS_CARR                   0x28
+#define VENC_C_PHASE                            0x2C
+#define VENC_GAIN_U                             0x30
+#define VENC_GAIN_V                             0x34
+#define VENC_GAIN_Y                             0x38
+#define VENC_BLACK_LEVEL                        0x3C
+#define VENC_BLANK_LEVEL                        0x40
+#define VENC_X_COLOR                            0x44
+#define VENC_M_CONTROL                          0x48
+#define VENC_BSTAMP_WSS_DATA                    0x4C
+#define VENC_S_CARR                             0x50
+#define VENC_LINE21                             0x54
+#define VENC_LN_SEL                             0x58
+#define VENC_L21__WC_CTL                        0x5C
+#define VENC_HTRIGGER_VTRIGGER                  0x60
+#define VENC_SAVID__EAVID                       0x64
+#define VENC_FLEN__FAL                          0x68
+#define VENC_LAL__PHASE_RESET                   0x6C
+#define VENC_HS_INT_START_STOP_X                0x70
+#define VENC_HS_EXT_START_STOP_X                0x74
+#define VENC_VS_INT_START_X                     0x78
+#define VENC_VS_INT_STOP_X__VS_INT_START_Y      0x7C
+#define VENC_VS_INT_STOP_Y__VS_EXT_START_X      0x80
+#define VENC_VS_EXT_STOP_X__VS_EXT_START_Y      0x84
+#define VENC_VS_EXT_STOP_Y                      0x88
+#define VENC_AVID_START_STOP_X                  0x90
+#define VENC_AVID_START_STOP_Y                  0x94
+#define VENC_FID_INT_START_X__FID_INT_START_Y   0xA0
+#define VENC_FID_INT_OFFSET_Y__FID_EXT_START_X  0xA4
+#define VENC_FID_EXT_START_Y__FID_EXT_OFFSET_Y  0xA8
+#define VENC_TVDETGP_INT_START_STOP_X           0xB0
+#define VENC_TVDETGP_INT_START_STOP_Y           0xB4
+#define VENC_GEN_CTRL                           0xB8
+#define VENC_OUTPUT_CONTROL                     0xC4
+#define VENC_OUTPUT_TEST                        0xC8
+#define VENC_DAC_B__DAC_C                       0xC8
+
+struct venc_config {
+        u32 f_control;
+        u32 vidout_ctrl;
+        u32 sync_ctrl;
+        u32 llen;
+        u32 flens;
+        u32 hfltr_ctrl;
+        u32 cc_carr_wss_carr;
+        u32 c_phase;
+        u32 gain_u;
+        u32 gain_v;
+        u32 gain_y;
+        u32 black_level;
+        u32 blank_level;
+        u32 x_color;
+        u32 m_control;
+        u32 bstamp_wss_data;
+        u32 s_carr;
+        u32 line21;
+        u32 ln_sel;
+        u32 l21__wc_ctl;
+        u32 htrigger_vtrigger;
+        u32 savid__eavid;
+        u32 flen__fal;
+        u32 lal__phase_reset;
+        u32 hs_int_start_stop_x;
+        u32 hs_ext_start_stop_x;
+        u32 vs_int_start_x;
+        u32 vs_int_stop_x__vs_int_start_y;
+        u32 vs_int_stop_y__vs_ext_start_x;
+        u32 vs_ext_stop_x__vs_ext_start_y;
+        u32 vs_ext_stop_y;
+        u32 avid_start_stop_x;
+        u32 avid_start_stop_y;
+        u32 fid_int_start_x__fid_int_start_y;
+        u32 fid_int_offset_y__fid_ext_start_x;
+        u32 fid_ext_start_y__fid_ext_offset_y;
+        u32 tvdetgp_int_start_stop_x;
+        u32 tvdetgp_int_start_stop_y;
+        u32 gen_ctrl;
+};
+
+/* from TRM */
+static const struct venc_config venc_config_pal_trm = {
+        .f_control                              = 0,
+        .vidout_ctrl                            = 1,
+        .sync_ctrl                              = 0x40,
+        .llen                                   = 0x35F, /* 863 */
+        .flens                                  = 0x270, /* 624 */
+        .hfltr_ctrl                             = 0,
+        .cc_carr_wss_carr                       = 0x2F7225ED,
+        .c_phase                                = 0,
+        .gain_u                                 = 0x111,
+        .gain_v                                 = 0x181,
+        .gain_y                                 = 0x140,
+        .black_level                            = 0x3B,
+        .blank_level                            = 0x3B,
+        .x_color                                = 0x7,
+        .m_control                              = 0x2,
+        .bstamp_wss_data                        = 0x3F,
+        .s_carr                                 = 0x2A098ACB,
+        .line21                                 = 0,
+        .ln_sel                                 = 0x01290015,
+        .l21__wc_ctl                            = 0x0000F603,
+        .htrigger_vtrigger                      = 0,
+
+        .savid__eavid                           = 0x06A70108,
+        .flen__fal                              = 0x00180270,
+        .lal__phase_reset                       = 0x00040135,
+        .hs_int_start_stop_x                    = 0x00880358,
+        .hs_ext_start_stop_x                    = 0x000F035F,
+        .vs_int_start_x                         = 0x01A70000,
+        .vs_int_stop_x__vs_int_start_y          = 0x000001A7,
+        .vs_int_stop_y__vs_ext_start_x          = 0x01AF0000,
+        .vs_ext_stop_x__vs_ext_start_y          = 0x000101AF,
+        .vs_ext_stop_y                          = 0x00000025,
+        .avid_start_stop_x                      = 0x03530083,
+        .avid_start_stop_y                      = 0x026C002E,
+        .fid_int_start_x__fid_int_start_y       = 0x0001008A,
+        .fid_int_offset_y__fid_ext_start_x      = 0x002E0138,
+        .fid_ext_start_y__fid_ext_offset_y      = 0x01380001,
+
+        .tvdetgp_int_start_stop_x               = 0x00140001,
+        .tvdetgp_int_start_stop_y               = 0x00010001,
+        .gen_ctrl                               = 0x00FF0000,
+};
+
+/* from TRM */
+static const struct venc_config venc_config_ntsc_trm = {
+        .f_control                              = 0,
+        .vidout_ctrl                            = 1,
+        .sync_ctrl                              = 0x8040,
+        .llen                                   = 0x359,
+        .flens                                  = 0x20C,
+        .hfltr_ctrl                             = 0,
+        .cc_carr_wss_carr                       = 0x043F2631,
+        .c_phase                                = 0,
+        .gain_u                                 = 0x102,
+        .gain_v                                 = 0x16C,
+        .gain_y                                 = 0x12F,
+        .black_level                            = 0x43,
+        .blank_level                            = 0x38,
+        .x_color                                = 0x7,
+        .m_control                              = 0x1,
+        .bstamp_wss_data                        = 0x38,
+        .s_carr                                 = 0x21F07C1F,
+        .line21                                 = 0,
+        .ln_sel                                 = 0x01310011,
+        .l21__wc_ctl                            = 0x0000F003,
+        .htrigger_vtrigger                      = 0,
+
+        .savid__eavid                           = 0x069300F4,
+        .flen__fal                              = 0x0016020C,
+        .lal__phase_reset                       = 0x00060107,
+        .hs_int_start_stop_x                    = 0x008E0350,
+        .hs_ext_start_stop_x                    = 0x000F0359,
+        .vs_int_start_x                         = 0x01A00000,
+        .vs_int_stop_x__vs_int_start_y          = 0x020701A0,
+        .vs_int_stop_y__vs_ext_start_x          = 0x01AC0024,
+        .vs_ext_stop_x__vs_ext_start_y          = 0x020D01AC,
+        .vs_ext_stop_y                          = 0x00000006,
+        .avid_start_stop_x                      = 0x03480078,
+        .avid_start_stop_y                      = 0x02060024,
+        .fid_int_start_x__fid_int_start_y       = 0x0001008A,
+        .fid_int_offset_y__fid_ext_start_x      = 0x01AC0106,
+        .fid_ext_start_y__fid_ext_offset_y      = 0x01060006,
+
+        .tvdetgp_int_start_stop_x               = 0x00140001,
+        .tvdetgp_int_start_stop_y               = 0x00010001,
+        .gen_ctrl                               = 0x00F90000,
+};
+
+static const struct venc_config venc_config_pal_bdghi = {
+        .f_control                              = 0,
+        .vidout_ctrl                            = 0,
+        .sync_ctrl                              = 0,
+        .hfltr_ctrl                             = 0,
+        .x_color                                = 0,
+        .line21                                 = 0,
+        .ln_sel                                 = 21,
+        .htrigger_vtrigger                      = 0,
+        .tvdetgp_int_start_stop_x               = 0x00140001,
+        .tvdetgp_int_start_stop_y               = 0x00010001,
+        .gen_ctrl                               = 0x00FB0000,
+
+        .llen                                   = 864-1,
+        .flens                                  = 625-1,
+        .cc_carr_wss_carr                       = 0x2F7625ED,
+        .c_phase                                = 0xDF,
+        .gain_u                                 = 0x111,
+        .gain_v                                 = 0x181,
+        .gain_y                                 = 0x140,
+        .black_level                            = 0x3e,
+        .blank_level                            = 0x3e,
+        .m_control                              = 0<<2 | 1<<1,
+        .bstamp_wss_data                        = 0x42,
+        .s_carr                                 = 0x2a098acb,
+        .l21__wc_ctl                            = 0<<13 | 0x16<<8 | 0<<0,
+        .savid__eavid                           = 0x06A70108,
+        .flen__fal                              = 23<<16 | 624<<0,
+        .lal__phase_reset                       = 2<<17 | 310<<0,
+        .hs_int_start_stop_x                    = 0x00920358,
+        .hs_ext_start_stop_x                    = 0x000F035F,
+        .vs_int_start_x                         = 0x1a7<<16,
+        .vs_int_stop_x__vs_int_start_y          = 0x000601A7,
+        .vs_int_stop_y__vs_ext_start_x          = 0x01AF0036,
+        .vs_ext_stop_x__vs_ext_start_y          = 0x27101af,
+        .vs_ext_stop_y                          = 0x05,
+        .avid_start_stop_x                      = 0x03530082,
+        .avid_start_stop_y                      = 0x0270002E,
+        .fid_int_start_x__fid_int_start_y       = 0x0005008A,
+        .fid_int_offset_y__fid_ext_start_x      = 0x002E0138,
+        .fid_ext_start_y__fid_ext_offset_y      = 0x01380005,
+};
+
+const struct omap_video_timings omap_dss_pal_timings = {
+        .x_res          = 720,
+        .y_res          = 574,
+        .pixel_clock    = 13500,
+        .hsw            = 64,
+        .hfp            = 12,
+        .hbp            = 68,
+        .vsw            = 5,
+        .vfp            = 5,
+        .vbp            = 41,
+};
+EXPORT_SYMBOL(omap_dss_pal_timings);
+
+const struct omap_video_timings omap_dss_ntsc_timings = {
+        .x_res          = 720,
+        .y_res          = 482,
+        .pixel_clock    = 13500,
+        .hsw            = 64,
+        .hfp            = 16,
+        .hbp            = 58,
+        .vsw            = 6,
+        .vfp            = 6,
+        .vbp            = 31,
+};
+EXPORT_SYMBOL(omap_dss_ntsc_timings);
+
+static struct {
+        void __iomem *base;
+        struct mutex venc_lock;
+        u32 wss_data;
+        struct regulator *vdda_dac_reg;
+} venc;
+
+static inline void venc_write_reg(int idx, u32 val)
+{
+        __raw_writel(val, venc.base + idx);
+}
+
+static inline u32 venc_read_reg(int idx)
+{
+        u32 l = __raw_readl(venc.base + idx);
+        return l;
+}
+
+static void venc_write_config(const struct venc_config *config)
+{
+        DSSDBG("write venc conf\n");
+
+        venc_write_reg(VENC_LLEN, config->llen);
+        venc_write_reg(VENC_FLENS, config->flens);
+        venc_write_reg(VENC_CC_CARR_WSS_CARR, config->cc_carr_wss_carr);
+        venc_write_reg(VENC_C_PHASE, config->c_phase);
+        venc_write_reg(VENC_GAIN_U, config->gain_u);
+        venc_write_reg(VENC_GAIN_V, config->gain_v);
+        venc_write_reg(VENC_GAIN_Y, config->gain_y);
+        venc_write_reg(VENC_BLACK_LEVEL, config->black_level);
+        venc_write_reg(VENC_BLANK_LEVEL, config->blank_level);
+        venc_write_reg(VENC_M_CONTROL, config->m_control);
+        venc_write_reg(VENC_BSTAMP_WSS_DATA, config->bstamp_wss_data |
+                        venc.wss_data);
+        venc_write_reg(VENC_S_CARR, config->s_carr);
+        venc_write_reg(VENC_L21__WC_CTL, config->l21__wc_ctl);
+        venc_write_reg(VENC_SAVID__EAVID, config->savid__eavid);
+        venc_write_reg(VENC_FLEN__FAL, config->flen__fal);
+        venc_write_reg(VENC_LAL__PHASE_RESET, config->lal__phase_reset);
+        venc_write_reg(VENC_HS_INT_START_STOP_X, config->hs_int_start_stop_x);
+        venc_write_reg(VENC_HS_EXT_START_STOP_X, config->hs_ext_start_stop_x);
+        venc_write_reg(VENC_VS_INT_START_X, config->vs_int_start_x);
+        venc_write_reg(VENC_VS_INT_STOP_X__VS_INT_START_Y,
+                       config->vs_int_stop_x__vs_int_start_y);
+        venc_write_reg(VENC_VS_INT_STOP_Y__VS_EXT_START_X,
+                       config->vs_int_stop_y__vs_ext_start_x);
+        venc_write_reg(VENC_VS_EXT_STOP_X__VS_EXT_START_Y,
+                       config->vs_ext_stop_x__vs_ext_start_y);
+        venc_write_reg(VENC_VS_EXT_STOP_Y, config->vs_ext_stop_y);
+        venc_write_reg(VENC_AVID_START_STOP_X, config->avid_start_stop_x);
+        venc_write_reg(VENC_AVID_START_STOP_Y, config->avid_start_stop_y);
+        venc_write_reg(VENC_FID_INT_START_X__FID_INT_START_Y,
+                       config->fid_int_start_x__fid_int_start_y);
+        venc_write_reg(VENC_FID_INT_OFFSET_Y__FID_EXT_START_X,
+                       config->fid_int_offset_y__fid_ext_start_x);
+        venc_write_reg(VENC_FID_EXT_START_Y__FID_EXT_OFFSET_Y,
+                       config->fid_ext_start_y__fid_ext_offset_y);
+
+        venc_write_reg(VENC_DAC_B__DAC_C,  venc_read_reg(VENC_DAC_B__DAC_C));
+        venc_write_reg(VENC_VIDOUT_CTRL, config->vidout_ctrl);
+        venc_write_reg(VENC_HFLTR_CTRL, config->hfltr_ctrl);
+        venc_write_reg(VENC_X_COLOR, config->x_color);
+        venc_write_reg(VENC_LINE21, config->line21);
+        venc_write_reg(VENC_LN_SEL, config->ln_sel);
+        venc_write_reg(VENC_HTRIGGER_VTRIGGER, config->htrigger_vtrigger);
+        venc_write_reg(VENC_TVDETGP_INT_START_STOP_X,
+                       config->tvdetgp_int_start_stop_x);
+        venc_write_reg(VENC_TVDETGP_INT_START_STOP_Y,
+                       config->tvdetgp_int_start_stop_y);
+        venc_write_reg(VENC_GEN_CTRL, config->gen_ctrl);
+        venc_write_reg(VENC_F_CONTROL, config->f_control);
+        venc_write_reg(VENC_SYNC_CTRL, config->sync_ctrl);
+}
+
+static void venc_reset(void)
+{
+        int t = 1000;
+
+        venc_write_reg(VENC_F_CONTROL, 1<<8);
+        while (venc_read_reg(VENC_F_CONTROL) & (1<<8)) {
+                if (--t == 0) {
+                        DSSERR("Failed to reset venc\n");
+                        return;
+                }
+        }
+
+        /* the magical sleep that makes things work */
+        msleep(20);
+}
+
+static void venc_enable_clocks(int enable)
+{
+        if (enable)
+                dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1 | DSS_CLK_54M |
+                                DSS_CLK_96M);
+        else
+                dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1 | DSS_CLK_54M |
+                                DSS_CLK_96M);
+}
+
+static const struct venc_config *venc_timings_to_config(
+                struct omap_video_timings *timings)
+{
+        if (memcmp(&omap_dss_pal_timings, timings, sizeof(*timings)) == 0)
+                return &venc_config_pal_trm;
+
+        if (memcmp(&omap_dss_ntsc_timings, timings, sizeof(*timings)) == 0)
+                return &venc_config_ntsc_trm;
+
+        BUG();
+}
+
+static void venc_power_on(struct omap_dss_device *dssdev)
+{
+        u32 l;
+
+        venc_enable_clocks(1);
+
+        venc_reset();
+        venc_write_config(venc_timings_to_config(&dssdev->panel.timings));
+
+        dss_set_venc_output(dssdev->phy.venc.type);
+        dss_set_dac_pwrdn_bgz(1);
+
+        l = 0;
+
+        if (dssdev->phy.venc.type == OMAP_DSS_VENC_TYPE_COMPOSITE)
+                l |= 1 << 1;
+        else /* S-Video */
+                l |= (1 << 0) | (1 << 2);
+
+        if (dssdev->phy.venc.invert_polarity == false)
+                l |= 1 << 3;
+
+        venc_write_reg(VENC_OUTPUT_CONTROL, l);
+
+        dispc_set_digit_size(dssdev->panel.timings.x_res,
+                        dssdev->panel.timings.y_res/2);
+
+        regulator_enable(venc.vdda_dac_reg);
+
+        if (dssdev->platform_enable)
+                dssdev->platform_enable(dssdev);
+
+        dssdev->manager->enable(dssdev->manager);
+}
+
+static void venc_power_off(struct omap_dss_device *dssdev)
+{
+        venc_write_reg(VENC_OUTPUT_CONTROL, 0);
+        dss_set_dac_pwrdn_bgz(0);
+
+        dssdev->manager->disable(dssdev->manager);
+
+        if (dssdev->platform_disable)
+                dssdev->platform_disable(dssdev);
+
+        regulator_disable(venc.vdda_dac_reg);
+
+        venc_enable_clocks(0);
+}
+
+
+
+
+
+/* driver */
+static int venc_panel_probe(struct omap_dss_device *dssdev)
+{
+        dssdev->panel.timings = omap_dss_pal_timings;
+
+        return 0;
+}
+
+static void venc_panel_remove(struct omap_dss_device *dssdev)
+{
+}
+
+static int venc_panel_enable(struct omap_dss_device *dssdev)
+{
+        int r = 0;
+
+        DSSDBG("venc_enable_display\n");
+
+        mutex_lock(&venc.venc_lock);
+
+        if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED) {
+                r = -EINVAL;
+                goto err1;
+        }
+
+        if (dssdev->platform_enable) {
+                r = dssdev->platform_enable(dssdev);
+                if (r)
+                        goto err2;
+        }
+
+        venc_power_on(dssdev);
+
+        venc.wss_data = 0;
+
+        dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+        /* wait couple of vsyncs until enabling the LCD */
+        msleep(50);
+
+        mutex_unlock(&venc.venc_lock);
+
+        return r;
+err2:
+        venc_power_off(dssdev);
+err1:
+        mutex_unlock(&venc.venc_lock);
+        return r;
+}
+
+static void venc_panel_disable(struct omap_dss_device *dssdev)
+{
+        DSSDBG("venc_disable_display\n");
+
+        mutex_lock(&venc.venc_lock);
+
+        if (dssdev->state == OMAP_DSS_DISPLAY_DISABLED)
+                goto end;
+
+        if (dssdev->state == OMAP_DSS_DISPLAY_SUSPENDED) {
+                /* suspended is the same as disabled with venc */
+                dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
+                goto end;
+        }
+
+        venc_power_off(dssdev);
+
+        /* wait at least 5 vsyncs after disabling the LCD */
+        msleep(100);
+
+        if (dssdev->platform_disable)
+                dssdev->platform_disable(dssdev);
+
+        dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
+end:
+        mutex_unlock(&venc.venc_lock);
+}
+
+static int venc_panel_suspend(struct omap_dss_device *dssdev)
+{
+        venc_panel_disable(dssdev);
+        return 0;
+}
+
+static int venc_panel_resume(struct omap_dss_device *dssdev)
+{
+        return venc_panel_enable(dssdev);
+}
+
+static enum omap_dss_update_mode venc_get_update_mode(
+                struct omap_dss_device *dssdev)
+{
+        return OMAP_DSS_UPDATE_AUTO;
+}
+
+static int venc_set_update_mode(struct omap_dss_device *dssdev,
+                enum omap_dss_update_mode mode)
+{
+        if (mode != OMAP_DSS_UPDATE_AUTO)
+                return -EINVAL;
+        return 0;
+}
+
+static void venc_get_timings(struct omap_dss_device *dssdev,
+                        struct omap_video_timings *timings)
+{
+        *timings = dssdev->panel.timings;
+}
+
+static void venc_set_timings(struct omap_dss_device *dssdev,
+                        struct omap_video_timings *timings)
+{
+        DSSDBG("venc_set_timings\n");
+
+        /* Reset WSS data when the TV standard changes. */
+        if (memcmp(&dssdev->panel.timings, timings, sizeof(*timings)))
+                venc.wss_data = 0;
+
+        dssdev->panel.timings = *timings;
+        if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) {
+                /* turn the venc off and on to get new timings to use */
+                venc_panel_disable(dssdev);
+                venc_panel_enable(dssdev);
+        }
+}
+
+static int venc_check_timings(struct omap_dss_device *dssdev,
+                        struct omap_video_timings *timings)
+{
+        DSSDBG("venc_check_timings\n");
+
+        if (memcmp(&omap_dss_pal_timings, timings, sizeof(*timings)) == 0)
+                return 0;
+
+        if (memcmp(&omap_dss_ntsc_timings, timings, sizeof(*timings)) == 0)
+                return 0;
+
+        return -EINVAL;
+}
+
+static u32 venc_get_wss(struct omap_dss_device *dssdev)
+{
+        /* Invert due to VENC_L21_WC_CTL:INV=1 */
+        return (venc.wss_data >> 8) ^ 0xfffff;
+}
+
+static int venc_set_wss(struct omap_dss_device *dssdev, u32 wss)
+{
+        const struct venc_config *config;
+
+        DSSDBG("venc_set_wss\n");
+
+        mutex_lock(&venc.venc_lock);
+
+        config = venc_timings_to_config(&dssdev->panel.timings);
+
+        /* Invert due to VENC_L21_WC_CTL:INV=1 */
+        venc.wss_data = (wss ^ 0xfffff) << 8;
+
+        venc_enable_clocks(1);
+
+        venc_write_reg(VENC_BSTAMP_WSS_DATA, config->bstamp_wss_data |
+                        venc.wss_data);
+
+        venc_enable_clocks(0);
+
+        mutex_unlock(&venc.venc_lock);
+
+        return 0;
+}
+
+static struct omap_dss_driver venc_driver = {
+        .probe          = venc_panel_probe,
+        .remove         = venc_panel_remove,
+
+        .enable         = venc_panel_enable,
+        .disable        = venc_panel_disable,
+        .suspend        = venc_panel_suspend,
+        .resume         = venc_panel_resume,
+
+        .get_resolution = omapdss_default_get_resolution,
+        .get_recommended_bpp = omapdss_default_get_recommended_bpp,
+
+        .set_update_mode = venc_set_update_mode,
+        .get_update_mode = venc_get_update_mode,
+
+        .get_timings    = venc_get_timings,
+        .set_timings    = venc_set_timings,
+        .check_timings  = venc_check_timings,
+
+        .get_wss        = venc_get_wss,
+        .set_wss        = venc_set_wss,
+
+        .driver         = {
+                .name   = "venc",
+                .owner  = THIS_MODULE,
+        },
+};
+/* driver end */
+
+
+
+int venc_init(struct platform_device *pdev)
+{
+        u8 rev_id;
+
+        mutex_init(&venc.venc_lock);
+
+        venc.wss_data = 0;
+
+        venc.base = ioremap(VENC_BASE, SZ_1K);
+        if (!venc.base) {
+                DSSERR("can't ioremap VENC\n");
+                return -ENOMEM;
+        }
+
+        venc.vdda_dac_reg = dss_get_vdda_dac();
+        if (IS_ERR(venc.vdda_dac_reg)) {
+                iounmap(venc.base);
+                DSSERR("can't get VDDA_DAC regulator\n");
+                return PTR_ERR(venc.vdda_dac_reg);
+        }
+
+        venc_enable_clocks(1);
+
+        rev_id = (u8)(venc_read_reg(VENC_REV_ID) & 0xff);
+        printk(KERN_INFO "OMAP VENC rev %d\n", rev_id);
+
+        venc_enable_clocks(0);
+
+        return omap_dss_register_driver(&venc_driver);
+}
+
+void venc_exit(void)
+{
+        omap_dss_unregister_driver(&venc_driver);
+
+        iounmap(venc.base);
+}
+
+int venc_init_display(struct omap_dss_device *dssdev)
+{
+        DSSDBG("init_display\n");
+
+        return 0;
+}
+
+void venc_dump_regs(struct seq_file *s)
+{
+#define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, venc_read_reg(r))
+
+        venc_enable_clocks(1);
+
+        DUMPREG(VENC_F_CONTROL);
+        DUMPREG(VENC_VIDOUT_CTRL);
+        DUMPREG(VENC_SYNC_CTRL);
+        DUMPREG(VENC_LLEN);
+        DUMPREG(VENC_FLENS);
+        DUMPREG(VENC_HFLTR_CTRL);
+        DUMPREG(VENC_CC_CARR_WSS_CARR);
+        DUMPREG(VENC_C_PHASE);
+        DUMPREG(VENC_GAIN_U);
+        DUMPREG(VENC_GAIN_V);
+        DUMPREG(VENC_GAIN_Y);
+        DUMPREG(VENC_BLACK_LEVEL);
+        DUMPREG(VENC_BLANK_LEVEL);
+        DUMPREG(VENC_X_COLOR);
+        DUMPREG(VENC_M_CONTROL);
+        DUMPREG(VENC_BSTAMP_WSS_DATA);
+        DUMPREG(VENC_S_CARR);
+        DUMPREG(VENC_LINE21);
+        DUMPREG(VENC_LN_SEL);
+        DUMPREG(VENC_L21__WC_CTL);
+        DUMPREG(VENC_HTRIGGER_VTRIGGER);
+        DUMPREG(VENC_SAVID__EAVID);
+        DUMPREG(VENC_FLEN__FAL);
+        DUMPREG(VENC_LAL__PHASE_RESET);
+        DUMPREG(VENC_HS_INT_START_STOP_X);
+        DUMPREG(VENC_HS_EXT_START_STOP_X);
+        DUMPREG(VENC_VS_INT_START_X);
+        DUMPREG(VENC_VS_INT_STOP_X__VS_INT_START_Y);
+        DUMPREG(VENC_VS_INT_STOP_Y__VS_EXT_START_X);
+        DUMPREG(VENC_VS_EXT_STOP_X__VS_EXT_START_Y);
+        DUMPREG(VENC_VS_EXT_STOP_Y);
+        DUMPREG(VENC_AVID_START_STOP_X);
+        DUMPREG(VENC_AVID_START_STOP_Y);
+        DUMPREG(VENC_FID_INT_START_X__FID_INT_START_Y);
+        DUMPREG(VENC_FID_INT_OFFSET_Y__FID_EXT_START_X);
+        DUMPREG(VENC_FID_EXT_START_Y__FID_EXT_OFFSET_Y);
+        DUMPREG(VENC_TVDETGP_INT_START_STOP_X);
+        DUMPREG(VENC_TVDETGP_INT_START_STOP_Y);
+        DUMPREG(VENC_GEN_CTRL);
+        DUMPREG(VENC_OUTPUT_CONTROL);
+        DUMPREG(VENC_OUTPUT_TEST);
+
+        venc_enable_clocks(0);
+
+#undef DUMPREG
+}
diff --git a/drivers/video/omap2/omapfb/Kconfig b/drivers/video/omap2/omapfb/Kconfig
new file mode 100644
index 000000000000..43496d6c377f
--- /dev/null
+++ b/drivers/video/omap2/omapfb/Kconfig
@@ -0,0 +1,28 @@
+menuconfig FB_OMAP2
+        tristate "OMAP2/3 frame buffer support (EXPERIMENTAL)"
+        depends on FB && OMAP2_DSS
+
+        select OMAP2_VRAM
+        select OMAP2_VRFB
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        help
+          Frame buffer driver for OMAP2/3 based boards.
+
+config FB_OMAP2_DEBUG_SUPPORT
+        bool "Debug support for OMAP2/3 FB"
+        default y
+        depends on FB_OMAP2
+        help
+          Support for debug output. You have to enable the actual printing
+          with 'debug' module parameter.
+
+config FB_OMAP2_NUM_FBS
+        int "Number of framebuffers"
+        range 1 10
+        default 3
+        depends on FB_OMAP2
+        help
+          Select the number of framebuffers created. OMAP2/3 has 3 overlays
+          so normally this would be 3.
diff --git a/drivers/video/omap2/omapfb/Makefile b/drivers/video/omap2/omapfb/Makefile
new file mode 100644
index 000000000000..51c2e00d9bf8
--- /dev/null
+++ b/drivers/video/omap2/omapfb/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_FB_OMAP2) += omapfb.o
+omapfb-y := omapfb-main.o omapfb-sysfs.o omapfb-ioctl.o
diff --git a/drivers/video/omap2/omapfb/omapfb-ioctl.c b/drivers/video/omap2/omapfb/omapfb-ioctl.c
new file mode 100644
index 000000000000..1ffa760b8545
--- /dev/null
+++ b/drivers/video/omap2/omapfb/omapfb-ioctl.c
@@ -0,0 +1,785 @@
+/*
+ * linux/drivers/video/omap2/omapfb-ioctl.c
+ *
+ * Copyright (C) 2008 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * Some code and ideas taken from drivers/video/omap/ driver
+ * by Imre Deak.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/fb.h>
+#include <linux/device.h>
+#include <linux/uaccess.h>
+#include <linux/platform_device.h>
+#include <linux/mm.h>
+#include <linux/omapfb.h>
+#include <linux/vmalloc.h>
+
+#include <plat/display.h>
+#include <plat/vrfb.h>
+#include <plat/vram.h>
+
+#include "omapfb.h"
+
+static int omapfb_setup_plane(struct fb_info *fbi, struct omapfb_plane_info *pi)
+{
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        struct omapfb2_device *fbdev = ofbi->fbdev;
+        struct omap_overlay *ovl;
+        struct omap_overlay_info info;
+        int r = 0;
+
+        DBG("omapfb_setup_plane\n");
+
+        if (ofbi->num_overlays != 1) {
+                r = -EINVAL;
+                goto out;
+        }
+
+        /* XXX uses only the first overlay */
+        ovl = ofbi->overlays[0];
+
+        if (pi->enabled && !ofbi->region.size) {
+                /*
+                 * This plane's memory was freed, can't enable it
+                 * until it's reallocated.
+                 */
+                r = -EINVAL;
+                goto out;
+        }
+
+        ovl->get_overlay_info(ovl, &info);
+
+        info.pos_x = pi->pos_x;
+        info.pos_y = pi->pos_y;
+        info.out_width = pi->out_width;
+        info.out_height = pi->out_height;
+        info.enabled = pi->enabled;
+
+        r = ovl->set_overlay_info(ovl, &info);
+        if (r)
+                goto out;
+
+        if (ovl->manager) {
+                r = ovl->manager->apply(ovl->manager);
+                if (r)
+                        goto out;
+        }
+
+out:
+        if (r)
+                dev_err(fbdev->dev, "setup_plane failed\n");
+        return r;
+}
+
+static int omapfb_query_plane(struct fb_info *fbi, struct omapfb_plane_info *pi)
+{
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+
+        if (ofbi->num_overlays != 1) {
+                memset(pi, 0, sizeof(*pi));
+        } else {
+                struct omap_overlay_info *ovli;
+                struct omap_overlay *ovl;
+
+                ovl = ofbi->overlays[0];
+                ovli = &ovl->info;
+
+                pi->pos_x = ovli->pos_x;
+                pi->pos_y = ovli->pos_y;
+                pi->enabled = ovli->enabled;
+                pi->channel_out = 0; /* xxx */
+                pi->mirror = 0;
+                pi->out_width = ovli->out_width;
+                pi->out_height = ovli->out_height;
+        }
+
+        return 0;
+}
+
+static int omapfb_setup_mem(struct fb_info *fbi, struct omapfb_mem_info *mi)
+{
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        struct omapfb2_device *fbdev = ofbi->fbdev;
+        struct omapfb2_mem_region *rg;
+        int r, i;
+        size_t size;
+
+        if (mi->type > OMAPFB_MEMTYPE_MAX)
+                return -EINVAL;
+
+        size = PAGE_ALIGN(mi->size);
+
+        rg = &ofbi->region;
+
+        for (i = 0; i < ofbi->num_overlays; i++) {
+                if (ofbi->overlays[i]->info.enabled)
+                        return -EBUSY;
+        }
+
+        if (rg->size != size || rg->type != mi->type) {
+                r = omapfb_realloc_fbmem(fbi, size, mi->type);
+                if (r) {
+                        dev_err(fbdev->dev, "realloc fbmem failed\n");
+                        return r;
+                }
+        }
+
+        return 0;
+}
+
+static int omapfb_query_mem(struct fb_info *fbi, struct omapfb_mem_info *mi)
+{
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        struct omapfb2_mem_region *rg;
+
+        rg = &ofbi->region;
+        memset(mi, 0, sizeof(*mi));
+
+        mi->size = rg->size;
+        mi->type = rg->type;
+
+        return 0;
+}
+
+static int omapfb_update_window_nolock(struct fb_info *fbi,
+                u32 x, u32 y, u32 w, u32 h)
+{
+        struct omap_dss_device *display = fb2display(fbi);
+        u16 dw, dh;
+
+        if (!display)
+                return 0;
+
+        if (w == 0 || h == 0)
+                return 0;
+
+        display->driver->get_resolution(display, &dw, &dh);
+
+        if (x + w > dw || y + h > dh)
+                return -EINVAL;
+
+        return display->driver->update(display, x, y, w, h);
+}
+
+/* This function is exported for SGX driver use */
+int omapfb_update_window(struct fb_info *fbi,
+                u32 x, u32 y, u32 w, u32 h)
+{
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        struct omapfb2_device *fbdev = ofbi->fbdev;
+        int r;
+
+        omapfb_lock(fbdev);
+        lock_fb_info(fbi);
+
+        r = omapfb_update_window_nolock(fbi, x, y, w, h);
+
+        unlock_fb_info(fbi);
+        omapfb_unlock(fbdev);
+
+        return r;
+}
+EXPORT_SYMBOL(omapfb_update_window);
+
+static int omapfb_set_update_mode(struct fb_info *fbi,
+                                   enum omapfb_update_mode mode)
+{
+        struct omap_dss_device *display = fb2display(fbi);
+        enum omap_dss_update_mode um;
+        int r;
+
+        if (!display || !display->driver->set_update_mode)
+                return -EINVAL;
+
+        switch (mode) {
+        case OMAPFB_UPDATE_DISABLED:
+                um = OMAP_DSS_UPDATE_DISABLED;
+                break;
+
+        case OMAPFB_AUTO_UPDATE:
+                um = OMAP_DSS_UPDATE_AUTO;
+                break;
+
+        case OMAPFB_MANUAL_UPDATE:
+                um = OMAP_DSS_UPDATE_MANUAL;
+                break;
+
+        default:
+                return -EINVAL;
+        }
+
+        r = display->driver->set_update_mode(display, um);
+
+        return r;
+}
+
+static int omapfb_get_update_mode(struct fb_info *fbi,
+                enum omapfb_update_mode *mode)
+{
+        struct omap_dss_device *display = fb2display(fbi);
+        enum omap_dss_update_mode m;
+
+        if (!display)
+                return -EINVAL;
+
+        if (!display->driver->get_update_mode) {
+                *mode = OMAPFB_AUTO_UPDATE;
+                return 0;
+        }
+
+        m = display->driver->get_update_mode(display);
+
+        switch (m) {
+        case OMAP_DSS_UPDATE_DISABLED:
+                *mode = OMAPFB_UPDATE_DISABLED;
+                break;
+        case OMAP_DSS_UPDATE_AUTO:
+                *mode = OMAPFB_AUTO_UPDATE;
+                break;
+        case OMAP_DSS_UPDATE_MANUAL:
+                *mode = OMAPFB_MANUAL_UPDATE;
+                break;
+        default:
+                BUG();
+        }
+
+        return 0;
+}
+
+/* XXX this color key handling is a hack... */
+static struct omapfb_color_key omapfb_color_keys[2];
+
+static int _omapfb_set_color_key(struct omap_overlay_manager *mgr,
+                struct omapfb_color_key *ck)
+{
+        struct omap_overlay_manager_info info;
+        enum omap_dss_trans_key_type kt;
+        int r;
+
+        mgr->get_manager_info(mgr, &info);
+
+        if (ck->key_type == OMAPFB_COLOR_KEY_DISABLED) {
+                info.trans_enabled = false;
+                omapfb_color_keys[mgr->id] = *ck;
+
+                r = mgr->set_manager_info(mgr, &info);
+                if (r)
+                        return r;
+
+                r = mgr->apply(mgr);
+
+                return r;
+        }
+
+        switch (ck->key_type) {
+        case OMAPFB_COLOR_KEY_GFX_DST:
+                kt = OMAP_DSS_COLOR_KEY_GFX_DST;
+                break;
+        case OMAPFB_COLOR_KEY_VID_SRC:
+                kt = OMAP_DSS_COLOR_KEY_VID_SRC;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        info.default_color = ck->background;
+        info.trans_key = ck->trans_key;
+        info.trans_key_type = kt;
+        info.trans_enabled = true;
+
+        omapfb_color_keys[mgr->id] = *ck;
+
+        r = mgr->set_manager_info(mgr, &info);
+        if (r)
+                return r;
+
+        r = mgr->apply(mgr);
+
+        return r;
+}
+
+static int omapfb_set_color_key(struct fb_info *fbi,
+                struct omapfb_color_key *ck)
+{
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        struct omapfb2_device *fbdev = ofbi->fbdev;
+        int r;
+        int i;
+        struct omap_overlay_manager *mgr = NULL;
+
+        omapfb_lock(fbdev);
+
+        for (i = 0; i < ofbi->num_overlays; i++) {
+                if (ofbi->overlays[i]->manager) {
+                        mgr = ofbi->overlays[i]->manager;
+                        break;
+                }
+        }
+
+        if (!mgr) {
+                r = -EINVAL;
+                goto err;
+        }
+
+        r = _omapfb_set_color_key(mgr, ck);
+err:
+        omapfb_unlock(fbdev);
+
+        return r;
+}
+
+static int omapfb_get_color_key(struct fb_info *fbi,
+                struct omapfb_color_key *ck)
+{
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        struct omapfb2_device *fbdev = ofbi->fbdev;
+        struct omap_overlay_manager *mgr = NULL;
+        int r = 0;
+        int i;
+
+        omapfb_lock(fbdev);
+
+        for (i = 0; i < ofbi->num_overlays; i++) {
+                if (ofbi->overlays[i]->manager) {
+                        mgr = ofbi->overlays[i]->manager;
+                        break;
+                }
+        }
+
+        if (!mgr) {
+                r = -EINVAL;
+                goto err;
+        }
+
+        *ck = omapfb_color_keys[mgr->id];
+err:
+        omapfb_unlock(fbdev);
+
+        return r;
+}
+
+static int omapfb_memory_read(struct fb_info *fbi,
+                struct omapfb_memory_read *mr)
+{
+        struct omap_dss_device *display = fb2display(fbi);
+        void *buf;
+        int r;
+
+        if (!display || !display->driver->memory_read)
+                return -ENOENT;
+
+        if (!access_ok(VERIFY_WRITE, mr->buffer, mr->buffer_size))
+                return -EFAULT;
+
+        if (mr->w * mr->h * 3 > mr->buffer_size)
+                return -EINVAL;
+
+        buf = vmalloc(mr->buffer_size);
+        if (!buf) {
+                DBG("vmalloc failed\n");
+                return -ENOMEM;
+        }
+
+        r = display->driver->memory_read(display, buf, mr->buffer_size,
+                        mr->x, mr->y, mr->w, mr->h);
+
+        if (r > 0) {
+                if (copy_to_user(mr->buffer, buf, mr->buffer_size))
+                        r = -EFAULT;
+        }
+
+        vfree(buf);
+
+        return r;
+}
+
+static int omapfb_get_ovl_colormode(struct omapfb2_device *fbdev,
+                             struct omapfb_ovl_colormode *mode)
+{
+        int ovl_idx = mode->overlay_idx;
+        int mode_idx = mode->mode_idx;
+        struct omap_overlay *ovl;
+        enum omap_color_mode supported_modes;
+        struct fb_var_screeninfo var;
+        int i;
+
+        if (ovl_idx >= fbdev->num_overlays)
+                return -ENODEV;
+        ovl = fbdev->overlays[ovl_idx];
+        supported_modes = ovl->supported_modes;
+
+        mode_idx = mode->mode_idx;
+
+        for (i = 0; i < sizeof(supported_modes) * 8; i++) {
+                if (!(supported_modes & (1 << i)))
+                        continue;
+                /*
+                 * It's possible that the FB doesn't support a mode
+                 * that is supported by the overlay, so call the
+                 * following here.
+                 */
+                if (dss_mode_to_fb_mode(1 << i, &var) < 0)
+                        continue;
+
+                mode_idx--;
+                if (mode_idx < 0)
+                        break;
+        }
+
+        if (i == sizeof(supported_modes) * 8)
+                return -ENOENT;
+
+        mode->bits_per_pixel = var.bits_per_pixel;
+        mode->nonstd = var.nonstd;
+        mode->red = var.red;
+        mode->green = var.green;
+        mode->blue = var.blue;
+        mode->transp = var.transp;
+
+        return 0;
+}
+
+static int omapfb_wait_for_go(struct fb_info *fbi)
+{
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        int r = 0;
+        int i;
+
+        for (i = 0; i < ofbi->num_overlays; ++i) {
+                struct omap_overlay *ovl = ofbi->overlays[i];
+                r = ovl->wait_for_go(ovl);
+                if (r)
+                        break;
+        }
+
+        return r;
+}
+
+int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg)
+{
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        struct omapfb2_device *fbdev = ofbi->fbdev;
+        struct omap_dss_device *display = fb2display(fbi);
+
+        union {
+                struct omapfb_update_window_old uwnd_o;
+                struct omapfb_update_window     uwnd;
+                struct omapfb_plane_info        plane_info;
+                struct omapfb_caps              caps;
+                struct omapfb_mem_info          mem_info;
+                struct omapfb_color_key         color_key;
+                struct omapfb_ovl_colormode     ovl_colormode;
+                enum omapfb_update_mode         update_mode;
+                int test_num;
+                struct omapfb_memory_read       memory_read;
+                struct omapfb_vram_info         vram_info;
+                struct omapfb_tearsync_info     tearsync_info;
+                struct omapfb_display_info      display_info;
+        } p;
+
+        int r = 0;
+
+        switch (cmd) {
+        case OMAPFB_SYNC_GFX:
+                DBG("ioctl SYNC_GFX\n");
+                if (!display || !display->driver->sync) {
+                        /* DSS1 never returns an error here, so we neither */
+                        /*r = -EINVAL;*/
+                        break;
+                }
+
+                r = display->driver->sync(display);
+                break;
+
+        case OMAPFB_UPDATE_WINDOW_OLD:
+                DBG("ioctl UPDATE_WINDOW_OLD\n");
+                if (!display || !display->driver->update) {
+                        r = -EINVAL;
+                        break;
+                }
+
+                if (copy_from_user(&p.uwnd_o,
+                                        (void __user *)arg,
+                                        sizeof(p.uwnd_o))) {
+                        r = -EFAULT;
+                        break;
+                }
+
+                r = omapfb_update_window_nolock(fbi, p.uwnd_o.x, p.uwnd_o.y,
+                                p.uwnd_o.width, p.uwnd_o.height);
+                break;
+
+        case OMAPFB_UPDATE_WINDOW:
+                DBG("ioctl UPDATE_WINDOW\n");
+                if (!display || !display->driver->update) {
+                        r = -EINVAL;
+                        break;
+                }
+
+                if (copy_from_user(&p.uwnd, (void __user *)arg,
+                                        sizeof(p.uwnd))) {
+                        r = -EFAULT;
+                        break;
+                }
+
+                r = omapfb_update_window_nolock(fbi, p.uwnd.x, p.uwnd.y,
+                                p.uwnd.width, p.uwnd.height);
+                break;
+
+        case OMAPFB_SETUP_PLANE:
+                DBG("ioctl SETUP_PLANE\n");
+                if (copy_from_user(&p.plane_info, (void __user *)arg,
+                                        sizeof(p.plane_info)))
+                        r = -EFAULT;
+                else
+                        r = omapfb_setup_plane(fbi, &p.plane_info);
+                break;
+
+        case OMAPFB_QUERY_PLANE:
+                DBG("ioctl QUERY_PLANE\n");
+                r = omapfb_query_plane(fbi, &p.plane_info);
+                if (r < 0)
+                        break;
+                if (copy_to_user((void __user *)arg, &p.plane_info,
+                                        sizeof(p.plane_info)))
+                        r = -EFAULT;
+                break;
+
+        case OMAPFB_SETUP_MEM:
+                DBG("ioctl SETUP_MEM\n");
+                if (copy_from_user(&p.mem_info, (void __user *)arg,
+                                        sizeof(p.mem_info)))
+                        r = -EFAULT;
+                else
+                        r = omapfb_setup_mem(fbi, &p.mem_info);
+                break;
+
+        case OMAPFB_QUERY_MEM:
+                DBG("ioctl QUERY_MEM\n");
+                r = omapfb_query_mem(fbi, &p.mem_info);
+                if (r < 0)
+                        break;
+                if (copy_to_user((void __user *)arg, &p.mem_info,
+                                        sizeof(p.mem_info)))
+                        r = -EFAULT;
+                break;
+
+        case OMAPFB_GET_CAPS:
+                DBG("ioctl GET_CAPS\n");
+                if (!display) {
+                        r = -EINVAL;
+                        break;
+                }
+
+                memset(&p.caps, 0, sizeof(p.caps));
+                if (display->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE)
+                        p.caps.ctrl |= OMAPFB_CAPS_MANUAL_UPDATE;
+                if (display->caps & OMAP_DSS_DISPLAY_CAP_TEAR_ELIM)
+                        p.caps.ctrl |= OMAPFB_CAPS_TEARSYNC;
+
+                if (copy_to_user((void __user *)arg, &p.caps, sizeof(p.caps)))
+                        r = -EFAULT;
+                break;
+
+        case OMAPFB_GET_OVERLAY_COLORMODE:
+                DBG("ioctl GET_OVERLAY_COLORMODE\n");
+                if (copy_from_user(&p.ovl_colormode, (void __user *)arg,
+                                   sizeof(p.ovl_colormode))) {
+                        r = -EFAULT;
+                        break;
+                }
+                r = omapfb_get_ovl_colormode(fbdev, &p.ovl_colormode);
+                if (r < 0)
+                        break;
+                if (copy_to_user((void __user *)arg, &p.ovl_colormode,
+                                 sizeof(p.ovl_colormode)))
+                        r = -EFAULT;
+                break;
+
+        case OMAPFB_SET_UPDATE_MODE:
+                DBG("ioctl SET_UPDATE_MODE\n");
+                if (get_user(p.update_mode, (int __user *)arg))
+                        r = -EFAULT;
+                else
+                        r = omapfb_set_update_mode(fbi, p.update_mode);
+                break;
+
+        case OMAPFB_GET_UPDATE_MODE:
+                DBG("ioctl GET_UPDATE_MODE\n");
+                r = omapfb_get_update_mode(fbi, &p.update_mode);
+                if (r)
+                        break;
+                if (put_user(p.update_mode,
+                                        (enum omapfb_update_mode __user *)arg))
+                        r = -EFAULT;
+                break;
+
+        case OMAPFB_SET_COLOR_KEY:
+                DBG("ioctl SET_COLOR_KEY\n");
+                if (copy_from_user(&p.color_key, (void __user *)arg,
+                                   sizeof(p.color_key)))
+                        r = -EFAULT;
+                else
+                        r = omapfb_set_color_key(fbi, &p.color_key);
+                break;
+
+        case OMAPFB_GET_COLOR_KEY:
+                DBG("ioctl GET_COLOR_KEY\n");
+                r = omapfb_get_color_key(fbi, &p.color_key);
+                if (r)
+                        break;
+                if (copy_to_user((void __user *)arg, &p.color_key,
+                                 sizeof(p.color_key)))
+                        r = -EFAULT;
+                break;
+
+        case OMAPFB_WAITFORVSYNC:
+                DBG("ioctl WAITFORVSYNC\n");
+                if (!display) {
+                        r = -EINVAL;
+                        break;
+                }
+
+                r = display->manager->wait_for_vsync(display->manager);
+                break;
+
+        case OMAPFB_WAITFORGO:
+                DBG("ioctl WAITFORGO\n");
+                if (!display) {
+                        r = -EINVAL;
+                        break;
+                }
+
+                r = omapfb_wait_for_go(fbi);
+                break;
+
+        /* LCD and CTRL tests do the same thing for backward
+         * compatibility */
+        case OMAPFB_LCD_TEST:
+                DBG("ioctl LCD_TEST\n");
+                if (get_user(p.test_num, (int __user *)arg)) {
+                        r = -EFAULT;
+                        break;
+                }
+                if (!display || !display->driver->run_test) {
+                        r = -EINVAL;
+                        break;
+                }
+
+                r = display->driver->run_test(display, p.test_num);
+
+                break;
+
+        case OMAPFB_CTRL_TEST:
+                DBG("ioctl CTRL_TEST\n");
+                if (get_user(p.test_num, (int __user *)arg)) {
+                        r = -EFAULT;
+                        break;
+                }
+                if (!display || !display->driver->run_test) {
+                        r = -EINVAL;
+                        break;
+                }
+
+                r = display->driver->run_test(display, p.test_num);
+
+                break;
+
+        case OMAPFB_MEMORY_READ:
+                DBG("ioctl MEMORY_READ\n");
+
+                if (copy_from_user(&p.memory_read, (void __user *)arg,
+                                        sizeof(p.memory_read))) {
+                        r = -EFAULT;
+                        break;
+                }
+
+                r = omapfb_memory_read(fbi, &p.memory_read);
+
+                break;
+
+        case OMAPFB_GET_VRAM_INFO: {
+                unsigned long vram, free, largest;
+
+                DBG("ioctl GET_VRAM_INFO\n");
+
+                omap_vram_get_info(&vram, &free, &largest);
+                p.vram_info.total = vram;
+                p.vram_info.free = free;
+                p.vram_info.largest_free_block = largest;
+
+                if (copy_to_user((void __user *)arg, &p.vram_info,
+                                        sizeof(p.vram_info)))
+                        r = -EFAULT;
+                break;
+        }
+
+        case OMAPFB_SET_TEARSYNC: {
+                DBG("ioctl SET_TEARSYNC\n");
+
+                if (copy_from_user(&p.tearsync_info, (void __user *)arg,
+                                        sizeof(p.tearsync_info))) {
+                        r = -EFAULT;
+                        break;
+                }
+
+                if (!display->driver->enable_te) {
+                        r = -ENODEV;
+                        break;
+                }
+
+                r = display->driver->enable_te(display,
+                                !!p.tearsync_info.enabled);
+
+                break;
+        }
+
+        case OMAPFB_GET_DISPLAY_INFO: {
+                u16 xres, yres;
+
+                DBG("ioctl GET_DISPLAY_INFO\n");
+
+                if (display == NULL) {
+                        r = -ENODEV;
+                        break;
+                }
+
+                display->driver->get_resolution(display, &xres, &yres);
+
+                p.display_info.xres = xres;
+                p.display_info.yres = yres;
+                p.display_info.width = 0;
+                p.display_info.height = 0;
+
+                if (copy_to_user((void __user *)arg, &p.display_info,
+                                        sizeof(p.display_info)))
+                        r = -EFAULT;
+                break;
+        }
+
+        default:
+                dev_err(fbdev->dev, "Unknown ioctl 0x%x\n", cmd);
+                r = -EINVAL;
+        }
+
+        if (r < 0)
+                DBG("ioctl failed: %d\n", r);
+
+        return r;
+}
+
+
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
new file mode 100644
index 000000000000..4b4506da96da
--- /dev/null
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -0,0 +1,2287 @@
+/*
+ * linux/drivers/video/omap2/omapfb-main.c
+ *
+ * Copyright (C) 2008 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * Some code and ideas taken from drivers/video/omap/ driver
+ * by Imre Deak.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/fb.h>
+#include <linux/dma-mapping.h>
+#include <linux/vmalloc.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/omapfb.h>
+
+#include <plat/display.h>
+#include <plat/vram.h>
+#include <plat/vrfb.h>
+
+#include "omapfb.h"
+
+#define MODULE_NAME     "omapfb"
+
+#define OMAPFB_PLANE_XRES_MIN           8
+#define OMAPFB_PLANE_YRES_MIN           8
+
+static char *def_mode;
+static char *def_vram;
+static int def_vrfb;
+static int def_rotate;
+static int def_mirror;
+
+#ifdef DEBUG
+unsigned int omapfb_debug;
+module_param_named(debug, omapfb_debug, bool, 0644);
+static unsigned int omapfb_test_pattern;
+module_param_named(test, omapfb_test_pattern, bool, 0644);
+#endif
+
+static int omapfb_fb_init(struct omapfb2_device *fbdev, struct fb_info *fbi);
+static int omapfb_get_recommended_bpp(struct omapfb2_device *fbdev,
+                struct omap_dss_device *dssdev);
+
+#ifdef DEBUG
+static void draw_pixel(struct fb_info *fbi, int x, int y, unsigned color)
+{
+        struct fb_var_screeninfo *var = &fbi->var;
+        struct fb_fix_screeninfo *fix = &fbi->fix;
+        void __iomem *addr = fbi->screen_base;
+        const unsigned bytespp = var->bits_per_pixel >> 3;
+        const unsigned line_len = fix->line_length / bytespp;
+
+        int r = (color >> 16) & 0xff;
+        int g = (color >> 8) & 0xff;
+        int b = (color >> 0) & 0xff;
+
+        if (var->bits_per_pixel == 16) {
+                u16 __iomem *p = (u16 __iomem *)addr;
+                p += y * line_len + x;
+
+                r = r * 32 / 256;
+                g = g * 64 / 256;
+                b = b * 32 / 256;
+
+                __raw_writew((r << 11) | (g << 5) | (b << 0), p);
+        } else if (var->bits_per_pixel == 24) {
+                u8 __iomem *p = (u8 __iomem *)addr;
+                p += (y * line_len + x) * 3;
+
+                __raw_writeb(b, p + 0);
+                __raw_writeb(g, p + 1);
+                __raw_writeb(r, p + 2);
+        } else if (var->bits_per_pixel == 32) {
+                u32 __iomem *p = (u32 __iomem *)addr;
+                p += y * line_len + x;
+                __raw_writel(color, p);
+        }
+}
+
+static void fill_fb(struct fb_info *fbi)
+{
+        struct fb_var_screeninfo *var = &fbi->var;
+        const short w = var->xres_virtual;
+        const short h = var->yres_virtual;
+        void __iomem *addr = fbi->screen_base;
+        int y, x;
+
+        if (!addr)
+                return;
+
+        DBG("fill_fb %dx%d, line_len %d bytes\n", w, h, fbi->fix.line_length);
+
+        for (y = 0; y < h; y++) {
+                for (x = 0; x < w; x++) {
+                        if (x < 20 && y < 20)
+                                draw_pixel(fbi, x, y, 0xffffff);
+                        else if (x < 20 && (y > 20 && y < h - 20))
+                                draw_pixel(fbi, x, y, 0xff);
+                        else if (y < 20 && (x > 20 && x < w - 20))
+                                draw_pixel(fbi, x, y, 0xff00);
+                        else if (x > w - 20 && (y > 20 && y < h - 20))
+                                draw_pixel(fbi, x, y, 0xff0000);
+                        else if (y > h - 20 && (x > 20 && x < w - 20))
+                                draw_pixel(fbi, x, y, 0xffff00);
+                        else if (x == 20 || x == w - 20 ||
+                                        y == 20 || y == h - 20)
+                                draw_pixel(fbi, x, y, 0xffffff);
+                        else if (x == y || w - x == h - y)
+                                draw_pixel(fbi, x, y, 0xff00ff);
+                        else if (w - x == y || x == h - y)
+                                draw_pixel(fbi, x, y, 0x00ffff);
+                        else if (x > 20 && y > 20 && x < w - 20 && y < h - 20) {
+                                int t = x * 3 / w;
+                                unsigned r = 0, g = 0, b = 0;
+                                unsigned c;
+                                if (var->bits_per_pixel == 16) {
+                                        if (t == 0)
+                                                b = (y % 32) * 256 / 32;
+                                        else if (t == 1)
+                                                g = (y % 64) * 256 / 64;
+                                        else if (t == 2)
+                                                r = (y % 32) * 256 / 32;
+                                } else {
+                                        if (t == 0)
+                                                b = (y % 256);
+                                        else if (t == 1)
+                                                g = (y % 256);
+                                        else if (t == 2)
+                                                r = (y % 256);
+                                }
+                                c = (r << 16) | (g << 8) | (b << 0);
+                                draw_pixel(fbi, x, y, c);
+                        } else {
+                                draw_pixel(fbi, x, y, 0);
+                        }
+                }
+        }
+}
+#endif
+
+static unsigned omapfb_get_vrfb_offset(const struct omapfb_info *ofbi, int rot)
+{
+        const struct vrfb *vrfb = &ofbi->region.vrfb;
+        unsigned offset;
+
+        switch (rot) {
+        case FB_ROTATE_UR:
+                offset = 0;
+                break;
+        case FB_ROTATE_CW:
+                offset = vrfb->yoffset;
+                break;
+        case FB_ROTATE_UD:
+                offset = vrfb->yoffset * OMAP_VRFB_LINE_LEN + vrfb->xoffset;
+                break;
+        case FB_ROTATE_CCW:
+                offset = vrfb->xoffset * OMAP_VRFB_LINE_LEN;
+                break;
+        default:
+                BUG();
+        }
+
+        offset *= vrfb->bytespp;
+
+        return offset;
+}
+
+static u32 omapfb_get_region_rot_paddr(const struct omapfb_info *ofbi, int rot)
+{
+        if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
+                return ofbi->region.vrfb.paddr[rot]
+                        + omapfb_get_vrfb_offset(ofbi, rot);
+        } else {
+                return ofbi->region.paddr;
+        }
+}
+
+static u32 omapfb_get_region_paddr(const struct omapfb_info *ofbi)
+{
+        if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB)
+                return ofbi->region.vrfb.paddr[0];
+        else
+                return ofbi->region.paddr;
+}
+
+static void __iomem *omapfb_get_region_vaddr(const struct omapfb_info *ofbi)
+{
+        if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB)
+                return ofbi->region.vrfb.vaddr[0];
+        else
+                return ofbi->region.vaddr;
+}
+
+static struct omapfb_colormode omapfb_colormodes[] = {
+        {
+                .dssmode = OMAP_DSS_COLOR_UYVY,
+                .bits_per_pixel = 16,
+                .nonstd = OMAPFB_COLOR_YUV422,
+        }, {
+                .dssmode = OMAP_DSS_COLOR_YUV2,
+                .bits_per_pixel = 16,
+                .nonstd = OMAPFB_COLOR_YUY422,
+        }, {
+                .dssmode = OMAP_DSS_COLOR_ARGB16,
+                .bits_per_pixel = 16,
+                .red    = { .length = 4, .offset = 8, .msb_right = 0 },
+                .green  = { .length = 4, .offset = 4, .msb_right = 0 },
+                .blue   = { .length = 4, .offset = 0, .msb_right = 0 },
+                .transp = { .length = 4, .offset = 12, .msb_right = 0 },
+        }, {
+                .dssmode = OMAP_DSS_COLOR_RGB16,
+                .bits_per_pixel = 16,
+                .red    = { .length = 5, .offset = 11, .msb_right = 0 },
+                .green  = { .length = 6, .offset = 5, .msb_right = 0 },
+                .blue   = { .length = 5, .offset = 0, .msb_right = 0 },
+                .transp = { .length = 0, .offset = 0, .msb_right = 0 },
+        }, {
+                .dssmode = OMAP_DSS_COLOR_RGB24P,
+                .bits_per_pixel = 24,
+                .red    = { .length = 8, .offset = 16, .msb_right = 0 },
+                .green  = { .length = 8, .offset = 8, .msb_right = 0 },
+                .blue   = { .length = 8, .offset = 0, .msb_right = 0 },
+                .transp = { .length = 0, .offset = 0, .msb_right = 0 },
+        }, {
+                .dssmode = OMAP_DSS_COLOR_RGB24U,
+                .bits_per_pixel = 32,
+                .red    = { .length = 8, .offset = 16, .msb_right = 0 },
+                .green  = { .length = 8, .offset = 8, .msb_right = 0 },
+                .blue   = { .length = 8, .offset = 0, .msb_right = 0 },
+                .transp = { .length = 0, .offset = 0, .msb_right = 0 },
+        }, {
+                .dssmode = OMAP_DSS_COLOR_ARGB32,
+                .bits_per_pixel = 32,
+                .red    = { .length = 8, .offset = 16, .msb_right = 0 },
+                .green  = { .length = 8, .offset = 8, .msb_right = 0 },
+                .blue   = { .length = 8, .offset = 0, .msb_right = 0 },
+                .transp = { .length = 8, .offset = 24, .msb_right = 0 },
+        }, {
+                .dssmode = OMAP_DSS_COLOR_RGBA32,
+                .bits_per_pixel = 32,
+                .red    = { .length = 8, .offset = 24, .msb_right = 0 },
+                .green  = { .length = 8, .offset = 16, .msb_right = 0 },
+                .blue   = { .length = 8, .offset = 8, .msb_right = 0 },
+                .transp = { .length = 8, .offset = 0, .msb_right = 0 },
+        }, {
+                .dssmode = OMAP_DSS_COLOR_RGBX32,
+                .bits_per_pixel = 32,
+                .red    = { .length = 8, .offset = 24, .msb_right = 0 },
+                .green  = { .length = 8, .offset = 16, .msb_right = 0 },
+                .blue   = { .length = 8, .offset = 8, .msb_right = 0 },
+                .transp = { .length = 0, .offset = 0, .msb_right = 0 },
+        },
+};
+
+static bool cmp_var_to_colormode(struct fb_var_screeninfo *var,
+                struct omapfb_colormode *color)
+{
+        bool cmp_component(struct fb_bitfield *f1, struct fb_bitfield *f2)
+        {
+                return f1->length == f2->length &&
+                        f1->offset == f2->offset &&
+                        f1->msb_right == f2->msb_right;
+        }
+
+        if (var->bits_per_pixel == 0 ||
+                        var->red.length == 0 ||
+                        var->blue.length == 0 ||
+                        var->green.length == 0)
+                return 0;
+
+        return var->bits_per_pixel == color->bits_per_pixel &&
+                cmp_component(&var->red, &color->red) &&
+                cmp_component(&var->green, &color->green) &&
+                cmp_component(&var->blue, &color->blue) &&
+                cmp_component(&var->transp, &color->transp);
+}
+
+static void assign_colormode_to_var(struct fb_var_screeninfo *var,
+                struct omapfb_colormode *color)
+{
+        var->bits_per_pixel = color->bits_per_pixel;
+        var->nonstd = color->nonstd;
+        var->red = color->red;
+        var->green = color->green;
+        var->blue = color->blue;
+        var->transp = color->transp;
+}
+
+static int fb_mode_to_dss_mode(struct fb_var_screeninfo *var,
+                enum omap_color_mode *mode)
+{
+        enum omap_color_mode dssmode;
+        int i;
+
+        /* first match with nonstd field */
+        if (var->nonstd) {
+                for (i = 0; i < ARRAY_SIZE(omapfb_colormodes); ++i) {
+                        struct omapfb_colormode *m = &omapfb_colormodes[i];
+                        if (var->nonstd == m->nonstd) {
+                                assign_colormode_to_var(var, m);
+                                *mode = m->dssmode;
+                                return 0;
+                        }
+                }
+
+                return -EINVAL;
+        }
+
+        /* then try exact match of bpp and colors */
+        for (i = 0; i < ARRAY_SIZE(omapfb_colormodes); ++i) {
+                struct omapfb_colormode *m = &omapfb_colormodes[i];
+                if (cmp_var_to_colormode(var, m)) {
+                        assign_colormode_to_var(var, m);
+                        *mode = m->dssmode;
+                        return 0;
+                }
+        }
+
+        /* match with bpp if user has not filled color fields
+         * properly */
+        switch (var->bits_per_pixel) {
+        case 1:
+                dssmode = OMAP_DSS_COLOR_CLUT1;
+                break;
+        case 2:
+                dssmode = OMAP_DSS_COLOR_CLUT2;
+                break;
+        case 4:
+                dssmode = OMAP_DSS_COLOR_CLUT4;
+                break;
+        case 8:
+                dssmode = OMAP_DSS_COLOR_CLUT8;
+                break;
+        case 12:
+                dssmode = OMAP_DSS_COLOR_RGB12U;
+                break;
+        case 16:
+                dssmode = OMAP_DSS_COLOR_RGB16;
+                break;
+        case 24:
+                dssmode = OMAP_DSS_COLOR_RGB24P;
+                break;
+        case 32:
+                dssmode = OMAP_DSS_COLOR_RGB24U;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        for (i = 0; i < ARRAY_SIZE(omapfb_colormodes); ++i) {
+                struct omapfb_colormode *m = &omapfb_colormodes[i];
+                if (dssmode == m->dssmode) {
+                        assign_colormode_to_var(var, m);
+                        *mode = m->dssmode;
+                        return 0;
+                }
+        }
+
+        return -EINVAL;
+}
+
+static int check_fb_res_bounds(struct fb_var_screeninfo *var)
+{
+        int xres_min = OMAPFB_PLANE_XRES_MIN;
+        int xres_max = 2048;
+        int yres_min = OMAPFB_PLANE_YRES_MIN;
+        int yres_max = 2048;
+
+        /* XXX: some applications seem to set virtual res to 0. */
+        if (var->xres_virtual == 0)
+                var->xres_virtual = var->xres;
+
+        if (var->yres_virtual == 0)
+                var->yres_virtual = var->yres;
+
+        if (var->xres_virtual < xres_min || var->yres_virtual < yres_min)
+                return -EINVAL;
+
+        if (var->xres < xres_min)
+                var->xres = xres_min;
+        if (var->yres < yres_min)
+                var->yres = yres_min;
+        if (var->xres > xres_max)
+                var->xres = xres_max;
+        if (var->yres > yres_max)
+                var->yres = yres_max;
+
+        if (var->xres > var->xres_virtual)
+                var->xres = var->xres_virtual;
+        if (var->yres > var->yres_virtual)
+                var->yres = var->yres_virtual;
+
+        return 0;
+}
+
+static void shrink_height(unsigned long max_frame_size,
+                struct fb_var_screeninfo *var)
+{
+        DBG("can't fit FB into memory, reducing y\n");
+        var->yres_virtual = max_frame_size /
+                (var->xres_virtual * var->bits_per_pixel >> 3);
+
+        if (var->yres_virtual < OMAPFB_PLANE_YRES_MIN)
+                var->yres_virtual = OMAPFB_PLANE_YRES_MIN;
+
+        if (var->yres > var->yres_virtual)
+                var->yres = var->yres_virtual;
+}
+
+static void shrink_width(unsigned long max_frame_size,
+                struct fb_var_screeninfo *var)
+{
+        DBG("can't fit FB into memory, reducing x\n");
+        var->xres_virtual = max_frame_size / var->yres_virtual /
+                (var->bits_per_pixel >> 3);
+
+        if (var->xres_virtual < OMAPFB_PLANE_XRES_MIN)
+                var->xres_virtual = OMAPFB_PLANE_XRES_MIN;
+
+        if (var->xres > var->xres_virtual)
+                var->xres = var->xres_virtual;
+}
+
+static int check_vrfb_fb_size(unsigned long region_size,
+                const struct fb_var_screeninfo *var)
+{
+        unsigned long min_phys_size = omap_vrfb_min_phys_size(var->xres_virtual,
+                var->yres_virtual, var->bits_per_pixel >> 3);
+
+        return min_phys_size > region_size ? -EINVAL : 0;
+}
+
+static int check_fb_size(const struct omapfb_info *ofbi,
+                struct fb_var_screeninfo *var)
+{
+        unsigned long max_frame_size = ofbi->region.size;
+        int bytespp = var->bits_per_pixel >> 3;
+        unsigned long line_size = var->xres_virtual * bytespp;
+
+        if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
+                /* One needs to check for both VRFB and OMAPFB limitations. */
+                if (check_vrfb_fb_size(max_frame_size, var))
+                        shrink_height(omap_vrfb_max_height(
+                                max_frame_size, var->xres_virtual, bytespp) *
+                                line_size, var);
+
+                if (check_vrfb_fb_size(max_frame_size, var)) {
+                        DBG("cannot fit FB to memory\n");
+                        return -EINVAL;
+                }
+
+                return 0;
+        }
+
+        DBG("max frame size %lu, line size %lu\n", max_frame_size, line_size);
+
+        if (line_size * var->yres_virtual > max_frame_size)
+                shrink_height(max_frame_size, var);
+
+        if (line_size * var->yres_virtual > max_frame_size) {
+                shrink_width(max_frame_size, var);
+                line_size = var->xres_virtual * bytespp;
+        }
+
+        if (line_size * var->yres_virtual > max_frame_size) {
+                DBG("cannot fit FB to memory\n");
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+/*
+ * Consider if VRFB assisted rotation is in use and if the virtual space for
+ * the zero degree view needs to be mapped. The need for mapping also acts as
+ * the trigger for setting up the hardware on the context in question. This
+ * ensures that one does not attempt to access the virtual view before the
+ * hardware is serving the address translations.
+ */
+static int setup_vrfb_rotation(struct fb_info *fbi)
+{
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        struct omapfb2_mem_region *rg = &ofbi->region;
+        struct vrfb *vrfb = &rg->vrfb;
+        struct fb_var_screeninfo *var = &fbi->var;
+        struct fb_fix_screeninfo *fix = &fbi->fix;
+        unsigned bytespp;
+        bool yuv_mode;
+        enum omap_color_mode mode;
+        int r;
+        bool reconf;
+
+        if (!rg->size || ofbi->rotation_type != OMAP_DSS_ROT_VRFB)
+                return 0;
+
+        DBG("setup_vrfb_rotation\n");
+
+        r = fb_mode_to_dss_mode(var, &mode);
+        if (r)
+                return r;
+
+        bytespp = var->bits_per_pixel >> 3;
+
+        yuv_mode = mode == OMAP_DSS_COLOR_YUV2 || mode == OMAP_DSS_COLOR_UYVY;
+
+        /* We need to reconfigure VRFB if the resolution changes, if yuv mode
+         * is enabled/disabled, or if bytes per pixel changes */
+
+        /* XXX we shouldn't allow this when framebuffer is mmapped */
+
+        reconf = false;
+
+        if (yuv_mode != vrfb->yuv_mode)
+                reconf = true;
+        else if (bytespp != vrfb->bytespp)
+                reconf = true;
+        else if (vrfb->xres != var->xres_virtual ||
+                        vrfb->yres != var->yres_virtual)
+                reconf = true;
+
+        if (vrfb->vaddr[0] && reconf) {
+                fbi->screen_base = NULL;
+                fix->smem_start = 0;
+                fix->smem_len = 0;
+                iounmap(vrfb->vaddr[0]);
+                vrfb->vaddr[0] = NULL;
+                DBG("setup_vrfb_rotation: reset fb\n");
+        }
+
+        if (vrfb->vaddr[0])
+                return 0;
+
+        omap_vrfb_setup(&rg->vrfb, rg->paddr,
+                        var->xres_virtual,
+                        var->yres_virtual,
+                        bytespp, yuv_mode);
+
+        /* Now one can ioremap the 0 angle view */
+        r = omap_vrfb_map_angle(vrfb, var->yres_virtual, 0);
+        if (r)
+                return r;
+
+        /* used by open/write in fbmem.c */
+        fbi->screen_base = ofbi->region.vrfb.vaddr[0];
+
+        fix->smem_start = ofbi->region.vrfb.paddr[0];
+
+        switch (var->nonstd) {
+        case OMAPFB_COLOR_YUV422:
+        case OMAPFB_COLOR_YUY422:
+                fix->line_length =
+                        (OMAP_VRFB_LINE_LEN * var->bits_per_pixel) >> 2;
+                break;
+        default:
+                fix->line_length =
+                        (OMAP_VRFB_LINE_LEN * var->bits_per_pixel) >> 3;
+                break;
+        }
+
+        fix->smem_len = var->yres_virtual * fix->line_length;
+
+        return 0;
+}
+
+int dss_mode_to_fb_mode(enum omap_color_mode dssmode,
+                        struct fb_var_screeninfo *var)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(omapfb_colormodes); ++i) {
+                struct omapfb_colormode *mode = &omapfb_colormodes[i];
+                if (dssmode == mode->dssmode) {
+                        assign_colormode_to_var(var, mode);
+                        return 0;
+                }
+        }
+        return -ENOENT;
+}
+
+void set_fb_fix(struct fb_info *fbi)
+{
+        struct fb_fix_screeninfo *fix = &fbi->fix;
+        struct fb_var_screeninfo *var = &fbi->var;
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        struct omapfb2_mem_region *rg = &ofbi->region;
+
+        DBG("set_fb_fix\n");
+
+        /* used by open/write in fbmem.c */
+        fbi->screen_base = (char __iomem *)omapfb_get_region_vaddr(ofbi);
+
+        /* used by mmap in fbmem.c */
+        if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
+                switch (var->nonstd) {
+                case OMAPFB_COLOR_YUV422:
+                case OMAPFB_COLOR_YUY422:
+                        fix->line_length =
+                                (OMAP_VRFB_LINE_LEN * var->bits_per_pixel) >> 2;
+                        break;
+                default:
+                        fix->line_length =
+                                (OMAP_VRFB_LINE_LEN * var->bits_per_pixel) >> 3;
+                        break;
+                }
+
+                fix->smem_len = var->yres_virtual * fix->line_length;
+        } else {
+                fix->line_length =
+                        (var->xres_virtual * var->bits_per_pixel) >> 3;
+                fix->smem_len = rg->size;
+        }
+
+        fix->smem_start = omapfb_get_region_paddr(ofbi);
+
+        fix->type = FB_TYPE_PACKED_PIXELS;
+
+        if (var->nonstd)
+                fix->visual = FB_VISUAL_PSEUDOCOLOR;
+        else {
+                switch (var->bits_per_pixel) {
+                case 32:
+                case 24:
+                case 16:
+                case 12:
+                        fix->visual = FB_VISUAL_TRUECOLOR;
+                        /* 12bpp is stored in 16 bits */
+                        break;
+                case 1:
+                case 2:
+                case 4:
+                case 8:
+                        fix->visual = FB_VISUAL_PSEUDOCOLOR;
+                        break;
+                }
+        }
+
+        fix->accel = FB_ACCEL_NONE;
+
+        fix->xpanstep = 1;
+        fix->ypanstep = 1;
+}
+
+/* check new var and possibly modify it to be ok */
+int check_fb_var(struct fb_info *fbi, struct fb_var_screeninfo *var)
+{
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        struct omap_dss_device *display = fb2display(fbi);
+        enum omap_color_mode mode = 0;
+        int i;
+        int r;
+
+        DBG("check_fb_var %d\n", ofbi->id);
+
+        if (ofbi->region.size == 0)
+                return 0;
+
+        r = fb_mode_to_dss_mode(var, &mode);
+        if (r) {
+                DBG("cannot convert var to omap dss mode\n");
+                return r;
+        }
+
+        for (i = 0; i < ofbi->num_overlays; ++i) {
+                if ((ofbi->overlays[i]->supported_modes & mode) == 0) {
+                        DBG("invalid mode\n");
+                        return -EINVAL;
+                }
+        }
+
+        if (var->rotate < 0 || var->rotate > 3)
+                return -EINVAL;
+
+        if (check_fb_res_bounds(var))
+                return -EINVAL;
+
+        if (check_fb_size(ofbi, var))
+                return -EINVAL;
+
+        if (var->xres + var->xoffset > var->xres_virtual)
+                var->xoffset = var->xres_virtual - var->xres;
+        if (var->yres + var->yoffset > var->yres_virtual)
+                var->yoffset = var->yres_virtual - var->yres;
+
+        DBG("xres = %d, yres = %d, vxres = %d, vyres = %d\n",
+                        var->xres, var->yres,
+                        var->xres_virtual, var->yres_virtual);
+
+        var->height             = -1;
+        var->width              = -1;
+        var->grayscale          = 0;
+
+        if (display && display->driver->get_timings) {
+                struct omap_video_timings timings;
+                display->driver->get_timings(display, &timings);
+
+                /* pixclock in ps, the rest in pixclock */
+                var->pixclock = timings.pixel_clock != 0 ?
+                        KHZ2PICOS(timings.pixel_clock) :
+                        0;
+                var->left_margin = timings.hfp;
+                var->right_margin = timings.hbp;
+                var->upper_margin = timings.vfp;
+                var->lower_margin = timings.vbp;
+                var->hsync_len = timings.hsw;
+                var->vsync_len = timings.vsw;
+        } else {
+                var->pixclock = 0;
+                var->left_margin = 0;
+                var->right_margin = 0;
+                var->upper_margin = 0;
+                var->lower_margin = 0;
+                var->hsync_len = 0;
+                var->vsync_len = 0;
+        }
+
+        /* TODO: get these from panel->config */
+        var->vmode              = FB_VMODE_NONINTERLACED;
+        var->sync               = 0;
+
+        return 0;
+}
+
+/*
+ * ---------------------------------------------------------------------------
+ * fbdev framework callbacks
+ * ---------------------------------------------------------------------------
+ */
+static int omapfb_open(struct fb_info *fbi, int user)
+{
+        return 0;
+}
+
+static int omapfb_release(struct fb_info *fbi, int user)
+{
+#if 0
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        struct omapfb2_device *fbdev = ofbi->fbdev;
+        struct omap_dss_device *display = fb2display(fbi);
+
+        DBG("Closing fb with plane index %d\n", ofbi->id);
+
+        omapfb_lock(fbdev);
+
+        if (display && display->get_update_mode && display->update) {
+                /* XXX this update should be removed, I think. But it's
+                 * good for debugging */
+                if (display->get_update_mode(display) ==
+                                OMAP_DSS_UPDATE_MANUAL) {
+                        u16 w, h;
+
+                        if (display->sync)
+                                display->sync(display);
+
+                        display->get_resolution(display, &w, &h);
+                        display->update(display, 0, 0, w, h);
+                }
+        }
+
+        if (display && display->sync)
+                display->sync(display);
+
+        omapfb_unlock(fbdev);
+#endif
+        return 0;
+}
+
+static unsigned calc_rotation_offset_dma(const struct fb_var_screeninfo *var,
+                const struct fb_fix_screeninfo *fix, int rotation)
+{
+        unsigned offset;
+
+        offset = var->yoffset * fix->line_length +
+                var->xoffset * (var->bits_per_pixel >> 3);
+
+        return offset;
+}
+
+static unsigned calc_rotation_offset_vrfb(const struct fb_var_screeninfo *var,
+                const struct fb_fix_screeninfo *fix, int rotation)
+{
+        unsigned offset;
+
+        if (rotation == FB_ROTATE_UD)
+                offset = (var->yres_virtual - var->yres) *
+                        fix->line_length;
+        else if (rotation == FB_ROTATE_CW)
+                offset = (var->yres_virtual - var->yres) *
+                        (var->bits_per_pixel >> 3);
+        else
+                offset = 0;
+
+        if (rotation == FB_ROTATE_UR)
+                offset += var->yoffset * fix->line_length +
+                        var->xoffset * (var->bits_per_pixel >> 3);
+        else if (rotation == FB_ROTATE_UD)
+                offset -= var->yoffset * fix->line_length +
+                        var->xoffset * (var->bits_per_pixel >> 3);
+        else if (rotation == FB_ROTATE_CW)
+                offset -= var->xoffset * fix->line_length +
+                        var->yoffset * (var->bits_per_pixel >> 3);
+        else if (rotation == FB_ROTATE_CCW)
+                offset += var->xoffset * fix->line_length +
+                        var->yoffset * (var->bits_per_pixel >> 3);
+
+        return offset;
+}
+
+
+/* setup overlay according to the fb */
+static int omapfb_setup_overlay(struct fb_info *fbi, struct omap_overlay *ovl,
+                u16 posx, u16 posy, u16 outw, u16 outh)
+{
+        int r = 0;
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        struct fb_var_screeninfo *var = &fbi->var;
+        struct fb_fix_screeninfo *fix = &fbi->fix;
+        enum omap_color_mode mode = 0;
+        int offset;
+        u32 data_start_p;
+        void __iomem *data_start_v;
+        struct omap_overlay_info info;
+        int xres, yres;
+        int screen_width;
+        int mirror;
+        int rotation = var->rotate;
+        int i;
+
+        for (i = 0; i < ofbi->num_overlays; i++) {
+                if (ovl != ofbi->overlays[i])
+                        continue;
+
+                rotation = (rotation + ofbi->rotation[i]) % 4;
+                break;
+        }
+
+        DBG("setup_overlay %d, posx %d, posy %d, outw %d, outh %d\n", ofbi->id,
+                        posx, posy, outw, outh);
+
+        if (rotation == FB_ROTATE_CW || rotation == FB_ROTATE_CCW) {
+                xres = var->yres;
+                yres = var->xres;
+        } else {
+                xres = var->xres;
+                yres = var->yres;
+        }
+
+
+        if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
+                data_start_p = omapfb_get_region_rot_paddr(ofbi, rotation);
+                data_start_v = NULL;
+        } else {
+                data_start_p = omapfb_get_region_paddr(ofbi);
+                data_start_v = omapfb_get_region_vaddr(ofbi);
+        }
+
+        if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB)
+                offset = calc_rotation_offset_vrfb(var, fix, rotation);
+        else
+                offset = calc_rotation_offset_dma(var, fix, rotation);
+
+        data_start_p += offset;
+        data_start_v += offset;
+
+        if (offset)
+                DBG("offset %d, %d = %d\n",
+                                var->xoffset, var->yoffset, offset);
+
+        DBG("paddr %x, vaddr %p\n", data_start_p, data_start_v);
+
+        r = fb_mode_to_dss_mode(var, &mode);
+        if (r) {
+                DBG("fb_mode_to_dss_mode failed");
+                goto err;
+        }
+
+        switch (var->nonstd) {
+        case OMAPFB_COLOR_YUV422:
+        case OMAPFB_COLOR_YUY422:
+                if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
+                        screen_width = fix->line_length
+                                / (var->bits_per_pixel >> 2);
+                        break;
+                }
+        default:
+                screen_width = fix->line_length / (var->bits_per_pixel >> 3);
+                break;
+        }
+
+        ovl->get_overlay_info(ovl, &info);
+
+        if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB)
+                mirror = 0;
+        else
+                mirror = ofbi->mirror;
+
+        info.paddr = data_start_p;
+        info.vaddr = data_start_v;
+        info.screen_width = screen_width;
+        info.width = xres;
+        info.height = yres;
+        info.color_mode = mode;
+        info.rotation_type = ofbi->rotation_type;
+        info.rotation = rotation;
+        info.mirror = mirror;
+
+        info.pos_x = posx;
+        info.pos_y = posy;
+        info.out_width = outw;
+        info.out_height = outh;
+
+        r = ovl->set_overlay_info(ovl, &info);
+        if (r) {
+                DBG("ovl->setup_overlay_info failed\n");
+                goto err;
+        }
+
+        return 0;
+
+err:
+        DBG("setup_overlay failed\n");
+        return r;
+}
+
+/* apply var to the overlay */
+int omapfb_apply_changes(struct fb_info *fbi, int init)
+{
+        int r = 0;
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        struct fb_var_screeninfo *var = &fbi->var;
+        struct omap_overlay *ovl;
+        u16 posx, posy;
+        u16 outw, outh;
+        int i;
+
+#ifdef DEBUG
+        if (omapfb_test_pattern)
+                fill_fb(fbi);
+#endif
+
+        for (i = 0; i < ofbi->num_overlays; i++) {
+                ovl = ofbi->overlays[i];
+
+                DBG("apply_changes, fb %d, ovl %d\n", ofbi->id, ovl->id);
+
+                if (ofbi->region.size == 0) {
+                        /* the fb is not available. disable the overlay */
+                        omapfb_overlay_enable(ovl, 0);
+                        if (!init && ovl->manager)
+                                ovl->manager->apply(ovl->manager);
+                        continue;
+                }
+
+                if (init || (ovl->caps & OMAP_DSS_OVL_CAP_SCALE) == 0) {
+                        int rotation = (var->rotate + ofbi->rotation[i]) % 4;
+                        if (rotation == FB_ROTATE_CW ||
+                                        rotation == FB_ROTATE_CCW) {
+                                outw = var->yres;
+                                outh = var->xres;
+                        } else {
+                                outw = var->xres;
+                                outh = var->yres;
+                        }
+                } else {
+                        outw = ovl->info.out_width;
+                        outh = ovl->info.out_height;
+                }
+
+                if (init) {
+                        posx = 0;
+                        posy = 0;
+                } else {
+                        posx = ovl->info.pos_x;
+                        posy = ovl->info.pos_y;
+                }
+
+                r = omapfb_setup_overlay(fbi, ovl, posx, posy, outw, outh);
+                if (r)
+                        goto err;
+
+                if (!init && ovl->manager)
+                        ovl->manager->apply(ovl->manager);
+        }
+        return 0;
+err:
+        DBG("apply_changes failed\n");
+        return r;
+}
+
+/* checks var and eventually tweaks it to something supported,
+ * DO NOT MODIFY PAR */
+static int omapfb_check_var(struct fb_var_screeninfo *var, struct fb_info *fbi)
+{
+        int r;
+
+        DBG("check_var(%d)\n", FB2OFB(fbi)->id);
+
+        r = check_fb_var(fbi, var);
+
+        return r;
+}
+
+/* set the video mode according to info->var */
+static int omapfb_set_par(struct fb_info *fbi)
+{
+        int r;
+
+        DBG("set_par(%d)\n", FB2OFB(fbi)->id);
+
+        set_fb_fix(fbi);
+
+        r = setup_vrfb_rotation(fbi);
+        if (r)
+                return r;
+
+        r = omapfb_apply_changes(fbi, 0);
+
+        return r;
+}
+
+static int omapfb_pan_display(struct fb_var_screeninfo *var,
+                struct fb_info *fbi)
+{
+        struct fb_var_screeninfo new_var;
+        int r;
+
+        DBG("pan_display(%d)\n", FB2OFB(fbi)->id);
+
+        if (var->xoffset == fbi->var.xoffset &&
+            var->yoffset == fbi->var.yoffset)
+                return 0;
+
+        new_var = fbi->var;
+        new_var.xoffset = var->xoffset;
+        new_var.yoffset = var->yoffset;
+
+        fbi->var = new_var;
+
+        r = omapfb_apply_changes(fbi, 0);
+
+        return r;
+}
+
+static void mmap_user_open(struct vm_area_struct *vma)
+{
+        struct omapfb_info *ofbi = (struct omapfb_info *)vma->vm_private_data;
+
+        atomic_inc(&ofbi->map_count);
+}
+
+static void mmap_user_close(struct vm_area_struct *vma)
+{
+        struct omapfb_info *ofbi = (struct omapfb_info *)vma->vm_private_data;
+
+        atomic_dec(&ofbi->map_count);
+}
+
+static struct vm_operations_struct mmap_user_ops = {
+        .open = mmap_user_open,
+        .close = mmap_user_close,
+};
+
+static int omapfb_mmap(struct fb_info *fbi, struct vm_area_struct *vma)
+{
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        struct fb_fix_screeninfo *fix = &fbi->fix;
+        unsigned long off;
+        unsigned long start;
+        u32 len;
+
+        if (vma->vm_end - vma->vm_start == 0)
+                return 0;
+        if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT))
+                return -EINVAL;
+        off = vma->vm_pgoff << PAGE_SHIFT;
+
+        start = omapfb_get_region_paddr(ofbi);
+        len = fix->smem_len;
+        if (off >= len)
+                return -EINVAL;
+        if ((vma->vm_end - vma->vm_start + off) > len)
+                return -EINVAL;
+
+        off += start;
+
+        DBG("user mmap region start %lx, len %d, off %lx\n", start, len, off);
+
+        vma->vm_pgoff = off >> PAGE_SHIFT;
+        vma->vm_flags |= VM_IO | VM_RESERVED;
+        vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
+        vma->vm_ops = &mmap_user_ops;
+        vma->vm_private_data = ofbi;
+        if (io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,
+                             vma->vm_end - vma->vm_start, vma->vm_page_prot))
+                return -EAGAIN;
+        /* vm_ops.open won't be called for mmap itself. */
+        atomic_inc(&ofbi->map_count);
+        return 0;
+}
+
+/* Store a single color palette entry into a pseudo palette or the hardware
+ * palette if one is available. For now we support only 16bpp and thus store
+ * the entry only to the pseudo palette.
+ */
+static int _setcolreg(struct fb_info *fbi, u_int regno, u_int red, u_int green,
+                u_int blue, u_int transp, int update_hw_pal)
+{
+        /*struct omapfb_info *ofbi = FB2OFB(fbi);*/
+        /*struct omapfb2_device *fbdev = ofbi->fbdev;*/
+        struct fb_var_screeninfo *var = &fbi->var;
+        int r = 0;
+
+        enum omapfb_color_format mode = OMAPFB_COLOR_RGB24U; /* XXX */
+
+        /*switch (plane->color_mode) {*/
+        switch (mode) {
+        case OMAPFB_COLOR_YUV422:
+        case OMAPFB_COLOR_YUV420:
+        case OMAPFB_COLOR_YUY422:
+                r = -EINVAL;
+                break;
+        case OMAPFB_COLOR_CLUT_8BPP:
+        case OMAPFB_COLOR_CLUT_4BPP:
+        case OMAPFB_COLOR_CLUT_2BPP:
+        case OMAPFB_COLOR_CLUT_1BPP:
+                /*
+                   if (fbdev->ctrl->setcolreg)
+                   r = fbdev->ctrl->setcolreg(regno, red, green, blue,
+                   transp, update_hw_pal);
+                   */
+                /* Fallthrough */
+                r = -EINVAL;
+                break;
+        case OMAPFB_COLOR_RGB565:
+        case OMAPFB_COLOR_RGB444:
+        case OMAPFB_COLOR_RGB24P:
+        case OMAPFB_COLOR_RGB24U:
+                if (r != 0)
+                        break;
+
+                if (regno < 0) {
+                        r = -EINVAL;
+                        break;
+                }
+
+                if (regno < 16) {
+                        u16 pal;
+                        pal = ((red >> (16 - var->red.length)) <<
+                                        var->red.offset) |
+                                ((green >> (16 - var->green.length)) <<
+                                 var->green.offset) |
+                                (blue >> (16 - var->blue.length));
+                        ((u32 *)(fbi->pseudo_palette))[regno] = pal;
+                }
+                break;
+        default:
+                BUG();
+        }
+        return r;
+}
+
+static int omapfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
+                u_int transp, struct fb_info *info)
+{
+        DBG("setcolreg\n");
+
+        return _setcolreg(info, regno, red, green, blue, transp, 1);
+}
+
+static int omapfb_setcmap(struct fb_cmap *cmap, struct fb_info *info)
+{
+        int count, index, r;
+        u16 *red, *green, *blue, *transp;
+        u16 trans = 0xffff;
+
+        DBG("setcmap\n");
+
+        red     = cmap->red;
+        green   = cmap->green;
+        blue    = cmap->blue;
+        transp  = cmap->transp;
+        index   = cmap->start;
+
+        for (count = 0; count < cmap->len; count++) {
+                if (transp)
+                        trans = *transp++;
+                r = _setcolreg(info, index++, *red++, *green++, *blue++, trans,
+                                count == cmap->len - 1);
+                if (r != 0)
+                        return r;
+        }
+
+        return 0;
+}
+
+static int omapfb_blank(int blank, struct fb_info *fbi)
+{
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        struct omapfb2_device *fbdev = ofbi->fbdev;
+        struct omap_dss_device *display = fb2display(fbi);
+        int do_update = 0;
+        int r = 0;
+
+        omapfb_lock(fbdev);
+
+        switch (blank) {
+        case FB_BLANK_UNBLANK:
+                if (display->state != OMAP_DSS_DISPLAY_SUSPENDED)
+                        goto exit;
+
+                if (display->driver->resume)
+                        r = display->driver->resume(display);
+
+                if (r == 0 && display->driver->get_update_mode &&
+                                display->driver->get_update_mode(display) ==
+                                OMAP_DSS_UPDATE_MANUAL)
+                        do_update = 1;
+
+                break;
+
+        case FB_BLANK_NORMAL:
+                /* FB_BLANK_NORMAL could be implemented.
+                 * Needs DSS additions. */
+        case FB_BLANK_VSYNC_SUSPEND:
+        case FB_BLANK_HSYNC_SUSPEND:
+        case FB_BLANK_POWERDOWN:
+                if (display->state != OMAP_DSS_DISPLAY_ACTIVE)
+                        goto exit;
+
+                if (display->driver->suspend)
+                        r = display->driver->suspend(display);
+
+                break;
+
+        default:
+                r = -EINVAL;
+        }
+
+exit:
+        omapfb_unlock(fbdev);
+
+        if (r == 0 && do_update && display->driver->update) {
+                u16 w, h;
+                display->driver->get_resolution(display, &w, &h);
+
+                r = display->driver->update(display, 0, 0, w, h);
+        }
+
+        return r;
+}
+
+#if 0
+/* XXX fb_read and fb_write are needed for VRFB */
+ssize_t omapfb_write(struct fb_info *info, const char __user *buf,
+                size_t count, loff_t *ppos)
+{
+        DBG("omapfb_write %d, %lu\n", count, (unsigned long)*ppos);
+        /* XXX needed for VRFB */
+        return count;
+}
+#endif
+
+static struct fb_ops omapfb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_open        = omapfb_open,
+        .fb_release     = omapfb_release,
+        .fb_fillrect    = cfb_fillrect,
+        .fb_copyarea    = cfb_copyarea,
+        .fb_imageblit   = cfb_imageblit,
+        .fb_blank       = omapfb_blank,
+        .fb_ioctl       = omapfb_ioctl,
+        .fb_check_var   = omapfb_check_var,
+        .fb_set_par     = omapfb_set_par,
+        .fb_pan_display = omapfb_pan_display,
+        .fb_mmap        = omapfb_mmap,
+        .fb_setcolreg   = omapfb_setcolreg,
+        .fb_setcmap     = omapfb_setcmap,
+        /*.fb_write     = omapfb_write,*/
+};
+
+static void omapfb_free_fbmem(struct fb_info *fbi)
+{
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        struct omapfb2_device *fbdev = ofbi->fbdev;
+        struct omapfb2_mem_region *rg;
+
+        rg = &ofbi->region;
+
+        if (rg->paddr)
+                if (omap_vram_free(rg->paddr, rg->size))
+                        dev_err(fbdev->dev, "VRAM FREE failed\n");
+
+        if (rg->vaddr)
+                iounmap(rg->vaddr);
+
+        if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
+                /* unmap the 0 angle rotation */
+                if (rg->vrfb.vaddr[0]) {
+                        iounmap(rg->vrfb.vaddr[0]);
+                        omap_vrfb_release_ctx(&rg->vrfb);
+                        rg->vrfb.vaddr[0] = NULL;
+                }
+        }
+
+        rg->vaddr = NULL;
+        rg->paddr = 0;
+        rg->alloc = 0;
+        rg->size = 0;
+}
+
+static void clear_fb_info(struct fb_info *fbi)
+{
+        memset(&fbi->var, 0, sizeof(fbi->var));
+        memset(&fbi->fix, 0, sizeof(fbi->fix));
+        strlcpy(fbi->fix.id, MODULE_NAME, sizeof(fbi->fix.id));
+}
+
+static int omapfb_free_all_fbmem(struct omapfb2_device *fbdev)
+{
+        int i;
+
+        DBG("free all fbmem\n");
+
+        for (i = 0; i < fbdev->num_fbs; i++) {
+                struct fb_info *fbi = fbdev->fbs[i];
+                omapfb_free_fbmem(fbi);
+                clear_fb_info(fbi);
+        }
+
+        return 0;
+}
+
+static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size,
+                unsigned long paddr)
+{
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        struct omapfb2_device *fbdev = ofbi->fbdev;
+        struct omapfb2_mem_region *rg;
+        void __iomem *vaddr;
+        int r;
+
+        rg = &ofbi->region;
+        memset(rg, 0, sizeof(*rg));
+
+        size = PAGE_ALIGN(size);
+
+        if (!paddr) {
+                DBG("allocating %lu bytes for fb %d\n", size, ofbi->id);
+                r = omap_vram_alloc(OMAP_VRAM_MEMTYPE_SDRAM, size, &paddr);
+        } else {
+                DBG("reserving %lu bytes at %lx for fb %d\n", size, paddr,
+                                ofbi->id);
+                r = omap_vram_reserve(paddr, size);
+        }
+
+        if (r) {
+                dev_err(fbdev->dev, "failed to allocate framebuffer\n");
+                return -ENOMEM;
+        }
+
+        if (ofbi->rotation_type != OMAP_DSS_ROT_VRFB) {
+                vaddr = ioremap_wc(paddr, size);
+
+                if (!vaddr) {
+                        dev_err(fbdev->dev, "failed to ioremap framebuffer\n");
+                        omap_vram_free(paddr, size);
+                        return -ENOMEM;
+                }
+
+                DBG("allocated VRAM paddr %lx, vaddr %p\n", paddr, vaddr);
+        } else {
+                r = omap_vrfb_request_ctx(&rg->vrfb);
+                if (r) {
+                        dev_err(fbdev->dev, "vrfb create ctx failed\n");
+                        return r;
+                }
+
+                vaddr = NULL;
+        }
+
+        rg->paddr = paddr;
+        rg->vaddr = vaddr;
+        rg->size = size;
+        rg->alloc = 1;
+
+        return 0;
+}
+
+/* allocate fbmem using display resolution as reference */
+static int omapfb_alloc_fbmem_display(struct fb_info *fbi, unsigned long size,
+                unsigned long paddr)
+{
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        struct omapfb2_device *fbdev = ofbi->fbdev;
+        struct omap_dss_device *display;
+        int bytespp;
+
+        display =  fb2display(fbi);
+
+        if (!display)
+                return 0;
+
+        switch (omapfb_get_recommended_bpp(fbdev, display)) {
+        case 16:
+                bytespp = 2;
+                break;
+        case 24:
+                bytespp = 4;
+                break;
+        default:
+                bytespp = 4;
+                break;
+        }
+
+        if (!size) {
+                u16 w, h;
+
+                display->driver->get_resolution(display, &w, &h);
+
+                if (ofbi->rotation_type == OMAP_DSS_ROT_VRFB) {
+                        size = max(omap_vrfb_min_phys_size(w, h, bytespp),
+                                        omap_vrfb_min_phys_size(h, w, bytespp));
+
+                        DBG("adjusting fb mem size for VRFB, %u -> %lu\n",
+                                        w * h * bytespp, size);
+                } else {
+                        size = w * h * bytespp;
+                }
+        }
+
+        if (!size)
+                return 0;
+
+        return omapfb_alloc_fbmem(fbi, size, paddr);
+}
+
+static enum omap_color_mode fb_format_to_dss_mode(enum omapfb_color_format fmt)
+{
+        enum omap_color_mode mode;
+
+        switch (fmt) {
+        case OMAPFB_COLOR_RGB565:
+                mode = OMAP_DSS_COLOR_RGB16;
+                break;
+        case OMAPFB_COLOR_YUV422:
+                mode = OMAP_DSS_COLOR_YUV2;
+                break;
+        case OMAPFB_COLOR_CLUT_8BPP:
+                mode = OMAP_DSS_COLOR_CLUT8;
+                break;
+        case OMAPFB_COLOR_CLUT_4BPP:
+                mode = OMAP_DSS_COLOR_CLUT4;
+                break;
+        case OMAPFB_COLOR_CLUT_2BPP:
+                mode = OMAP_DSS_COLOR_CLUT2;
+                break;
+        case OMAPFB_COLOR_CLUT_1BPP:
+                mode = OMAP_DSS_COLOR_CLUT1;
+                break;
+        case OMAPFB_COLOR_RGB444:
+                mode = OMAP_DSS_COLOR_RGB12U;
+                break;
+        case OMAPFB_COLOR_YUY422:
+                mode = OMAP_DSS_COLOR_UYVY;
+                break;
+        case OMAPFB_COLOR_ARGB16:
+                mode = OMAP_DSS_COLOR_ARGB16;
+                break;
+        case OMAPFB_COLOR_RGB24U:
+                mode = OMAP_DSS_COLOR_RGB24U;
+                break;
+        case OMAPFB_COLOR_RGB24P:
+                mode = OMAP_DSS_COLOR_RGB24P;
+                break;
+        case OMAPFB_COLOR_ARGB32:
+                mode = OMAP_DSS_COLOR_ARGB32;
+                break;
+        case OMAPFB_COLOR_RGBA32:
+                mode = OMAP_DSS_COLOR_RGBA32;
+                break;
+        case OMAPFB_COLOR_RGBX32:
+                mode = OMAP_DSS_COLOR_RGBX32;
+                break;
+        default:
+                mode = -EINVAL;
+        }
+
+        return mode;
+}
+
+static int omapfb_parse_vram_param(const char *param, int max_entries,
+                unsigned long *sizes, unsigned long *paddrs)
+{
+        int fbnum;
+        unsigned long size;
+        unsigned long paddr = 0;
+        char *p, *start;
+
+        start = (char *)param;
+
+        while (1) {
+                p = start;
+
+                fbnum = simple_strtoul(p, &p, 10);
+
+                if (p == param)
+                        return -EINVAL;
+
+                if (*p != ':')
+                        return -EINVAL;
+
+                if (fbnum >= max_entries)
+                        return -EINVAL;
+
+                size = memparse(p + 1, &p);
+
+                if (!size)
+                        return -EINVAL;
+
+                paddr = 0;
+
+                if (*p == '@') {
+                        paddr = simple_strtoul(p + 1, &p, 16);
+
+                        if (!paddr)
+                                return -EINVAL;
+
+                }
+
+                paddrs[fbnum] = paddr;
+                sizes[fbnum] = size;
+
+                if (*p == 0)
+                        break;
+
+                if (*p != ',')
+                        return -EINVAL;
+
+                ++p;
+
+                start = p;
+        }
+
+        return 0;
+}
+
+static int omapfb_allocate_all_fbs(struct omapfb2_device *fbdev)
+{
+        int i, r;
+        unsigned long vram_sizes[10];
+        unsigned long vram_paddrs[10];
+
+        memset(&vram_sizes, 0, sizeof(vram_sizes));
+        memset(&vram_paddrs, 0, sizeof(vram_paddrs));
+
+        if (def_vram && omapfb_parse_vram_param(def_vram, 10,
+                                vram_sizes, vram_paddrs)) {
+                dev_err(fbdev->dev, "failed to parse vram parameter\n");
+
+                memset(&vram_sizes, 0, sizeof(vram_sizes));
+                memset(&vram_paddrs, 0, sizeof(vram_paddrs));
+        }
+
+        if (fbdev->dev->platform_data) {
+                struct omapfb_platform_data *opd;
+                opd = fbdev->dev->platform_data;
+                for (i = 0; i < opd->mem_desc.region_cnt; ++i) {
+                        if (!vram_sizes[i]) {
+                                unsigned long size;
+                                unsigned long paddr;
+
+                                size = opd->mem_desc.region[i].size;
+                                paddr = opd->mem_desc.region[i].paddr;
+
+                                vram_sizes[i] = size;
+                                vram_paddrs[i] = paddr;
+                        }
+                }
+        }
+
+        for (i = 0; i < fbdev->num_fbs; i++) {
+                /* allocate memory automatically only for fb0, or if
+                 * excplicitly defined with vram or plat data option */
+                if (i == 0 || vram_sizes[i] != 0) {
+                        r = omapfb_alloc_fbmem_display(fbdev->fbs[i],
+                                        vram_sizes[i], vram_paddrs[i]);
+
+                        if (r)
+                                return r;
+                }
+        }
+
+        for (i = 0; i < fbdev->num_fbs; i++) {
+                struct omapfb_info *ofbi = FB2OFB(fbdev->fbs[i]);
+                struct omapfb2_mem_region *rg;
+                rg = &ofbi->region;
+
+                DBG("region%d phys %08x virt %p size=%lu\n",
+                                i,
+                                rg->paddr,
+                                rg->vaddr,
+                                rg->size);
+        }
+
+        return 0;
+}
+
+int omapfb_realloc_fbmem(struct fb_info *fbi, unsigned long size, int type)
+{
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        struct omapfb2_device *fbdev = ofbi->fbdev;
+        struct omap_dss_device *display = fb2display(fbi);
+        struct omapfb2_mem_region *rg = &ofbi->region;
+        unsigned long old_size = rg->size;
+        unsigned long old_paddr = rg->paddr;
+        int old_type = rg->type;
+        int r;
+
+        if (type > OMAPFB_MEMTYPE_MAX)
+                return -EINVAL;
+
+        size = PAGE_ALIGN(size);
+
+        if (old_size == size && old_type == type)
+                return 0;
+
+        if (display && display->driver->sync)
+                        display->driver->sync(display);
+
+        omapfb_free_fbmem(fbi);
+
+        if (size == 0) {
+                clear_fb_info(fbi);
+                return 0;
+        }
+
+        r = omapfb_alloc_fbmem(fbi, size, 0);
+
+        if (r) {
+                if (old_size)
+                        omapfb_alloc_fbmem(fbi, old_size, old_paddr);
+
+                if (rg->size == 0)
+                        clear_fb_info(fbi);
+
+                return r;
+        }
+
+        if (old_size == size)
+                return 0;
+
+        if (old_size == 0) {
+                DBG("initializing fb %d\n", ofbi->id);
+                r = omapfb_fb_init(fbdev, fbi);
+                if (r) {
+                        DBG("omapfb_fb_init failed\n");
+                        goto err;
+                }
+                r = omapfb_apply_changes(fbi, 1);
+                if (r) {
+                        DBG("omapfb_apply_changes failed\n");
+                        goto err;
+                }
+        } else {
+                struct fb_var_screeninfo new_var;
+                memcpy(&new_var, &fbi->var, sizeof(new_var));
+                r = check_fb_var(fbi, &new_var);
+                if (r)
+                        goto err;
+                memcpy(&fbi->var, &new_var, sizeof(fbi->var));
+                set_fb_fix(fbi);
+                r = setup_vrfb_rotation(fbi);
+                if (r)
+                        goto err;
+        }
+
+        return 0;
+err:
+        omapfb_free_fbmem(fbi);
+        clear_fb_info(fbi);
+        return r;
+}
+
+/* initialize fb_info, var, fix to something sane based on the display */
+static int omapfb_fb_init(struct omapfb2_device *fbdev, struct fb_info *fbi)
+{
+        struct fb_var_screeninfo *var = &fbi->var;
+        struct omap_dss_device *display = fb2display(fbi);
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        int r = 0;
+
+        fbi->fbops = &omapfb_ops;
+        fbi->flags = FBINFO_FLAG_DEFAULT;
+        fbi->pseudo_palette = fbdev->pseudo_palette;
+
+        if (ofbi->region.size == 0) {
+                clear_fb_info(fbi);
+                return 0;
+        }
+
+        var->nonstd = 0;
+        var->bits_per_pixel = 0;
+
+        var->rotate = def_rotate;
+
+        /*
+         * Check if there is a default color format set in the board file,
+         * and use this format instead the default deducted from the
+         * display bpp.
+         */
+        if (fbdev->dev->platform_data) {
+                struct omapfb_platform_data *opd;
+                int id = ofbi->id;
+
+                opd = fbdev->dev->platform_data;
+                if (opd->mem_desc.region[id].format_used) {
+                        enum omap_color_mode mode;
+                        enum omapfb_color_format format;
+
+                        format = opd->mem_desc.region[id].format;
+                        mode = fb_format_to_dss_mode(format);
+                        if (mode < 0) {
+                                r = mode;
+                                goto err;
+                        }
+                        r = dss_mode_to_fb_mode(mode, var);
+                        if (r < 0)
+                                goto err;
+                }
+        }
+
+        if (display) {
+                u16 w, h;
+                int rotation = (var->rotate + ofbi->rotation[0]) % 4;
+
+                display->driver->get_resolution(display, &w, &h);
+
+                if (rotation == FB_ROTATE_CW ||
+                                rotation == FB_ROTATE_CCW) {
+                        var->xres = h;
+                        var->yres = w;
+                } else {
+                        var->xres = w;
+                        var->yres = h;
+                }
+
+                var->xres_virtual = var->xres;
+                var->yres_virtual = var->yres;
+
+                if (!var->bits_per_pixel) {
+                        switch (omapfb_get_recommended_bpp(fbdev, display)) {
+                        case 16:
+                                var->bits_per_pixel = 16;
+                                break;
+                        case 24:
+                                var->bits_per_pixel = 32;
+                                break;
+                        default:
+                                dev_err(fbdev->dev, "illegal display "
+                                                "bpp\n");
+                                return -EINVAL;
+                        }
+                }
+        } else {
+                /* if there's no display, let's just guess some basic values */
+                var->xres = 320;
+                var->yres = 240;
+                var->xres_virtual = var->xres;
+                var->yres_virtual = var->yres;
+                if (!var->bits_per_pixel)
+                        var->bits_per_pixel = 16;
+        }
+
+        r = check_fb_var(fbi, var);
+        if (r)
+                goto err;
+
+        set_fb_fix(fbi);
+        r = setup_vrfb_rotation(fbi);
+        if (r)
+                goto err;
+
+        r = fb_alloc_cmap(&fbi->cmap, 256, 0);
+        if (r)
+                dev_err(fbdev->dev, "unable to allocate color map memory\n");
+
+err:
+        return r;
+}
+
+static void fbinfo_cleanup(struct omapfb2_device *fbdev, struct fb_info *fbi)
+{
+        fb_dealloc_cmap(&fbi->cmap);
+}
+
+
+static void omapfb_free_resources(struct omapfb2_device *fbdev)
+{
+        int i;
+
+        DBG("free_resources\n");
+
+        if (fbdev == NULL)
+                return;
+
+        for (i = 0; i < fbdev->num_fbs; i++)
+                unregister_framebuffer(fbdev->fbs[i]);
+
+        /* free the reserved fbmem */
+        omapfb_free_all_fbmem(fbdev);
+
+        for (i = 0; i < fbdev->num_fbs; i++) {
+                fbinfo_cleanup(fbdev, fbdev->fbs[i]);
+                framebuffer_release(fbdev->fbs[i]);
+        }
+
+        for (i = 0; i < fbdev->num_displays; i++) {
+                if (fbdev->displays[i]->state != OMAP_DSS_DISPLAY_DISABLED)
+                        fbdev->displays[i]->driver->disable(fbdev->displays[i]);
+
+                omap_dss_put_device(fbdev->displays[i]);
+        }
+
+        dev_set_drvdata(fbdev->dev, NULL);
+        kfree(fbdev);
+}
+
+static int omapfb_create_framebuffers(struct omapfb2_device *fbdev)
+{
+        int r, i;
+
+        fbdev->num_fbs = 0;
+
+        DBG("create %d framebuffers\n", CONFIG_FB_OMAP2_NUM_FBS);
+
+        /* allocate fb_infos */
+        for (i = 0; i < CONFIG_FB_OMAP2_NUM_FBS; i++) {
+                struct fb_info *fbi;
+                struct omapfb_info *ofbi;
+
+                fbi = framebuffer_alloc(sizeof(struct omapfb_info),
+                                fbdev->dev);
+
+                if (fbi == NULL) {
+                        dev_err(fbdev->dev,
+                                "unable to allocate memory for plane info\n");
+                        return -ENOMEM;
+                }
+
+                clear_fb_info(fbi);
+
+                fbdev->fbs[i] = fbi;
+
+                ofbi = FB2OFB(fbi);
+                ofbi->fbdev = fbdev;
+                ofbi->id = i;
+
+                /* assign these early, so that fb alloc can use them */
+                ofbi->rotation_type = def_vrfb ? OMAP_DSS_ROT_VRFB :
+                        OMAP_DSS_ROT_DMA;
+                ofbi->mirror = def_mirror;
+
+                fbdev->num_fbs++;
+        }
+
+        DBG("fb_infos allocated\n");
+
+        /* assign overlays for the fbs */
+        for (i = 0; i < min(fbdev->num_fbs, fbdev->num_overlays); i++) {
+                struct omapfb_info *ofbi = FB2OFB(fbdev->fbs[i]);
+
+                ofbi->overlays[0] = fbdev->overlays[i];
+                ofbi->num_overlays = 1;
+        }
+
+        /* allocate fb memories */
+        r = omapfb_allocate_all_fbs(fbdev);
+        if (r) {
+                dev_err(fbdev->dev, "failed to allocate fbmem\n");
+                return r;
+        }
+
+        DBG("fbmems allocated\n");
+
+        /* setup fb_infos */
+        for (i = 0; i < fbdev->num_fbs; i++) {
+                r = omapfb_fb_init(fbdev, fbdev->fbs[i]);
+                if (r) {
+                        dev_err(fbdev->dev, "failed to setup fb_info\n");
+                        return r;
+                }
+        }
+
+        DBG("fb_infos initialized\n");
+
+        for (i = 0; i < fbdev->num_fbs; i++) {
+                r = register_framebuffer(fbdev->fbs[i]);
+                if (r != 0) {
+                        dev_err(fbdev->dev,
+                                "registering framebuffer %d failed\n", i);
+                        return r;
+                }
+        }
+
+        DBG("framebuffers registered\n");
+
+        for (i = 0; i < fbdev->num_fbs; i++) {
+                r = omapfb_apply_changes(fbdev->fbs[i], 1);
+                if (r) {
+                        dev_err(fbdev->dev, "failed to change mode\n");
+                        return r;
+                }
+        }
+
+        DBG("create sysfs for fbs\n");
+        r = omapfb_create_sysfs(fbdev);
+        if (r) {
+                dev_err(fbdev->dev, "failed to create sysfs entries\n");
+                return r;
+        }
+
+        /* Enable fb0 */
+        if (fbdev->num_fbs > 0) {
+                struct omapfb_info *ofbi = FB2OFB(fbdev->fbs[0]);
+
+                if (ofbi->num_overlays > 0) {
+                        struct omap_overlay *ovl = ofbi->overlays[0];
+
+                        r = omapfb_overlay_enable(ovl, 1);
+
+                        if (r) {
+                                dev_err(fbdev->dev,
+                                                "failed to enable overlay\n");
+                                return r;
+                        }
+                }
+        }
+
+        DBG("create_framebuffers done\n");
+
+        return 0;
+}
+
+static int omapfb_mode_to_timings(const char *mode_str,
+                struct omap_video_timings *timings, u8 *bpp)
+{
+        struct fb_info fbi;
+        struct fb_var_screeninfo var;
+        struct fb_ops fbops;
+        int r;
+
+#ifdef CONFIG_OMAP2_DSS_VENC
+        if (strcmp(mode_str, "pal") == 0) {
+                *timings = omap_dss_pal_timings;
+                *bpp = 0;
+                return 0;
+        } else if (strcmp(mode_str, "ntsc") == 0) {
+                *timings = omap_dss_ntsc_timings;
+                *bpp = 0;
+                return 0;
+        }
+#endif
+
+        /* this is quite a hack, but I wanted to use the modedb and for
+         * that we need fb_info and var, so we create dummy ones */
+
+        memset(&fbi, 0, sizeof(fbi));
+        memset(&var, 0, sizeof(var));
+        memset(&fbops, 0, sizeof(fbops));
+        fbi.fbops = &fbops;
+
+        r = fb_find_mode(&var, &fbi, mode_str, NULL, 0, NULL, 24);
+
+        if (r != 0) {
+                timings->pixel_clock = PICOS2KHZ(var.pixclock);
+                timings->hfp = var.left_margin;
+                timings->hbp = var.right_margin;
+                timings->vfp = var.upper_margin;
+                timings->vbp = var.lower_margin;
+                timings->hsw = var.hsync_len;
+                timings->vsw = var.vsync_len;
+                timings->x_res = var.xres;
+                timings->y_res = var.yres;
+
+                switch (var.bits_per_pixel) {
+                case 16:
+                        *bpp = 16;
+                        break;
+                case 24:
+                case 32:
+                default:
+                        *bpp = 24;
+                        break;
+                }
+
+                return 0;
+        } else {
+                return -EINVAL;
+        }
+}
+
+static int omapfb_set_def_mode(struct omapfb2_device *fbdev,
+                struct omap_dss_device *display, char *mode_str)
+{
+        int r;
+        u8 bpp;
+        struct omap_video_timings timings;
+
+        r = omapfb_mode_to_timings(mode_str, &timings, &bpp);
+        if (r)
+                return r;
+
+        fbdev->bpp_overrides[fbdev->num_bpp_overrides].dssdev = display;
+        fbdev->bpp_overrides[fbdev->num_bpp_overrides].bpp = bpp;
+        ++fbdev->num_bpp_overrides;
+
+        if (!display->driver->check_timings || !display->driver->set_timings)
+                return -EINVAL;
+
+        r = display->driver->check_timings(display, &timings);
+        if (r)
+                return r;
+
+        display->driver->set_timings(display, &timings);
+
+        return 0;
+}
+
+static int omapfb_get_recommended_bpp(struct omapfb2_device *fbdev,
+                struct omap_dss_device *dssdev)
+{
+        int i;
+
+        BUG_ON(dssdev->driver->get_recommended_bpp == NULL);
+
+        for (i = 0; i < fbdev->num_bpp_overrides; ++i) {
+                if (dssdev == fbdev->bpp_overrides[i].dssdev)
+                        return fbdev->bpp_overrides[i].bpp;
+        }
+
+        return dssdev->driver->get_recommended_bpp(dssdev);
+}
+
+static int omapfb_parse_def_modes(struct omapfb2_device *fbdev)
+{
+        char *str, *options, *this_opt;
+        int r = 0;
+
+        str = kmalloc(strlen(def_mode) + 1, GFP_KERNEL);
+        strcpy(str, def_mode);
+        options = str;
+
+        while (!r && (this_opt = strsep(&options, ",")) != NULL) {
+                char *p, *display_str, *mode_str;
+                struct omap_dss_device *display;
+                int i;
+
+                p = strchr(this_opt, ':');
+                if (!p) {
+                        r = -EINVAL;
+                        break;
+                }
+
+                *p = 0;
+                display_str = this_opt;
+                mode_str = p + 1;
+
+                display = NULL;
+                for (i = 0; i < fbdev->num_displays; ++i) {
+                        if (strcmp(fbdev->displays[i]->name,
+                                                display_str) == 0) {
+                                display = fbdev->displays[i];
+                                break;
+                        }
+                }
+
+                if (!display) {
+                        r = -EINVAL;
+                        break;
+                }
+
+                r = omapfb_set_def_mode(fbdev, display, mode_str);
+                if (r)
+                        break;
+        }
+
+        kfree(str);
+
+        return r;
+}
+
+static int omapfb_probe(struct platform_device *pdev)
+{
+        struct omapfb2_device *fbdev = NULL;
+        int r = 0;
+        int i;
+        struct omap_overlay *ovl;
+        struct omap_dss_device *def_display;
+        struct omap_dss_device *dssdev;
+
+        DBG("omapfb_probe\n");
+
+        if (pdev->num_resources != 0) {
+                dev_err(&pdev->dev, "probed for an unknown device\n");
+                r = -ENODEV;
+                goto err0;
+        }
+
+        fbdev = kzalloc(sizeof(struct omapfb2_device), GFP_KERNEL);
+        if (fbdev == NULL) {
+                r = -ENOMEM;
+                goto err0;
+        }
+
+        mutex_init(&fbdev->mtx);
+
+        fbdev->dev = &pdev->dev;
+        platform_set_drvdata(pdev, fbdev);
+
+        r = 0;
+        fbdev->num_displays = 0;
+        dssdev = NULL;
+        for_each_dss_dev(dssdev) {
+                omap_dss_get_device(dssdev);
+
+                if (!dssdev->driver) {
+                        dev_err(&pdev->dev, "no driver for display\n");
+                        r = -ENODEV;
+                }
+
+                fbdev->displays[fbdev->num_displays++] = dssdev;
+        }
+
+        if (r)
+                goto cleanup;
+
+        if (fbdev->num_displays == 0) {
+                dev_err(&pdev->dev, "no displays\n");
+                r = -EINVAL;
+                goto cleanup;
+        }
+
+        fbdev->num_overlays = omap_dss_get_num_overlays();
+        for (i = 0; i < fbdev->num_overlays; i++)
+                fbdev->overlays[i] = omap_dss_get_overlay(i);
+
+        fbdev->num_managers = omap_dss_get_num_overlay_managers();
+        for (i = 0; i < fbdev->num_managers; i++)
+                fbdev->managers[i] = omap_dss_get_overlay_manager(i);
+
+        if (def_mode && strlen(def_mode) > 0) {
+                if (omapfb_parse_def_modes(fbdev))
+                        dev_warn(&pdev->dev, "cannot parse default modes\n");
+        }
+
+        r = omapfb_create_framebuffers(fbdev);
+        if (r)
+                goto cleanup;
+
+        for (i = 0; i < fbdev->num_managers; i++) {
+                struct omap_overlay_manager *mgr;
+                mgr = fbdev->managers[i];
+                r = mgr->apply(mgr);
+                if (r)
+                        dev_warn(fbdev->dev, "failed to apply dispc config\n");
+        }
+
+        DBG("mgr->apply'ed\n");
+
+        /* gfx overlay should be the default one. find a display
+         * connected to that, and use it as default display */
+        ovl = omap_dss_get_overlay(0);
+        if (ovl->manager && ovl->manager->device) {
+                def_display = ovl->manager->device;
+        } else {
+                dev_warn(&pdev->dev, "cannot find default display\n");
+                def_display = NULL;
+        }
+
+        if (def_display) {
+                struct omap_dss_driver *dssdrv = def_display->driver;
+
+                r = def_display->driver->enable(def_display);
+                if (r) {
+                        dev_warn(fbdev->dev, "Failed to enable display '%s'\n",
+                                        def_display->name);
+                        goto cleanup;
+                }
+
+                if (def_display->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
+                        u16 w, h;
+                        if (dssdrv->enable_te)
+                                dssdrv->enable_te(def_display, 1);
+                        if (dssdrv->set_update_mode)
+                                dssdrv->set_update_mode(def_display,
+                                                OMAP_DSS_UPDATE_MANUAL);
+
+                        dssdrv->get_resolution(def_display, &w, &h);
+                        def_display->driver->update(def_display, 0, 0, w, h);
+                } else {
+                        if (dssdrv->set_update_mode)
+                                dssdrv->set_update_mode(def_display,
+                                                OMAP_DSS_UPDATE_AUTO);
+                }
+        }
+
+        return 0;
+
+cleanup:
+        omapfb_free_resources(fbdev);
+err0:
+        dev_err(&pdev->dev, "failed to setup omapfb\n");
+        return r;
+}
+
+static int omapfb_remove(struct platform_device *pdev)
+{
+        struct omapfb2_device *fbdev = platform_get_drvdata(pdev);
+
+        /* FIXME: wait till completion of pending events */
+
+        omapfb_remove_sysfs(fbdev);
+
+        omapfb_free_resources(fbdev);
+
+        return 0;
+}
+
+static struct platform_driver omapfb_driver = {
+        .probe          = omapfb_probe,
+        .remove         = omapfb_remove,
+        .driver         = {
+                .name   = "omapfb",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init omapfb_init(void)
+{
+        DBG("omapfb_init\n");
+
+        if (platform_driver_register(&omapfb_driver)) {
+                printk(KERN_ERR "failed to register omapfb driver\n");
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
+static void __exit omapfb_exit(void)
+{
+        DBG("omapfb_exit\n");
+        platform_driver_unregister(&omapfb_driver);
+}
+
+module_param_named(mode, def_mode, charp, 0);
+module_param_named(vram, def_vram, charp, 0);
+module_param_named(rotate, def_rotate, int, 0);
+module_param_named(vrfb, def_vrfb, bool, 0);
+module_param_named(mirror, def_mirror, bool, 0);
+
+/* late_initcall to let panel/ctrl drivers loaded first.
+ * I guess better option would be a more dynamic approach,
+ * so that omapfb reacts to new panels when they are loaded */
+late_initcall(omapfb_init);
+/*module_init(omapfb_init);*/
+module_exit(omapfb_exit);
+
+MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@nokia.com>");
+MODULE_DESCRIPTION("OMAP2/3 Framebuffer");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/video/omap2/omapfb/omapfb-sysfs.c b/drivers/video/omap2/omapfb/omapfb-sysfs.c
new file mode 100644
index 000000000000..62bb88f5c192
--- /dev/null
+++ b/drivers/video/omap2/omapfb/omapfb-sysfs.c
@@ -0,0 +1,507 @@
+/*
+ * linux/drivers/video/omap2/omapfb-sysfs.c
+ *
+ * Copyright (C) 2008 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * Some code and ideas taken from drivers/video/omap/ driver
+ * by Imre Deak.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/fb.h>
+#include <linux/sysfs.h>
+#include <linux/device.h>
+#include <linux/uaccess.h>
+#include <linux/platform_device.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/omapfb.h>
+
+#include <plat/display.h>
+#include <plat/vrfb.h>
+
+#include "omapfb.h"
+
+static ssize_t show_rotate_type(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct fb_info *fbi = dev_get_drvdata(dev);
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+
+        return snprintf(buf, PAGE_SIZE, "%d\n", ofbi->rotation_type);
+}
+
+static ssize_t store_rotate_type(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct fb_info *fbi = dev_get_drvdata(dev);
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        enum omap_dss_rotation_type rot_type;
+        int r;
+
+        rot_type = simple_strtoul(buf, NULL, 0);
+
+        if (rot_type != OMAP_DSS_ROT_DMA && rot_type != OMAP_DSS_ROT_VRFB)
+                return -EINVAL;
+
+        lock_fb_info(fbi);
+
+        r = 0;
+        if (rot_type == ofbi->rotation_type)
+                goto out;
+
+        if (ofbi->region.size) {
+                r = -EBUSY;
+                goto out;
+        }
+
+        ofbi->rotation_type = rot_type;
+
+        /*
+         * Since the VRAM for this FB is not allocated at the moment we don't
+         * need to do any further parameter checking at this point.
+         */
+out:
+        unlock_fb_info(fbi);
+
+        return r ? r : count;
+}
+
+
+static ssize_t show_mirror(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct fb_info *fbi = dev_get_drvdata(dev);
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+
+        return snprintf(buf, PAGE_SIZE, "%d\n", ofbi->mirror);
+}
+
+static ssize_t store_mirror(struct device *dev,
+                struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct fb_info *fbi = dev_get_drvdata(dev);
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        bool mirror;
+        int r;
+        struct fb_var_screeninfo new_var;
+
+        mirror = simple_strtoul(buf, NULL, 0);
+
+        if (mirror != 0 && mirror != 1)
+                return -EINVAL;
+
+        lock_fb_info(fbi);
+
+        ofbi->mirror = mirror;
+
+        memcpy(&new_var, &fbi->var, sizeof(new_var));
+        r = check_fb_var(fbi, &new_var);
+        if (r)
+                goto out;
+        memcpy(&fbi->var, &new_var, sizeof(fbi->var));
+
+        set_fb_fix(fbi);
+
+        r = omapfb_apply_changes(fbi, 0);
+        if (r)
+                goto out;
+
+        r = count;
+out:
+        unlock_fb_info(fbi);
+
+        return r;
+}
+
+static ssize_t show_overlays(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct fb_info *fbi = dev_get_drvdata(dev);
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        struct omapfb2_device *fbdev = ofbi->fbdev;
+        ssize_t l = 0;
+        int t;
+
+        omapfb_lock(fbdev);
+        lock_fb_info(fbi);
+
+        for (t = 0; t < ofbi->num_overlays; t++) {
+                struct omap_overlay *ovl = ofbi->overlays[t];
+                int ovlnum;
+
+                for (ovlnum = 0; ovlnum < fbdev->num_overlays; ++ovlnum)
+                        if (ovl == fbdev->overlays[ovlnum])
+                                break;
+
+                l += snprintf(buf + l, PAGE_SIZE - l, "%s%d",
+                                t == 0 ? "" : ",", ovlnum);
+        }
+
+        l += snprintf(buf + l, PAGE_SIZE - l, "\n");
+
+        unlock_fb_info(fbi);
+        omapfb_unlock(fbdev);
+
+        return l;
+}
+
+static struct omapfb_info *get_overlay_fb(struct omapfb2_device *fbdev,
+                struct omap_overlay *ovl)
+{
+        int i, t;
+
+        for (i = 0; i < fbdev->num_fbs; i++) {
+                struct omapfb_info *ofbi = FB2OFB(fbdev->fbs[i]);
+
+                for (t = 0; t < ofbi->num_overlays; t++) {
+                        if (ofbi->overlays[t] == ovl)
+                                return ofbi;
+                }
+        }
+
+        return NULL;
+}
+
+static ssize_t store_overlays(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct fb_info *fbi = dev_get_drvdata(dev);
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        struct omapfb2_device *fbdev = ofbi->fbdev;
+        struct omap_overlay *ovls[OMAPFB_MAX_OVL_PER_FB];
+        struct omap_overlay *ovl;
+        int num_ovls, r, i;
+        int len;
+        bool added = false;
+
+        num_ovls = 0;
+
+        len = strlen(buf);
+        if (buf[len - 1] == '\n')
+                len = len - 1;
+
+        omapfb_lock(fbdev);
+        lock_fb_info(fbi);
+
+        if (len > 0) {
+                char *p = (char *)buf;
+                int ovlnum;
+
+                while (p < buf + len) {
+                        int found;
+                        if (num_ovls == OMAPFB_MAX_OVL_PER_FB) {
+                                r = -EINVAL;
+                                goto out;
+                        }
+
+                        ovlnum = simple_strtoul(p, &p, 0);
+                        if (ovlnum > fbdev->num_overlays) {
+                                r = -EINVAL;
+                                goto out;
+                        }
+
+                        found = 0;
+                        for (i = 0; i < num_ovls; ++i) {
+                                if (ovls[i] == fbdev->overlays[ovlnum]) {
+                                        found = 1;
+                                        break;
+                                }
+                        }
+
+                        if (!found)
+                                ovls[num_ovls++] = fbdev->overlays[ovlnum];
+
+                        p++;
+                }
+        }
+
+        for (i = 0; i < num_ovls; ++i) {
+                struct omapfb_info *ofbi2 = get_overlay_fb(fbdev, ovls[i]);
+                if (ofbi2 && ofbi2 != ofbi) {
+                        dev_err(fbdev->dev, "overlay already in use\n");
+                        r = -EINVAL;
+                        goto out;
+                }
+        }
+
+        /* detach unused overlays */
+        for (i = 0; i < ofbi->num_overlays; ++i) {
+                int t, found;
+
+                ovl = ofbi->overlays[i];
+
+                found = 0;
+
+                for (t = 0; t < num_ovls; ++t) {
+                        if (ovl == ovls[t]) {
+                                found = 1;
+                                break;
+                        }
+                }
+
+                if (found)
+                        continue;
+
+                DBG("detaching %d\n", ofbi->overlays[i]->id);
+
+                omapfb_overlay_enable(ovl, 0);
+
+                if (ovl->manager)
+                        ovl->manager->apply(ovl->manager);
+
+                for (t = i + 1; t < ofbi->num_overlays; t++) {
+                        ofbi->rotation[t-1] = ofbi->rotation[t];
+                        ofbi->overlays[t-1] = ofbi->overlays[t];
+                }
+
+                ofbi->num_overlays--;
+                i--;
+        }
+
+        for (i = 0; i < num_ovls; ++i) {
+                int t, found;
+
+                ovl = ovls[i];
+
+                found = 0;
+
+                for (t = 0; t < ofbi->num_overlays; ++t) {
+                        if (ovl == ofbi->overlays[t]) {
+                                found = 1;
+                                break;
+                        }
+                }
+
+                if (found)
+                        continue;
+                ofbi->rotation[ofbi->num_overlays] = 0;
+                ofbi->overlays[ofbi->num_overlays++] = ovl;
+
+                added = true;
+        }
+
+        if (added) {
+                r = omapfb_apply_changes(fbi, 0);
+                if (r)
+                        goto out;
+        }
+
+        r = count;
+out:
+        unlock_fb_info(fbi);
+        omapfb_unlock(fbdev);
+
+        return r;
+}
+
+static ssize_t show_overlays_rotate(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct fb_info *fbi = dev_get_drvdata(dev);
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        ssize_t l = 0;
+        int t;
+
+        lock_fb_info(fbi);
+
+        for (t = 0; t < ofbi->num_overlays; t++) {
+                l += snprintf(buf + l, PAGE_SIZE - l, "%s%d",
+                                t == 0 ? "" : ",", ofbi->rotation[t]);
+        }
+
+        l += snprintf(buf + l, PAGE_SIZE - l, "\n");
+
+        unlock_fb_info(fbi);
+
+        return l;
+}
+
+static ssize_t store_overlays_rotate(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct fb_info *fbi = dev_get_drvdata(dev);
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        int num_ovls = 0, r, i;
+        int len;
+        bool changed = false;
+        u8 rotation[OMAPFB_MAX_OVL_PER_FB];
+
+        len = strlen(buf);
+        if (buf[len - 1] == '\n')
+                len = len - 1;
+
+        lock_fb_info(fbi);
+
+        if (len > 0) {
+                char *p = (char *)buf;
+
+                while (p < buf + len) {
+                        int rot;
+
+                        if (num_ovls == ofbi->num_overlays) {
+                                r = -EINVAL;
+                                goto out;
+                        }
+
+                        rot = simple_strtoul(p, &p, 0);
+                        if (rot < 0 || rot > 3) {
+                                r = -EINVAL;
+                                goto out;
+                        }
+
+                        if (ofbi->rotation[num_ovls] != rot)
+                                changed = true;
+
+                        rotation[num_ovls++] = rot;
+
+                        p++;
+                }
+        }
+
+        if (num_ovls != ofbi->num_overlays) {
+                r = -EINVAL;
+                goto out;
+        }
+
+        if (changed) {
+                for (i = 0; i < num_ovls; ++i)
+                        ofbi->rotation[i] = rotation[i];
+
+                r = omapfb_apply_changes(fbi, 0);
+                if (r)
+                        goto out;
+
+                /* FIXME error handling? */
+        }
+
+        r = count;
+out:
+        unlock_fb_info(fbi);
+
+        return r;
+}
+
+static ssize_t show_size(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct fb_info *fbi = dev_get_drvdata(dev);
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+
+        return snprintf(buf, PAGE_SIZE, "%lu\n", ofbi->region.size);
+}
+
+static ssize_t store_size(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct fb_info *fbi = dev_get_drvdata(dev);
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        unsigned long size;
+        int r;
+        int i;
+
+        size = PAGE_ALIGN(simple_strtoul(buf, NULL, 0));
+
+        lock_fb_info(fbi);
+
+        for (i = 0; i < ofbi->num_overlays; i++) {
+                if (ofbi->overlays[i]->info.enabled) {
+                        r = -EBUSY;
+                        goto out;
+                }
+        }
+
+        if (size != ofbi->region.size) {
+                r = omapfb_realloc_fbmem(fbi, size, ofbi->region.type);
+                if (r) {
+                        dev_err(dev, "realloc fbmem failed\n");
+                        goto out;
+                }
+        }
+
+        r = count;
+out:
+        unlock_fb_info(fbi);
+
+        return r;
+}
+
+static ssize_t show_phys(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct fb_info *fbi = dev_get_drvdata(dev);
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+
+        return snprintf(buf, PAGE_SIZE, "%0x\n", ofbi->region.paddr);
+}
+
+static ssize_t show_virt(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct fb_info *fbi = dev_get_drvdata(dev);
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+
+        return snprintf(buf, PAGE_SIZE, "%p\n", ofbi->region.vaddr);
+}
+
+static struct device_attribute omapfb_attrs[] = {
+        __ATTR(rotate_type, S_IRUGO | S_IWUSR, show_rotate_type,
+                        store_rotate_type),
+        __ATTR(mirror, S_IRUGO | S_IWUSR, show_mirror, store_mirror),
+        __ATTR(size, S_IRUGO | S_IWUSR, show_size, store_size),
+        __ATTR(overlays, S_IRUGO | S_IWUSR, show_overlays, store_overlays),
+        __ATTR(overlays_rotate, S_IRUGO | S_IWUSR, show_overlays_rotate,
+                        store_overlays_rotate),
+        __ATTR(phys_addr, S_IRUGO, show_phys, NULL),
+        __ATTR(virt_addr, S_IRUGO, show_virt, NULL),
+};
+
+int omapfb_create_sysfs(struct omapfb2_device *fbdev)
+{
+        int i;
+        int r;
+
+        DBG("create sysfs for fbs\n");
+        for (i = 0; i < fbdev->num_fbs; i++) {
+                int t;
+                for (t = 0; t < ARRAY_SIZE(omapfb_attrs); t++) {
+                        r = device_create_file(fbdev->fbs[i]->dev,
+                                        &omapfb_attrs[t]);
+
+                        if (r) {
+                                dev_err(fbdev->dev, "failed to create sysfs "
+                                                "file\n");
+                                return r;
+                        }
+                }
+        }
+
+        return 0;
+}
+
+void omapfb_remove_sysfs(struct omapfb2_device *fbdev)
+{
+        int i, t;
+
+        DBG("remove sysfs for fbs\n");
+        for (i = 0; i < fbdev->num_fbs; i++) {
+                for (t = 0; t < ARRAY_SIZE(omapfb_attrs); t++)
+                        device_remove_file(fbdev->fbs[i]->dev,
+                                        &omapfb_attrs[t]);
+        }
+}
+
diff --git a/drivers/video/omap2/omapfb/omapfb.h b/drivers/video/omap2/omapfb/omapfb.h
new file mode 100644
index 000000000000..cd54fdbfd8bb
--- /dev/null
+++ b/drivers/video/omap2/omapfb/omapfb.h
@@ -0,0 +1,155 @@
+/*
+ * linux/drivers/video/omap2/omapfb.h
+ *
+ * Copyright (C) 2008 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * Some code and ideas taken from drivers/video/omap/ driver
+ * by Imre Deak.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DRIVERS_VIDEO_OMAP2_OMAPFB_H__
+#define __DRIVERS_VIDEO_OMAP2_OMAPFB_H__
+
+#ifdef CONFIG_FB_OMAP2_DEBUG_SUPPORT
+#define DEBUG
+#endif
+
+#include <plat/display.h>
+
+#ifdef DEBUG
+extern unsigned int omapfb_debug;
+#define DBG(format, ...) \
+        if (omapfb_debug) \
+                printk(KERN_DEBUG "OMAPFB: " format, ## __VA_ARGS__)
+#else
+#define DBG(format, ...)
+#endif
+
+#define FB2OFB(fb_info) ((struct omapfb_info *)(fb_info->par))
+
+/* max number of overlays to which a framebuffer data can be direct */
+#define OMAPFB_MAX_OVL_PER_FB 3
+
+struct omapfb2_mem_region {
+        u32             paddr;
+        void __iomem    *vaddr;
+        struct vrfb     vrfb;
+        unsigned long   size;
+        u8              type;           /* OMAPFB_PLANE_MEM_* */
+        bool            alloc;          /* allocated by the driver */
+        bool            map;            /* kernel mapped by the driver */
+};
+
+/* appended to fb_info */
+struct omapfb_info {
+        int id;
+        struct omapfb2_mem_region region;
+        atomic_t map_count;
+        int num_overlays;
+        struct omap_overlay *overlays[OMAPFB_MAX_OVL_PER_FB];
+        struct omapfb2_device *fbdev;
+        enum omap_dss_rotation_type rotation_type;
+        u8 rotation[OMAPFB_MAX_OVL_PER_FB];
+        bool mirror;
+};
+
+struct omapfb2_device {
+        struct device *dev;
+        struct mutex  mtx;
+
+        u32 pseudo_palette[17];
+
+        int state;
+
+        unsigned num_fbs;
+        struct fb_info *fbs[10];
+
+        unsigned num_displays;
+        struct omap_dss_device *displays[10];
+        unsigned num_overlays;
+        struct omap_overlay *overlays[10];
+        unsigned num_managers;
+        struct omap_overlay_manager *managers[10];
+
+        unsigned num_bpp_overrides;
+        struct {
+                struct omap_dss_device *dssdev;
+                u8 bpp;
+        } bpp_overrides[10];
+};
+
+struct omapfb_colormode {
+        enum omap_color_mode dssmode;
+        u32 bits_per_pixel;
+        u32 nonstd;
+        struct fb_bitfield red;
+        struct fb_bitfield green;
+        struct fb_bitfield blue;
+        struct fb_bitfield transp;
+};
+
+void set_fb_fix(struct fb_info *fbi);
+int check_fb_var(struct fb_info *fbi, struct fb_var_screeninfo *var);
+int omapfb_realloc_fbmem(struct fb_info *fbi, unsigned long size, int type);
+int omapfb_apply_changes(struct fb_info *fbi, int init);
+
+int omapfb_create_sysfs(struct omapfb2_device *fbdev);
+void omapfb_remove_sysfs(struct omapfb2_device *fbdev);
+
+int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg);
+
+int omapfb_update_window(struct fb_info *fbi,
+                u32 x, u32 y, u32 w, u32 h);
+
+int dss_mode_to_fb_mode(enum omap_color_mode dssmode,
+                        struct fb_var_screeninfo *var);
+
+/* find the display connected to this fb, if any */
+static inline struct omap_dss_device *fb2display(struct fb_info *fbi)
+{
+        struct omapfb_info *ofbi = FB2OFB(fbi);
+        int i;
+
+        /* XXX: returns the display connected to first attached overlay */
+        for (i = 0; i < ofbi->num_overlays; i++) {
+                if (ofbi->overlays[i]->manager)
+                        return ofbi->overlays[i]->manager->device;
+        }
+
+        return NULL;
+}
+
+static inline void omapfb_lock(struct omapfb2_device *fbdev)
+{
+        mutex_lock(&fbdev->mtx);
+}
+
+static inline void omapfb_unlock(struct omapfb2_device *fbdev)
+{
+        mutex_unlock(&fbdev->mtx);
+}
+
+static inline int omapfb_overlay_enable(struct omap_overlay *ovl,
+                int enable)
+{
+        struct omap_overlay_info info;
+
+        ovl->get_overlay_info(ovl, &info);
+        info.enabled = enable;
+        return ovl->set_overlay_info(ovl, &info);
+}
+
+#endif
diff --git a/drivers/video/omap2/vram.c b/drivers/video/omap2/vram.c
new file mode 100644
index 000000000000..3b1237ad85ed
--- /dev/null
+++ b/drivers/video/omap2/vram.c
@@ -0,0 +1,657 @@
+/*
+ * VRAM manager for OMAP
+ *
+ * Copyright (C) 2009 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/*#define DEBUG*/
+
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/seq_file.h>
+#include <linux/bootmem.h>
+#include <linux/completion.h>
+#include <linux/debugfs.h>
+#include <linux/jiffies.h>
+#include <linux/module.h>
+
+#include <asm/setup.h>
+
+#include <plat/sram.h>
+#include <plat/vram.h>
+#include <plat/dma.h>
+
+#ifdef DEBUG
+#define DBG(format, ...) pr_debug("VRAM: " format, ## __VA_ARGS__)
+#else
+#define DBG(format, ...)
+#endif
+
+#define OMAP2_SRAM_START                0x40200000
+/* Maximum size, in reality this is smaller if SRAM is partially locked. */
+#define OMAP2_SRAM_SIZE                 0xa0000         /* 640k */
+
+/* postponed regions are used to temporarily store region information at boot
+ * time when we cannot yet allocate the region list */
+#define MAX_POSTPONED_REGIONS 10
+
+static bool vram_initialized;
+static int postponed_cnt;
+static struct {
+        unsigned long paddr;
+        size_t size;
+} postponed_regions[MAX_POSTPONED_REGIONS];
+
+struct vram_alloc {
+        struct list_head list;
+        unsigned long paddr;
+        unsigned pages;
+};
+
+struct vram_region {
+        struct list_head list;
+        struct list_head alloc_list;
+        unsigned long paddr;
+        unsigned pages;
+};
+
+static DEFINE_MUTEX(region_mutex);
+static LIST_HEAD(region_list);
+
+static inline int region_mem_type(unsigned long paddr)
+{
+        if (paddr >= OMAP2_SRAM_START &&
+            paddr < OMAP2_SRAM_START + OMAP2_SRAM_SIZE)
+                return OMAP_VRAM_MEMTYPE_SRAM;
+        else
+                return OMAP_VRAM_MEMTYPE_SDRAM;
+}
+
+static struct vram_region *omap_vram_create_region(unsigned long paddr,
+                unsigned pages)
+{
+        struct vram_region *rm;
+
+        rm = kzalloc(sizeof(*rm), GFP_KERNEL);
+
+        if (rm) {
+                INIT_LIST_HEAD(&rm->alloc_list);
+                rm->paddr = paddr;
+                rm->pages = pages;
+        }
+
+        return rm;
+}
+
+#if 0
+static void omap_vram_free_region(struct vram_region *vr)
+{
+        list_del(&vr->list);
+        kfree(vr);
+}
+#endif
+
+static struct vram_alloc *omap_vram_create_allocation(struct vram_region *vr,
+                unsigned long paddr, unsigned pages)
+{
+        struct vram_alloc *va;
+        struct vram_alloc *new;
+
+        new = kzalloc(sizeof(*va), GFP_KERNEL);
+
+        if (!new)
+                return NULL;
+
+        new->paddr = paddr;
+        new->pages = pages;
+
+        list_for_each_entry(va, &vr->alloc_list, list) {
+                if (va->paddr > new->paddr)
+                        break;
+        }
+
+        list_add_tail(&new->list, &va->list);
+
+        return new;
+}
+
+static void omap_vram_free_allocation(struct vram_alloc *va)
+{
+        list_del(&va->list);
+        kfree(va);
+}
+
+int omap_vram_add_region(unsigned long paddr, size_t size)
+{
+        struct vram_region *rm;
+        unsigned pages;
+
+        if (vram_initialized) {
+                DBG("adding region paddr %08lx size %d\n",
+                                paddr, size);
+
+                size &= PAGE_MASK;
+                pages = size >> PAGE_SHIFT;
+
+                rm = omap_vram_create_region(paddr, pages);
+                if (rm == NULL)
+                        return -ENOMEM;
+
+                list_add(&rm->list, &region_list);
+        } else {
+                if (postponed_cnt == MAX_POSTPONED_REGIONS)
+                        return -ENOMEM;
+
+                postponed_regions[postponed_cnt].paddr = paddr;
+                postponed_regions[postponed_cnt].size = size;
+
+                ++postponed_cnt;
+        }
+        return 0;
+}
+
+int omap_vram_free(unsigned long paddr, size_t size)
+{
+        struct vram_region *rm;
+        struct vram_alloc *alloc;
+        unsigned start, end;
+
+        DBG("free mem paddr %08lx size %d\n", paddr, size);
+
+        size = PAGE_ALIGN(size);
+
+        mutex_lock(&region_mutex);
+
+        list_for_each_entry(rm, &region_list, list) {
+                list_for_each_entry(alloc, &rm->alloc_list, list) {
+                        start = alloc->paddr;
+                        end = alloc->paddr + (alloc->pages >> PAGE_SHIFT);
+
+                        if (start >= paddr && end < paddr + size)
+                                goto found;
+                }
+        }
+
+        mutex_unlock(&region_mutex);
+        return -EINVAL;
+
+found:
+        omap_vram_free_allocation(alloc);
+
+        mutex_unlock(&region_mutex);
+        return 0;
+}
+EXPORT_SYMBOL(omap_vram_free);
+
+static int _omap_vram_reserve(unsigned long paddr, unsigned pages)
+{
+        struct vram_region *rm;
+        struct vram_alloc *alloc;
+        size_t size;
+
+        size = pages << PAGE_SHIFT;
+
+        list_for_each_entry(rm, &region_list, list) {
+                unsigned long start, end;
+
+                DBG("checking region %lx %d\n", rm->paddr, rm->pages);
+
+                if (region_mem_type(rm->paddr) != region_mem_type(paddr))
+                        continue;
+
+                start = rm->paddr;
+                end = start + (rm->pages << PAGE_SHIFT) - 1;
+                if (start > paddr || end < paddr + size - 1)
+                        continue;
+
+                DBG("block ok, checking allocs\n");
+
+                list_for_each_entry(alloc, &rm->alloc_list, list) {
+                        end = alloc->paddr - 1;
+
+                        if (start <= paddr && end >= paddr + size - 1)
+                                goto found;
+
+                        start = alloc->paddr + (alloc->pages << PAGE_SHIFT);
+                }
+
+                end = rm->paddr + (rm->pages << PAGE_SHIFT) - 1;
+
+                if (!(start <= paddr && end >= paddr + size - 1))
+                        continue;
+found:
+                DBG("found area start %lx, end %lx\n", start, end);
+
+                if (omap_vram_create_allocation(rm, paddr, pages) == NULL)
+                        return -ENOMEM;
+
+                return 0;
+        }
+
+        return -ENOMEM;
+}
+
+int omap_vram_reserve(unsigned long paddr, size_t size)
+{
+        unsigned pages;
+        int r;
+
+        DBG("reserve mem paddr %08lx size %d\n", paddr, size);
+
+        size = PAGE_ALIGN(size);
+        pages = size >> PAGE_SHIFT;
+
+        mutex_lock(&region_mutex);
+
+        r = _omap_vram_reserve(paddr, pages);
+
+        mutex_unlock(&region_mutex);
+
+        return r;
+}
+EXPORT_SYMBOL(omap_vram_reserve);
+
+static void _omap_vram_dma_cb(int lch, u16 ch_status, void *data)
+{
+        struct completion *compl = data;
+        complete(compl);
+}
+
+static int _omap_vram_clear(u32 paddr, unsigned pages)
+{
+        struct completion compl;
+        unsigned elem_count;
+        unsigned frame_count;
+        int r;
+        int lch;
+
+        init_completion(&compl);
+
+        r = omap_request_dma(OMAP_DMA_NO_DEVICE, "VRAM DMA",
+                        _omap_vram_dma_cb,
+                        &compl, &lch);
+        if (r) {
+                pr_err("VRAM: request_dma failed for memory clear\n");
+                return -EBUSY;
+        }
+
+        elem_count = pages * PAGE_SIZE / 4;
+        frame_count = 1;
+
+        omap_set_dma_transfer_params(lch, OMAP_DMA_DATA_TYPE_S32,
+                        elem_count, frame_count,
+                        OMAP_DMA_SYNC_ELEMENT,
+                        0, 0);
+
+        omap_set_dma_dest_params(lch, 0, OMAP_DMA_AMODE_POST_INC,
+                        paddr, 0, 0);
+
+        omap_set_dma_color_mode(lch, OMAP_DMA_CONSTANT_FILL, 0x000000);
+
+        omap_start_dma(lch);
+
+        if (wait_for_completion_timeout(&compl, msecs_to_jiffies(1000)) == 0) {
+                omap_stop_dma(lch);
+                pr_err("VRAM: dma timeout while clearing memory\n");
+                r = -EIO;
+                goto err;
+        }
+
+        r = 0;
+err:
+        omap_free_dma(lch);
+
+        return r;
+}
+
+static int _omap_vram_alloc(int mtype, unsigned pages, unsigned long *paddr)
+{
+        struct vram_region *rm;
+        struct vram_alloc *alloc;
+
+        list_for_each_entry(rm, &region_list, list) {
+                unsigned long start, end;
+
+                DBG("checking region %lx %d\n", rm->paddr, rm->pages);
+
+                if (region_mem_type(rm->paddr) != mtype)
+                        continue;
+
+                start = rm->paddr;
+
+                list_for_each_entry(alloc, &rm->alloc_list, list) {
+                        end = alloc->paddr;
+
+                        if (end - start >= pages << PAGE_SHIFT)
+                                goto found;
+
+                        start = alloc->paddr + (alloc->pages << PAGE_SHIFT);
+                }
+
+                end = rm->paddr + (rm->pages << PAGE_SHIFT);
+found:
+                if (end - start < pages << PAGE_SHIFT)
+                        continue;
+
+                DBG("found %lx, end %lx\n", start, end);
+
+                alloc = omap_vram_create_allocation(rm, start, pages);
+                if (alloc == NULL)
+                        return -ENOMEM;
+
+                *paddr = start;
+
+                _omap_vram_clear(start, pages);
+
+                return 0;
+        }
+
+        return -ENOMEM;
+}
+
+int omap_vram_alloc(int mtype, size_t size, unsigned long *paddr)
+{
+        unsigned pages;
+        int r;
+
+        BUG_ON(mtype > OMAP_VRAM_MEMTYPE_MAX || !size);
+
+        DBG("alloc mem type %d size %d\n", mtype, size);
+
+        size = PAGE_ALIGN(size);
+        pages = size >> PAGE_SHIFT;
+
+        mutex_lock(&region_mutex);
+
+        r = _omap_vram_alloc(mtype, pages, paddr);
+
+        mutex_unlock(&region_mutex);
+
+        return r;
+}
+EXPORT_SYMBOL(omap_vram_alloc);
+
+void omap_vram_get_info(unsigned long *vram,
+                unsigned long *free_vram,
+                unsigned long *largest_free_block)
+{
+        struct vram_region *vr;
+        struct vram_alloc *va;
+
+        *vram = 0;
+        *free_vram = 0;
+        *largest_free_block = 0;
+
+        mutex_lock(&region_mutex);
+
+        list_for_each_entry(vr, &region_list, list) {
+                unsigned free;
+                unsigned long pa;
+
+                pa = vr->paddr;
+                *vram += vr->pages << PAGE_SHIFT;
+
+                list_for_each_entry(va, &vr->alloc_list, list) {
+                        free = va->paddr - pa;
+                        *free_vram += free;
+                        if (free > *largest_free_block)
+                                *largest_free_block = free;
+                        pa = va->paddr + (va->pages << PAGE_SHIFT);
+                }
+
+                free = vr->paddr + (vr->pages << PAGE_SHIFT) - pa;
+                *free_vram += free;
+                if (free > *largest_free_block)
+                        *largest_free_block = free;
+        }
+
+        mutex_unlock(&region_mutex);
+}
+EXPORT_SYMBOL(omap_vram_get_info);
+
+#if defined(CONFIG_DEBUG_FS)
+static int vram_debug_show(struct seq_file *s, void *unused)
+{
+        struct vram_region *vr;
+        struct vram_alloc *va;
+        unsigned size;
+
+        mutex_lock(&region_mutex);
+
+        list_for_each_entry(vr, &region_list, list) {
+                size = vr->pages << PAGE_SHIFT;
+                seq_printf(s, "%08lx-%08lx (%d bytes)\n",
+                                vr->paddr, vr->paddr + size - 1,
+                                size);
+
+                list_for_each_entry(va, &vr->alloc_list, list) {
+                        size = va->pages << PAGE_SHIFT;
+                        seq_printf(s, "    %08lx-%08lx (%d bytes)\n",
+                                        va->paddr, va->paddr + size - 1,
+                                        size);
+                }
+        }
+
+        mutex_unlock(&region_mutex);
+
+        return 0;
+}
+
+static int vram_debug_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, vram_debug_show, inode->i_private);
+}
+
+static const struct file_operations vram_debug_fops = {
+        .open           = vram_debug_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+static int __init omap_vram_create_debugfs(void)
+{
+        struct dentry *d;
+
+        d = debugfs_create_file("vram", S_IRUGO, NULL,
+                        NULL, &vram_debug_fops);
+        if (IS_ERR(d))
+                return PTR_ERR(d);
+
+        return 0;
+}
+#endif
+
+static __init int omap_vram_init(void)
+{
+        int i;
+
+        vram_initialized = 1;
+
+        for (i = 0; i < postponed_cnt; i++)
+                omap_vram_add_region(postponed_regions[i].paddr,
+                                postponed_regions[i].size);
+
+#ifdef CONFIG_DEBUG_FS
+        if (omap_vram_create_debugfs())
+                pr_err("VRAM: Failed to create debugfs file\n");
+#endif
+
+        return 0;
+}
+
+arch_initcall(omap_vram_init);
+
+/* boottime vram alloc stuff */
+
+/* set from board file */
+static u32 omap_vram_sram_start __initdata;
+static u32 omap_vram_sram_size __initdata;
+
+/* set from board file */
+static u32 omap_vram_sdram_start __initdata;
+static u32 omap_vram_sdram_size __initdata;
+
+/* set from kernel cmdline */
+static u32 omap_vram_def_sdram_size __initdata;
+static u32 omap_vram_def_sdram_start __initdata;
+
+static int __init omap_vram_early_vram(char *p)
+{
+        omap_vram_def_sdram_size = memparse(p, &p);
+        if (*p == ',')
+                omap_vram_def_sdram_start = simple_strtoul(p + 1, &p, 16);
+        return 0;
+}
+early_param("vram", omap_vram_early_vram);
+
+/*
+ * Called from map_io. We need to call to this early enough so that we
+ * can reserve the fixed SDRAM regions before VM could get hold of them.
+ */
+void __init omap_vram_reserve_sdram(void)
+{
+        struct bootmem_data     *bdata;
+        unsigned long           sdram_start, sdram_size;
+        u32 paddr;
+        u32 size = 0;
+
+        /* cmdline arg overrides the board file definition */
+        if (omap_vram_def_sdram_size) {
+                size = omap_vram_def_sdram_size;
+                paddr = omap_vram_def_sdram_start;
+        }
+
+        if (!size) {
+                size = omap_vram_sdram_size;
+                paddr = omap_vram_sdram_start;
+        }
+
+#ifdef CONFIG_OMAP2_VRAM_SIZE
+        if (!size) {
+                size = CONFIG_OMAP2_VRAM_SIZE * 1024 * 1024;
+                paddr = 0;
+        }
+#endif
+
+        if (!size)
+                return;
+
+        size = PAGE_ALIGN(size);
+
+        bdata = NODE_DATA(0)->bdata;
+        sdram_start = bdata->node_min_pfn << PAGE_SHIFT;
+        sdram_size = (bdata->node_low_pfn << PAGE_SHIFT) - sdram_start;
+
+        if (paddr) {
+                if ((paddr & ~PAGE_MASK) || paddr < sdram_start ||
+                                paddr + size > sdram_start + sdram_size) {
+                        pr_err("Illegal SDRAM region for VRAM\n");
+                        return;
+                }
+
+                if (reserve_bootmem(paddr, size, BOOTMEM_EXCLUSIVE) < 0) {
+                        pr_err("FB: failed to reserve VRAM\n");
+                        return;
+                }
+        } else {
+                if (size > sdram_size) {
+                        pr_err("Illegal SDRAM size for VRAM\n");
+                        return;
+                }
+
+                paddr = virt_to_phys(alloc_bootmem_pages(size));
+                BUG_ON(paddr & ~PAGE_MASK);
+        }
+
+        omap_vram_add_region(paddr, size);
+
+        pr_info("Reserving %u bytes SDRAM for VRAM\n", size);
+}
+
+/*
+ * Called at sram init time, before anything is pushed to the SRAM stack.
+ * Because of the stack scheme, we will allocate everything from the
+ * start of the lowest address region to the end of SRAM. This will also
+ * include padding for page alignment and possible holes between regions.
+ *
+ * As opposed to the SDRAM case, we'll also do any dynamic allocations at
+ * this point, since the driver built as a module would have problem with
+ * freeing / reallocating the regions.
+ */
+unsigned long __init omap_vram_reserve_sram(unsigned long sram_pstart,
+                                  unsigned long sram_vstart,
+                                  unsigned long sram_size,
+                                  unsigned long pstart_avail,
+                                  unsigned long size_avail)
+{
+        unsigned long                   pend_avail;
+        unsigned long                   reserved;
+        u32 paddr;
+        u32 size;
+
+        paddr = omap_vram_sram_start;
+        size = omap_vram_sram_size;
+
+        if (!size)
+                return 0;
+
+        reserved = 0;
+        pend_avail = pstart_avail + size_avail;
+
+        if (!paddr) {
+                /* Dynamic allocation */
+                if ((size_avail & PAGE_MASK) < size) {
+                        pr_err("Not enough SRAM for VRAM\n");
+                        return 0;
+                }
+                size_avail = (size_avail - size) & PAGE_MASK;
+                paddr = pstart_avail + size_avail;
+        }
+
+        if (paddr < sram_pstart ||
+                        paddr + size > sram_pstart + sram_size) {
+                pr_err("Illegal SRAM region for VRAM\n");
+                return 0;
+        }
+
+        /* Reserve everything above the start of the region. */
+        if (pend_avail - paddr > reserved)
+                reserved = pend_avail - paddr;
+        size_avail = pend_avail - reserved - pstart_avail;
+
+        omap_vram_add_region(paddr, size);
+
+        if (reserved)
+                pr_info("Reserving %lu bytes SRAM for VRAM\n", reserved);
+
+        return reserved;
+}
+
+void __init omap_vram_set_sdram_vram(u32 size, u32 start)
+{
+        omap_vram_sdram_start = start;
+        omap_vram_sdram_size = size;
+}
+
+void __init omap_vram_set_sram_vram(u32 size, u32 start)
+{
+        omap_vram_sram_start = start;
+        omap_vram_sram_size = size;
+}
diff --git a/drivers/video/omap2/vrfb.c b/drivers/video/omap2/vrfb.c
new file mode 100644
index 000000000000..fd2271600370
--- /dev/null
+++ b/drivers/video/omap2/vrfb.c
@@ -0,0 +1,315 @@
+/*
+ * VRFB Rotation Engine
+ *
+ * Copyright (C) 2009 Nokia Corporation
+ * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/*#define DEBUG*/
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/ioport.h>
+#include <linux/io.h>
+#include <linux/bitops.h>
+#include <linux/mutex.h>
+
+#include <mach/io.h>
+#include <plat/vrfb.h>
+#include <plat/sdrc.h>
+
+#ifdef DEBUG
+#define DBG(format, ...) pr_debug("VRFB: " format, ## __VA_ARGS__)
+#else
+#define DBG(format, ...)
+#endif
+
+#define SMS_ROT_VIRT_BASE(context, rot) \
+        (((context >= 4) ? 0xD0000000 : 0x70000000) \
+         + (0x4000000 * (context)) \
+         + (0x1000000 * (rot)))
+
+#define OMAP_VRFB_SIZE                  (2048 * 2048 * 4)
+
+#define VRFB_PAGE_WIDTH_EXP     5 /* Assuming SDRAM pagesize= 1024 */
+#define VRFB_PAGE_HEIGHT_EXP    5 /* 1024 = 2^5 * 2^5 */
+#define VRFB_PAGE_WIDTH         (1 << VRFB_PAGE_WIDTH_EXP)
+#define VRFB_PAGE_HEIGHT        (1 << VRFB_PAGE_HEIGHT_EXP)
+#define SMS_IMAGEHEIGHT_OFFSET  16
+#define SMS_IMAGEWIDTH_OFFSET   0
+#define SMS_PH_OFFSET           8
+#define SMS_PW_OFFSET           4
+#define SMS_PS_OFFSET           0
+
+#define VRFB_NUM_CTXS 12
+/* bitmap of reserved contexts */
+static unsigned long ctx_map;
+
+static DEFINE_MUTEX(ctx_lock);
+
+/*
+ * Access to this happens from client drivers or the PM core after wake-up.
+ * For the first case we require locking at the driver level, for the second
+ * we don't need locking, since no drivers will run until after the wake-up
+ * has finished.
+ */
+static struct {
+        u32 physical_ba;
+        u32 control;
+        u32 size;
+} vrfb_hw_context[VRFB_NUM_CTXS];
+
+static inline void restore_hw_context(int ctx)
+{
+        omap2_sms_write_rot_control(vrfb_hw_context[ctx].control, ctx);
+        omap2_sms_write_rot_size(vrfb_hw_context[ctx].size, ctx);
+        omap2_sms_write_rot_physical_ba(vrfb_hw_context[ctx].physical_ba, ctx);
+}
+
+static u32 get_image_width_roundup(u16 width, u8 bytespp)
+{
+        unsigned long stride = width * bytespp;
+        unsigned long ceil_pages_per_stride = (stride / VRFB_PAGE_WIDTH) +
+                (stride % VRFB_PAGE_WIDTH != 0);
+
+        return ceil_pages_per_stride * VRFB_PAGE_WIDTH / bytespp;
+}
+
+/*
+ * This the extra space needed in the VRFB physical area for VRFB to safely wrap
+ * any memory accesses to the invisible part of the virtual view to the physical
+ * area.
+ */
+static inline u32 get_extra_physical_size(u16 image_width_roundup, u8 bytespp)
+{
+        return (OMAP_VRFB_LINE_LEN - image_width_roundup) * VRFB_PAGE_HEIGHT *
+                bytespp;
+}
+
+void omap_vrfb_restore_context(void)
+{
+        int i;
+        unsigned long map = ctx_map;
+
+        for (i = ffs(map); i; i = ffs(map)) {
+                /* i=1..32 */
+                i--;
+                map &= ~(1 << i);
+                restore_hw_context(i);
+        }
+}
+
+void omap_vrfb_adjust_size(u16 *width, u16 *height,
+                u8 bytespp)
+{
+        *width = ALIGN(*width * bytespp, VRFB_PAGE_WIDTH) / bytespp;
+        *height = ALIGN(*height, VRFB_PAGE_HEIGHT);
+}
+EXPORT_SYMBOL(omap_vrfb_adjust_size);
+
+u32 omap_vrfb_min_phys_size(u16 width, u16 height, u8 bytespp)
+{
+        unsigned long image_width_roundup = get_image_width_roundup(width,
+                bytespp);
+
+        if (image_width_roundup > OMAP_VRFB_LINE_LEN)
+                return 0;
+
+        return (width * height * bytespp) + get_extra_physical_size(
+                image_width_roundup, bytespp);
+}
+EXPORT_SYMBOL(omap_vrfb_min_phys_size);
+
+u16 omap_vrfb_max_height(u32 phys_size, u16 width, u8 bytespp)
+{
+        unsigned long image_width_roundup = get_image_width_roundup(width,
+                bytespp);
+        unsigned long height;
+        unsigned long extra;
+
+        if (image_width_roundup > OMAP_VRFB_LINE_LEN)
+                return 0;
+
+        extra = get_extra_physical_size(image_width_roundup, bytespp);
+
+        if (phys_size < extra)
+                return 0;
+
+        height = (phys_size - extra) / (width * bytespp);
+
+        /* Virtual views provided by VRFB are limited to 2048x2048. */
+        return min_t(unsigned long, height, 2048);
+}
+EXPORT_SYMBOL(omap_vrfb_max_height);
+
+void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr,
+                u16 width, u16 height,
+                unsigned bytespp, bool yuv_mode)
+{
+        unsigned pixel_size_exp;
+        u16 vrfb_width;
+        u16 vrfb_height;
+        u8 ctx = vrfb->context;
+        u32 size;
+        u32 control;
+
+        DBG("omapfb_set_vrfb(%d, %lx, %dx%d, %d, %d)\n", ctx, paddr,
+                        width, height, bytespp, yuv_mode);
+
+        /* For YUV2 and UYVY modes VRFB needs to handle pixels a bit
+         * differently. See TRM. */
+        if (yuv_mode) {
+                bytespp *= 2;
+                width /= 2;
+        }
+
+        if (bytespp == 4)
+                pixel_size_exp = 2;
+        else if (bytespp == 2)
+                pixel_size_exp = 1;
+        else
+                BUG();
+
+        vrfb_width = ALIGN(width * bytespp, VRFB_PAGE_WIDTH) / bytespp;
+        vrfb_height = ALIGN(height, VRFB_PAGE_HEIGHT);
+
+        DBG("vrfb w %u, h %u bytespp %d\n", vrfb_width, vrfb_height, bytespp);
+
+        size  = vrfb_width << SMS_IMAGEWIDTH_OFFSET;
+        size |= vrfb_height << SMS_IMAGEHEIGHT_OFFSET;
+
+        control  = pixel_size_exp << SMS_PS_OFFSET;
+        control |= VRFB_PAGE_WIDTH_EXP  << SMS_PW_OFFSET;
+        control |= VRFB_PAGE_HEIGHT_EXP << SMS_PH_OFFSET;
+
+        vrfb_hw_context[ctx].physical_ba = paddr;
+        vrfb_hw_context[ctx].size = size;
+        vrfb_hw_context[ctx].control = control;
+
+        omap2_sms_write_rot_physical_ba(paddr, ctx);
+        omap2_sms_write_rot_size(size, ctx);
+        omap2_sms_write_rot_control(control, ctx);
+
+        DBG("vrfb offset pixels %d, %d\n",
+                        vrfb_width - width, vrfb_height - height);
+
+        vrfb->xres = width;
+        vrfb->yres = height;
+        vrfb->xoffset = vrfb_width - width;
+        vrfb->yoffset = vrfb_height - height;
+        vrfb->bytespp = bytespp;
+        vrfb->yuv_mode = yuv_mode;
+}
+EXPORT_SYMBOL(omap_vrfb_setup);
+
+int omap_vrfb_map_angle(struct vrfb *vrfb, u16 height, u8 rot)
+{
+        unsigned long size = height * OMAP_VRFB_LINE_LEN * vrfb->bytespp;
+
+        vrfb->vaddr[rot] = ioremap_wc(vrfb->paddr[rot], size);
+
+        if (!vrfb->vaddr[rot]) {
+                printk(KERN_ERR "vrfb: ioremap failed\n");
+                return -ENOMEM;
+        }
+
+        DBG("ioremapped vrfb area %d of size %lu into %p\n", rot, size,
+                vrfb->vaddr[rot]);
+
+        return 0;
+}
+EXPORT_SYMBOL(omap_vrfb_map_angle);
+
+void omap_vrfb_release_ctx(struct vrfb *vrfb)
+{
+        int rot;
+        int ctx = vrfb->context;
+
+        if (ctx == 0xff)
+                return;
+
+        DBG("release ctx %d\n", ctx);
+
+        mutex_lock(&ctx_lock);
+
+        BUG_ON(!(ctx_map & (1 << ctx)));
+
+        clear_bit(ctx, &ctx_map);
+
+        for (rot = 0; rot < 4; ++rot) {
+                if (vrfb->paddr[rot]) {
+                        release_mem_region(vrfb->paddr[rot], OMAP_VRFB_SIZE);
+                        vrfb->paddr[rot] = 0;
+                }
+        }
+
+        vrfb->context = 0xff;
+
+        mutex_unlock(&ctx_lock);
+}
+EXPORT_SYMBOL(omap_vrfb_release_ctx);
+
+int omap_vrfb_request_ctx(struct vrfb *vrfb)
+{
+        int rot;
+        u32 paddr;
+        u8 ctx;
+        int r;
+
+        DBG("request ctx\n");
+
+        mutex_lock(&ctx_lock);
+
+        for (ctx = 0; ctx < VRFB_NUM_CTXS; ++ctx)
+                if ((ctx_map & (1 << ctx)) == 0)
+                        break;
+
+        if (ctx == VRFB_NUM_CTXS) {
+                pr_err("vrfb: no free contexts\n");
+                r = -EBUSY;
+                goto out;
+        }
+
+        DBG("found free ctx %d\n", ctx);
+
+        set_bit(ctx, &ctx_map);
+
+        memset(vrfb, 0, sizeof(*vrfb));
+
+        vrfb->context = ctx;
+
+        for (rot = 0; rot < 4; ++rot) {
+                paddr = SMS_ROT_VIRT_BASE(ctx, rot);
+                if (!request_mem_region(paddr, OMAP_VRFB_SIZE, "vrfb")) {
+                        pr_err("vrfb: failed to reserve VRFB "
+                                        "area for ctx %d, rotation %d\n",
+                                        ctx, rot * 90);
+                        omap_vrfb_release_ctx(vrfb);
+                        r = -ENOMEM;
+                        goto out;
+                }
+
+                vrfb->paddr[rot] = paddr;
+
+                DBG("VRFB %d/%d: %lx\n", ctx, rot*90, vrfb->paddr[rot]);
+        }
+
+        r = 0;
+out:
+        mutex_unlock(&ctx_lock);
+        return r;
+}
+EXPORT_SYMBOL(omap_vrfb_request_ctx);
diff --git a/drivers/video/output.c b/drivers/video/output.c
index 5e6439ae7394..0d6f2cda9369 100644
--- a/drivers/video/output.c
+++ b/drivers/video/output.c
@@ -23,6 +23,7 @@
  */
 #include <linux/module.h>
 #include <linux/video_output.h>
+#include <linux/slab.h>
 #include <linux/err.h>
 #include <linux/ctype.h>
 
@@ -50,7 +51,7 @@ static ssize_t video_output_store_state(struct device *dev,
         int request_state = simple_strtoul(buf,&endp,0);
         size_t size = endp - buf;
 
-        if (*endp && isspace(*endp))
+        if (isspace(*endp))
                 size++;
         if (size != count)
                 return -EINVAL;
diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c
index 7fa4ab01b0d3..81440f2b9091 100644
--- a/drivers/video/p9100.c
+++ b/drivers/video/p9100.c
@@ -10,7 +10,6 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/fb.h>
diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c
index 0a366d86f08e..8a204e7a5b5b 100644
--- a/drivers/video/platinumfb.c
+++ b/drivers/video/platinumfb.c
@@ -24,7 +24,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c
index 36436ee6c1a4..27f93aab6ddc 100644
--- a/drivers/video/pm2fb.c
+++ b/drivers/video/pm2fb.c
@@ -896,7 +896,7 @@ static int pm2fb_setcolreg(unsigned regno, unsigned red, unsigned green,
          * Pseudocolor:
          *    uses offset = 0 && length = DAC register width.
          *    var->{color}.offset is 0
-         *    var->{color}.length contains widht of DAC
+         *    var->{color}.length contains width of DAC
          *    cmap is not used
          *    DAC[X] is programmed to (red, green, blue)
          * Truecolor:
diff --git a/drivers/video/pmag-aa-fb.c b/drivers/video/pmag-aa-fb.c
index 6515ec11c16b..838424817de2 100644
--- a/drivers/video/pmag-aa-fb.c
+++ b/drivers/video/pmag-aa-fb.c
@@ -28,7 +28,6 @@
 #include <linux/string.h>
 #include <linux/timer.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/fb.h>
diff --git a/drivers/video/pmag-ba-fb.c b/drivers/video/pmag-ba-fb.c
index 0573ec685a57..0f361b6100d2 100644
--- a/drivers/video/pmag-ba-fb.c
+++ b/drivers/video/pmag-ba-fb.c
@@ -98,7 +98,8 @@ static int pmagbafb_setcolreg(unsigned int regno, unsigned int red,
 {
         struct pmagbafb_par *par = info->par;
 
-        BUG_ON(regno >= info->cmap.len);
+        if (regno >= info->cmap.len)
+                return 1;
 
         red   >>= 8;    /* The cmap fields are 16 bits    */
         green >>= 8;    /* wide, but the hardware colormap */
diff --git a/drivers/video/pmagb-b-fb.c b/drivers/video/pmagb-b-fb.c
index 98748723af9f..2de0806421b4 100644
--- a/drivers/video/pmagb-b-fb.c
+++ b/drivers/video/pmagb-b-fb.c
@@ -102,7 +102,8 @@ static int pmagbbfb_setcolreg(unsigned int regno, unsigned int red,
 {
         struct pmagbbfb_par *par = info->par;
 
-        BUG_ON(regno >= info->cmap.len);
+        if (regno >= info->cmap.len)
+                return 1;
 
         red   >>= 8;    /* The cmap fields are 16 bits    */
         green >>= 8;    /* wide, but the hardware colormap */
diff --git a/drivers/video/pnx4008/pnxrgbfb.c b/drivers/video/pnx4008/pnxrgbfb.c
index 4db6b48a8715..b2252fea2858 100644
--- a/drivers/video/pnx4008/pnxrgbfb.c
+++ b/drivers/video/pnx4008/pnxrgbfb.c
@@ -18,7 +18,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
diff --git a/drivers/video/pnx4008/sdum.c b/drivers/video/pnx4008/sdum.c
index 2aa09bce3944..5ec4f2d439c9 100644
--- a/drivers/video/pnx4008/sdum.c
+++ b/drivers/video/pnx4008/sdum.c
@@ -20,7 +20,6 @@
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/tty.h>
-#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -29,6 +28,7 @@
 #include <linux/init.h>
 #include <linux/dma-mapping.h>
 #include <linux/clk.h>
+#include <linux/gfp.h>
 #include <asm/uaccess.h>
 #include <mach/gpio.h>
 
diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c
index 53f8f1100e81..f9975100d56d 100644
--- a/drivers/video/pvr2fb.c
+++ b/drivers/video/pvr2fb.c
@@ -831,7 +831,7 @@ static int __devinit pvr2fb_common_init(void)
         printk(KERN_NOTICE "fb%d: registering with SQ API\n", fb_info->node);
 
         pvr2fb_map = sq_remap(fb_info->fix.smem_start, fb_info->fix.smem_len,
-                              fb_info->fix.id, pgprot_val(PAGE_SHARED));
+                              fb_info->fix.id, PAGE_SHARED);
 
         printk(KERN_NOTICE "fb%d: Mapped video memory to SQ addr 0x%lx\n",
                fb_info->node, pvr2fb_map);
diff --git a/drivers/video/pxa168fb.c b/drivers/video/pxa168fb.c
index 84d8327e47db..c91a7f70f7b0 100644
--- a/drivers/video/pxa168fb.c
+++ b/drivers/video/pxa168fb.c
@@ -668,7 +668,7 @@ static int __init pxa168fb_probe(struct platform_device *pdev)
         /*
          * Map LCD controller registers.
          */
-        fbi->reg_base = ioremap_nocache(res->start, res->end - res->start);
+        fbi->reg_base = ioremap_nocache(res->start, resource_size(res));
         if (fbi->reg_base == NULL) {
                 ret = -ENOMEM;
                 goto failed;
@@ -687,6 +687,7 @@ static int __init pxa168fb_probe(struct platform_device *pdev)
         }
 
         info->fix.smem_start = (unsigned long)fbi->fb_start_dma;
+        set_graphics_start(info, 0, 0);
 
         /*
          * Set video mode according to platform data.
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 1820c4a24434..825b665245bb 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -80,7 +80,8 @@
 static int pxafb_activate_var(struct fb_var_screeninfo *var,
                                 struct pxafb_info *);
 static void set_ctrlr_state(struct pxafb_info *fbi, u_int state);
-static void setup_base_frame(struct pxafb_info *fbi, int branch);
+static void setup_base_frame(struct pxafb_info *fbi,
+                             struct fb_var_screeninfo *var, int branch);
 static int setup_frame_dma(struct pxafb_info *fbi, int dma, int pal,
                            unsigned long offset, size_t size);
 
@@ -397,6 +398,7 @@ static void pxafb_setmode(struct fb_var_screeninfo *var,
         var->lower_margin       = mode->lower_margin;
         var->sync               = mode->sync;
         var->grayscale          = mode->cmap_greyscale;
+        var->transp.length      = mode->transparency;
 
         /* set the initial RGBA bitfields */
         pxafb_set_pixfmt(var, mode->depth);
@@ -531,12 +533,22 @@ static int pxafb_pan_display(struct fb_var_screeninfo *var,
                              struct fb_info *info)
 {
         struct pxafb_info *fbi = (struct pxafb_info *)info;
+        struct fb_var_screeninfo newvar;
         int dma = DMA_MAX + DMA_BASE;
 
         if (fbi->state != C_ENABLE)
                 return 0;
 
-        setup_base_frame(fbi, 1);
+        /* Only take .xoffset, .yoffset and .vmode & FB_VMODE_YWRAP from what
+         * was passed in and copy the rest from the old screeninfo.
+         */
+        memcpy(&newvar, &fbi->fb.var, sizeof(newvar));
+        newvar.xoffset = var->xoffset;
+        newvar.yoffset = var->yoffset;
+        newvar.vmode &= ~FB_VMODE_YWRAP;
+        newvar.vmode |= var->vmode & FB_VMODE_YWRAP;
+
+        setup_base_frame(fbi, &newvar, 1);
 
         if (fbi->lccr0 & LCCR0_SDS)
                 lcd_writel(fbi, FBR1, fbi->fdadr[dma + 1] | 0x1);
@@ -1052,9 +1064,10 @@ static int setup_frame_dma(struct pxafb_info *fbi, int dma, int pal,
         return 0;
 }
 
-static void setup_base_frame(struct pxafb_info *fbi, int branch)
+static void setup_base_frame(struct pxafb_info *fbi,
+                             struct fb_var_screeninfo *var,
+                             int branch)
 {
-        struct fb_var_screeninfo *var = &fbi->fb.var;
         struct fb_fix_screeninfo *fix = &fbi->fb.fix;
         int nbytes, dma, pal, bpp = var->bits_per_pixel;
         unsigned long offset;
@@ -1210,11 +1223,12 @@ static int pxafb_smart_thread(void *arg)
         struct pxafb_info *fbi = arg;
         struct pxafb_mach_info *inf = fbi->dev->platform_data;
 
-        if (!fbi || !inf->smart_update) {
+        if (!inf->smart_update) {
                 pr_err("%s: not properly initialized, thread terminated\n",
                                 __func__);
                 return -EINVAL;
         }
+        inf = fbi->dev->platform_data;
 
         pr_debug("%s(): task starting\n", __func__);
 
@@ -1332,7 +1346,7 @@ static int pxafb_activate_var(struct fb_var_screeninfo *var,
 #endif
                 setup_parallel_timing(fbi, var);
 
-        setup_base_frame(fbi, 0);
+        setup_base_frame(fbi, var, 0);
 
         fbi->reg_lccr0 = fbi->lccr0 |
                 (LCCR0_LDM | LCCR0_SFM | LCCR0_IUM | LCCR0_EFM |
@@ -1654,7 +1668,7 @@ static int pxafb_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops pxafb_pm_ops = {
+static const struct dev_pm_ops pxafb_pm_ops = {
         .suspend        = pxafb_suspend,
         .resume         = pxafb_resume,
 };
diff --git a/drivers/video/q40fb.c b/drivers/video/q40fb.c
index 4beac1df617b..fc32c323a381 100644
--- a/drivers/video/q40fb.c
+++ b/drivers/video/q40fb.c
@@ -14,7 +14,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
@@ -85,7 +84,7 @@ static struct fb_ops q40fb_ops = {
         .fb_imageblit   = cfb_imageblit,
 };
 
-static int __init q40fb_probe(struct platform_device *dev)
+static int __devinit q40fb_probe(struct platform_device *dev)
 {
         struct fb_info *info;
 
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index d94c57ffbdb1..618f36bec10d 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -338,6 +338,7 @@ static struct backlight_ops riva_bl_ops = {
 
 static void riva_bl_init(struct riva_par *par)
 {
+        struct backlight_properties props;
         struct fb_info *info = pci_get_drvdata(par->pdev);
         struct backlight_device *bd;
         char name[12];
@@ -353,7 +354,10 @@ static void riva_bl_init(struct riva_par *par)
 
         snprintf(name, sizeof(name), "rivabl%d", info->node);
 
-        bd = backlight_device_register(name, info->dev, par, &riva_bl_ops);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
+        bd = backlight_device_register(name, info->dev, par, &riva_bl_ops,
+                                       &props);
         if (IS_ERR(bd)) {
                 info->bl_dev = NULL;
                 printk(KERN_WARNING "riva: Backlight registration failed\n");
@@ -365,7 +369,6 @@ static void riva_bl_init(struct riva_par *par)
                 MIN_LEVEL * FB_BACKLIGHT_MAX / MAX_LEVEL,
                 FB_BACKLIGHT_MAX);
 
-        bd->props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
         bd->props.brightness = bd->props.max_brightness;
         bd->props.power = FB_BLANK_UNBLANK;
         backlight_update_status(bd);
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
index 0deb0a8867b7..a6247fc081ab 100644
--- a/drivers/video/s1d13xxxfb.c
+++ b/drivers/video/s1d13xxxfb.c
@@ -31,6 +31,7 @@
 #include <linux/fb.h>
 #include <linux/spinlock_types.h>
 #include <linux/spinlock.h>
+#include <linux/slab.h>
 
 #include <asm/io.h>
 
@@ -517,12 +518,12 @@ s1d13xxxfb_bitblt_copyarea(struct fb_info *info, const struct fb_copyarea *area)
                 src = (sy * stride) + (bpp * sx);
         }
 
-        /* set source adress */
+        /* set source address */
         s1d13xxxfb_writereg(info->par, S1DREG_BBLT_SRC_START0, (src & 0xff));
         s1d13xxxfb_writereg(info->par, S1DREG_BBLT_SRC_START1, (src >> 8) & 0x00ff);
         s1d13xxxfb_writereg(info->par, S1DREG_BBLT_SRC_START2, (src >> 16) & 0x00ff);
 
-        /* set destination adress */
+        /* set destination address */
         s1d13xxxfb_writereg(info->par, S1DREG_BBLT_DST_START0, (dst & 0xff));
         s1d13xxxfb_writereg(info->par, S1DREG_BBLT_DST_START1, (dst >> 8) & 0x00ff);
         s1d13xxxfb_writereg(info->par, S1DREG_BBLT_DST_START2, (dst >> 16) & 0x00ff);
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
index adf9632c6b1f..9682ecc60e12 100644
--- a/drivers/video/s3c-fb.c
+++ b/drivers/video/s3c-fb.c
@@ -16,8 +16,8 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
+#include <linux/slab.h>
 #include <linux/init.h>
-#include <linux/gfp.h>
 #include <linux/clk.h>
 #include <linux/fb.h>
 #include <linux/io.h>
@@ -211,21 +211,23 @@ static int s3c_fb_check_var(struct fb_var_screeninfo *var,
 
 /**
  * s3c_fb_calc_pixclk() - calculate the divider to create the pixel clock.
- * @id: window id.
  * @sfb: The hardware state.
  * @pixclock: The pixel clock wanted, in picoseconds.
  *
  * Given the specified pixel clock, work out the necessary divider to get
  * close to the output frequency.
  */
-static int s3c_fb_calc_pixclk(unsigned char id, struct s3c_fb *sfb, unsigned int pixclk)
+static int s3c_fb_calc_pixclk(struct s3c_fb *sfb, unsigned int pixclk)
 {
-        struct s3c_fb_pd_win *win = sfb->pdata->win[id];
         unsigned long clk = clk_get_rate(sfb->bus_clk);
+        unsigned long long tmp;
         unsigned int result;
 
-        pixclk *= win->win_mode.refresh;
-        result = clk / pixclk;
+        tmp = (unsigned long long)clk;
+        tmp *= pixclk;
+
+        do_div(tmp, 1000000000UL);
+        result = (unsigned int)tmp / 1000;
 
         dev_dbg(sfb->dev, "pixclk=%u, clk=%lu, div=%d (%lu)\n",
                 pixclk, clk, result, clk / result);
@@ -301,7 +303,7 @@ static int s3c_fb_set_par(struct fb_info *info)
         /* use window 0 as the basis for the lcd output timings */
 
         if (win_no == 0) {
-                clkdiv = s3c_fb_calc_pixclk(win_no, sfb, var->pixclock);
+                clkdiv = s3c_fb_calc_pixclk(sfb, var->pixclock);
 
                 data = sfb->pdata->vidcon0;
                 data &= ~(VIDCON0_CLKVAL_F_MASK | VIDCON0_CLKDIR);
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index aac661225c78..2b094dec4a56 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -1004,12 +1004,12 @@ dealloc_fb:
         return ret;
 }
 
-static int __init s3c2410fb_probe(struct platform_device *pdev)
+static int __devinit s3c2410fb_probe(struct platform_device *pdev)
 {
         return s3c24xxfb_probe(pdev, DRV_S3C2410);
 }
 
-static int __init s3c2412fb_probe(struct platform_device *pdev)
+static int __devinit s3c2412fb_probe(struct platform_device *pdev)
 {
         return s3c24xxfb_probe(pdev, DRV_S3C2412);
 }
diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index c3fad34309ed..d4471b4c0374 100644
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -17,7 +17,6 @@
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/tty.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <linux/svga.h>
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index cdaa873a6054..e8b76d65a070 100644
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -1435,7 +1435,7 @@ static struct sa1100fb_info * __init sa1100fb_init_fbinfo(struct device *dev)
         return fbi;
 }
 
-static int __init sa1100fb_probe(struct platform_device *pdev)
+static int __devinit sa1100fb_probe(struct platform_device *pdev)
 {
         struct sa1100fb_info *fbi;
         int ret, irq;
diff --git a/drivers/video/savage/savagefb-i2c.c b/drivers/video/savage/savagefb-i2c.c
index 574b29e9f8f2..ed371c868b3a 100644
--- a/drivers/video/savage/savagefb-i2c.c
+++ b/drivers/video/savage/savagefb-i2c.c
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
+#include <linux/gfp.h>
 #include <linux/pci.h>
 #include <linux/fb.h>
 
diff --git a/drivers/video/sgivwfb.c b/drivers/video/sgivwfb.c
index bba53714a7b1..7a3a5e28eca1 100644
--- a/drivers/video/sgivwfb.c
+++ b/drivers/video/sgivwfb.c
@@ -260,13 +260,13 @@ static int sgivwfb_check_var(struct fb_var_screeninfo *var,
         var->grayscale = 0;     /* No grayscale for now */
 
         /* determine valid resolution and timing */
-        for (min_mode = 0; min_mode < DBE_VT_SIZE; min_mode++) {
+        for (min_mode = 0; min_mode < ARRAY_SIZE(dbeVTimings); min_mode++) {
                 if (dbeVTimings[min_mode].width >= var->xres &&
                     dbeVTimings[min_mode].height >= var->yres)
                         break;
         }
 
-        if (min_mode == DBE_VT_SIZE)
+        if (min_mode == ARRAY_SIZE(dbeVTimings))
                 return -EINVAL; /* Resolution to high */
 
         /* XXX FIXME - should try to pick best refresh rate */
@@ -745,7 +745,7 @@ int __init sgivwfb_setup(char *options)
 /*
  *  Initialisation
  */
-static int __init sgivwfb_probe(struct platform_device *dev)
+static int __devinit sgivwfb_probe(struct platform_device *dev)
 {
         struct sgivw_par *par;
         struct fb_info *info;
diff --git a/drivers/video/sh7760fb.c b/drivers/video/sh7760fb.c
index 9f6d6e61f0cc..bea38fce2470 100644
--- a/drivers/video/sh7760fb.c
+++ b/drivers/video/sh7760fb.c
@@ -26,6 +26,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/slab.h>
 
 #include <asm/sh7760fb.h>
 
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
index 3ad5157f9899..e8c769944812 100644
--- a/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
@@ -19,6 +19,8 @@
 #include <linux/dma-mapping.h>
 #include <linux/interrupt.h>
 #include <linux/vmalloc.h>
+#include <linux/ioctl.h>
+#include <linux/slab.h>
 #include <video/sh_mobile_lcdc.h>
 #include <asm/atomic.h>
 
@@ -106,6 +108,7 @@ static unsigned long lcdc_offs_sublcd[NR_CH_REGS] = {
 #define LDRCNTR_SRC     0x00010000
 #define LDRCNTR_MRS     0x00000002
 #define LDRCNTR_MRC     0x00000001
+#define LDSR_MRS        0x00000100
 
 struct sh_mobile_lcdc_priv;
 struct sh_mobile_lcdc_chan {
@@ -122,8 +125,8 @@ struct sh_mobile_lcdc_chan {
         struct scatterlist *sglist;
         unsigned long frame_end;
         unsigned long pan_offset;
-        unsigned long new_pan_offset;
         wait_queue_head_t frame_end_wait;
+        struct completion vsync_completion;
 };
 
 struct sh_mobile_lcdc_priv {
@@ -281,18 +284,42 @@ static void sh_mobile_lcdc_deferred_io(struct fb_info *info,
                                        struct list_head *pagelist)
 {
         struct sh_mobile_lcdc_chan *ch = info->par;
-        unsigned int nr_pages;
+        struct sh_mobile_lcdc_board_cfg *bcfg = &ch->cfg.board_cfg;
 
         /* enable clocks before accessing hardware */
         sh_mobile_lcdc_clk_on(ch->lcdc);
 
-        nr_pages = sh_mobile_lcdc_sginit(info, pagelist);
-        dma_map_sg(info->dev, ch->sglist, nr_pages, DMA_TO_DEVICE);
-
-        /* trigger panel update */
-        lcdc_write_chan(ch, LDSM2R, 1);
-
-        dma_unmap_sg(info->dev, ch->sglist, nr_pages, DMA_TO_DEVICE);
+        /*
+         * It's possible to get here without anything on the pagelist via
+         * sh_mobile_lcdc_deferred_io_touch() or via a userspace fsync()
+         * invocation. In the former case, the acceleration routines are
+         * stepped in to when using the framebuffer console causing the
+         * workqueue to be scheduled without any dirty pages on the list.
+         *
+         * Despite this, a panel update is still needed given that the
+         * acceleration routines have their own methods for writing in
+         * that still need to be updated.
+         *
+         * The fsync() and empty pagelist case could be optimized for,
+         * but we don't bother, as any application exhibiting such
+         * behaviour is fundamentally broken anyways.
+         */
+        if (!list_empty(pagelist)) {
+                unsigned int nr_pages = sh_mobile_lcdc_sginit(info, pagelist);
+
+                /* trigger panel update */
+                dma_map_sg(info->dev, ch->sglist, nr_pages, DMA_TO_DEVICE);
+                if (bcfg->start_transfer)
+                        bcfg->start_transfer(bcfg->board_data, ch,
+                                             &sh_mobile_lcdc_sys_bus_ops);
+                lcdc_write_chan(ch, LDSM2R, 1);
+                dma_unmap_sg(info->dev, ch->sglist, nr_pages, DMA_TO_DEVICE);
+        } else {
+                if (bcfg->start_transfer)
+                        bcfg->start_transfer(bcfg->board_data, ch,
+                                             &sh_mobile_lcdc_sys_bus_ops);
+                lcdc_write_chan(ch, LDSM2R, 1);
+        }
 }
 
 static void sh_mobile_lcdc_deferred_io_touch(struct fb_info *info)
@@ -342,19 +369,8 @@ static irqreturn_t sh_mobile_lcdc_irq(int irq, void *data)
                 }
 
                 /* VSYNC End */
-                if (ldintr & LDINTR_VES) {
-                        unsigned long ldrcntr = lcdc_read(priv, _LDRCNTR);
-                        /* Set the source address for the next refresh */
-                        lcdc_write_chan_mirror(ch, LDSA1R, ch->dma_handle +
-                                               ch->new_pan_offset);
-                        if (lcdc_chan_is_sublcd(ch))
-                                lcdc_write(ch->lcdc, _LDRCNTR,
-                                           ldrcntr ^ LDRCNTR_SRS);
-                        else
-                                lcdc_write(ch->lcdc, _LDRCNTR,
-                                           ldrcntr ^ LDRCNTR_MRS);
-                        ch->pan_offset = ch->new_pan_offset;
-                }
+                if (ldintr & LDINTR_VES)
+                        complete(&ch->vsync_completion);
         }
 
         return IRQ_HANDLED;
@@ -679,6 +695,7 @@ static int sh_mobile_lcdc_setup_clocks(struct platform_device *pdev,
          * 1) Enable Runtime PM
          * 2) Force Runtime PM Resume since hardware is accessed from probe()
          */
+        priv->dev = &pdev->dev;
         pm_runtime_enable(priv->dev);
         pm_runtime_resume(priv->dev);
         return 0;
@@ -743,25 +760,69 @@ static int sh_mobile_fb_pan_display(struct fb_var_screeninfo *var,
                                      struct fb_info *info)
 {
         struct sh_mobile_lcdc_chan *ch = info->par;
+        struct sh_mobile_lcdc_priv *priv = ch->lcdc;
+        unsigned long ldrcntr;
+        unsigned long new_pan_offset;
+
+        new_pan_offset = (var->yoffset * info->fix.line_length) +
+                (var->xoffset * (info->var.bits_per_pixel / 8));
 
-        if (info->var.xoffset == var->xoffset &&
-            info->var.yoffset == var->yoffset)
+        if (new_pan_offset == ch->pan_offset)
                 return 0;       /* No change, do nothing */
 
-        ch->new_pan_offset = (var->yoffset * info->fix.line_length) +
-                (var->xoffset * (info->var.bits_per_pixel / 8));
+        ldrcntr = lcdc_read(priv, _LDRCNTR);
 
-        if (ch->new_pan_offset != ch->pan_offset) {
-                unsigned long ldintr;
-                ldintr = lcdc_read(ch->lcdc, _LDINTR);
-                ldintr |= LDINTR_VEE;
-                lcdc_write(ch->lcdc, _LDINTR, ldintr);
-                sh_mobile_lcdc_deferred_io_touch(info);
-        }
+        /* Set the source address for the next refresh */
+        lcdc_write_chan_mirror(ch, LDSA1R, ch->dma_handle + new_pan_offset);
+        if (lcdc_chan_is_sublcd(ch))
+                lcdc_write(ch->lcdc, _LDRCNTR, ldrcntr ^ LDRCNTR_SRS);
+        else
+                lcdc_write(ch->lcdc, _LDRCNTR, ldrcntr ^ LDRCNTR_MRS);
+
+        ch->pan_offset = new_pan_offset;
+
+        sh_mobile_lcdc_deferred_io_touch(info);
 
         return 0;
 }
 
+static int sh_mobile_wait_for_vsync(struct fb_info *info)
+{
+        struct sh_mobile_lcdc_chan *ch = info->par;
+        unsigned long ldintr;
+        int ret;
+
+        /* Enable VSync End interrupt */
+        ldintr = lcdc_read(ch->lcdc, _LDINTR);
+        ldintr |= LDINTR_VEE;
+        lcdc_write(ch->lcdc, _LDINTR, ldintr);
+
+        ret = wait_for_completion_interruptible_timeout(&ch->vsync_completion,
+                                                        msecs_to_jiffies(100));
+        if (!ret)
+                return -ETIMEDOUT;
+
+        return 0;
+}
+
+static int sh_mobile_ioctl(struct fb_info *info, unsigned int cmd,
+                       unsigned long arg)
+{
+        int retval;
+
+        switch (cmd) {
+        case FBIO_WAITFORVSYNC:
+                retval = sh_mobile_wait_for_vsync(info);
+                break;
+
+        default:
+                retval = -ENOIOCTLCMD;
+                break;
+        }
+        return retval;
+}
+
+
 static struct fb_ops sh_mobile_lcdc_ops = {
         .owner          = THIS_MODULE,
         .fb_setcolreg   = sh_mobile_lcdc_setcolreg,
@@ -771,6 +832,7 @@ static struct fb_ops sh_mobile_lcdc_ops = {
         .fb_copyarea    = sh_mobile_lcdc_copyarea,
         .fb_imageblit   = sh_mobile_lcdc_imageblit,
         .fb_pan_display = sh_mobile_fb_pan_display,
+        .fb_ioctl       = sh_mobile_ioctl,
 };
 
 static int sh_mobile_lcdc_set_bpp(struct fb_var_screeninfo *var, int bpp)
@@ -874,7 +936,7 @@ static int sh_mobile_lcdc_runtime_resume(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops sh_mobile_lcdc_dev_pm_ops = {
+static const struct dev_pm_ops sh_mobile_lcdc_dev_pm_ops = {
         .suspend = sh_mobile_lcdc_suspend,
         .resume = sh_mobile_lcdc_resume,
         .runtime_suspend = sh_mobile_lcdc_runtime_suspend,
@@ -883,7 +945,7 @@ static struct dev_pm_ops sh_mobile_lcdc_dev_pm_ops = {
 
 static int sh_mobile_lcdc_remove(struct platform_device *pdev);
 
-static int __init sh_mobile_lcdc_probe(struct platform_device *pdev)
+static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev)
 {
         struct fb_info *info;
         struct sh_mobile_lcdc_priv *priv;
@@ -896,25 +958,24 @@ static int __init sh_mobile_lcdc_probe(struct platform_device *pdev)
 
         if (!pdev->dev.platform_data) {
                 dev_err(&pdev->dev, "no platform data defined\n");
-                error = -EINVAL;
-                goto err0;
+                return -EINVAL;
         }
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         i = platform_get_irq(pdev, 0);
         if (!res || i < 0) {
                 dev_err(&pdev->dev, "cannot get platform resources\n");
-                error = -ENOENT;
-                goto err0;
+                return -ENOENT;
         }
 
         priv = kzalloc(sizeof(*priv), GFP_KERNEL);
         if (!priv) {
                 dev_err(&pdev->dev, "cannot allocate device data\n");
-                error = -ENOMEM;
-                goto err0;
+                return -ENOMEM;
         }
 
+        platform_set_drvdata(pdev, priv);
+
         error = request_irq(i, sh_mobile_lcdc_irq, IRQF_DISABLED,
                             dev_name(&pdev->dev), priv);
         if (error) {
@@ -923,8 +984,6 @@ static int __init sh_mobile_lcdc_probe(struct platform_device *pdev)
         }
 
         priv->irq = i;
-        priv->dev = &pdev->dev;
-        platform_set_drvdata(pdev, priv);
         pdata = pdev->dev.platform_data;
 
         j = 0;
@@ -938,8 +997,8 @@ static int __init sh_mobile_lcdc_probe(struct platform_device *pdev)
                         goto err1;
                 }
                 init_waitqueue_head(&priv->ch[i].frame_end_wait);
+                init_completion(&priv->ch[i].vsync_completion);
                 priv->ch[j].pan_offset = 0;
-                priv->ch[j].new_pan_offset = 0;
 
                 switch (pdata->ch[i].chan) {
                 case LCDC_CHAN_MAINLCD:
@@ -1038,9 +1097,9 @@ static int __init sh_mobile_lcdc_probe(struct platform_device *pdev)
                 info = ch->info;
 
                 if (info->fbdefio) {
-                        priv->ch->sglist = vmalloc(sizeof(struct scatterlist) *
+                        ch->sglist = vmalloc(sizeof(struct scatterlist) *
                                         info->fix.smem_len >> PAGE_SHIFT);
-                        if (!priv->ch->sglist) {
+                        if (!ch->sglist) {
                                 dev_err(&pdev->dev, "cannot allocate sglist\n");
                                 goto err1;
                         }
@@ -1065,9 +1124,9 @@ static int __init sh_mobile_lcdc_probe(struct platform_device *pdev)
         }
 
         return 0;
- err1:
+err1:
         sh_mobile_lcdc_remove(pdev);
- err0:
+
         return error;
 }
 
@@ -1078,7 +1137,7 @@ static int sh_mobile_lcdc_remove(struct platform_device *pdev)
         int i;
 
         for (i = 0; i < ARRAY_SIZE(priv->ch); i++)
-                if (priv->ch[i].info->dev)
+                if (priv->ch[i].info && priv->ch[i].info->dev)
                         unregister_framebuffer(priv->ch[i].info);
 
         sh_mobile_lcdc_stop(priv);
@@ -1101,7 +1160,8 @@ static int sh_mobile_lcdc_remove(struct platform_device *pdev)
         if (priv->dot_clk)
                 clk_put(priv->dot_clk);
 
-        pm_runtime_disable(priv->dev);
+        if (priv->dev)
+                pm_runtime_disable(priv->dev);
 
         if (priv->base)
                 iounmap(priv->base);
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c
index a4e05e4d7501..a531a0f7cdf2 100644
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
@@ -1891,9 +1891,6 @@ static struct fb_ops sisfb_ops = {
         .fb_fillrect    = fbcon_sis_fillrect,
         .fb_copyarea    = fbcon_sis_copyarea,
         .fb_imageblit   = cfb_imageblit,
-#ifdef CONFIG_FB_SOFT_CURSOR
-        .fb_cursor      = soft_cursor,
-#endif
         .fb_sync        = fbcon_sis_sync,
 #ifdef SIS_NEW_CONFIG_COMPAT
         .fb_compat_ioctl= sisfb_ioctl,
@@ -2115,7 +2112,7 @@ sisfb_detect_VB_connect(struct sis_video_info *ivideo)
            if( (!(ivideo->vbflags2 & VB2_SISBRIDGE)) &&
                (!((ivideo->sisvga_engine == SIS_315_VGA) &&
                         (ivideo->vbflags2 & VB2_CHRONTEL))) ) {
-              if(ivideo->sisfb_tvstd & (TV_PALN | TV_PALN | TV_NTSCJ)) {
+              if(ivideo->sisfb_tvstd & (TV_PALM | TV_PALN | TV_NTSCJ)) {
                  ivideo->sisfb_tvstd = -1;
                  printk(KERN_ERR "sisfb: PALM/PALN/NTSCJ not supported\n");
               }
diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c
index 924d79462780..b7dc1800efa9 100644
--- a/drivers/video/sm501fb.c
+++ b/drivers/video/sm501fb.c
@@ -29,8 +29,8 @@
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <linux/console.h>
+#include <linux/io.h>
 
-#include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/div64.h>
 
@@ -66,6 +66,7 @@ struct sm501fb_info {
         struct fb_info          *fb[2];         /* fb info for both heads */
         struct resource         *fbmem_res;     /* framebuffer resource */
         struct resource         *regs_res;      /* registers resource */
+        struct resource         *regs2d_res;    /* 2d registers resource */
         struct sm501_platdata_fb *pdata;        /* our platform data */
 
         unsigned long            pm_crt_ctrl;   /* pm: crt ctrl save */
@@ -73,6 +74,7 @@ struct sm501fb_info {
         int                      irq;
         int                      swap_endian;   /* set to swap rgb=>bgr */
         void __iomem            *regs;          /* remapped registers */
+        void __iomem            *regs2d;        /* 2d remapped registers */
         void __iomem            *fbmem;         /* remapped framebuffer */
         size_t                   fbmem_len;     /* length of remapped region */
 };
@@ -123,9 +125,9 @@ static inline void sm501fb_sync_regs(struct sm501fb_info *info)
  * This is an attempt to lay out memory for the two framebuffers and
  * everything else
  *
- * |fbmem_res->start                                           fbmem_res->end|
- * |                                                                         |
- * |fb[0].fix.smem_start    |         |fb[1].fix.smem_start    |     2K      |
+ * |fbmem_res->start                                           fbmem_res->end|
+ * |                                                                         |
+ * |fb[0].fix.smem_start    |         |fb[1].fix.smem_start    |     2K      |
  * |-> fb[0].fix.smem_len <-| spare   |-> fb[1].fix.smem_len <-|-> cursors <-|
  *
  * The "spare" space is for the 2d engine data
@@ -409,7 +411,7 @@ static int sm501fb_set_par_common(struct fb_info *info,
         struct sm501fb_par  *par = info->par;
         struct sm501fb_info *fbi = par->info;
         unsigned long pixclock;      /* pixelclock in Hz */
-        unsigned long sm501pixclock; /* pixelclock the 501 can achive in Hz */
+        unsigned long sm501pixclock; /* pixelclock the 501 can achieve in Hz */
         unsigned int mem_type;
         unsigned int clock_type;
         unsigned int head_addr;
@@ -1246,7 +1248,173 @@ static ssize_t sm501fb_debug_show_pnl(struct device *dev,
 
 static DEVICE_ATTR(fbregs_pnl, 0444, sm501fb_debug_show_pnl, NULL);
 
-/* framebuffer ops */
+/* acceleration operations */
+static int sm501fb_sync(struct fb_info *info)
+{
+        int count = 1000000;
+        struct sm501fb_par  *par = info->par;
+        struct sm501fb_info *fbi = par->info;
+
+        /* wait for the 2d engine to be ready */
+        while ((count > 0) &&
+               (readl(fbi->regs + SM501_SYSTEM_CONTROL) &
+                SM501_SYSCTRL_2D_ENGINE_STATUS) != 0)
+                count--;
+
+        if (count <= 0) {
+                dev_err(info->dev, "Timeout waiting for 2d engine sync\n");
+                return 1;
+        }
+        return 0;
+}
+
+static void sm501fb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
+{
+        struct sm501fb_par  *par = info->par;
+        struct sm501fb_info *fbi = par->info;
+        int width = area->width;
+        int height = area->height;
+        int sx = area->sx;
+        int sy = area->sy;
+        int dx = area->dx;
+        int dy = area->dy;
+        unsigned long rtl = 0;
+
+        /* source clip */
+        if ((sx >= info->var.xres_virtual) ||
+            (sy >= info->var.yres_virtual))
+                /* source Area not within virtual screen, skipping */
+                return;
+        if ((sx + width) >= info->var.xres_virtual)
+                width = info->var.xres_virtual - sx - 1;
+        if ((sy + height) >= info->var.yres_virtual)
+                height = info->var.yres_virtual - sy - 1;
+
+        /* dest clip */
+        if ((dx >= info->var.xres_virtual) ||
+            (dy >= info->var.yres_virtual))
+                /* Destination Area not within virtual screen, skipping */
+                return;
+        if ((dx + width) >= info->var.xres_virtual)
+                width = info->var.xres_virtual - dx - 1;
+        if ((dy + height) >= info->var.yres_virtual)
+                height = info->var.yres_virtual - dy - 1;
+
+        if ((sx < dx) || (sy < dy)) {
+                rtl = 1 << 27;
+                sx += width - 1;
+                dx += width - 1;
+                sy += height - 1;
+                dy += height - 1;
+        }
+
+        if (sm501fb_sync(info))
+                return;
+
+        /* set the base addresses */
+        writel(par->screen.sm_addr, fbi->regs2d + SM501_2D_SOURCE_BASE);
+        writel(par->screen.sm_addr, fbi->regs2d + SM501_2D_DESTINATION_BASE);
+
+        /* set the window width */
+        writel((info->var.xres << 16) | info->var.xres,
+               fbi->regs2d + SM501_2D_WINDOW_WIDTH);
+
+        /* set window stride */
+        writel((info->var.xres_virtual << 16) | info->var.xres_virtual,
+               fbi->regs2d + SM501_2D_PITCH);
+
+        /* set data format */
+        switch (info->var.bits_per_pixel) {
+        case 8:
+                writel(0, fbi->regs2d + SM501_2D_STRETCH);
+                break;
+        case 16:
+                writel(0x00100000, fbi->regs2d + SM501_2D_STRETCH);
+                break;
+        case 32:
+                writel(0x00200000, fbi->regs2d + SM501_2D_STRETCH);
+                break;
+        }
+
+        /* 2d compare mask */
+        writel(0xffffffff, fbi->regs2d + SM501_2D_COLOR_COMPARE_MASK);
+
+        /* 2d mask */
+        writel(0xffffffff, fbi->regs2d + SM501_2D_MASK);
+
+        /* source and destination x y */
+        writel((sx << 16) | sy, fbi->regs2d + SM501_2D_SOURCE);
+        writel((dx << 16) | dy, fbi->regs2d + SM501_2D_DESTINATION);
+
+        /* w/h */
+        writel((width << 16) | height, fbi->regs2d + SM501_2D_DIMENSION);
+
+        /* do area move */
+        writel(0x800000cc | rtl, fbi->regs2d + SM501_2D_CONTROL);
+}
+
+static void sm501fb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
+{
+        struct sm501fb_par  *par = info->par;
+        struct sm501fb_info *fbi = par->info;
+        int width = rect->width, height = rect->height;
+
+        if ((rect->dx >= info->var.xres_virtual) ||
+            (rect->dy >= info->var.yres_virtual))
+                /* Rectangle not within virtual screen, skipping */
+                return;
+        if ((rect->dx + width) >= info->var.xres_virtual)
+                width = info->var.xres_virtual - rect->dx - 1;
+        if ((rect->dy + height) >= info->var.yres_virtual)
+                height = info->var.yres_virtual - rect->dy - 1;
+
+        if (sm501fb_sync(info))
+                return;
+
+        /* set the base addresses */
+        writel(par->screen.sm_addr, fbi->regs2d + SM501_2D_SOURCE_BASE);
+        writel(par->screen.sm_addr, fbi->regs2d + SM501_2D_DESTINATION_BASE);
+
+        /* set the window width */
+        writel((info->var.xres << 16) | info->var.xres,
+               fbi->regs2d + SM501_2D_WINDOW_WIDTH);
+
+        /* set window stride */
+        writel((info->var.xres_virtual << 16) | info->var.xres_virtual,
+               fbi->regs2d + SM501_2D_PITCH);
+
+        /* set data format */
+        switch (info->var.bits_per_pixel) {
+        case 8:
+                writel(0, fbi->regs2d + SM501_2D_STRETCH);
+                break;
+        case 16:
+                writel(0x00100000, fbi->regs2d + SM501_2D_STRETCH);
+                break;
+        case 32:
+                writel(0x00200000, fbi->regs2d + SM501_2D_STRETCH);
+                break;
+        }
+
+        /* 2d compare mask */
+        writel(0xffffffff, fbi->regs2d + SM501_2D_COLOR_COMPARE_MASK);
+
+        /* 2d mask */
+        writel(0xffffffff, fbi->regs2d + SM501_2D_MASK);
+
+        /* colour */
+        writel(rect->color, fbi->regs2d + SM501_2D_FOREGROUND);
+
+        /* x y */
+        writel((rect->dx << 16) | rect->dy, fbi->regs2d + SM501_2D_DESTINATION);
+
+        /* w/h */
+        writel((width << 16) | height, fbi->regs2d + SM501_2D_DIMENSION);
+
+        /* do rectangle fill */
+        writel(0x800100cc, fbi->regs2d + SM501_2D_CONTROL);
+}
+
 
 static struct fb_ops sm501fb_ops_crt = {
         .owner          = THIS_MODULE,
@@ -1256,9 +1424,10 @@ static struct fb_ops sm501fb_ops_crt = {
         .fb_setcolreg   = sm501fb_setcolreg,
         .fb_pan_display = sm501fb_pan_crt,
         .fb_cursor      = sm501fb_cursor,
-        .fb_fillrect    = cfb_fillrect,
-        .fb_copyarea    = cfb_copyarea,
+        .fb_fillrect    = sm501fb_fillrect,
+        .fb_copyarea    = sm501fb_copyarea,
         .fb_imageblit   = cfb_imageblit,
+        .fb_sync        = sm501fb_sync,
 };
 
 static struct fb_ops sm501fb_ops_pnl = {
@@ -1269,9 +1438,10 @@ static struct fb_ops sm501fb_ops_pnl = {
         .fb_blank       = sm501fb_blank_pnl,
         .fb_setcolreg   = sm501fb_setcolreg,
         .fb_cursor      = sm501fb_cursor,
-        .fb_fillrect    = cfb_fillrect,
-        .fb_copyarea    = cfb_copyarea,
+        .fb_fillrect    = sm501fb_fillrect,
+        .fb_copyarea    = sm501fb_copyarea,
         .fb_imageblit   = cfb_imageblit,
+        .fb_sync        = sm501fb_sync,
 };
 
 /* sm501_init_cursor
@@ -1329,7 +1499,8 @@ static int sm501fb_start(struct sm501fb_info *info,
                 dev_warn(dev, "no irq for device\n");
         }
 
-        /* allocate, reserve and remap resources for registers */
+        /* allocate, reserve and remap resources for display
+         * controller registers */
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (res == NULL) {
                 dev_err(dev, "no resource definition for registers\n");
@@ -1338,7 +1509,7 @@ static int sm501fb_start(struct sm501fb_info *info,
         }
 
         info->regs_res = request_mem_region(res->start,
-                                            res->end - res->start,
+                                            resource_size(res),
                                             pdev->name);
 
         if (info->regs_res == NULL) {
@@ -1347,37 +1518,63 @@ static int sm501fb_start(struct sm501fb_info *info,
                 goto err_release;
         }
 
-        info->regs = ioremap(res->start, (res->end - res->start)+1);
+        info->regs = ioremap(res->start, resource_size(res));
         if (info->regs == NULL) {
                 dev_err(dev, "cannot remap registers\n");
                 ret = -ENXIO;
                 goto err_regs_res;
         }
 
+        /* allocate, reserve and remap resources for 2d
+         * controller registers */
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+        if (res == NULL) {
+                dev_err(dev, "no resource definition for 2d registers\n");
+                ret = -ENOENT;
+                goto err_regs_map;
+        }
+
+        info->regs2d_res = request_mem_region(res->start,
+                                              resource_size(res),
+                                              pdev->name);
+
+        if (info->regs2d_res == NULL) {
+                dev_err(dev, "cannot claim registers\n");
+                ret = -ENXIO;
+                goto err_regs_map;
+        }
+
+        info->regs2d = ioremap(res->start, resource_size(res));
+        if (info->regs2d == NULL) {
+                dev_err(dev, "cannot remap registers\n");
+                ret = -ENXIO;
+                goto err_regs2d_res;
+        }
+
         /* allocate, reserve resources for framebuffer */
         res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
         if (res == NULL) {
                 dev_err(dev, "no memory resource defined\n");
                 ret = -ENXIO;
-                goto err_regs_map;
+                goto err_regs2d_map;
         }
 
         info->fbmem_res = request_mem_region(res->start,
-                                             (res->end - res->start)+1,
+                                             resource_size(res),
                                              pdev->name);
         if (info->fbmem_res == NULL) {
                 dev_err(dev, "cannot claim framebuffer\n");
                 ret = -ENXIO;
-                goto err_regs_map;
+                goto err_regs2d_map;
         }
 
-        info->fbmem = ioremap(res->start, (res->end - res->start)+1);
+        info->fbmem = ioremap(res->start, resource_size(res));
         if (info->fbmem == NULL) {
                 dev_err(dev, "cannot remap framebuffer\n");
                 goto err_mem_res;
         }
 
-        info->fbmem_len = (res->end - res->start)+1;
+        info->fbmem_len = resource_size(res);
 
         /* clear framebuffer memory - avoids garbage data on unused fb */
         memset(info->fbmem, 0, info->fbmem_len);
@@ -1389,8 +1586,10 @@ static int sm501fb_start(struct sm501fb_info *info,
         /* enable display controller */
         sm501_unit_power(dev->parent, SM501_GATE_DISPLAY, 1);
 
-        /* setup cursors */
+        /* enable 2d controller */
+        sm501_unit_power(dev->parent, SM501_GATE_2D_ENGINE, 1);
 
+        /* setup cursors */
         sm501_init_cursor(info->fb[HEAD_CRT], SM501_DC_CRT_HWC_ADDR);
         sm501_init_cursor(info->fb[HEAD_PANEL], SM501_DC_PANEL_HWC_ADDR);
 
@@ -1400,6 +1599,13 @@ static int sm501fb_start(struct sm501fb_info *info,
         release_resource(info->fbmem_res);
         kfree(info->fbmem_res);
 
+ err_regs2d_map:
+        iounmap(info->regs2d);
+
+ err_regs2d_res:
+        release_resource(info->regs2d_res);
+        kfree(info->regs2d_res);
+
  err_regs_map:
         iounmap(info->regs);
 
@@ -1420,6 +1626,10 @@ static void sm501fb_stop(struct sm501fb_info *info)
         release_resource(info->fbmem_res);
         kfree(info->fbmem_res);
 
+        iounmap(info->regs2d);
+        release_resource(info->regs2d_res);
+        kfree(info->regs2d_res);
+
         iounmap(info->regs);
         release_resource(info->regs_res);
         kfree(info->regs_res);
@@ -1486,7 +1696,8 @@ static int sm501fb_init_fb(struct fb_info *fb,
                 par->ops.fb_cursor = NULL;
 
         fb->fbops = &par->ops;
-        fb->flags = FBINFO_FLAG_DEFAULT |
+        fb->flags = FBINFO_FLAG_DEFAULT | FBINFO_READS_FAST |
+                FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT |
                 FBINFO_HWACCEL_XPAN | FBINFO_HWACCEL_YPAN;
 
         /* fixed data */
diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c
index 609d0a521ca2..dee64c3b1e67 100644
--- a/drivers/video/sstfb.c
+++ b/drivers/video/sstfb.c
@@ -86,7 +86,6 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <linux/slab.h>
 #include <asm/io.h>
 #include <linux/uaccess.h>
 #include <video/sstfb.h>
@@ -1102,7 +1101,7 @@ static void sst_set_vidmod_ics(struct fb_info *info, const int bpp)
  * detect dac type
  * prerequisite : write to FbiInitx enabled, video and fbi and pci fifo reset,
  * dram refresh disabled, FbiInit remaped.
- * TODO: mmh.. maybe i shoud put the "prerequisite" in the func ...
+ * TODO: mmh.. maybe i should put the "prerequisite" in the func ...
  */
 
 
diff --git a/drivers/video/stifb.c b/drivers/video/stifb.c
index 6120f0c526fe..876648e15e9d 100644
--- a/drivers/video/stifb.c
+++ b/drivers/video/stifb.c
@@ -756,9 +756,9 @@ hyperResetPlanes(struct stifb_info *fb, int enable)
                 if (fb->info.var.bits_per_pixel == 32)
                         controlPlaneReg = 0x04000F00;
                 else
-                        controlPlaneReg = 0x00000F00;   /* 0x00000800 should be enought, but lets clear all 4 bits */
+                        controlPlaneReg = 0x00000F00;   /* 0x00000800 should be enough, but lets clear all 4 bits */
         else
-                controlPlaneReg = 0x00000F00; /* 0x00000100 should be enought, but lets clear all 4 bits */
+                controlPlaneReg = 0x00000F00; /* 0x00000100 should be enough, but lets clear all 4 bits */
 
         switch (enable) {
         case ENABLE:
diff --git a/drivers/video/sunxvr1000.c b/drivers/video/sunxvr1000.c
new file mode 100644
index 000000000000..23e69e834a18
--- /dev/null
+++ b/drivers/video/sunxvr1000.c
@@ -0,0 +1,227 @@
+/* sunxvr1000.c: Sun XVR-1000 driver for sparc64 systems
+ *
+ * Copyright (C) 2010 David S. Miller (davem@davemloft.net)
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/of_device.h>
+
+struct gfb_info {
+        struct fb_info          *info;
+
+        char __iomem            *fb_base;
+        unsigned long           fb_base_phys;
+
+        struct device_node      *of_node;
+
+        unsigned int            width;
+        unsigned int            height;
+        unsigned int            depth;
+        unsigned int            fb_size;
+
+        u32                     pseudo_palette[16];
+};
+
+static int __devinit gfb_get_props(struct gfb_info *gp)
+{
+        gp->width = of_getintprop_default(gp->of_node, "width", 0);
+        gp->height = of_getintprop_default(gp->of_node, "height", 0);
+        gp->depth = of_getintprop_default(gp->of_node, "depth", 32);
+
+        if (!gp->width || !gp->height) {
+                printk(KERN_ERR "gfb: Critical properties missing for %s\n",
+                       gp->of_node->full_name);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int gfb_setcolreg(unsigned regno,
+                         unsigned red, unsigned green, unsigned blue,
+                         unsigned transp, struct fb_info *info)
+{
+        u32 value;
+
+        if (regno < 16) {
+                red >>= 8;
+                green >>= 8;
+                blue >>= 8;
+
+                value = (blue << 16) | (green << 8) | red;
+                ((u32 *)info->pseudo_palette)[regno] = value;
+        }
+
+        return 0;
+}
+
+static struct fb_ops gfb_ops = {
+        .owner                  = THIS_MODULE,
+        .fb_setcolreg           = gfb_setcolreg,
+        .fb_fillrect            = cfb_fillrect,
+        .fb_copyarea            = cfb_copyarea,
+        .fb_imageblit           = cfb_imageblit,
+};
+
+static int __devinit gfb_set_fbinfo(struct gfb_info *gp)
+{
+        struct fb_info *info = gp->info;
+        struct fb_var_screeninfo *var = &info->var;
+
+        info->flags = FBINFO_DEFAULT;
+        info->fbops = &gfb_ops;
+        info->screen_base = gp->fb_base;
+        info->screen_size = gp->fb_size;
+
+        info->pseudo_palette = gp->pseudo_palette;
+
+        /* Fill fix common fields */
+        strlcpy(info->fix.id, "gfb", sizeof(info->fix.id));
+        info->fix.smem_start = gp->fb_base_phys;
+        info->fix.smem_len = gp->fb_size;
+        info->fix.type = FB_TYPE_PACKED_PIXELS;
+        if (gp->depth == 32 || gp->depth == 24)
+                info->fix.visual = FB_VISUAL_TRUECOLOR;
+        else
+                info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+
+        var->xres = gp->width;
+        var->yres = gp->height;
+        var->xres_virtual = var->xres;
+        var->yres_virtual = var->yres;
+        var->bits_per_pixel = gp->depth;
+
+        var->red.offset = 0;
+        var->red.length = 8;
+        var->green.offset = 8;
+        var->green.length = 8;
+        var->blue.offset = 16;
+        var->blue.length = 8;
+        var->transp.offset = 0;
+        var->transp.length = 0;
+
+        if (fb_alloc_cmap(&info->cmap, 256, 0)) {
+                printk(KERN_ERR "gfb: Cannot allocate color map.\n");
+                return -ENOMEM;
+        }
+
+        return 0;
+}
+
+static int __devinit gfb_probe(struct of_device *op,
+                               const struct of_device_id *match)
+{
+        struct device_node *dp = op->node;
+        struct fb_info *info;
+        struct gfb_info *gp;
+        int err;
+
+        info = framebuffer_alloc(sizeof(struct gfb_info), &op->dev);
+        if (!info) {
+                printk(KERN_ERR "gfb: Cannot allocate fb_info\n");
+                err = -ENOMEM;
+                goto err_out;
+        }
+
+        gp = info->par;
+        gp->info = info;
+        gp->of_node = dp;
+
+        gp->fb_base_phys = op->resource[6].start;
+
+        err = gfb_get_props(gp);
+        if (err)
+                goto err_release_fb;
+
+        /* Framebuffer length is the same regardless of resolution. */
+        info->fix.line_length = 16384;
+        gp->fb_size = info->fix.line_length * gp->height;
+
+        gp->fb_base = of_ioremap(&op->resource[6], 0,
+                                 gp->fb_size, "gfb fb");
+        if (!gp->fb_base)
+                goto err_release_fb;
+
+        err = gfb_set_fbinfo(gp);
+        if (err)
+                goto err_unmap_fb;
+
+        printk("gfb: Found device at %s\n", dp->full_name);
+
+        err = register_framebuffer(info);
+        if (err < 0) {
+                printk(KERN_ERR "gfb: Could not register framebuffer %s\n",
+                       dp->full_name);
+                goto err_unmap_fb;
+        }
+
+        dev_set_drvdata(&op->dev, info);
+
+        return 0;
+
+err_unmap_fb:
+        of_iounmap(&op->resource[6], gp->fb_base, gp->fb_size);
+
+err_release_fb:
+        framebuffer_release(info);
+
+err_out:
+        return err;
+}
+
+static int __devexit gfb_remove(struct of_device *op)
+{
+        struct fb_info *info = dev_get_drvdata(&op->dev);
+        struct gfb_info *gp = info->par;
+
+        unregister_framebuffer(info);
+
+        iounmap(gp->fb_base);
+
+        of_iounmap(&op->resource[6], gp->fb_base, gp->fb_size);
+
+        framebuffer_release(info);
+
+        dev_set_drvdata(&op->dev, NULL);
+
+        return 0;
+}
+
+static const struct of_device_id gfb_match[] = {
+        {
+                .name = "SUNW,gfb",
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(of, ffb_match);
+
+static struct of_platform_driver gfb_driver = {
+        .name           = "gfb",
+        .match_table    = gfb_match,
+        .probe          = gfb_probe,
+        .remove         = __devexit_p(gfb_remove),
+};
+
+static int __init gfb_init(void)
+{
+        if (fb_get_options("gfb", NULL))
+                return -ENODEV;
+
+        return of_register_driver(&gfb_driver, &of_bus_type);
+}
+
+static void __exit gfb_exit(void)
+{
+        of_unregister_driver(&gfb_driver);
+}
+
+module_init(gfb_init);
+module_exit(gfb_exit);
+
+MODULE_DESCRIPTION("framebuffer driver for Sun XVR-1000 graphics");
+MODULE_AUTHOR("David S. Miller <davem@davemloft.net>");
+MODULE_VERSION("1.0");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/sunxvr2500.c b/drivers/video/sunxvr2500.c
index b1dde09e7015..5848436c19da 100644
--- a/drivers/video/sunxvr2500.c
+++ b/drivers/video/sunxvr2500.c
@@ -5,7 +5,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/slab.h>
 #include <linux/fb.h>
 #include <linux/pci.h>
 #include <linux/init.h>
diff --git a/drivers/video/sunxvr500.c b/drivers/video/sunxvr500.c
index 18b950706cad..b9c2b948d34d 100644
--- a/drivers/video/sunxvr500.c
+++ b/drivers/video/sunxvr500.c
@@ -5,7 +5,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/slab.h>
 #include <linux/fb.h>
 #include <linux/pci.h>
 #include <linux/init.h>
@@ -242,11 +241,27 @@ static int __devinit e3d_set_fbinfo(struct e3d_info *ep)
 static int __devinit e3d_pci_register(struct pci_dev *pdev,
                                       const struct pci_device_id *ent)
 {
+        struct device_node *of_node;
+        const char *device_type;
         struct fb_info *info;
         struct e3d_info *ep;
         unsigned int line_length;
         int err;
 
+        of_node = pci_device_to_OF_node(pdev);
+        if (!of_node) {
+                printk(KERN_ERR "e3d: Cannot find OF node of %s\n",
+                       pci_name(pdev));
+                return -ENODEV;
+        }
+
+        device_type = of_get_property(of_node, "device_type", NULL);
+        if (!device_type) {
+                printk(KERN_INFO "e3d: Ignoring secondary output device "
+                       "at %s\n", pci_name(pdev));
+                return -ENODEV;
+        }
+
         err = pci_enable_device(pdev);
         if (err < 0) {
                 printk(KERN_ERR "e3d: Cannot enable PCI device %s\n",
@@ -265,13 +280,7 @@ static int __devinit e3d_pci_register(struct pci_dev *pdev,
         ep->info = info;
         ep->pdev = pdev;
         spin_lock_init(&ep->lock);
-        ep->of_node = pci_device_to_OF_node(pdev);
-        if (!ep->of_node) {
-                printk(KERN_ERR "e3d: Cannot find OF node of %s\n",
-                       pci_name(pdev));
-                err = -ENODEV;
-                goto err_release_fb;
-        }
+        ep->of_node = of_node;
 
         /* Read the PCI base register of the frame buffer, which we
          * need in order to interpret the RAMDAC_VID_*FB* values in
@@ -400,6 +409,7 @@ static void __devexit e3d_pci_unregister(struct pci_dev *pdev)
 
 static struct pci_device_id e3d_pci_table[] = {
         {       PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x7a0),        },
+        {       PCI_DEVICE(0x1091, 0x7a0),                      },
         {       PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x7a2),        },
         {       .vendor = PCI_VENDOR_ID_3DLABS,
                 .device = PCI_ANY_ID,
diff --git a/drivers/video/svgalib.c b/drivers/video/svgalib.c
index 9c7106701572..fdb45674e2f6 100644
--- a/drivers/video/svgalib.c
+++ b/drivers/video/svgalib.c
@@ -15,7 +15,6 @@
 #include <linux/string.h>
 #include <linux/fb.h>
 #include <linux/svga.h>
-#include <linux/slab.h>
 #include <asm/types.h>
 #include <asm/io.h>
 
diff --git a/drivers/video/syscopyarea.c b/drivers/video/syscopyarea.c
index a352d5f46bbf..844a32fd38ed 100644
--- a/drivers/video/syscopyarea.c
+++ b/drivers/video/syscopyarea.c
@@ -16,7 +16,6 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/fb.h>
-#include <linux/slab.h>
 #include <asm/types.h>
 #include <asm/io.h>
 #include "fb_draw.h"
diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c
index 45b883598bf0..c0c2b18fcdcf 100644
--- a/drivers/video/tcx.c
+++ b/drivers/video/tcx.c
@@ -12,7 +12,6 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/fb.h>
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c
index ff43c8885028..980548390048 100644
--- a/drivers/video/tdfxfb.c
+++ b/drivers/video/tdfxfb.c
@@ -52,7 +52,7 @@
  *
  * 0.1.3 (released 1999-11-02)  added Attila's panning support, code
  *                              reorg, hwcursor address page size alignment
- *                              (for mmaping both frame buffer and regs),
+ *                              (for mmapping both frame buffer and regs),
  *                              and my changes to get rid of hardcoded
  *                              VGA i/o register locations (uses PCI
  *                              configuration info now)
diff --git a/drivers/video/tgafb.c b/drivers/video/tgafb.c
index a86046ff60ad..1b3b1c718e80 100644
--- a/drivers/video/tgafb.c
+++ b/drivers/video/tgafb.c
@@ -25,7 +25,6 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/selection.h>
-#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/tc.h>
 
diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c
index 03a9c35e9f55..c6c77562839d 100644
--- a/drivers/video/tridentfb.c
+++ b/drivers/video/tridentfb.c
@@ -19,6 +19,7 @@
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 
 #include <linux/delay.h>
 #include <video/vga.h>
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
index 54fbb2995a5f..7b8839ebf3c4 100644
--- a/drivers/video/uvesafb.c
+++ b/drivers/video/uvesafb.c
@@ -18,6 +18,7 @@
 #include <linux/fb.h>
 #include <linux/io.h>
 #include <linux/mutex.h>
+#include <linux/slab.h>
 #include <video/edid.h>
 #include <video/uvesafb.h>
 #ifdef CONFIG_X86
diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c
index 4bb9a0b18950..6b52bf65f0b5 100644
--- a/drivers/video/valkyriefb.c
+++ b/drivers/video/valkyriefb.c
@@ -69,7 +69,7 @@
 #ifdef CONFIG_MAC
 /* We don't yet have functions to read the PRAM... perhaps we can
    adapt them from the PPC code? */
-static int default_vmode = VMODE_640_480_67;
+static int default_vmode = VMODE_CHOOSE;
 static int default_cmode = CMODE_8;
 #else
 static int default_vmode = VMODE_NVRAM;
@@ -326,11 +326,11 @@ int __init valkyriefb_init(void)
 
 #ifdef CONFIG_MAC
         if (!MACH_IS_MAC)
-                return 0;
+                return -ENODEV;
         if (!(mac_bi_data.id == MAC_MODEL_Q630
               /* I'm not sure about this one */
             || mac_bi_data.id == MAC_MODEL_P588))
-                return 0;
+                return -ENODEV;
 
         /* Hardcoded addresses... welcome to 68k Macintosh country :-) */
         frame_buffer_phys = 0xf9000000;
diff --git a/drivers/video/valkyriefb.h b/drivers/video/valkyriefb.h
index 97aaf7bb6417..d787441e5a42 100644
--- a/drivers/video/valkyriefb.h
+++ b/drivers/video/valkyriefb.h
@@ -134,15 +134,7 @@ static struct valkyrie_regvals valkyrie_reg_init_14 = {
     { 1024, 0 },
         1024, 768
 };
-
-/* Register values for 800x600, 72Hz mode (11) */
-static struct valkyrie_regvals valkyrie_reg_init_11 = {
-    13,
-    { 17, 27, 3 },  /* pixel clock = 49.63MHz for V=71.66Hz */
-    { 800, 0 },
-        800, 600
-};
-#endif /* CONFIG_MAC */
+#endif /* !defined CONFIG_MAC */
 
 /* Register values for 832x624, 75Hz mode (13) */
 static struct valkyrie_regvals valkyrie_reg_init_13 = {
@@ -152,6 +144,14 @@ static struct valkyrie_regvals valkyrie_reg_init_13 = {
         832, 624
 };
 
+/* Register values for 800x600, 72Hz mode (11) */
+static struct valkyrie_regvals valkyrie_reg_init_11 = {
+    13,
+    { 17, 27, 3 },  /* pixel clock = 49.63MHz for V=71.66Hz */
+    { 800, 0 },
+        800, 600
+};
+
 /* Register values for 800x600, 60Hz mode (10) */
 static struct valkyrie_regvals valkyrie_reg_init_10 = {
     12,
@@ -188,24 +188,13 @@ static struct valkyrie_regvals *valkyrie_reg_init[VMODE_MAX] = {
         NULL,
         NULL,
         &valkyrie_reg_init_10,
-#ifdef CONFIG_MAC
-        NULL,
-        NULL,
-        &valkyrie_reg_init_13,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-#else
         &valkyrie_reg_init_11,
         NULL,
         &valkyrie_reg_init_13,
+#ifndef CONFIG_MAC
         &valkyrie_reg_init_14,
         &valkyrie_reg_init_15,
         NULL,
         &valkyrie_reg_init_17,
 #endif
-        NULL,
-        NULL,
-        NULL
 };
diff --git a/drivers/video/vermilion/vermilion.c b/drivers/video/vermilion/vermilion.c
index c18f1884b550..931a567f9aff 100644
--- a/drivers/video/vermilion/vermilion.c
+++ b/drivers/video/vermilion/vermilion.c
@@ -33,6 +33,7 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/delay.h>
+#include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/fb.h>
 #include <linux/pci.h>
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index bd37ee1f6a25..0cadf7aee27e 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -13,7 +13,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <linux/ioport.h>
@@ -477,7 +476,6 @@ err:
 }
 
 static struct platform_driver vesafb_driver = {
-        .probe  = vesafb_probe,
         .driver = {
                 .name   = "vesafb",
         },
@@ -493,20 +491,21 @@ static int __init vesafb_init(void)
         /* ignore error return of fb_get_options */
         fb_get_options("vesafb", &option);
         vesafb_setup(option);
-        ret = platform_driver_register(&vesafb_driver);
 
-        if (!ret) {
-                vesafb_device = platform_device_alloc("vesafb", 0);
+        vesafb_device = platform_device_alloc("vesafb", 0);
+        if (!vesafb_device)
+                return -ENOMEM;
 
-                if (vesafb_device)
-                        ret = platform_device_add(vesafb_device);
-                else
-                        ret = -ENOMEM;
+        ret = platform_device_add(vesafb_device);
+        if (!ret) {
+                ret = platform_driver_probe(&vesafb_driver, vesafb_probe);
+                if (ret)
+                        platform_device_del(vesafb_device);
+        }
 
-                if (ret) {
-                        platform_device_put(vesafb_device);
-                        platform_driver_unregister(&vesafb_driver);
-                }
+        if (ret) {
+                platform_device_put(vesafb_device);
+                vesafb_device = NULL;
         }
 
         return ret;
diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c
index 050d432c7d95..9b5532b4de35 100644
--- a/drivers/video/vfb.c
+++ b/drivers/video/vfb.c
@@ -15,7 +15,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -479,7 +478,7 @@ static int __init vfb_setup(char *options)
      *  Initialisation
      */
 
-static int __init vfb_probe(struct platform_device *dev)
+static int __devinit vfb_probe(struct platform_device *dev)
 {
         struct fb_info *info;
         int retval = -ENOMEM;
diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c
index 5b2938903ac2..bf638a47a5b3 100644
--- a/drivers/video/vga16fb.c
+++ b/drivers/video/vga16fb.c
@@ -15,7 +15,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <linux/ioport.h>
@@ -1293,7 +1292,7 @@ static int vga16fb_setup(char *options)
 }
 #endif
 
-static int __init vga16fb_probe(struct platform_device *dev)
+static int __devinit vga16fb_probe(struct platform_device *dev)
 {
         struct fb_info *info;
         struct vga16fb_par *par;
diff --git a/drivers/video/via/Makefile b/drivers/video/via/Makefile
index e533b4b6aba4..eeed238ad6a2 100644
--- a/drivers/video/via/Makefile
+++ b/drivers/video/via/Makefile
@@ -4,4 +4,4 @@
 
 obj-$(CONFIG_FB_VIA) += viafb.o
 
-viafb-y :=viafbdev.o hw.o iface.o  via_i2c.o dvi.o lcd.o ioctl.o accel.o via_utility.o vt1636.o global.o tblDPASetting.o viamode.o tbl1636.o
+viafb-y :=viafbdev.o hw.o via_i2c.o dvi.o lcd.o ioctl.o accel.o via_utility.o vt1636.o global.o tblDPASetting.o viamode.o tbl1636.o
diff --git a/drivers/video/via/accel.c b/drivers/video/via/accel.c
index 9d4f3a49ba4a..d5077dfa9e00 100644
--- a/drivers/video/via/accel.c
+++ b/drivers/video/via/accel.c
@@ -137,7 +137,7 @@ static int hw_bitblt_1(void __iomem *engine, u8 op, u32 width, u32 height,
                         tmp, dst_pitch);
                 return -EINVAL;
         }
-        tmp = (tmp >> 3) | (dst_pitch << (16 - 3));
+        tmp = VIA_PITCH_ENABLE | (tmp >> 3) | (dst_pitch << (16 - 3));
         writel(tmp, engine + 0x38);
 
         if (op == VIA_BITBLT_FILL)
@@ -352,6 +352,9 @@ int viafb_init_engine(struct fb_info *info)
         viapar->shared->vq_vram_addr = viapar->fbmem_free;
         viapar->fbmem_used += VQ_SIZE;
 
+        /* Init 2D engine reg to reset 2D engine */
+        writel(0x0, engine + VIA_REG_KEYCONTROL);
+
         /* Init AGP and VQ regs */
         switch (chip_name) {
         case UNICHROME_K8M890:
diff --git a/drivers/video/via/chip.h b/drivers/video/via/chip.h
index 474f428aea92..8c06bd3c0b4d 100644
--- a/drivers/video/via/chip.h
+++ b/drivers/video/via/chip.h
@@ -107,7 +107,6 @@
 struct tmds_chip_information {
         int tmds_chip_name;
         int tmds_chip_slave_addr;
-        int dvi_panel_id;
         int data_mode;
         int output_interface;
         int i2c_port;
@@ -142,14 +141,9 @@ struct tmds_setting_information {
         int iga_path;
         int h_active;
         int v_active;
-        int bpp;
-        int refresh_rate;
-        int get_dvi_size_method;
         int max_pixel_clock;
-        int dvi_panel_size;
-        int dvi_panel_hres;
-        int dvi_panel_vres;
-        int native_size;
+        int max_hres;
+        int max_vres;
 };
 
 struct lvds_setting_information {
@@ -160,7 +154,6 @@ struct lvds_setting_information {
         int refresh_rate;
         int get_lcd_size_method;
         int lcd_panel_id;
-        int lcd_panel_size;
         int lcd_panel_hres;
         int lcd_panel_vres;
         int display_method;
diff --git a/drivers/video/via/dvi.c b/drivers/video/via/dvi.c
index c5c32b6b6e6c..abe59b8c7a05 100644
--- a/drivers/video/via/dvi.c
+++ b/drivers/video/via/dvi.c
@@ -23,11 +23,10 @@
 static void tmds_register_write(int index, u8 data);
 static int tmds_register_read(int index);
 static int tmds_register_read_bytes(int index, u8 *buff, int buff_len);
-static int check_reduce_blanking_mode(int mode_index,
-        int refresh_rate);
-static int dvi_get_panel_size_from_DDCv1(void);
-static int dvi_get_panel_size_from_DDCv2(void);
-static unsigned char dvi_get_panel_info(void);
+static void dvi_get_panel_size_from_DDCv1(struct tmds_chip_information
+        *tmds_chip, struct tmds_setting_information *tmds_setting);
+static void dvi_get_panel_size_from_DDCv2(struct tmds_chip_information
+        *tmds_chip, struct tmds_setting_information *tmds_setting);
 static int viafb_dvi_query_EDID(void);
 
 static int check_tmds_chip(int device_id_subaddr, int device_id)
@@ -38,23 +37,24 @@ static int check_tmds_chip(int device_id_subaddr, int device_id)
                 return FAIL;
 }
 
-void viafb_init_dvi_size(void)
+void viafb_init_dvi_size(struct tmds_chip_information *tmds_chip,
+        struct tmds_setting_information *tmds_setting)
 {
         DEBUG_MSG(KERN_INFO "viafb_init_dvi_size()\n");
-        DEBUG_MSG(KERN_INFO
-                "viaparinfo->tmds_setting_info->get_dvi_size_method %d\n",
-                  viaparinfo->tmds_setting_info->get_dvi_size_method);
 
-        switch (viaparinfo->tmds_setting_info->get_dvi_size_method) {
-        case GET_DVI_SIZE_BY_SYSTEM_BIOS:
+        viafb_dvi_sense();
+        switch (viafb_dvi_query_EDID()) {
+        case 1:
+                dvi_get_panel_size_from_DDCv1(tmds_chip, tmds_setting);
                 break;
-        case GET_DVI_SZIE_BY_HW_STRAPPING:
+        case 2:
+                dvi_get_panel_size_from_DDCv2(tmds_chip, tmds_setting);
                 break;
-        case GET_DVI_SIZE_BY_VGA_BIOS:
         default:
-                dvi_get_panel_info();
+                printk(KERN_WARNING "viafb_init_dvi_size: DVI panel size undetected!\n");
                 break;
         }
+
         return;
 }
 
@@ -189,42 +189,14 @@ static int tmds_register_read_bytes(int index, u8 *buff, int buff_len)
         return 0;
 }
 
-static int check_reduce_blanking_mode(int mode_index,
-        int refresh_rate)
-{
-        if (refresh_rate != 60)
-                return false;
-
-        switch (mode_index) {
-                /* Following modes have reduce blanking mode. */
-        case VIA_RES_1360X768:
-        case VIA_RES_1400X1050:
-        case VIA_RES_1440X900:
-        case VIA_RES_1600X900:
-        case VIA_RES_1680X1050:
-        case VIA_RES_1920X1080:
-        case VIA_RES_1920X1200:
-                break;
-
-        default:
-                DEBUG_MSG(KERN_INFO
-                          "This dvi mode %d have no reduce blanking mode!\n",
-                          mode_index);
-                return false;
-        }
-
-        return true;
-}
-
 /* DVI Set Mode */
-void viafb_dvi_set_mode(int video_index, int mode_bpp, int set_iga)
+void viafb_dvi_set_mode(struct VideoModeTable *mode, int mode_bpp,
+        int set_iga)
 {
-        struct VideoModeTable *videoMode = NULL;
+        struct VideoModeTable *rb_mode;
         struct crt_mode_table *pDviTiming;
         unsigned long desirePixelClock, maxPixelClock;
-        int status = 0;
-        videoMode = viafb_get_modetbl_pointer(video_index);
-        pDviTiming = videoMode->crtc;
+        pDviTiming = mode->crtc;
         desirePixelClock = pDviTiming->clk / 1000000;
         maxPixelClock = (unsigned long)viaparinfo->
                 tmds_setting_info->max_pixel_clock;
@@ -232,20 +204,14 @@ void viafb_dvi_set_mode(int video_index, int mode_bpp, int set_iga)
         DEBUG_MSG(KERN_INFO "\nDVI_set_mode!!\n");
 
         if ((maxPixelClock != 0) && (desirePixelClock > maxPixelClock)) {
-                /*Check if reduce-blanking mode is exist */
-                status =
-                    check_reduce_blanking_mode(video_index,
-                                               pDviTiming->refresh_rate);
-                if (status) {
-                        video_index += 100;     /*Use reduce-blanking mode */
-                        videoMode = viafb_get_modetbl_pointer(video_index);
-                        pDviTiming = videoMode->crtc;
-                        DEBUG_MSG(KERN_INFO
-                                  "DVI use reduce blanking mode %d!!\n",
-                                  video_index);
+                rb_mode = viafb_get_rb_mode(mode->crtc[0].crtc.hor_addr,
+                        mode->crtc[0].crtc.ver_addr);
+                if (rb_mode) {
+                        mode = rb_mode;
+                        pDviTiming = rb_mode->crtc;
                 }
         }
-        viafb_fill_crtc_timing(pDviTiming, video_index, mode_bpp / 8, set_iga);
+        viafb_fill_crtc_timing(pDviTiming, mode, mode_bpp / 8, set_iga);
         viafb_set_output_path(DEVICE_DVI, set_iga,
                         viaparinfo->chip_info->tmds_chip_info.output_interface);
 }
@@ -350,25 +316,18 @@ static int viafb_dvi_query_EDID(void)
                 return false;
 }
 
-/*
- *
- * int dvi_get_panel_size_from_DDCv1(void)
- *
- *     - Get Panel Size Using EDID1 Table
- *
- * Return Type:    int
- *
- */
-static int dvi_get_panel_size_from_DDCv1(void)
+/* Get Panel Size Using EDID1 Table */
+static void dvi_get_panel_size_from_DDCv1(struct tmds_chip_information
+        *tmds_chip, struct tmds_setting_information *tmds_setting)
 {
-        int i, max_h = 0, max_v = 0, tmp, restore;
+        int i, max_h = 0, tmp, restore;
         unsigned char rData;
         unsigned char EDID_DATA[18];
 
         DEBUG_MSG(KERN_INFO "\n dvi_get_panel_size_from_DDCv1 \n");
 
-        restore = viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr;
-        viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr = 0xA0;
+        restore = tmds_chip->tmds_chip_slave_addr;
+        tmds_chip->tmds_chip_slave_addr = 0xA0;
 
         rData = tmds_register_read(0x23);
         if (rData & 0x3C)
@@ -414,8 +373,8 @@ static int dvi_get_panel_size_from_DDCv1(void)
                                 /* The first two byte must be zero. */
                                 if (EDID_DATA[3] == 0xFD) {
                                         /* To get max pixel clock. */
-                                        viaparinfo->tmds_setting_info->
-                                        max_pixel_clock = EDID_DATA[9] * 10;
+                                        tmds_setting->max_pixel_clock =
+                                                EDID_DATA[9] * 10;
                                 }
                         }
                         break;
@@ -425,154 +384,88 @@ static int dvi_get_panel_size_from_DDCv1(void)
                 }
         }
 
+        tmds_setting->max_hres = max_h;
         switch (max_h) {
         case 640:
-                viaparinfo->tmds_setting_info->dvi_panel_size =
-                        VIA_RES_640X480;
+                tmds_setting->max_vres = 480;
                 break;
         case 800:
-                viaparinfo->tmds_setting_info->dvi_panel_size =
-                        VIA_RES_800X600;
+                tmds_setting->max_vres = 600;
                 break;
         case 1024:
-                viaparinfo->tmds_setting_info->dvi_panel_size =
-                        VIA_RES_1024X768;
+                tmds_setting->max_vres = 768;
                 break;
         case 1280:
-                viaparinfo->tmds_setting_info->dvi_panel_size =
-                        VIA_RES_1280X1024;
+                tmds_setting->max_vres = 1024;
                 break;
         case 1400:
-                viaparinfo->tmds_setting_info->dvi_panel_size =
-                        VIA_RES_1400X1050;
+                tmds_setting->max_vres = 1050;
                 break;
         case 1440:
-                viaparinfo->tmds_setting_info->dvi_panel_size =
-                        VIA_RES_1440X1050;
+                tmds_setting->max_vres = 1050;
                 break;
         case 1600:
-                viaparinfo->tmds_setting_info->dvi_panel_size =
-                        VIA_RES_1600X1200;
+                tmds_setting->max_vres = 1200;
                 break;
         case 1920:
-                if (max_v == 1200) {
-                        viaparinfo->tmds_setting_info->dvi_panel_size =
-                                VIA_RES_1920X1200;
-                } else {
-                        viaparinfo->tmds_setting_info->dvi_panel_size =
-                                VIA_RES_1920X1080;
-                }
-
+                tmds_setting->max_vres = 1080;
                 break;
         default:
-                viaparinfo->tmds_setting_info->dvi_panel_size =
-                        VIA_RES_1024X768;
-                DEBUG_MSG(KERN_INFO "Unknow panel size max resolution = %d !\
-                                         set default panel size.\n", max_h);
+                DEBUG_MSG(KERN_INFO "Unknown panel size max resolution = %d ! "
+                                         "set default panel size.\n", max_h);
                 break;
         }
 
         DEBUG_MSG(KERN_INFO "DVI max pixelclock = %d\n",
-                  viaparinfo->tmds_setting_info->max_pixel_clock);
-        viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr = restore;
-        return viaparinfo->tmds_setting_info->dvi_panel_size;
+                tmds_setting->max_pixel_clock);
+        tmds_chip->tmds_chip_slave_addr = restore;
 }
 
-/*
- *
- * int dvi_get_panel_size_from_DDCv2(void)
- *
- *     - Get Panel Size Using EDID2 Table
- *
- * Return Type:    int
- *
- */
-static int dvi_get_panel_size_from_DDCv2(void)
+/* Get Panel Size Using EDID2 Table */
+static void dvi_get_panel_size_from_DDCv2(struct tmds_chip_information
+        *tmds_chip, struct tmds_setting_information *tmds_setting)
 {
-        int HSize = 0, restore;
+        int restore;
         unsigned char R_Buffer[2];
 
         DEBUG_MSG(KERN_INFO "\n dvi_get_panel_size_from_DDCv2 \n");
 
-        restore = viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr;
-        viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr = 0xA2;
+        restore = tmds_chip->tmds_chip_slave_addr;
+        tmds_chip->tmds_chip_slave_addr = 0xA2;
 
         /* Horizontal: 0x76, 0x77 */
         tmds_register_read_bytes(0x76, R_Buffer, 2);
-        HSize = R_Buffer[0];
-        HSize += R_Buffer[1] << 8;
+        tmds_setting->max_hres = R_Buffer[0] + (R_Buffer[1] << 8);
 
-        switch (HSize) {
+        switch (tmds_setting->max_hres) {
         case 640:
-                viaparinfo->tmds_setting_info->dvi_panel_size =
-                        VIA_RES_640X480;
+                tmds_setting->max_vres = 480;
                 break;
         case 800:
-                viaparinfo->tmds_setting_info->dvi_panel_size =
-                        VIA_RES_800X600;
+                tmds_setting->max_vres = 600;
                 break;
         case 1024:
-                viaparinfo->tmds_setting_info->dvi_panel_size =
-                        VIA_RES_1024X768;
+                tmds_setting->max_vres = 768;
                 break;
         case 1280:
-                viaparinfo->tmds_setting_info->dvi_panel_size =
-                        VIA_RES_1280X1024;
+                tmds_setting->max_vres = 1024;
                 break;
         case 1400:
-                viaparinfo->tmds_setting_info->dvi_panel_size =
-                        VIA_RES_1400X1050;
+                tmds_setting->max_vres = 1050;
                 break;
         case 1440:
-                viaparinfo->tmds_setting_info->dvi_panel_size =
-                        VIA_RES_1440X1050;
+                tmds_setting->max_vres = 1050;
                 break;
         case 1600:
-                viaparinfo->tmds_setting_info->dvi_panel_size =
-                        VIA_RES_1600X1200;
-                break;
-        default:
-                viaparinfo->tmds_setting_info->dvi_panel_size =
-                        VIA_RES_1024X768;
-                DEBUG_MSG(KERN_INFO "Unknow panel size max resolution = %d!\
-                                        set default panel size.\n", HSize);
-                break;
-        }
-
-        viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr = restore;
-        return viaparinfo->tmds_setting_info->dvi_panel_size;
-}
-
-/*
- *
- * unsigned char dvi_get_panel_info(void)
- *
- *     - Get Panel Size
- *
- * Return Type:    unsigned char
- */
-static unsigned char dvi_get_panel_info(void)
-{
-        unsigned char dvipanelsize;
-        DEBUG_MSG(KERN_INFO "dvi_get_panel_info! \n");
-
-        viafb_dvi_sense();
-        switch (viafb_dvi_query_EDID()) {
-        case 1:
-                dvi_get_panel_size_from_DDCv1();
-                break;
-        case 2:
-                dvi_get_panel_size_from_DDCv2();
+                tmds_setting->max_vres = 1200;
                 break;
         default:
+                DEBUG_MSG(KERN_INFO "Unknown panel size max resolution = %d! "
+                        "set default panel size.\n", tmds_setting->max_hres);
                 break;
         }
 
-        DEBUG_MSG(KERN_INFO "dvi panel size is %2d \n",
-                  viaparinfo->tmds_setting_info->dvi_panel_size);
-        dvipanelsize = (unsigned char)(viaparinfo->
-                tmds_setting_info->dvi_panel_size);
-        return dvipanelsize;
+        tmds_chip->tmds_chip_slave_addr = restore;
 }
 
 /* If Disable DVI, turn off pad */
diff --git a/drivers/video/via/dvi.h b/drivers/video/via/dvi.h
index e1ec37fb0dc3..0dffcfd395f3 100644
--- a/drivers/video/via/dvi.h
+++ b/drivers/video/via/dvi.h
@@ -53,12 +53,13 @@
 #define     DEV_CONNECT_DVI     0x01
 #define     DEV_CONNECT_HDMI    0x02
 
-struct VideoModeTable *viafb_get_cea_mode_tbl_pointer(int Index);
 int viafb_dvi_sense(void);
 void viafb_dvi_disable(void);
 void viafb_dvi_enable(void);
 int viafb_tmds_trasmitter_identify(void);
-void viafb_init_dvi_size(void);
-void viafb_dvi_set_mode(int video_index, int mode_bpp, int set_iga);
+void viafb_init_dvi_size(struct tmds_chip_information *tmds_chip,
+        struct tmds_setting_information *tmds_setting);
+void viafb_dvi_set_mode(struct VideoModeTable *videoMode, int mode_bpp,
+        int set_iga);
 
 #endif /* __DVI_H__ */
diff --git a/drivers/video/via/global.c b/drivers/video/via/global.c
index b675cdbb03ad..1ee511b73307 100644
--- a/drivers/video/via/global.c
+++ b/drivers/video/via/global.c
@@ -23,15 +23,12 @@ int viafb_platform_epia_dvi = STATE_OFF;
 int viafb_device_lcd_dualedge = STATE_OFF;
 int viafb_bus_width = 12;
 int viafb_display_hardware_layout = HW_LAYOUT_LCD_DVI;
-int viafb_memsize;
 int viafb_DeviceStatus = CRT_Device;
 int viafb_hotplug;
 int viafb_refresh = 60;
 int viafb_refresh1 = 60;
 int viafb_lcd_dsp_method = LCD_EXPANDSION;
 int viafb_lcd_mode = LCD_OPENLDI;
-int viafb_bpp = 32;
-int viafb_bpp1 = 32;
 int viafb_CRT_ON = 1;
 int viafb_DVI_ON;
 int viafb_LCD_ON ;
@@ -42,8 +39,6 @@ int viafb_hotplug_Xres = 640;
 int viafb_hotplug_Yres = 480;
 int viafb_hotplug_bpp = 32;
 int viafb_hotplug_refresh = 60;
-unsigned int viafb_second_offset;
-int viafb_second_size;
 int viafb_primary_dev = None_Device;
 unsigned int viafb_second_xres = 640;
 unsigned int viafb_second_yres = 480;
diff --git a/drivers/video/via/global.h b/drivers/video/via/global.h
index d69d0ca99c2f..8d95d5fd1388 100644
--- a/drivers/video/via/global.h
+++ b/drivers/video/via/global.h
@@ -35,7 +35,6 @@
 
 #include "debug.h"
 
-#include "iface.h"
 #include "viafbdev.h"
 #include "chip.h"
 #include "accel.h"
@@ -68,8 +67,6 @@ extern int viafb_refresh;
 extern int viafb_refresh1;
 extern int viafb_lcd_dsp_method;
 extern int viafb_lcd_mode;
-extern int viafb_bpp;
-extern int viafb_bpp1;
 
 extern int viafb_CRT_ON;
 extern int viafb_hotplug_Xres;
diff --git a/drivers/video/via/hw.c b/drivers/video/via/hw.c
index 3e083ff67ae2..f2583b1b527f 100644
--- a/drivers/video/via/hw.c
+++ b/drivers/video/via/hw.c
@@ -524,7 +524,6 @@ static void dvi_patch_skew_dvp1(void);
 static void dvi_patch_skew_dvp_low(void);
 static void set_dvi_output_path(int set_iga, int output_interface);
 static void set_lcd_output_path(int set_iga, int output_interface);
-static int search_mode_setting(int ModeInfoIndex);
 static void load_fix_bit_crtc_reg(void);
 static void init_gfx_chip_info(struct pci_dev *pdev,
                                 const struct pci_device_id *pdi);
@@ -686,6 +685,84 @@ void viafb_set_secondary_pitch(u32 pitch)
         viafb_write_reg_mask(0x71, VIACR, (pitch >> (10 - 7)) & 0x80, 0x80);
 }
 
+void viafb_set_primary_color_depth(u8 depth)
+{
+        u8 value;
+
+        DEBUG_MSG(KERN_DEBUG "viafb_set_primary_color_depth(%d)\n", depth);
+        switch (depth) {
+        case 8:
+                value = 0x00;
+                break;
+        case 15:
+                value = 0x04;
+                break;
+        case 16:
+                value = 0x14;
+                break;
+        case 24:
+                value = 0x0C;
+                break;
+        case 30:
+                value = 0x08;
+                break;
+        default:
+                printk(KERN_WARNING "viafb_set_primary_color_depth: "
+                        "Unsupported depth: %d\n", depth);
+                return;
+        }
+
+        viafb_write_reg_mask(0x15, VIASR, value, 0x1C);
+}
+
+void viafb_set_secondary_color_depth(u8 depth)
+{
+        u8 value;
+
+        DEBUG_MSG(KERN_DEBUG "viafb_set_secondary_color_depth(%d)\n", depth);
+        switch (depth) {
+        case 8:
+                value = 0x00;
+                break;
+        case 16:
+                value = 0x40;
+                break;
+        case 24:
+                value = 0xC0;
+                break;
+        case 30:
+                value = 0x80;
+                break;
+        default:
+                printk(KERN_WARNING "viafb_set_secondary_color_depth: "
+                        "Unsupported depth: %d\n", depth);
+                return;
+        }
+
+        viafb_write_reg_mask(0x67, VIACR, value, 0xC0);
+}
+
+static void set_color_register(u8 index, u8 red, u8 green, u8 blue)
+{
+        outb(0xFF, 0x3C6); /* bit mask of palette */
+        outb(index, 0x3C8);
+        outb(red, 0x3C9);
+        outb(green, 0x3C9);
+        outb(blue, 0x3C9);
+}
+
+void viafb_set_primary_color_register(u8 index, u8 red, u8 green, u8 blue)
+{
+        viafb_write_reg_mask(0x1A, VIASR, 0x00, 0x01);
+        set_color_register(index, red, green, blue);
+}
+
+void viafb_set_secondary_color_register(u8 index, u8 red, u8 green, u8 blue)
+{
+        viafb_write_reg_mask(0x1A, VIASR, 0x01, 0x01);
+        set_color_register(index, red, green, blue);
+}
+
 void viafb_set_output_path(int device, int set_iga, int output_interface)
 {
         switch (device) {
@@ -710,11 +787,8 @@ static void set_crt_output_path(int set_iga)
                 viafb_write_reg_mask(SR16, VIASR, 0x00, BIT6);
                 break;
         case IGA2:
-        case IGA1_IGA2:
                 viafb_write_reg_mask(CR6A, VIACR, 0xC0, BIT6 + BIT7);
                 viafb_write_reg_mask(SR16, VIASR, 0x40, BIT6);
-                if (set_iga == IGA1_IGA2)
-                        viafb_write_reg_mask(CR6B, VIACR, 0x08, BIT3);
                 break;
         }
 }
@@ -904,13 +978,6 @@ static void set_lcd_output_path(int set_iga, int output_interface)
 
                 enable_second_display_channel();
                 break;
-
-        case IGA1_IGA2:
-                viafb_write_reg_mask(CR6B, VIACR, 0x08, BIT3);
-                viafb_write_reg_mask(CR6A, VIACR, 0x08, BIT3);
-
-                disable_second_display_channel();
-                break;
         }
 
         switch (output_interface) {
@@ -987,49 +1054,6 @@ static void set_lcd_output_path(int set_iga, int output_interface)
         }
 }
 
-/* Search Mode Index */
-static int search_mode_setting(int ModeInfoIndex)
-{
-        int i = 0;
-
-        while ((i < NUM_TOTAL_MODETABLE) &&
-                        (ModeInfoIndex != CLE266Modes[i].ModeIndex))
-                i++;
-        if (i >= NUM_TOTAL_MODETABLE)
-                i = 0;
-        return i;
-
-}
-
-struct VideoModeTable *viafb_get_modetbl_pointer(int Index)
-{
-        struct VideoModeTable *TmpTbl = NULL;
-        TmpTbl = &CLE266Modes[search_mode_setting(Index)];
-        return TmpTbl;
-}
-
-struct VideoModeTable *viafb_get_cea_mode_tbl_pointer(int Index)
-{
-        struct VideoModeTable *TmpTbl = NULL;
-        int i = 0;
-        while ((i < NUM_TOTAL_CEA_MODES) &&
-                        (Index != CEA_HDMI_Modes[i].ModeIndex))
-                i++;
-        if ((i < NUM_TOTAL_CEA_MODES))
-                TmpTbl = &CEA_HDMI_Modes[i];
-         else {
-                /*Still use general timing if don't find CEA timing */
-                i = 0;
-                while ((i < NUM_TOTAL_MODETABLE) &&
-                                (Index != CLE266Modes[i].ModeIndex))
-                       i++;
-                if (i >= NUM_TOTAL_MODETABLE)
-                        i = 0;
-                TmpTbl = &CLE266Modes[i];
-        }
-        return TmpTbl;
-}
-
 static void load_fix_bit_crtc_reg(void)
 {
         /* always set to 1 */
@@ -1121,15 +1145,13 @@ void viafb_load_fetch_count_reg(int h_addr, int bpp_byte, int set_iga)
         struct io_register *reg = NULL;
 
         switch (set_iga) {
-        case IGA1_IGA2:
         case IGA1:
                 reg_value = IGA1_FETCH_COUNT_FORMULA(h_addr, bpp_byte);
                 viafb_load_reg_num = fetch_count_reg.
                         iga1_fetch_count_reg.reg_num;
                 reg = fetch_count_reg.iga1_fetch_count_reg.reg;
                 viafb_load_reg(reg_value, viafb_load_reg_num, reg, VIASR);
-                if (set_iga == IGA1)
-                        break;
+                break;
         case IGA2:
                 reg_value = IGA2_FETCH_COUNT_FORMULA(h_addr, bpp_byte);
                 viafb_load_reg_num = fetch_count_reg.
@@ -1499,7 +1521,7 @@ void viafb_set_vclock(u32 CLK, int set_iga)
         /* H.W. Reset : ON */
         viafb_write_reg_mask(CR17, VIACR, 0x00, BIT7);
 
-        if ((set_iga == IGA1) || (set_iga == IGA1_IGA2)) {
+        if (set_iga == IGA1) {
                 /* Change D,N FOR VCLK */
                 switch (viaparinfo->chip_info->gfx_chip_name) {
                 case UNICHROME_CLE266:
@@ -1528,7 +1550,7 @@ void viafb_set_vclock(u32 CLK, int set_iga)
                 }
         }
 
-        if ((set_iga == IGA2) || (set_iga == IGA1_IGA2)) {
+        if (set_iga == IGA2) {
                 /* Change D,N FOR LCK */
                 switch (viaparinfo->chip_info->gfx_chip_name) {
                 case UNICHROME_CLE266:
@@ -1557,12 +1579,12 @@ void viafb_set_vclock(u32 CLK, int set_iga)
         viafb_write_reg_mask(CR17, VIACR, 0x80, BIT7);
 
         /* Reset PLL */
-        if ((set_iga == IGA1) || (set_iga == IGA1_IGA2)) {
+        if (set_iga == IGA1) {
                 viafb_write_reg_mask(SR40, VIASR, 0x02, BIT1);
                 viafb_write_reg_mask(SR40, VIASR, 0x00, BIT1);
         }
 
-        if ((set_iga == IGA2) || (set_iga == IGA1_IGA2)) {
+        if (set_iga == IGA2) {
                 viafb_write_reg_mask(SR40, VIASR, 0x01, BIT0);
                 viafb_write_reg_mask(SR40, VIASR, 0x00, BIT0);
         }
@@ -1805,47 +1827,15 @@ void viafb_load_crtc_timing(struct display_timing device_timing,
         viafb_lock_crt();
 }
 
-void viafb_set_color_depth(int bpp_byte, int set_iga)
-{
-        if (set_iga == IGA1) {
-                switch (bpp_byte) {
-                case MODE_8BPP:
-                        viafb_write_reg_mask(SR15, VIASR, 0x22, 0x7E);
-                        break;
-                case MODE_16BPP:
-                        viafb_write_reg_mask(SR15, VIASR, 0xB6, 0xFE);
-                        break;
-                case MODE_32BPP:
-                        viafb_write_reg_mask(SR15, VIASR, 0xAE, 0xFE);
-                        break;
-                }
-        } else {
-                switch (bpp_byte) {
-                case MODE_8BPP:
-                        viafb_write_reg_mask(CR67, VIACR, 0x00, BIT6 + BIT7);
-                        break;
-                case MODE_16BPP:
-                        viafb_write_reg_mask(CR67, VIACR, 0x40, BIT6 + BIT7);
-                        break;
-                case MODE_32BPP:
-                        viafb_write_reg_mask(CR67, VIACR, 0xC0, BIT6 + BIT7);
-                        break;
-                }
-        }
-}
-
 void viafb_fill_crtc_timing(struct crt_mode_table *crt_table,
-        int mode_index, int bpp_byte, int set_iga)
+        struct VideoModeTable *video_mode, int bpp_byte, int set_iga)
 {
-        struct VideoModeTable *video_mode;
         struct display_timing crt_reg;
         int i;
         int index = 0;
         int h_addr, v_addr;
         u32 pll_D_N;
 
-        video_mode = &CLE266Modes[search_mode_setting(mode_index)];
-
         for (i = 0; i < video_mode->mode_array; i++) {
                 index = i;
 
@@ -1858,8 +1848,10 @@ void viafb_fill_crtc_timing(struct crt_mode_table *crt_table,
 
         /* Mode 640x480 has border, but LCD/DFP didn't have border. */
         /* So we would delete border. */
-        if ((viafb_LCD_ON | viafb_DVI_ON) && (mode_index == VIA_RES_640X480)
-            && (viaparinfo->crt_setting_info->refresh_rate == 60)) {
+        if ((viafb_LCD_ON | viafb_DVI_ON)
+            && video_mode->crtc[0].crtc.hor_addr == 640
+            && video_mode->crtc[0].crtc.ver_addr == 480
+            && viaparinfo->crt_setting_info->refresh_rate == 60) {
                 /* The border is 8 pixels. */
                 crt_reg.hor_blank_start = crt_reg.hor_blank_start - 8;
 
@@ -1912,9 +1904,6 @@ void viafb_fill_crtc_timing(struct crt_mode_table *crt_table,
             && (viaparinfo->chip_info->gfx_chip_name != UNICHROME_K400))
                 viafb_load_FIFO_reg(set_iga, h_addr, v_addr);
 
-        /* load SR Register About Memory and Color part */
-        viafb_set_color_depth(bpp_byte, set_iga);
-
         pll_D_N = viafb_get_clk_value(crt_table[index].clk);
         DEBUG_MSG(KERN_INFO "PLL=%x", pll_D_N);
         viafb_set_vclock(pll_D_N, set_iga);
@@ -1956,9 +1945,6 @@ void viafb_update_device_setting(int hres, int vres,
 
                 viaparinfo->tmds_setting_info->h_active = hres;
                 viaparinfo->tmds_setting_info->v_active = vres;
-                viaparinfo->tmds_setting_info->bpp = bpp;
-                viaparinfo->tmds_setting_info->refresh_rate =
-                        vmode_refresh;
 
                 viaparinfo->lvds_setting_info->h_active = hres;
                 viaparinfo->lvds_setting_info->v_active = vres;
@@ -1975,9 +1961,6 @@ void viafb_update_device_setting(int hres, int vres,
                 if (viaparinfo->tmds_setting_info->iga_path == IGA2) {
                         viaparinfo->tmds_setting_info->h_active = hres;
                         viaparinfo->tmds_setting_info->v_active = vres;
-                        viaparinfo->tmds_setting_info->bpp = bpp;
-                        viaparinfo->tmds_setting_info->refresh_rate =
-                                vmode_refresh;
                 }
 
                 if (viaparinfo->lvds_setting_info->iga_path == IGA2) {
@@ -2076,9 +2059,8 @@ static void init_tmds_chip_info(void)
 
         DEBUG_MSG(KERN_INFO "TMDS Chip = %d\n",
                   viaparinfo->chip_info->tmds_chip_info.tmds_chip_name);
-        viaparinfo->tmds_setting_info->get_dvi_size_method =
-                GET_DVI_SIZE_BY_VGA_BIOS;
-        viafb_init_dvi_size();
+        viafb_init_dvi_size(&viaparinfo->shared->chip_info.tmds_chip_info,
+                &viaparinfo->shared->tmds_setting_info);
 }
 
 static void init_lvds_chip_info(void)
@@ -2195,28 +2177,19 @@ static void set_display_channel(void)
         }
 }
 
-int viafb_setmode(int vmode_index, int hor_res, int ver_res, int video_bpp,
-        int vmode_index1, int hor_res1, int ver_res1, int video_bpp1)
+int viafb_setmode(struct VideoModeTable *vmode_tbl, int video_bpp,
+        struct VideoModeTable *vmode_tbl1, int video_bpp1)
 {
         int i, j;
         int port;
         u8 value, index, mask;
-        struct VideoModeTable *vmode_tbl;
         struct crt_mode_table *crt_timing;
-        struct VideoModeTable *vmode_tbl1 = NULL;
         struct crt_mode_table *crt_timing1 = NULL;
 
-        DEBUG_MSG(KERN_INFO "Set Mode!!\n");
-        DEBUG_MSG(KERN_INFO
-                  "vmode_index=%d hor_res=%d ver_res=%d video_bpp=%d\n",
-                  vmode_index, hor_res, ver_res, video_bpp);
-
         device_screen_off();
-        vmode_tbl = &CLE266Modes[search_mode_setting(vmode_index)];
         crt_timing = vmode_tbl->crtc;
 
         if (viafb_SAMM_ON == 1) {
-                vmode_tbl1 = &CLE266Modes[search_mode_setting(vmode_index1)];
                 crt_timing1 = vmode_tbl1->crtc;
         }
 
@@ -2267,12 +2240,11 @@ int viafb_setmode(int vmode_index, int hor_res, int ver_res, int video_bpp,
                 outb(VPIT.SR[i - 1], VIASR + 1);
         }
 
-        viafb_set_primary_address(0);
-        viafb_set_secondary_address(viafb_SAMM_ON ? viafb_second_offset : 0);
+        viafb_write_reg_mask(0x15, VIASR, 0xA2, 0xA2);
         viafb_set_iga_path();
 
         /* Write CRTC */
-        viafb_fill_crtc_timing(crt_timing, vmode_index, video_bpp / 8, IGA1);
+        viafb_fill_crtc_timing(crt_timing, vmode_tbl, video_bpp / 8, IGA1);
 
         /* Write Graphic Controller */
         for (i = 0; i < StdGR; i++) {
@@ -2292,65 +2264,25 @@ int viafb_setmode(int vmode_index, int hor_res, int ver_res, int video_bpp,
 
         /* Update Patch Register */
 
-        if ((viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266)
-            || (viaparinfo->chip_info->gfx_chip_name == UNICHROME_K400)) {
-                for (i = 0; i < NUM_TOTAL_PATCH_MODE; i++) {
-                        if (res_patch_table[i].mode_index == vmode_index) {
-                                for (j = 0;
-                                     j < res_patch_table[i].table_length; j++) {
-                                        index =
-                                            res_patch_table[i].
-                                            io_reg_table[j].index;
-                                        port =
-                                            res_patch_table[i].
-                                            io_reg_table[j].port;
-                                        value =
-                                            res_patch_table[i].
-                                            io_reg_table[j].value;
-                                        mask =
-                                            res_patch_table[i].
-                                            io_reg_table[j].mask;
-                                        viafb_write_reg_mask(index, port, value,
-                                                       mask);
-                                }
-                        }
-                }
-        }
-
-        if (viafb_SAMM_ON == 1) {
-                if ((viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266)
-                    || (viaparinfo->chip_info->gfx_chip_name ==
-                    UNICHROME_K400)) {
-                        for (i = 0; i < NUM_TOTAL_PATCH_MODE; i++) {
-                                if (res_patch_table[i].mode_index ==
-                                    vmode_index1) {
-                                        for (j = 0;
-                                             j <
-                                             res_patch_table[i].
-                                             table_length; j++) {
-                                                index =
-                                                    res_patch_table[i].
-                                                    io_reg_table[j].index;
-                                                port =
-                                                    res_patch_table[i].
-                                                    io_reg_table[j].port;
-                                                value =
-                                                    res_patch_table[i].
-                                                    io_reg_table[j].value;
-                                                mask =
-                                                    res_patch_table[i].
-                                                    io_reg_table[j].mask;
-                                                viafb_write_reg_mask(index,
-                                                        port, value, mask);
-                                        }
-                                }
-                        }
+        if ((viaparinfo->chip_info->gfx_chip_name == UNICHROME_CLE266
+            || viaparinfo->chip_info->gfx_chip_name == UNICHROME_K400)
+            && vmode_tbl->crtc[0].crtc.hor_addr == 1024
+            && vmode_tbl->crtc[0].crtc.ver_addr == 768) {
+                for (j = 0; j < res_patch_table[0].table_length; j++) {
+                        index = res_patch_table[0].io_reg_table[j].index;
+                        port = res_patch_table[0].io_reg_table[j].port;
+                        value = res_patch_table[0].io_reg_table[j].value;
+                        mask = res_patch_table[0].io_reg_table[j].mask;
+                        viafb_write_reg_mask(index, port, value, mask);
                 }
         }
 
         viafb_set_primary_pitch(viafbinfo->fix.line_length);
         viafb_set_secondary_pitch(viafb_dual_fb ? viafbinfo1->fix.line_length
                 : viafbinfo->fix.line_length);
+        viafb_set_primary_color_depth(viaparinfo->depth);
+        viafb_set_secondary_color_depth(viafb_dual_fb ? viaparinfo1->depth
+                : viaparinfo->depth);
         /* Update Refresh Rate Setting */
 
         /* Clear On Screen */
@@ -2359,11 +2291,11 @@ int viafb_setmode(int vmode_index, int hor_res, int ver_res, int video_bpp,
         if (viafb_CRT_ON) {
                 if (viafb_SAMM_ON && (viaparinfo->crt_setting_info->iga_path ==
                         IGA2)) {
-                        viafb_fill_crtc_timing(crt_timing1, vmode_index1,
+                        viafb_fill_crtc_timing(crt_timing1, vmode_tbl1,
                                 video_bpp1 / 8,
                                 viaparinfo->crt_setting_info->iga_path);
                 } else {
-                        viafb_fill_crtc_timing(crt_timing, vmode_index,
+                        viafb_fill_crtc_timing(crt_timing, vmode_tbl,
                                 video_bpp / 8,
                                 viaparinfo->crt_setting_info->iga_path);
                 }
@@ -2373,7 +2305,7 @@ int viafb_setmode(int vmode_index, int hor_res, int ver_res, int video_bpp,
                 /* Patch if set_hres is not 8 alignment (1366) to viafb_setmode
                 to 8 alignment (1368),there is several pixels (2 pixels)
                 on right side of screen. */
-                if (hor_res % 8) {
+                if (vmode_tbl->crtc[0].crtc.hor_addr % 8) {
                         viafb_unlock_crt();
                         viafb_write_reg(CR02, VIACR,
                                 viafb_read_reg(VIACR, CR02) - 1);
@@ -2384,14 +2316,14 @@ int viafb_setmode(int vmode_index, int hor_res, int ver_res, int video_bpp,
         if (viafb_DVI_ON) {
                 if (viafb_SAMM_ON &&
                         (viaparinfo->tmds_setting_info->iga_path == IGA2)) {
-                        viafb_dvi_set_mode(viafb_get_mode_index
+                        viafb_dvi_set_mode(viafb_get_mode
                                      (viaparinfo->tmds_setting_info->h_active,
                                       viaparinfo->tmds_setting_info->
                                       v_active),
                                      video_bpp1, viaparinfo->
                                      tmds_setting_info->iga_path);
                 } else {
-                        viafb_dvi_set_mode(viafb_get_mode_index
+                        viafb_dvi_set_mode(viafb_get_mode
                                      (viaparinfo->tmds_setting_info->h_active,
                                       viaparinfo->
                                       tmds_setting_info->v_active),
@@ -2445,8 +2377,8 @@ int viafb_setmode(int vmode_index, int hor_res, int ver_res, int video_bpp,
 
         /* If set mode normally, save resolution information for hot-plug . */
         if (!viafb_hotplug) {
-                viafb_hotplug_Xres = hor_res;
-                viafb_hotplug_Yres = ver_res;
+                viafb_hotplug_Xres = vmode_tbl->crtc[0].crtc.hor_addr;
+                viafb_hotplug_Yres = vmode_tbl->crtc[0].crtc.ver_addr;
                 viafb_hotplug_bpp = video_bpp;
                 viafb_hotplug_refresh = viafb_refresh;
 
@@ -2706,13 +2638,11 @@ void viafb_set_dpa_gfx(int output_interface, struct GFX_DPA_SETTING\
 
 /*According var's xres, yres fill var's other timing information*/
 void viafb_fill_var_timing_info(struct fb_var_screeninfo *var, int refresh,
-                          int mode_index)
+        struct VideoModeTable *vmode_tbl)
 {
-        struct VideoModeTable *vmode_tbl = NULL;
         struct crt_mode_table *crt_timing = NULL;
         struct display_timing crt_reg;
         int i = 0, index = 0;
-        vmode_tbl = &CLE266Modes[search_mode_setting(mode_index)];
         crt_timing = vmode_tbl->crtc;
         for (i = 0; i < vmode_tbl->mode_array; i++) {
                 index = i;
@@ -2721,36 +2651,6 @@ void viafb_fill_var_timing_info(struct fb_var_screeninfo *var, int refresh,
         }
 
         crt_reg = crt_timing[index].crtc;
-        switch (var->bits_per_pixel) {
-        case 8:
-                var->red.offset = 0;
-                var->green.offset = 0;
-                var->blue.offset = 0;
-                var->red.length = 6;
-                var->green.length = 6;
-                var->blue.length = 6;
-                break;
-        case 16:
-                var->red.offset = 11;
-                var->green.offset = 5;
-                var->blue.offset = 0;
-                var->red.length = 5;
-                var->green.length = 6;
-                var->blue.length = 5;
-                break;
-        case 32:
-                var->red.offset = 16;
-                var->green.offset = 8;
-                var->blue.offset = 0;
-                var->red.length = 8;
-                var->green.length = 8;
-                var->blue.length = 8;
-                break;
-        default:
-                /* never happed, put here to keep consistent */
-                break;
-        }
-
         var->pixclock = viafb_get_pixclock(var->xres, var->yres, refresh);
         var->left_margin =
             crt_reg.hor_total - (crt_reg.hor_sync_start + crt_reg.hor_sync_end);
diff --git a/drivers/video/via/hw.h b/drivers/video/via/hw.h
index b874d952b446..12ef32d334cb 100644
--- a/drivers/video/via/hw.h
+++ b/drivers/video/via/hw.h
@@ -22,6 +22,7 @@
 #ifndef __HW_H__
 #define __HW_H__
 
+#include "viamode.h"
 #include "global.h"
 
 /***************************************************
@@ -862,8 +863,6 @@ struct pci_device_id_info {
 };
 
 extern unsigned int viafb_second_virtual_xres;
-extern unsigned int viafb_second_offset;
-extern int viafb_second_size;
 extern int viafb_SAMM_ON;
 extern int viafb_dual_fb;
 extern int viafb_LCD2_ON;
@@ -874,8 +873,9 @@ extern int viafb_hotplug;
 void viafb_write_reg_mask(u8 index, int io_port, u8 data, u8 mask);
 void viafb_set_output_path(int device, int set_iga,
         int output_interface);
+
 void viafb_fill_crtc_timing(struct crt_mode_table *crt_table,
-                      int mode_index, int bpp_byte, int set_iga);
+        struct VideoModeTable *video_mode, int bpp_byte, int set_iga);
 
 void viafb_set_vclock(u32 CLK, int set_iga);
 void viafb_load_reg(int timing_value, int viafb_load_reg_num,
@@ -891,16 +891,15 @@ void viafb_lock_crt(void);
 void viafb_unlock_crt(void);
 void viafb_load_fetch_count_reg(int h_addr, int bpp_byte, int set_iga);
 void viafb_write_regx(struct io_reg RegTable[], int ItemNum);
-struct VideoModeTable *viafb_get_modetbl_pointer(int Index);
 u32 viafb_get_clk_value(int clk);
 void viafb_load_FIFO_reg(int set_iga, int hor_active, int ver_active);
-void viafb_set_color_depth(int bpp_byte, int set_iga);
 void viafb_set_dpa_gfx(int output_interface, struct GFX_DPA_SETTING\
                                         *p_gfx_dpa_setting);
 
-int viafb_setmode(int vmode_index, int hor_res, int ver_res,
-            int video_bpp, int vmode_index1, int hor_res1,
-            int ver_res1, int video_bpp1);
+int viafb_setmode(struct VideoModeTable *vmode_tbl, int video_bpp,
+        struct VideoModeTable *vmode_tbl1, int video_bpp1);
+void viafb_fill_var_timing_info(struct fb_var_screeninfo *var, int refresh,
+        struct VideoModeTable *vmode_tbl);
 void viafb_init_chip_info(struct pci_dev *pdev,
                           const struct pci_device_id *pdi);
 void viafb_init_dac(int set_iga);
@@ -915,6 +914,8 @@ void viafb_set_primary_address(u32 addr);
 void viafb_set_secondary_address(u32 addr);
 void viafb_set_primary_pitch(u32 pitch);
 void viafb_set_secondary_pitch(u32 pitch);
+void viafb_set_primary_color_register(u8 index, u8 red, u8 green, u8 blue);
+void viafb_set_secondary_color_register(u8 index, u8 red, u8 green, u8 blue);
 void viafb_get_fb_info(unsigned int *fb_base, unsigned int *fb_len);
 
 #endif /* __HW_H__ */
diff --git a/drivers/video/via/iface.c b/drivers/video/via/iface.c
deleted file mode 100644
index 1570636c8d51..000000000000
--- a/drivers/video/via/iface.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
- * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
-
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation;
- * either version 2, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE.See the GNU General Public License
- * for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include "global.h"
-
-/* Get frame buffer size from VGA BIOS */
-
-unsigned int viafb_get_memsize(void)
-{
-        unsigned int m;
-
-        /* If memory size provided by user */
-        if (viafb_memsize)
-                m = viafb_memsize * Mb;
-        else {
-                m = (unsigned int)viafb_read_reg(VIASR, SR39);
-                m = m * (4 * Mb);
-
-                if ((m < (16 * Mb)) || (m > (64 * Mb)))
-                        m = 16 * Mb;
-        }
-        DEBUG_MSG(KERN_INFO "framebuffer size = %d Mb\n", m / Mb);
-        return m;
-}
-
-/* Get Video Buffer Starting Physical Address(back door)*/
-
-unsigned long viafb_get_videobuf_addr(void)
-{
-        struct pci_dev *pdev = NULL;
-        unsigned char sys_mem;
-        unsigned char video_mem;
-        unsigned long sys_mem_size;
-        unsigned long video_mem_size;
-        /*system memory = 256 MB, video memory 64 MB */
-        unsigned long vmem_starting_adr = 0x0C000000;
-
-        pdev =
-            (struct pci_dev *)pci_get_device(VIA_K800_BRIDGE_VID,
-                                             VIA_K800_BRIDGE_DID, NULL);
-        if (pdev != NULL) {
-                pci_read_config_byte(pdev, VIA_K800_SYSTEM_MEMORY_REG,
-                                     &sys_mem);
-                pci_read_config_byte(pdev, VIA_K800_VIDEO_MEMORY_REG,
-                                     &video_mem);
-                video_mem = (video_mem & 0x70) >> 4;
-                sys_mem_size = ((unsigned long)sys_mem) << 24;
-                if (video_mem != 0)
-                        video_mem_size = (1 << (video_mem)) * 1024 * 1024;
-                else
-                        video_mem_size = 0;
-
-                vmem_starting_adr = sys_mem_size - video_mem_size;
-                pci_dev_put(pdev);
-        }
-
-        DEBUG_MSG(KERN_INFO "Video Memory Starting Address = %lx \n",
-                  vmem_starting_adr);
-        return vmem_starting_adr;
-}
diff --git a/drivers/video/via/iface.h b/drivers/video/via/iface.h
deleted file mode 100644
index 790ec3e3aea2..000000000000
--- a/drivers/video/via/iface.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
- * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
-
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation;
- * either version 2, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE.See the GNU General Public License
- * for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __IFACE_H__
-#define __IFACE_H__
-
-#define Kb  (1024)
-#define Mb  (Kb*Kb)
-
-#define VIA_K800_BRIDGE_VID         0x1106
-#define VIA_K800_BRIDGE_DID         0x3204
-
-#define VIA_K800_SYSTEM_MEMORY_REG  0x47
-#define VIA_K800_VIDEO_MEMORY_REG   0xA1
-
-extern int viafb_memsize;
-unsigned int viafb_get_memsize(void);
-unsigned long viafb_get_videobuf_addr(void);
-
-#endif /* __IFACE_H__ */
diff --git a/drivers/video/via/lcd.c b/drivers/video/via/lcd.c
index e3e597f937a5..1b1ccdc2d83d 100644
--- a/drivers/video/via/lcd.c
+++ b/drivers/video/via/lcd.c
@@ -22,25 +22,7 @@
 #include "global.h"
 #include "lcdtbl.h"
 
-static struct iga2_shadow_crtc_timing iga2_shadow_crtc_reg = {
-        /* IGA2 Shadow Horizontal Total */
-        {IGA2_SHADOW_HOR_TOTAL_REG_NUM, {{CR6D, 0, 7}, {CR71, 3, 3} } },
-        /* IGA2 Shadow Horizontal Blank End */
-        {IGA2_SHADOW_HOR_BLANK_END_REG_NUM, {{CR6E, 0, 7} } },
-        /* IGA2 Shadow Vertical Total */
-        {IGA2_SHADOW_VER_TOTAL_REG_NUM, {{CR6F, 0, 7}, {CR71, 0, 2} } },
-        /* IGA2 Shadow Vertical Addressable Video */
-        {IGA2_SHADOW_VER_ADDR_REG_NUM, {{CR70, 0, 7}, {CR71, 4, 6} } },
-        /* IGA2 Shadow Vertical Blank Start */
-        {IGA2_SHADOW_VER_BLANK_START_REG_NUM,
-         {{CR72, 0, 7}, {CR74, 4, 6} } },
-        /* IGA2 Shadow Vertical Blank End */
-        {IGA2_SHADOW_VER_BLANK_END_REG_NUM, {{CR73, 0, 7}, {CR74, 0, 2} } },
-        /* IGA2 Shadow Vertical Sync Start */
-        {IGA2_SHADOW_VER_SYNC_START_REG_NUM, {{CR75, 0, 7}, {CR76, 4, 6} } },
-        /* IGA2 Shadow Vertical Sync End */
-        {IGA2_SHADOW_VER_SYNC_END_REG_NUM, {{CR76, 0, 3} } }
-};
+#define viafb_compact_res(x, y) (((x)<<16)|(y))
 
 static struct _lcd_scaling_factor lcd_scaling_factor = {
         /* LCD Horizontal Scaling Factor Register */
@@ -59,16 +41,10 @@ static struct _lcd_scaling_factor lcd_scaling_factor_CLE = {
 
 static int check_lvds_chip(int device_id_subaddr, int device_id);
 static bool lvds_identify_integratedlvds(void);
-static int fp_id_to_vindex(int panel_id);
+static void fp_id_to_vindex(int panel_id);
 static int lvds_register_read(int index);
 static void load_lcd_scaling(int set_hres, int set_vres, int panel_hres,
                       int panel_vres);
-static void load_lcd_k400_patch_tbl(int set_hres, int set_vres,
-        int panel_id);
-static void load_lcd_p880_patch_tbl(int set_hres, int set_vres,
-        int panel_id);
-static void load_lcd_patch_regs(int set_hres, int set_vres,
-        int panel_id, int set_iga);
 static void via_pitch_alignment_patch_lcd(
         struct lvds_setting_information *plvds_setting_info,
                                    struct lvds_chip_information
@@ -98,8 +74,6 @@ static void check_diport_of_integrated_lvds(
 static struct display_timing lcd_centering_timging(struct display_timing
                                             mode_crt_reg,
                                            struct display_timing panel_crt_reg);
-static void load_crtc_shadow_timing(struct display_timing mode_timing,
-                             struct display_timing panel_timing);
 static void viafb_load_scaling_factor_for_p4m900(int set_hres,
         int set_vres, int panel_hres, int panel_vres);
 
@@ -125,33 +99,24 @@ void viafb_init_lcd_size(void)
                 break;
         case GET_LCD_SIZE_BY_VGA_BIOS:
                 DEBUG_MSG(KERN_INFO "Get LCD Size method by VGA BIOS !!\n");
-                viaparinfo->lvds_setting_info->lcd_panel_size =
-                    fp_id_to_vindex(viafb_lcd_panel_id);
+                fp_id_to_vindex(viafb_lcd_panel_id);
                 DEBUG_MSG(KERN_INFO "LCD Panel_ID = %d\n",
                           viaparinfo->lvds_setting_info->lcd_panel_id);
-                DEBUG_MSG(KERN_INFO "LCD Panel Size = %d\n",
-                          viaparinfo->lvds_setting_info->lcd_panel_size);
                 break;
         case GET_LCD_SIZE_BY_USER_SETTING:
                 DEBUG_MSG(KERN_INFO "Get LCD Size method by user setting !!\n");
-                viaparinfo->lvds_setting_info->lcd_panel_size =
-                    fp_id_to_vindex(viafb_lcd_panel_id);
+                fp_id_to_vindex(viafb_lcd_panel_id);
                 DEBUG_MSG(KERN_INFO "LCD Panel_ID = %d\n",
                           viaparinfo->lvds_setting_info->lcd_panel_id);
-                DEBUG_MSG(KERN_INFO "LCD Panel Size = %d\n",
-                          viaparinfo->lvds_setting_info->lcd_panel_size);
                 break;
         default:
                 DEBUG_MSG(KERN_INFO "viafb_init_lcd_size fail\n");
                 viaparinfo->lvds_setting_info->lcd_panel_id =
                         LCD_PANEL_ID1_800X600;
-                viaparinfo->lvds_setting_info->lcd_panel_size =
-                    fp_id_to_vindex(LCD_PANEL_ID1_800X600);
+                fp_id_to_vindex(LCD_PANEL_ID1_800X600);
         }
         viaparinfo->lvds_setting_info2->lcd_panel_id =
                 viaparinfo->lvds_setting_info->lcd_panel_id;
-        viaparinfo->lvds_setting_info2->lcd_panel_size =
-                viaparinfo->lvds_setting_info->lcd_panel_size;
         viaparinfo->lvds_setting_info2->lcd_panel_hres =
                 viaparinfo->lvds_setting_info->lcd_panel_hres;
         viaparinfo->lvds_setting_info2->lcd_panel_vres =
@@ -171,13 +136,13 @@ static bool lvds_identify_integratedlvds(void)
                 if (viaparinfo->chip_info->lvds_chip_info.lvds_chip_name) {
                         viaparinfo->chip_info->lvds_chip_info2.lvds_chip_name =
                             INTEGRATED_LVDS;
-                        DEBUG_MSG(KERN_INFO "Support two dual channel LVDS!\
-                                  (Internal LVDS + External LVDS)\n");
+                        DEBUG_MSG(KERN_INFO "Support two dual channel LVDS! "
+                                  "(Internal LVDS + External LVDS)\n");
                 } else {
                         viaparinfo->chip_info->lvds_chip_info.lvds_chip_name =
                             INTEGRATED_LVDS;
-                        DEBUG_MSG(KERN_INFO "Not found external LVDS,\
-                                  so can't support two dual channel LVDS!\n");
+                        DEBUG_MSG(KERN_INFO "Not found external LVDS, "
+                                  "so can't support two dual channel LVDS!\n");
                 }
         } else if (viafb_display_hardware_layout == HW_LAYOUT_LCD1_LCD2) {
                 /* Two single channel LCD (Internal LVDS + Internal LVDS): */
@@ -185,8 +150,8 @@ static bool lvds_identify_integratedlvds(void)
                 INTEGRATED_LVDS;
                 viaparinfo->chip_info->lvds_chip_info2.lvds_chip_name =
                         INTEGRATED_LVDS;
-                DEBUG_MSG(KERN_INFO "Support two single channel LVDS!\
-                          (Internal LVDS + Internal LVDS)\n");
+                DEBUG_MSG(KERN_INFO "Support two single channel LVDS! "
+                          "(Internal LVDS + Internal LVDS)\n");
         } else if (viafb_display_hardware_layout != HW_LAYOUT_DVI_ONLY) {
                 /* If we have found external LVDS, just use it,
                    otherwise, we will use internal LVDS as default. */
@@ -248,7 +213,7 @@ int viafb_lvds_trasmitter_identify(void)
         return FAIL;
 }
 
-static int fp_id_to_vindex(int panel_id)
+static void fp_id_to_vindex(int panel_id)
 {
         DEBUG_MSG(KERN_INFO "fp_get_panel_id()\n");
 
@@ -264,7 +229,6 @@ static int fp_id_to_vindex(int panel_id)
                         LCD_PANEL_ID0_640X480;
                 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
                 viaparinfo->lvds_setting_info->LCDDithering = 1;
-                return VIA_RES_640X480;
                 break;
         case 0x1:
                 viaparinfo->lvds_setting_info->lcd_panel_hres = 800;
@@ -273,7 +237,6 @@ static int fp_id_to_vindex(int panel_id)
                         LCD_PANEL_ID1_800X600;
                 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
                 viaparinfo->lvds_setting_info->LCDDithering = 1;
-                return VIA_RES_800X600;
                 break;
         case 0x2:
                 viaparinfo->lvds_setting_info->lcd_panel_hres = 1024;
@@ -282,7 +245,6 @@ static int fp_id_to_vindex(int panel_id)
                         LCD_PANEL_ID2_1024X768;
                 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
                 viaparinfo->lvds_setting_info->LCDDithering = 1;
-                return VIA_RES_1024X768;
                 break;
         case 0x3:
                 viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;
@@ -291,7 +253,6 @@ static int fp_id_to_vindex(int panel_id)
                         LCD_PANEL_ID3_1280X768;
                 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
                 viaparinfo->lvds_setting_info->LCDDithering = 1;
-                return VIA_RES_1280X768;
                 break;
         case 0x4:
                 viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;
@@ -300,7 +261,6 @@ static int fp_id_to_vindex(int panel_id)
                         LCD_PANEL_ID4_1280X1024;
                 viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
                 viaparinfo->lvds_setting_info->LCDDithering = 1;
-                return VIA_RES_1280X1024;
                 break;
         case 0x5:
                 viaparinfo->lvds_setting_info->lcd_panel_hres = 1400;
@@ -309,7 +269,6 @@ static int fp_id_to_vindex(int panel_id)
                         LCD_PANEL_ID5_1400X1050;
                 viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
                 viaparinfo->lvds_setting_info->LCDDithering = 1;
-                return VIA_RES_1400X1050;
                 break;
         case 0x6:
                 viaparinfo->lvds_setting_info->lcd_panel_hres = 1600;
@@ -318,7 +277,6 @@ static int fp_id_to_vindex(int panel_id)
                         LCD_PANEL_ID6_1600X1200;
                 viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
                 viaparinfo->lvds_setting_info->LCDDithering = 1;
-                return VIA_RES_1600X1200;
                 break;
         case 0x8:
                 viaparinfo->lvds_setting_info->lcd_panel_hres = 800;
@@ -327,7 +285,6 @@ static int fp_id_to_vindex(int panel_id)
                         LCD_PANEL_IDA_800X480;
                 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
                 viaparinfo->lvds_setting_info->LCDDithering = 1;
-                return VIA_RES_800X480;
                 break;
         case 0x9:
                 viaparinfo->lvds_setting_info->lcd_panel_hres = 1024;
@@ -336,7 +293,6 @@ static int fp_id_to_vindex(int panel_id)
                         LCD_PANEL_ID2_1024X768;
                 viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
                 viaparinfo->lvds_setting_info->LCDDithering = 1;
-                return VIA_RES_1024X768;
                 break;
         case 0xA:
                 viaparinfo->lvds_setting_info->lcd_panel_hres = 1024;
@@ -345,7 +301,6 @@ static int fp_id_to_vindex(int panel_id)
                         LCD_PANEL_ID2_1024X768;
                 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
                 viaparinfo->lvds_setting_info->LCDDithering = 0;
-                return VIA_RES_1024X768;
                 break;
         case 0xB:
                 viaparinfo->lvds_setting_info->lcd_panel_hres = 1024;
@@ -354,7 +309,6 @@ static int fp_id_to_vindex(int panel_id)
                         LCD_PANEL_ID2_1024X768;
                 viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
                 viaparinfo->lvds_setting_info->LCDDithering = 0;
-                return VIA_RES_1024X768;
                 break;
         case 0xC:
                 viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;
@@ -363,7 +317,6 @@ static int fp_id_to_vindex(int panel_id)
                         LCD_PANEL_ID3_1280X768;
                 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
                 viaparinfo->lvds_setting_info->LCDDithering = 0;
-                return VIA_RES_1280X768;
                 break;
         case 0xD:
                 viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;
@@ -372,7 +325,6 @@ static int fp_id_to_vindex(int panel_id)
                         LCD_PANEL_ID4_1280X1024;
                 viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
                 viaparinfo->lvds_setting_info->LCDDithering = 0;
-                return VIA_RES_1280X1024;
                 break;
         case 0xE:
                 viaparinfo->lvds_setting_info->lcd_panel_hres = 1400;
@@ -381,7 +333,6 @@ static int fp_id_to_vindex(int panel_id)
                         LCD_PANEL_ID5_1400X1050;
                 viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
                 viaparinfo->lvds_setting_info->LCDDithering = 0;
-                return VIA_RES_1400X1050;
                 break;
         case 0xF:
                 viaparinfo->lvds_setting_info->lcd_panel_hres = 1600;
@@ -390,7 +341,6 @@ static int fp_id_to_vindex(int panel_id)
                         LCD_PANEL_ID6_1600X1200;
                 viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
                 viaparinfo->lvds_setting_info->LCDDithering = 0;
-                return VIA_RES_1600X1200;
                 break;
         case 0x10:
                 viaparinfo->lvds_setting_info->lcd_panel_hres = 1366;
@@ -399,7 +349,6 @@ static int fp_id_to_vindex(int panel_id)
                         LCD_PANEL_ID7_1366X768;
                 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
                 viaparinfo->lvds_setting_info->LCDDithering = 0;
-                return VIA_RES_1368X768;
                 break;
         case 0x11:
                 viaparinfo->lvds_setting_info->lcd_panel_hres = 1024;
@@ -408,7 +357,6 @@ static int fp_id_to_vindex(int panel_id)
                         LCD_PANEL_ID8_1024X600;
                 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
                 viaparinfo->lvds_setting_info->LCDDithering = 1;
-                return VIA_RES_1024X600;
                 break;
         case 0x12:
                 viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;
@@ -417,7 +365,6 @@ static int fp_id_to_vindex(int panel_id)
                         LCD_PANEL_ID3_1280X768;
                 viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
                 viaparinfo->lvds_setting_info->LCDDithering = 1;
-                return VIA_RES_1280X768;
                 break;
         case 0x13:
                 viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;
@@ -426,7 +373,6 @@ static int fp_id_to_vindex(int panel_id)
                         LCD_PANEL_ID9_1280X800;
                 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
                 viaparinfo->lvds_setting_info->LCDDithering = 1;
-                return VIA_RES_1280X800;
                 break;
         case 0x14:
                 viaparinfo->lvds_setting_info->lcd_panel_hres = 1360;
@@ -435,7 +381,6 @@ static int fp_id_to_vindex(int panel_id)
                         LCD_PANEL_IDB_1360X768;
                 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
                 viaparinfo->lvds_setting_info->LCDDithering = 0;
-                return VIA_RES_1360X768;
                 break;
         case 0x15:
                 viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;
@@ -444,7 +389,6 @@ static int fp_id_to_vindex(int panel_id)
                         LCD_PANEL_ID3_1280X768;
                 viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;
                 viaparinfo->lvds_setting_info->LCDDithering = 0;
-                return VIA_RES_1280X768;
                 break;
         case 0x16:
                 viaparinfo->lvds_setting_info->lcd_panel_hres = 480;
@@ -453,7 +397,6 @@ static int fp_id_to_vindex(int panel_id)
                         LCD_PANEL_IDC_480X640;
                 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
                 viaparinfo->lvds_setting_info->LCDDithering = 1;
-                return VIA_RES_480X640;
                 break;
         default:
                 viaparinfo->lvds_setting_info->lcd_panel_hres = 800;
@@ -462,7 +405,6 @@ static int fp_id_to_vindex(int panel_id)
                         LCD_PANEL_ID1_800X600;
                 viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;
                 viaparinfo->lvds_setting_info->LCDDithering = 1;
-                return VIA_RES_800X600;
         }
 }
 
@@ -573,284 +515,6 @@ static void load_lcd_scaling(int set_hres, int set_vres, int panel_hres,
         }
 }
 
-static void load_lcd_k400_patch_tbl(int set_hres, int set_vres,
-        int panel_id)
-{
-        int vmode_index;
-        int reg_num = 0;
-        struct io_reg *lcd_patch_reg = NULL;
-
-        vmode_index = viafb_get_mode_index(set_hres, set_vres);
-        switch (panel_id) {
-                /* LCD 800x600 */
-        case LCD_PANEL_ID1_800X600:
-                switch (vmode_index) {
-                case VIA_RES_640X400:
-                case VIA_RES_640X480:
-                        reg_num = NUM_TOTAL_K400_LCD_RES_6X4_8X6;
-                        lcd_patch_reg = K400_LCD_RES_6X4_8X6;
-                        break;
-                case VIA_RES_720X480:
-                case VIA_RES_720X576:
-                        reg_num = NUM_TOTAL_K400_LCD_RES_7X4_8X6;
-                        lcd_patch_reg = K400_LCD_RES_7X4_8X6;
-                        break;
-                }
-                break;
-
-                /* LCD 1024x768 */
-        case LCD_PANEL_ID2_1024X768:
-                switch (vmode_index) {
-                case VIA_RES_640X400:
-                case VIA_RES_640X480:
-                        reg_num = NUM_TOTAL_K400_LCD_RES_6X4_10X7;
-                        lcd_patch_reg = K400_LCD_RES_6X4_10X7;
-                        break;
-                case VIA_RES_720X480:
-                case VIA_RES_720X576:
-                        reg_num = NUM_TOTAL_K400_LCD_RES_7X4_10X7;
-                        lcd_patch_reg = K400_LCD_RES_7X4_10X7;
-                        break;
-                case VIA_RES_800X600:
-                        reg_num = NUM_TOTAL_K400_LCD_RES_8X6_10X7;
-                        lcd_patch_reg = K400_LCD_RES_8X6_10X7;
-                        break;
-                }
-                break;
-
-                /* LCD 1280x1024 */
-        case LCD_PANEL_ID4_1280X1024:
-                switch (vmode_index) {
-                case VIA_RES_640X400:
-                case VIA_RES_640X480:
-                        reg_num = NUM_TOTAL_K400_LCD_RES_6X4_12X10;
-                        lcd_patch_reg = K400_LCD_RES_6X4_12X10;
-                        break;
-                case VIA_RES_720X480:
-                case VIA_RES_720X576:
-                        reg_num = NUM_TOTAL_K400_LCD_RES_7X4_12X10;
-                        lcd_patch_reg = K400_LCD_RES_7X4_12X10;
-                        break;
-                case VIA_RES_800X600:
-                        reg_num = NUM_TOTAL_K400_LCD_RES_8X6_12X10;
-                        lcd_patch_reg = K400_LCD_RES_8X6_12X10;
-                        break;
-                case VIA_RES_1024X768:
-                        reg_num = NUM_TOTAL_K400_LCD_RES_10X7_12X10;
-                        lcd_patch_reg = K400_LCD_RES_10X7_12X10;
-                        break;
-
-                }
-                break;
-
-                /* LCD 1400x1050 */
-        case LCD_PANEL_ID5_1400X1050:
-                switch (vmode_index) {
-                case VIA_RES_640X480:
-                        reg_num = NUM_TOTAL_K400_LCD_RES_6X4_14X10;
-                        lcd_patch_reg = K400_LCD_RES_6X4_14X10;
-                        break;
-                case VIA_RES_800X600:
-                        reg_num = NUM_TOTAL_K400_LCD_RES_8X6_14X10;
-                        lcd_patch_reg = K400_LCD_RES_8X6_14X10;
-                        break;
-                case VIA_RES_1024X768:
-                        reg_num = NUM_TOTAL_K400_LCD_RES_10X7_14X10;
-                        lcd_patch_reg = K400_LCD_RES_10X7_14X10;
-                        break;
-                case VIA_RES_1280X768:
-                case VIA_RES_1280X800:
-                case VIA_RES_1280X960:
-                case VIA_RES_1280X1024:
-                        reg_num = NUM_TOTAL_K400_LCD_RES_12X10_14X10;
-                        lcd_patch_reg = K400_LCD_RES_12X10_14X10;
-                        break;
-                }
-                break;
-
-                /* LCD 1600x1200 */
-        case LCD_PANEL_ID6_1600X1200:
-                switch (vmode_index) {
-                case VIA_RES_640X400:
-                case VIA_RES_640X480:
-                        reg_num = NUM_TOTAL_K400_LCD_RES_6X4_16X12;
-                        lcd_patch_reg = K400_LCD_RES_6X4_16X12;
-                        break;
-                case VIA_RES_720X480:
-                case VIA_RES_720X576:
-                        reg_num = NUM_TOTAL_K400_LCD_RES_7X4_16X12;
-                        lcd_patch_reg = K400_LCD_RES_7X4_16X12;
-                        break;
-                case VIA_RES_800X600:
-                        reg_num = NUM_TOTAL_K400_LCD_RES_8X6_16X12;
-                        lcd_patch_reg = K400_LCD_RES_8X6_16X12;
-                        break;
-                case VIA_RES_1024X768:
-                        reg_num = NUM_TOTAL_K400_LCD_RES_10X7_16X12;
-                        lcd_patch_reg = K400_LCD_RES_10X7_16X12;
-                        break;
-                case VIA_RES_1280X768:
-                case VIA_RES_1280X800:
-                case VIA_RES_1280X960:
-                case VIA_RES_1280X1024:
-                        reg_num = NUM_TOTAL_K400_LCD_RES_12X10_16X12;
-                        lcd_patch_reg = K400_LCD_RES_12X10_16X12;
-                        break;
-                }
-                break;
-
-                /* LCD 1366x768 */
-        case LCD_PANEL_ID7_1366X768:
-                switch (vmode_index) {
-                case VIA_RES_640X480:
-                        reg_num = NUM_TOTAL_K400_LCD_RES_6X4_1366X7;
-                        lcd_patch_reg = K400_LCD_RES_6X4_1366X7;
-                        break;
-                case VIA_RES_720X480:
-                case VIA_RES_720X576:
-                        reg_num = NUM_TOTAL_K400_LCD_RES_7X4_1366X7;
-                        lcd_patch_reg = K400_LCD_RES_7X4_1366X7;
-                        break;
-                case VIA_RES_800X600:
-                        reg_num = NUM_TOTAL_K400_LCD_RES_8X6_1366X7;
-                        lcd_patch_reg = K400_LCD_RES_8X6_1366X7;
-                        break;
-                case VIA_RES_1024X768:
-                        reg_num = NUM_TOTAL_K400_LCD_RES_10X7_1366X7;
-                        lcd_patch_reg = K400_LCD_RES_10X7_1366X7;
-                        break;
-                case VIA_RES_1280X768:
-                case VIA_RES_1280X800:
-                case VIA_RES_1280X960:
-                case VIA_RES_1280X1024:
-                        reg_num = NUM_TOTAL_K400_LCD_RES_12X10_1366X7;
-                        lcd_patch_reg = K400_LCD_RES_12X10_1366X7;
-                        break;
-                }
-                break;
-
-                /* LCD 1360x768 */
-        case LCD_PANEL_IDB_1360X768:
-                break;
-        }
-        if (reg_num != 0) {
-                /* H.W. Reset : ON */
-                viafb_write_reg_mask(CR17, VIACR, 0x00, BIT7);
-
-                viafb_write_regx(lcd_patch_reg, reg_num);
-
-                /* H.W. Reset : OFF */
-                viafb_write_reg_mask(CR17, VIACR, 0x80, BIT7);
-
-                /* Reset PLL */
-                viafb_write_reg_mask(SR40, VIASR, 0x02, BIT1);
-                viafb_write_reg_mask(SR40, VIASR, 0x00, BIT1);
-
-                /* Fire! */
-                outb(inb(VIARMisc) | (BIT2 + BIT3), VIAWMisc);
-        }
-}
-
-static void load_lcd_p880_patch_tbl(int set_hres, int set_vres,
-        int panel_id)
-{
-        int vmode_index;
-        int reg_num = 0;
-        struct io_reg *lcd_patch_reg = NULL;
-
-        vmode_index = viafb_get_mode_index(set_hres, set_vres);
-
-        switch (panel_id) {
-        case LCD_PANEL_ID5_1400X1050:
-                switch (vmode_index) {
-                case VIA_RES_640X480:
-                        reg_num = NUM_TOTAL_P880_LCD_RES_6X4_14X10;
-                        lcd_patch_reg = P880_LCD_RES_6X4_14X10;
-                        break;
-                case VIA_RES_800X600:
-                        reg_num = NUM_TOTAL_P880_LCD_RES_8X6_14X10;
-                        lcd_patch_reg = P880_LCD_RES_8X6_14X10;
-                        break;
-                }
-                break;
-        case LCD_PANEL_ID6_1600X1200:
-                switch (vmode_index) {
-                case VIA_RES_640X400:
-                case VIA_RES_640X480:
-                        reg_num = NUM_TOTAL_P880_LCD_RES_6X4_16X12;
-                        lcd_patch_reg = P880_LCD_RES_6X4_16X12;
-                        break;
-                case VIA_RES_720X480:
-                case VIA_RES_720X576:
-                        reg_num = NUM_TOTAL_P880_LCD_RES_7X4_16X12;
-                        lcd_patch_reg = P880_LCD_RES_7X4_16X12;
-                        break;
-                case VIA_RES_800X600:
-                        reg_num = NUM_TOTAL_P880_LCD_RES_8X6_16X12;
-                        lcd_patch_reg = P880_LCD_RES_8X6_16X12;
-                        break;
-                case VIA_RES_1024X768:
-                        reg_num = NUM_TOTAL_P880_LCD_RES_10X7_16X12;
-                        lcd_patch_reg = P880_LCD_RES_10X7_16X12;
-                        break;
-                case VIA_RES_1280X768:
-                case VIA_RES_1280X960:
-                case VIA_RES_1280X1024:
-                        reg_num = NUM_TOTAL_P880_LCD_RES_12X10_16X12;
-                        lcd_patch_reg = P880_LCD_RES_12X10_16X12;
-                        break;
-                }
-                break;
-
-        }
-        if (reg_num != 0) {
-                /* H.W. Reset : ON */
-                viafb_write_reg_mask(CR17, VIACR, 0x00, BIT7);
-
-                viafb_write_regx(lcd_patch_reg, reg_num);
-
-                /* H.W. Reset : OFF */
-                viafb_write_reg_mask(CR17, VIACR, 0x80, BIT7);
-
-                /* Reset PLL */
-                viafb_write_reg_mask(SR40, VIASR, 0x02, BIT1);
-                viafb_write_reg_mask(SR40, VIASR, 0x00, BIT1);
-
-                /* Fire! */
-                outb(inb(VIARMisc) | (BIT2 + BIT3), VIAWMisc);
-        }
-}
-
-static void load_lcd_patch_regs(int set_hres, int set_vres,
-        int panel_id, int set_iga)
-{
-        int vmode_index;
-
-        vmode_index = viafb_get_mode_index(set_hres, set_vres);
-
-        viafb_unlock_crt();
-
-        /* Patch for simultaneous & Expansion */
-        if ((set_iga == IGA1_IGA2) &&
-                (viaparinfo->lvds_setting_info->display_method ==
-            LCD_EXPANDSION)) {
-                switch (viaparinfo->chip_info->gfx_chip_name) {
-                case UNICHROME_CLE266:
-                case UNICHROME_K400:
-                        load_lcd_k400_patch_tbl(set_hres, set_vres, panel_id);
-                        break;
-                case UNICHROME_K800:
-                        break;
-                case UNICHROME_PM800:
-                case UNICHROME_CN700:
-                case UNICHROME_CX700:
-                        load_lcd_p880_patch_tbl(set_hres, set_vres, panel_id);
-                }
-        }
-
-        viafb_lock_crt();
-}
-
 static void via_pitch_alignment_patch_lcd(
         struct lvds_setting_information *plvds_setting_info,
                                    struct lvds_chip_information
@@ -949,29 +613,25 @@ void viafb_lcd_set_mode(struct crt_mode_table *mode_crt_table,
                   struct lvds_setting_information *plvds_setting_info,
                   struct lvds_chip_information *plvds_chip_info)
 {
-        int video_index = plvds_setting_info->lcd_panel_size;
         int set_iga = plvds_setting_info->iga_path;
         int mode_bpp = plvds_setting_info->bpp;
-        int set_hres, set_vres;
-        int panel_hres, panel_vres;
+        int set_hres = plvds_setting_info->h_active;
+        int set_vres = plvds_setting_info->v_active;
+        int panel_hres = plvds_setting_info->lcd_panel_hres;
+        int panel_vres = plvds_setting_info->lcd_panel_vres;
         u32 pll_D_N;
-        int offset;
         struct display_timing mode_crt_reg, panel_crt_reg;
         struct crt_mode_table *panel_crt_table = NULL;
-        struct VideoModeTable *vmode_tbl = NULL;
+        struct VideoModeTable *vmode_tbl = viafb_get_mode(panel_hres,
+                panel_vres);
 
         DEBUG_MSG(KERN_INFO "viafb_lcd_set_mode!!\n");
         /* Get mode table */
         mode_crt_reg = mode_crt_table->crtc;
         /* Get panel table Pointer */
-        vmode_tbl = viafb_get_modetbl_pointer(video_index);
         panel_crt_table = vmode_tbl->crtc;
         panel_crt_reg = panel_crt_table->crtc;
         DEBUG_MSG(KERN_INFO "bellow viafb_lcd_set_mode!!\n");
-        set_hres = plvds_setting_info->h_active;
-        set_vres = plvds_setting_info->v_active;
-        panel_hres = plvds_setting_info->lcd_panel_hres;
-        panel_vres = plvds_setting_info->lcd_panel_vres;
         if (VT1636_LVDS == plvds_chip_info->lvds_chip_name)
                 viafb_init_lvds_vt1636(plvds_setting_info, plvds_chip_info);
         plvds_setting_info->vclk = panel_crt_table->clk;
@@ -1001,54 +661,12 @@ void viafb_lcd_set_mode(struct crt_mode_table *mode_crt_table,
                 }
         }
 
-        if (set_iga == IGA1_IGA2) {
-                load_crtc_shadow_timing(mode_crt_reg, panel_crt_reg);
-                /* Fill shadow registers */
-
-                switch (plvds_setting_info->lcd_panel_id) {
-                case LCD_PANEL_ID0_640X480:
-                        offset = 80;
-                        break;
-                case LCD_PANEL_ID1_800X600:
-                case LCD_PANEL_IDA_800X480:
-                        offset = 110;
-                        break;
-                case LCD_PANEL_ID2_1024X768:
-                        offset = 150;
-                        break;
-                case LCD_PANEL_ID3_1280X768:
-                case LCD_PANEL_ID4_1280X1024:
-                case LCD_PANEL_ID5_1400X1050:
-                case LCD_PANEL_ID9_1280X800:
-                        offset = 190;
-                        break;
-                case LCD_PANEL_ID6_1600X1200:
-                        offset = 250;
-                        break;
-                case LCD_PANEL_ID7_1366X768:
-                case LCD_PANEL_IDB_1360X768:
-                        offset = 212;
-                        break;
-                default:
-                        offset = 140;
-                        break;
-                }
-
-                /* Offset for simultaneous */
-                viafb_set_secondary_pitch(offset << 3);
-                DEBUG_MSG(KERN_INFO "viafb_load_reg!!\n");
-                viafb_load_fetch_count_reg(set_hres, 4, IGA2);
-                /* Fetch count for simultaneous */
-        } else {                /* SAMM */
-                /* Fetch count for IGA2 only */
-                viafb_load_fetch_count_reg(set_hres, mode_bpp / 8, set_iga);
-
-                if ((viaparinfo->chip_info->gfx_chip_name != UNICHROME_CLE266)
-                    && (viaparinfo->chip_info->gfx_chip_name != UNICHROME_K400))
-                        viafb_load_FIFO_reg(set_iga, set_hres, set_vres);
+        /* Fetch count for IGA2 only */
+        viafb_load_fetch_count_reg(set_hres, mode_bpp / 8, set_iga);
 
-                viafb_set_color_depth(mode_bpp / 8, set_iga);
-        }
+        if ((viaparinfo->chip_info->gfx_chip_name != UNICHROME_CLE266)
+                && (viaparinfo->chip_info->gfx_chip_name != UNICHROME_K400))
+                viafb_load_FIFO_reg(set_iga, set_hres, set_vres);
 
         fill_lcd_format();
 
@@ -1065,11 +683,6 @@ void viafb_lcd_set_mode(struct crt_mode_table *mode_crt_table,
             || (UNICHROME_K8M890 == viaparinfo->chip_info->gfx_chip_name))
                 viafb_write_reg_mask(CR6A, VIACR, 0x01, BIT0);
 
-        load_lcd_patch_regs(set_hres, set_vres,
-                            plvds_setting_info->lcd_panel_id, set_iga);
-
-        DEBUG_MSG(KERN_INFO "load_lcd_patch_regs!!\n");
-
         /* Patch for non 32bit alignment mode */
         via_pitch_alignment_patch_lcd(plvds_setting_info, plvds_chip_info);
 }
@@ -1134,45 +747,33 @@ static void integrated_lvds_enable(struct lvds_setting_information
                             *plvds_setting_info,
                             struct lvds_chip_information *plvds_chip_info)
 {
-        bool turn_on_first_powersequence = false;
-        bool turn_on_second_powersequence = false;
-
         DEBUG_MSG(KERN_INFO "integrated_lvds_enable, out_interface:%d\n",
                   plvds_chip_info->output_interface);
         if (plvds_setting_info->lcd_mode == LCD_SPWG)
                 viafb_write_reg_mask(CRD2, VIACR, 0x00, BIT0 + BIT1);
-         else
+        else
                 viafb_write_reg_mask(CRD2, VIACR, 0x03, BIT0 + BIT1);
-        if (INTERFACE_LVDS0LVDS1 == plvds_chip_info->output_interface)
-                turn_on_first_powersequence = true;
-        if (INTERFACE_LVDS0 == plvds_chip_info->output_interface)
-                turn_on_first_powersequence = true;
-        if (INTERFACE_LVDS1 == plvds_chip_info->output_interface)
-                turn_on_second_powersequence = true;
-
-        if (turn_on_second_powersequence) {
-                /* Use second power sequence control: */
 
-                /* Use hardware control power sequence. */
-                viafb_write_reg_mask(CRD3, VIACR, 0, BIT0);
-
-                /* Turn on back light. */
-                viafb_write_reg_mask(CRD3, VIACR, 0, BIT6 + BIT7);
-
-                /* Turn on hardware power sequence. */
-                viafb_write_reg_mask(CRD4, VIACR, 0x02, BIT1);
-        }
-        if (turn_on_first_powersequence) {
+        switch (plvds_chip_info->output_interface) {
+        case INTERFACE_LVDS0LVDS1:
+        case INTERFACE_LVDS0:
                 /* Use first power sequence control: */
-
                 /* Use hardware control power sequence. */
                 viafb_write_reg_mask(CR91, VIACR, 0, BIT0);
-
                 /* Turn on back light. */
                 viafb_write_reg_mask(CR91, VIACR, 0, BIT6 + BIT7);
-
                 /* Turn on hardware power sequence. */
                 viafb_write_reg_mask(CR6A, VIACR, 0x08, BIT3);
+                break;
+        case INTERFACE_LVDS1:
+                /* Use second power sequence control: */
+                /* Use hardware control power sequence. */
+                viafb_write_reg_mask(CRD3, VIACR, 0, BIT0);
+                /* Turn on back light. */
+                viafb_write_reg_mask(CRD3, VIACR, 0, BIT6 + BIT7);
+                /* Turn on hardware power sequence. */
+                viafb_write_reg_mask(CRD4, VIACR, 0x02, BIT1);
+                break;
         }
 
         /* Turn DFP High/Low pad on. */
@@ -1295,8 +896,7 @@ void viafb_lcd_enable(void)
                 viafb_write_reg_mask(CR6A, VIACR, 0x48, 0x48);
         }
 
-        if ((viaparinfo->lvds_setting_info->iga_path == IGA1)
-            || (viaparinfo->lvds_setting_info->iga_path == IGA1_IGA2)) {
+        if (viaparinfo->lvds_setting_info->iga_path == IGA1) {
                 /* CRT path set to IGA2    */
                 viafb_write_reg_mask(SR16, VIASR, 0x40, 0x40);
                 /* IGA2 path disabled      */
@@ -1488,210 +1088,6 @@ static struct display_timing lcd_centering_timging(struct display_timing
         return crt_reg;
 }
 
-static void load_crtc_shadow_timing(struct display_timing mode_timing,
-                             struct display_timing panel_timing)
-{
-        struct io_register *reg = NULL;
-        int i;
-        int viafb_load_reg_Num = 0;
-        int reg_value = 0;
-
-        if (viaparinfo->lvds_setting_info->display_method == LCD_EXPANDSION) {
-                /* Expansion */
-                for (i = 12; i < 20; i++) {
-                        switch (i) {
-                        case H_TOTAL_SHADOW_INDEX:
-                                reg_value =
-                                    IGA2_HOR_TOTAL_SHADOW_FORMULA
-                                    (panel_timing.hor_total);
-                                viafb_load_reg_Num =
-                                    iga2_shadow_crtc_reg.hor_total_shadow.
-                                    reg_num;
-                                reg = iga2_shadow_crtc_reg.hor_total_shadow.reg;
-                                break;
-                        case H_BLANK_END_SHADOW_INDEX:
-                                reg_value =
-                                    IGA2_HOR_BLANK_END_SHADOW_FORMULA
-                                    (panel_timing.hor_blank_start,
-                                     panel_timing.hor_blank_end);
-                                viafb_load_reg_Num =
-                                    iga2_shadow_crtc_reg.
-                                    hor_blank_end_shadow.reg_num;
-                                reg =
-                                    iga2_shadow_crtc_reg.
-                                    hor_blank_end_shadow.reg;
-                                break;
-                        case V_TOTAL_SHADOW_INDEX:
-                                reg_value =
-                                    IGA2_VER_TOTAL_SHADOW_FORMULA
-                                    (panel_timing.ver_total);
-                                viafb_load_reg_Num =
-                                    iga2_shadow_crtc_reg.ver_total_shadow.
-                                    reg_num;
-                                reg = iga2_shadow_crtc_reg.ver_total_shadow.reg;
-                                break;
-                        case V_ADDR_SHADOW_INDEX:
-                                reg_value =
-                                    IGA2_VER_ADDR_SHADOW_FORMULA
-                                    (panel_timing.ver_addr);
-                                viafb_load_reg_Num =
-                                    iga2_shadow_crtc_reg.ver_addr_shadow.
-                                    reg_num;
-                                reg = iga2_shadow_crtc_reg.ver_addr_shadow.reg;
-                                break;
-                        case V_BLANK_SATRT_SHADOW_INDEX:
-                                reg_value =
-                                    IGA2_VER_BLANK_START_SHADOW_FORMULA
-                                    (panel_timing.ver_blank_start);
-                                viafb_load_reg_Num =
-                                    iga2_shadow_crtc_reg.
-                                    ver_blank_start_shadow.reg_num;
-                                reg =
-                                    iga2_shadow_crtc_reg.
-                                    ver_blank_start_shadow.reg;
-                                break;
-                        case V_BLANK_END_SHADOW_INDEX:
-                                reg_value =
-                                    IGA2_VER_BLANK_END_SHADOW_FORMULA
-                                    (panel_timing.ver_blank_start,
-                                     panel_timing.ver_blank_end);
-                                viafb_load_reg_Num =
-                                    iga2_shadow_crtc_reg.
-                                    ver_blank_end_shadow.reg_num;
-                                reg =
-                                    iga2_shadow_crtc_reg.
-                                    ver_blank_end_shadow.reg;
-                                break;
-                        case V_SYNC_SATRT_SHADOW_INDEX:
-                                reg_value =
-                                    IGA2_VER_SYNC_START_SHADOW_FORMULA
-                                    (panel_timing.ver_sync_start);
-                                viafb_load_reg_Num =
-                                    iga2_shadow_crtc_reg.
-                                    ver_sync_start_shadow.reg_num;
-                                reg =
-                                    iga2_shadow_crtc_reg.
-                                    ver_sync_start_shadow.reg;
-                                break;
-                        case V_SYNC_END_SHADOW_INDEX:
-                                reg_value =
-                                    IGA2_VER_SYNC_END_SHADOW_FORMULA
-                                    (panel_timing.ver_sync_start,
-                                     panel_timing.ver_sync_end);
-                                viafb_load_reg_Num =
-                                    iga2_shadow_crtc_reg.
-                                    ver_sync_end_shadow.reg_num;
-                                reg =
-                                    iga2_shadow_crtc_reg.
-                                    ver_sync_end_shadow.reg;
-                                break;
-                        }
-                        viafb_load_reg(reg_value,
-                                viafb_load_reg_Num, reg, VIACR);
-                }
-        } else {                /* Centering */
-                for (i = 12; i < 20; i++) {
-                        switch (i) {
-                        case H_TOTAL_SHADOW_INDEX:
-                                reg_value =
-                                    IGA2_HOR_TOTAL_SHADOW_FORMULA
-                                    (panel_timing.hor_total);
-                                viafb_load_reg_Num =
-                                    iga2_shadow_crtc_reg.hor_total_shadow.
-                                    reg_num;
-                                reg = iga2_shadow_crtc_reg.hor_total_shadow.reg;
-                                break;
-                        case H_BLANK_END_SHADOW_INDEX:
-                                reg_value =
-                                    IGA2_HOR_BLANK_END_SHADOW_FORMULA
-                                    (panel_timing.hor_blank_start,
-                                     panel_timing.hor_blank_end);
-                                viafb_load_reg_Num =
-                                    iga2_shadow_crtc_reg.
-                                    hor_blank_end_shadow.reg_num;
-                                reg =
-                                    iga2_shadow_crtc_reg.
-                                    hor_blank_end_shadow.reg;
-                                break;
-                        case V_TOTAL_SHADOW_INDEX:
-                                reg_value =
-                                    IGA2_VER_TOTAL_SHADOW_FORMULA
-                                    (panel_timing.ver_total);
-                                viafb_load_reg_Num =
-                                    iga2_shadow_crtc_reg.ver_total_shadow.
-                                    reg_num;
-                                reg = iga2_shadow_crtc_reg.ver_total_shadow.reg;
-                                break;
-                        case V_ADDR_SHADOW_INDEX:
-                                reg_value =
-                                    IGA2_VER_ADDR_SHADOW_FORMULA
-                                    (mode_timing.ver_addr);
-                                viafb_load_reg_Num =
-                                    iga2_shadow_crtc_reg.ver_addr_shadow.
-                                    reg_num;
-                                reg = iga2_shadow_crtc_reg.ver_addr_shadow.reg;
-                                break;
-                        case V_BLANK_SATRT_SHADOW_INDEX:
-                                reg_value =
-                                    IGA2_VER_BLANK_START_SHADOW_FORMULA
-                                    (mode_timing.ver_blank_start);
-                                viafb_load_reg_Num =
-                                    iga2_shadow_crtc_reg.
-                                    ver_blank_start_shadow.reg_num;
-                                reg =
-                                    iga2_shadow_crtc_reg.
-                                    ver_blank_start_shadow.reg;
-                                break;
-                        case V_BLANK_END_SHADOW_INDEX:
-                                reg_value =
-                                    IGA2_VER_BLANK_END_SHADOW_FORMULA
-                                    (panel_timing.ver_blank_start,
-                                     panel_timing.ver_blank_end);
-                                viafb_load_reg_Num =
-                                    iga2_shadow_crtc_reg.
-                                    ver_blank_end_shadow.reg_num;
-                                reg =
-                                    iga2_shadow_crtc_reg.
-                                    ver_blank_end_shadow.reg;
-                                break;
-                        case V_SYNC_SATRT_SHADOW_INDEX:
-                                reg_value =
-                                    IGA2_VER_SYNC_START_SHADOW_FORMULA(
-                                    (panel_timing.ver_sync_start -
-                                    panel_timing.ver_blank_start) +
-                                    (panel_timing.ver_addr -
-                                    mode_timing.ver_addr) / 2 +
-                                    mode_timing.ver_addr);
-                                viafb_load_reg_Num =
-                                    iga2_shadow_crtc_reg.ver_sync_start_shadow.
-                                    reg_num;
-                                reg =
-                                    iga2_shadow_crtc_reg.ver_sync_start_shadow.
-                                    reg;
-                                break;
-                        case V_SYNC_END_SHADOW_INDEX:
-                                reg_value =
-                                    IGA2_VER_SYNC_END_SHADOW_FORMULA(
-                                    (panel_timing.ver_sync_start -
-                                    panel_timing.ver_blank_start) +
-                                    (panel_timing.ver_addr -
-                                    mode_timing.ver_addr) / 2 +
-                                    mode_timing.ver_addr,
-                                    panel_timing.ver_sync_end);
-                                viafb_load_reg_Num =
-                                    iga2_shadow_crtc_reg.ver_sync_end_shadow.
-                                    reg_num;
-                                reg =
-                                    iga2_shadow_crtc_reg.ver_sync_end_shadow.
-                                    reg;
-                                break;
-                        }
-                        viafb_load_reg(reg_value,
-                                viafb_load_reg_Num, reg, VIACR);
-                }
-        }
-}
-
 bool viafb_lcd_get_mobile_state(bool *mobile)
 {
         unsigned char *romptr, *tableptr;
diff --git a/drivers/video/via/share.h b/drivers/video/via/share.h
index 7cd03e2a1275..d55aaa7b912c 100644
--- a/drivers/video/via/share.h
+++ b/drivers/video/via/share.h
@@ -43,61 +43,6 @@
 /* Video Memory Size */
 #define VIDEO_MEMORY_SIZE_16M    0x1000000
 
-/* Definition Mode Index
-*/
-#define     VIA_RES_640X480                     0
-#define     VIA_RES_800X600                     1
-#define     VIA_RES_1024X768                    2
-#define     VIA_RES_1152X864                    3
-#define     VIA_RES_1280X1024                   4
-#define     VIA_RES_1600X1200                   5
-#define     VIA_RES_1440X1050                   6
-#define     VIA_RES_1280X768                    7
-#define     VIA_RES_1280X960                    8
-#define     VIA_RES_1920X1440                   9
-#define     VIA_RES_848X480                     10
-#define     VIA_RES_1400X1050                   11
-#define     VIA_RES_720X480                     12
-#define     VIA_RES_720X576                     13
-#define     VIA_RES_1024X512                    14
-#define     VIA_RES_856X480                     15
-#define     VIA_RES_1024X576                    16
-#define     VIA_RES_640X400                     17
-#define     VIA_RES_1280X720                    18
-#define     VIA_RES_1920X1080                   19
-#define     VIA_RES_800X480                     20
-#define     VIA_RES_1368X768                    21
-#define     VIA_RES_1024X600                    22
-#define     VIA_RES_1280X800                    23
-#define     VIA_RES_1680X1050                   24
-#define     VIA_RES_960X600                     25
-#define     VIA_RES_1000X600                    26
-#define     VIA_RES_1088X612                    27
-#define     VIA_RES_1152X720                    28
-#define     VIA_RES_1200X720                    29
-#define     VIA_RES_1280X600                    30
-#define     VIA_RES_1360X768                    31
-#define     VIA_RES_1366X768                    32
-#define     VIA_RES_1440X900                    33
-#define     VIA_RES_1600X900                    34
-#define     VIA_RES_1600X1024                   35
-#define     VIA_RES_1792X1344                   36
-#define     VIA_RES_1856X1392                   37
-#define     VIA_RES_1920X1200                   38
-#define     VIA_RES_2048X1536                   39
-#define     VIA_RES_480X640                     40
-
-/*Reduce Blanking*/
-#define     VIA_RES_1360X768_RB                 131
-#define     VIA_RES_1440X900_RB                 133
-#define     VIA_RES_1400X1050_RB                111
-#define     VIA_RES_1600X900_RB                 134
-#define     VIA_RES_1680X1050_RB                124
-#define     VIA_RES_1920X1080_RB                119
-#define     VIA_RES_1920X1200_RB                138
-
-#define     VIA_RES_INVALID                     255
-
 /* standard VGA IO port
 */
 #define VIARMisc    0x3CC
@@ -118,7 +63,6 @@
 /* Display path */
 #define IGA1        1
 #define IGA2        2
-#define IGA1_IGA2   3
 
 /* Define Color Depth  */
 #define MODE_8BPP       1
diff --git a/drivers/video/via/via_utility.c b/drivers/video/via/via_utility.c
index d53c3d54ed8e..aefdeeec89b1 100644
--- a/drivers/video/via/via_utility.c
+++ b/drivers/video/via/via_utility.c
@@ -239,15 +239,3 @@ void viafb_get_gamma_support_state(int bpp, unsigned int *support_state)
         else
                 *support_state = CRT_Device | DVI_Device | LCD_Device;
 }
-
-int viafb_input_parameter_converter(int parameter_value)
-{
-        int result;
-
-        if (parameter_value >= 1 && parameter_value <= 9)
-                result = 1 << (parameter_value - 1);
-        else
-                result = 1;
-
-        return result;
-}
diff --git a/drivers/video/via/via_utility.h b/drivers/video/via/via_utility.h
index 2fd455202ebd..1670ba82143f 100644
--- a/drivers/video/via/via_utility.h
+++ b/drivers/video/via/via_utility.h
@@ -30,6 +30,5 @@ bool viafb_lcd_get_support_expand_state(u32 xres, u32 yres);
 void viafb_set_gamma_table(int bpp, unsigned int *gamma_table);
 void viafb_get_gamma_table(unsigned int *gamma_table);
 void viafb_get_gamma_support_state(int bpp, unsigned int *support_state);
-int viafb_input_parameter_converter(int parameter_value);
 
 #endif /* __VIAUTILITY_H__ */
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index 56ec696e8afa..777b38a06d40 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -21,23 +21,28 @@
 
 #include <linux/module.h>
 #include <linux/seq_file.h>
+#include <linux/slab.h>
 #include <linux/stat.h>
 #define _MASTER_FILE
 
 #include "global.h"
 
-static struct fb_var_screeninfo default_var;
 static char *viafb_name = "Via";
 static u32 pseudo_pal[17];
 
 /* video mode */
-static char *viafb_mode = "640x480";
-static char *viafb_mode1 = "640x480";
+static char *viafb_mode;
+static char *viafb_mode1;
+static int viafb_bpp = 32;
+static int viafb_bpp1 = 32;
+
+static unsigned int viafb_second_offset;
+static int viafb_second_size;
 
 static int viafb_accel = 1;
 
 /* Added for specifying active devices.*/
-char *viafb_active_dev = "";
+char *viafb_active_dev;
 
 /*Added for specify lcd output port*/
 char *viafb_lcd_port = "";
@@ -50,18 +55,78 @@ static void apply_second_mode_setting(struct fb_var_screeninfo
         *sec_var);
 static void retrieve_device_setting(struct viafb_ioctl_setting
         *setting_info);
+static int viafb_pan_display(struct fb_var_screeninfo *var,
+        struct fb_info *info);
 
 static struct fb_ops viafb_ops;
 
 
+static void viafb_fill_var_color_info(struct fb_var_screeninfo *var, u8 depth)
+{
+        var->grayscale = 0;
+        var->red.msb_right = 0;
+        var->green.msb_right = 0;
+        var->blue.msb_right = 0;
+        var->transp.offset = 0;
+        var->transp.length = 0;
+        var->transp.msb_right = 0;
+        var->nonstd = 0;
+        switch (depth) {
+        case 8:
+                var->bits_per_pixel = 8;
+                var->red.offset = 0;
+                var->green.offset = 0;
+                var->blue.offset = 0;
+                var->red.length = 8;
+                var->green.length = 8;
+                var->blue.length = 8;
+                break;
+        case 15:
+                var->bits_per_pixel = 16;
+                var->red.offset = 10;
+                var->green.offset = 5;
+                var->blue.offset = 0;
+                var->red.length = 5;
+                var->green.length = 5;
+                var->blue.length = 5;
+                break;
+        case 16:
+                var->bits_per_pixel = 16;
+                var->red.offset = 11;
+                var->green.offset = 5;
+                var->blue.offset = 0;
+                var->red.length = 5;
+                var->green.length = 6;
+                var->blue.length = 5;
+                break;
+        case 24:
+                var->bits_per_pixel = 32;
+                var->red.offset = 16;
+                var->green.offset = 8;
+                var->blue.offset = 0;
+                var->red.length = 8;
+                var->green.length = 8;
+                var->blue.length = 8;
+                break;
+        case 30:
+                var->bits_per_pixel = 32;
+                var->red.offset = 20;
+                var->green.offset = 10;
+                var->blue.offset = 0;
+                var->red.length = 10;
+                var->green.length = 10;
+                var->blue.length = 10;
+                break;
+        }
+}
+
 static void viafb_update_fix(struct fb_info *info)
 {
         u32 bpp = info->var.bits_per_pixel;
 
         info->fix.visual =
                 bpp == 8 ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR;
-        info->fix.line_length =
-                ((info->var.xres_virtual + 7) & ~7) * bpp / 8;
+        info->fix.line_length = (info->var.xres_virtual * bpp / 8 + 7) & ~7;
 }
 
 static void viafb_setup_fixinfo(struct fb_fix_screeninfo *fix,
@@ -75,6 +140,7 @@ static void viafb_setup_fixinfo(struct fb_fix_screeninfo *fix,
 
         fix->type = FB_TYPE_PACKED_PIXELS;
         fix->type_aux = 0;
+        fix->visual = FB_VISUAL_TRUECOLOR;
 
         fix->xpanstep = fix->ywrapstep = 0;
         fix->ypanstep = 1;
@@ -97,9 +163,10 @@ static int viafb_release(struct fb_info *info, int user)
 static int viafb_check_var(struct fb_var_screeninfo *var,
         struct fb_info *info)
 {
-        int vmode_index, htotal, vtotal;
+        int htotal, vtotal, depth;
+        struct VideoModeTable *vmode_entry;
         struct viafb_par *ppar = info->par;
-        u32 long_refresh;
+        u32 long_refresh, line;
 
         DEBUG_MSG(KERN_INFO "viafb_check_var!\n");
         /* Sanity check */
@@ -107,26 +174,36 @@ static int viafb_check_var(struct fb_var_screeninfo *var,
         if (var->vmode & FB_VMODE_INTERLACED || var->vmode & FB_VMODE_DOUBLE)
                 return -EINVAL;
 
-        vmode_index = viafb_get_mode_index(var->xres, var->yres);
-        if (vmode_index == VIA_RES_INVALID) {
+        vmode_entry = viafb_get_mode(var->xres, var->yres);
+        if (!vmode_entry) {
                 DEBUG_MSG(KERN_INFO
                           "viafb: Mode %dx%dx%d not supported!!\n",
                           var->xres, var->yres, var->bits_per_pixel);
                 return -EINVAL;
         }
 
-        if (24 == var->bits_per_pixel)
-                var->bits_per_pixel = 32;
+        depth = fb_get_color_depth(var, &info->fix);
+        if (!depth)
+                depth = var->bits_per_pixel;
 
-        if (var->bits_per_pixel != 8 && var->bits_per_pixel != 16 &&
-                var->bits_per_pixel != 32)
+        if (depth < 0 || depth > 32)
                 return -EINVAL;
+        else if (!depth)
+                depth = 24;
+        else if (depth == 15 && viafb_dual_fb && ppar->iga_path == IGA1)
+                depth = 15;
+        else if (depth == 30)
+                depth = 30;
+        else if (depth <= 8)
+                depth = 8;
+        else if (depth <= 16)
+                depth = 16;
+        else
+                depth = 24;
 
-        if ((var->xres_virtual * (var->bits_per_pixel >> 3)) & 0x1F)
-                /*32 pixel alignment */
-                var->xres_virtual = (var->xres_virtual + 31) & ~31;
-        if (var->xres_virtual * var->yres_virtual * var->bits_per_pixel / 8 >
-                ppar->memsize)
+        viafb_fill_var_color_info(var, depth);
+        line = (var->xres_virtual * var->bits_per_pixel / 8 + 7) & ~7;
+        if (line * var->yres_virtual > ppar->memsize)
                 return -EINVAL;
 
         /* Based on var passed in to calculate the refresh,
@@ -142,7 +219,7 @@ static int viafb_check_var(struct fb_var_screeninfo *var,
         viafb_refresh = viafb_get_refresh(var->xres, var->yres, long_refresh);
 
         /* Adjust var according to our driver's own table */
-        viafb_fill_var_timing_info(var, viafb_refresh, vmode_index);
+        viafb_fill_var_timing_info(var, viafb_refresh, vmode_entry);
         if (info->var.accel_flags & FB_ACCELF_TEXT &&
                 !ppar->shared->engine_mmio)
                 info->var.accel_flags = 0;
@@ -153,40 +230,45 @@ static int viafb_check_var(struct fb_var_screeninfo *var,
 static int viafb_set_par(struct fb_info *info)
 {
         struct viafb_par *viapar = info->par;
-        int vmode_index;
-        int vmode_index1 = 0;
+        struct VideoModeTable *vmode_entry, *vmode_entry1 = NULL;
         DEBUG_MSG(KERN_INFO "viafb_set_par!\n");
 
         viapar->depth = fb_get_color_depth(&info->var, &info->fix);
-        viafb_update_device_setting(info->var.xres, info->var.yres,
-                              info->var.bits_per_pixel, viafb_refresh, 0);
+        viafb_update_device_setting(viafbinfo->var.xres, viafbinfo->var.yres,
+                viafbinfo->var.bits_per_pixel, viafb_refresh, 0);
 
-        vmode_index = viafb_get_mode_index(info->var.xres, info->var.yres);
-
-        if (viafb_SAMM_ON == 1) {
+        vmode_entry = viafb_get_mode(viafbinfo->var.xres, viafbinfo->var.yres);
+        if (viafb_dual_fb) {
+                vmode_entry1 = viafb_get_mode(viafbinfo1->var.xres,
+                        viafbinfo1->var.yres);
+                viafb_update_device_setting(viafbinfo1->var.xres,
+                        viafbinfo1->var.yres, viafbinfo1->var.bits_per_pixel,
+                        viafb_refresh1, 1);
+        } else if (viafb_SAMM_ON == 1) {
                 DEBUG_MSG(KERN_INFO
                 "viafb_second_xres = %d, viafb_second_yres = %d, bpp = %d\n",
                           viafb_second_xres, viafb_second_yres, viafb_bpp1);
-                vmode_index1 = viafb_get_mode_index(viafb_second_xres,
+                vmode_entry1 = viafb_get_mode(viafb_second_xres,
                         viafb_second_yres);
-                DEBUG_MSG(KERN_INFO "->viafb_SAMM_ON: index=%d\n",
-                        vmode_index1);
 
                 viafb_update_device_setting(viafb_second_xres,
                         viafb_second_yres, viafb_bpp1, viafb_refresh1, 1);
         }
 
-        if (vmode_index != VIA_RES_INVALID) {
-                viafb_setmode(vmode_index, info->var.xres, info->var.yres,
-                        info->var.bits_per_pixel, vmode_index1,
-                        viafb_second_xres, viafb_second_yres, viafb_bpp1);
-
+        if (vmode_entry) {
                 viafb_update_fix(info);
-                viafb_bpp = info->var.bits_per_pixel;
+                if (viafb_dual_fb && viapar->iga_path == IGA2)
+                        viafb_bpp1 = info->var.bits_per_pixel;
+                else
+                        viafb_bpp = info->var.bits_per_pixel;
+
                 if (info->var.accel_flags & FB_ACCELF_TEXT)
                         info->flags &= ~FBINFO_HWACCEL_DISABLED;
                 else
                         info->flags |= FBINFO_HWACCEL_DISABLED;
+                viafb_setmode(vmode_entry, info->var.bits_per_pixel,
+                        vmode_entry1, viafb_bpp1);
+                viafb_pan_display(&info->var, info);
         }
 
         return 0;
@@ -196,234 +278,52 @@ static int viafb_set_par(struct fb_info *info)
 static int viafb_setcolreg(unsigned regno, unsigned red, unsigned green,
 unsigned blue, unsigned transp, struct fb_info *info)
 {
-        u8 sr1a, sr1b, cr67, cr6a, rev = 0, shift = 10;
-        unsigned cmap_entries = (info->var.bits_per_pixel == 8) ? 256 : 16;
-        DEBUG_MSG(KERN_INFO "viafb_setcolreg!\n");
-        if (regno >= cmap_entries)
-                return 1;
-        if (UNICHROME_CLE266 == viaparinfo->chip_info->gfx_chip_name) {
-                /*
-                 * Read PCI bus 0,dev 0,function 0,index 0xF6 to get chip rev.
-                 */
-                outl(0x80000000 | (0xf6 & ~3), (unsigned long)0xCF8);
-                rev = (inl((unsigned long)0xCFC) >> ((0xf6 & 3) * 8)) & 0xff;
-        }
-        switch (info->var.bits_per_pixel) {
-        case 8:
-                outb(0x1A, 0x3C4);
-                sr1a = inb(0x3C5);
-                outb(0x1B, 0x3C4);
-                sr1b = inb(0x3C5);
-                outb(0x67, 0x3D4);
-                cr67 = inb(0x3D5);
-                outb(0x6A, 0x3D4);
-                cr6a = inb(0x3D5);
-
-                /* Map the 3C6/7/8/9 to the IGA2 */
-                outb(0x1A, 0x3C4);
-                outb(sr1a | 0x01, 0x3C5);
-                /* Second Display Engine colck always on */
-                outb(0x1B, 0x3C4);
-                outb(sr1b | 0x80, 0x3C5);
-                /* Second Display Color Depth 8 */
-                outb(0x67, 0x3D4);
-                outb(cr67 & 0x3F, 0x3D5);
-                outb(0x6A, 0x3D4);
-                /* Second Display Channel Reset CR6A[6]) */
-                outb(cr6a & 0xBF, 0x3D5);
-                /* Second Display Channel Enable CR6A[7] */
-                outb(cr6a | 0x80, 0x3D5);
-                /* Second Display Channel stop reset) */
-                outb(cr6a | 0x40, 0x3D5);
-
-                /* Bit mask of palette */
-                outb(0xFF, 0x3c6);
-                /* Write one register of IGA2 */
-                outb(regno, 0x3C8);
-                if (UNICHROME_CLE266 == viaparinfo->chip_info->gfx_chip_name &&
-                        rev >= 15) {
-                        shift = 8;
-                        viafb_write_reg_mask(CR6A, VIACR, BIT5, BIT5);
-                        viafb_write_reg_mask(SR15, VIASR, BIT7, BIT7);
-                } else {
-                        shift = 10;
-                        viafb_write_reg_mask(CR6A, VIACR, 0, BIT5);
-                        viafb_write_reg_mask(SR15, VIASR, 0, BIT7);
-                }
-                outb(red >> shift, 0x3C9);
-                outb(green >> shift, 0x3C9);
-                outb(blue >> shift, 0x3C9);
-
-                /* Map the 3C6/7/8/9 to the IGA1 */
-                outb(0x1A, 0x3C4);
-                outb(sr1a & 0xFE, 0x3C5);
-                /* Bit mask of palette */
-                outb(0xFF, 0x3c6);
-                /* Write one register of IGA1 */
-                outb(regno, 0x3C8);
-                outb(red >> shift, 0x3C9);
-                outb(green >> shift, 0x3C9);
-                outb(blue >> shift, 0x3C9);
-
-                outb(0x1A, 0x3C4);
-                outb(sr1a, 0x3C5);
-                outb(0x1B, 0x3C4);
-                outb(sr1b, 0x3C5);
-                outb(0x67, 0x3D4);
-                outb(cr67, 0x3D5);
-                outb(0x6A, 0x3D4);
-                outb(cr6a, 0x3D5);
-                break;
-        case 16:
-                ((u32 *) info->pseudo_palette)[regno] = (red & 0xF800) |
-                    ((green & 0xFC00) >> 5) | ((blue & 0xF800) >> 11);
-                break;
-        case 32:
-                ((u32 *) info->pseudo_palette)[regno] =
-                    ((transp & 0xFF00) << 16) |
-                    ((red & 0xFF00) << 8) |
-                    ((green & 0xFF00)) | ((blue & 0xFF00) >> 8);
-                break;
-        }
-
-        return 0;
+        struct viafb_par *viapar = info->par;
+        u32 r, g, b;
 
-}
+        if (info->fix.visual == FB_VISUAL_PSEUDOCOLOR) {
+                if (regno > 255)
+                        return -EINVAL;
 
-/*CALLED BY: fb_set_cmap */
-/*           fb_set_var, pass 256 colors */
-/*CALLED BY: fb_set_cmap */
-/*           fbcon_set_palette, pass 16 colors */
-static int viafb_setcmap(struct fb_cmap *cmap, struct fb_info *info)
-{
-        u32 len = cmap->len;
-        u32 i;
-        u16 *pred = cmap->red;
-        u16 *pgreen = cmap->green;
-        u16 *pblue = cmap->blue;
-        u16 *ptransp = cmap->transp;
-        u8 sr1a, sr1b, cr67, cr6a, rev = 0, shift = 10;
-        if (len > 256)
-                return 1;
-        if (UNICHROME_CLE266 == viaparinfo->chip_info->gfx_chip_name) {
-                /*
-                 * Read PCI bus 0, dev 0, function 0, index 0xF6 to get chip
-                 * rev.
-                 */
-                outl(0x80000000 | (0xf6 & ~3), (unsigned long)0xCF8);
-                rev = (inl((unsigned long)0xCFC) >> ((0xf6 & 3) * 8)) & 0xff;
-        }
-        switch (info->var.bits_per_pixel) {
-        case 8:
-                outb(0x1A, 0x3C4);
-                sr1a = inb(0x3C5);
-                outb(0x1B, 0x3C4);
-                sr1b = inb(0x3C5);
-                outb(0x67, 0x3D4);
-                cr67 = inb(0x3D5);
-                outb(0x6A, 0x3D4);
-                cr6a = inb(0x3D5);
-                /* Map the 3C6/7/8/9 to the IGA2 */
-                outb(0x1A, 0x3C4);
-                outb(sr1a | 0x01, 0x3C5);
-                outb(0x1B, 0x3C4);
-                /* Second Display Engine colck always on */
-                outb(sr1b | 0x80, 0x3C5);
-                outb(0x67, 0x3D4);
-                /* Second Display Color Depth 8 */
-                outb(cr67 & 0x3F, 0x3D5);
-                outb(0x6A, 0x3D4);
-                /* Second Display Channel Reset CR6A[6]) */
-                outb(cr6a & 0xBF, 0x3D5);
-                /* Second Display Channel Enable CR6A[7] */
-                outb(cr6a | 0x80, 0x3D5);
-                /* Second Display Channel stop reset) */
-                outb(cr6a | 0xC0, 0x3D5);
-
-                /* Bit mask of palette */
-                outb(0xFF, 0x3c6);
-                outb(0x00, 0x3C8);
-                if (UNICHROME_CLE266 == viaparinfo->chip_info->gfx_chip_name &&
-                        rev >= 15) {
-                        shift = 8;
-                        viafb_write_reg_mask(CR6A, VIACR, BIT5, BIT5);
-                        viafb_write_reg_mask(SR15, VIASR, BIT7, BIT7);
-                } else {
-                        shift = 10;
-                        viafb_write_reg_mask(CR6A, VIACR, 0, BIT5);
-                        viafb_write_reg_mask(SR15, VIASR, 0, BIT7);
-                }
-                for (i = 0; i < len; i++) {
-                        outb((*(pred + i)) >> shift, 0x3C9);
-                        outb((*(pgreen + i)) >> shift, 0x3C9);
-                        outb((*(pblue + i)) >> shift, 0x3C9);
-                }
+                if (!viafb_dual_fb || viapar->iga_path == IGA1)
+                        viafb_set_primary_color_register(regno, red >> 8,
+                                green >> 8, blue >> 8);
 
-                outb(0x1A, 0x3C4);
-                /* Map the 3C6/7/8/9 to the IGA1 */
-                outb(sr1a & 0xFE, 0x3C5);
-                /* Bit mask of palette */
-                outb(0xFF, 0x3c6);
-                outb(0x00, 0x3C8);
-                for (i = 0; i < len; i++) {
-                        outb((*(pred + i)) >> shift, 0x3C9);
-                        outb((*(pgreen + i)) >> shift, 0x3C9);
-                        outb((*(pblue + i)) >> shift, 0x3C9);
-                }
+                if (!viafb_dual_fb || viapar->iga_path == IGA2)
+                        viafb_set_secondary_color_register(regno, red >> 8,
+                                green >> 8, blue >> 8);
+        } else {
+                if (regno > 15)
+                        return -EINVAL;
 
-                outb(0x1A, 0x3C4);
-                outb(sr1a, 0x3C5);
-                outb(0x1B, 0x3C4);
-                outb(sr1b, 0x3C5);
-                outb(0x67, 0x3D4);
-                outb(cr67, 0x3D5);
-                outb(0x6A, 0x3D4);
-                outb(cr6a, 0x3D5);
-                break;
-        case 16:
-                if (len > 17)
-                        return 0;       /* Because static u32 pseudo_pal[17]; */
-                for (i = 0; i < len; i++)
-                        ((u32 *) info->pseudo_palette)[i] =
-                            (*(pred + i) & 0xF800) |
-                            ((*(pgreen + i) & 0xFC00) >> 5) |
-                            ((*(pblue + i) & 0xF800) >> 11);
-                break;
-        case 32:
-                if (len > 17)
-                        return 0;
-                if (ptransp) {
-                        for (i = 0; i < len; i++)
-                                ((u32 *) info->pseudo_palette)[i] =
-                                    ((*(ptransp + i) & 0xFF00) << 16) |
-                                    ((*(pred + i) & 0xFF00) << 8) |
-                                    ((*(pgreen + i) & 0xFF00)) |
-                                    ((*(pblue + i) & 0xFF00) >> 8);
-                } else {
-                        for (i = 0; i < len; i++)
-                                ((u32 *) info->pseudo_palette)[i] =
-                                    0x00000000 |
-                                    ((*(pred + i) & 0xFF00) << 8) |
-                                    ((*(pgreen + i) & 0xFF00)) |
-                                    ((*(pblue + i) & 0xFF00) >> 8);
-                }
-                break;
+                r = (red >> (16 - info->var.red.length))
+                        << info->var.red.offset;
+                b = (blue >> (16 - info->var.blue.length))
+                        << info->var.blue.offset;
+                g = (green >> (16 - info->var.green.length))
+                        << info->var.green.offset;
+                ((u32 *) info->pseudo_palette)[regno] = r | g | b;
         }
+
         return 0;
 }
 
 static int viafb_pan_display(struct fb_var_screeninfo *var,
         struct fb_info *info)
 {
-        unsigned int offset;
-
-        DEBUG_MSG(KERN_INFO "viafb_pan_display!\n");
-
-        offset = (var->xoffset + (var->yoffset * var->xres_virtual)) *
-            var->bits_per_pixel / 16;
+        struct viafb_par *viapar = info->par;
+        u32 vram_addr = (var->yoffset * var->xres_virtual + var->xoffset)
+                * (var->bits_per_pixel / 8) + viapar->vram_addr;
+
+        DEBUG_MSG(KERN_DEBUG "viafb_pan_display, address = %d\n", vram_addr);
+        if (!viafb_dual_fb) {
+                viafb_set_primary_address(vram_addr);
+                viafb_set_secondary_address(vram_addr);
+        } else if (viapar->iga_path == IGA1)
+                viafb_set_primary_address(vram_addr);
+        else
+                viafb_set_secondary_address(vram_addr);
 
-        DEBUG_MSG(KERN_INFO "\nviafb_pan_display,offset =%d ", offset);
-        viafb_set_primary_address(offset);
         return 0;
 }
 
@@ -477,6 +377,7 @@ static int viafb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
         u32 gpu32;
 
         DEBUG_MSG(KERN_INFO "viafb_ioctl: 0x%X !!\n", cmd);
+        printk(KERN_WARNING "viafb_ioctl: Please avoid this interface as it is unstable and might change or vanish at any time!\n");
         memset(&u, 0, sizeof(u));
 
         switch (cmd) {
@@ -680,7 +581,7 @@ static int viafb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
                 if (!viafb_gamma_table)
                         return -ENOMEM;
                 if (copy_from_user(viafb_gamma_table, argp,
-                                sizeof(viafb_gamma_table))) {
+                                256 * sizeof(u32))) {
                         kfree(viafb_gamma_table);
                         return -EFAULT;
                 }
@@ -694,7 +595,7 @@ static int viafb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
                         return -ENOMEM;
                 viafb_get_gamma_table(viafb_gamma_table);
                 if (copy_to_user(argp, viafb_gamma_table,
-                        sizeof(viafb_gamma_table))) {
+                        256 * sizeof(u32))) {
                         kfree(viafb_gamma_table);
                         return -EFAULT;
                 }
@@ -872,7 +773,9 @@ static int viafb_cursor(struct fb_info *info, struct fb_cursor *cursor)
         if (info->flags & FBINFO_HWACCEL_DISABLED || info != viafbinfo)
                 return -ENODEV;
 
-        if (chip_name == UNICHROME_CLE266 && viapar->iga_path == IGA2)
+        /* LCD ouput does not support hw cursors (at least on VN896) */
+        if ((chip_name == UNICHROME_CLE266 && viapar->iga_path == IGA2) ||
+                viafb_LCD_ON)
                 return -ENODEV;
 
         viafb_show_hw_cursor(info, HW_Cursor_OFF);
@@ -1014,23 +917,6 @@ static int viafb_sync(struct fb_info *info)
         return 0;
 }
 
-int viafb_get_mode_index(int hres, int vres)
-{
-        u32 i;
-        DEBUG_MSG(KERN_INFO "viafb_get_mode_index!\n");
-
-        for (i = 0; i < NUM_TOTAL_MODETABLE; i++)
-                if (CLE266Modes[i].mode_array &&
-                        CLE266Modes[i].crtc[0].crtc.hor_addr == hres &&
-                        CLE266Modes[i].crtc[0].crtc.ver_addr == vres)
-                        break;
-
-        if (i == NUM_TOTAL_MODETABLE)
-                return VIA_RES_INVALID;
-
-        return CLE266Modes[i].ModeIndex;
-}
-
 static void check_available_device_to_enable(int device_id)
 {
         int device_num = 0;
@@ -1329,7 +1215,7 @@ static void retrieve_device_setting(struct viafb_ioctl_setting
         setting_info->lcd_attributes.lcd_mode = viafb_lcd_mode;
 }
 
-static void parse_active_dev(void)
+static int parse_active_dev(void)
 {
         viafb_CRT_ON = STATE_OFF;
         viafb_DVI_ON = STATE_OFF;
@@ -1340,60 +1226,63 @@ static void parse_active_dev(void)
            IGA path to devices in SAMM case. */
         /*    Note: The previous of active_dev is primary device,
            and the following is secondary device. */
-        if (!strncmp(viafb_active_dev, "CRT+DVI", 7)) {
+        if (!viafb_active_dev) {
+                viafb_CRT_ON = STATE_ON;
+                viafb_SAMM_ON = STATE_OFF;
+        } else if (!strcmp(viafb_active_dev, "CRT+DVI")) {
                 /* CRT+DVI */
                 viafb_CRT_ON = STATE_ON;
                 viafb_DVI_ON = STATE_ON;
                 viafb_primary_dev = CRT_Device;
-        } else if (!strncmp(viafb_active_dev, "DVI+CRT", 7)) {
+        } else if (!strcmp(viafb_active_dev, "DVI+CRT")) {
                 /* DVI+CRT */
                 viafb_CRT_ON = STATE_ON;
                 viafb_DVI_ON = STATE_ON;
                 viafb_primary_dev = DVI_Device;
-        } else if (!strncmp(viafb_active_dev, "CRT+LCD", 7)) {
+        } else if (!strcmp(viafb_active_dev, "CRT+LCD")) {
                 /* CRT+LCD */
                 viafb_CRT_ON = STATE_ON;
                 viafb_LCD_ON = STATE_ON;
                 viafb_primary_dev = CRT_Device;
-        } else if (!strncmp(viafb_active_dev, "LCD+CRT", 7)) {
+        } else if (!strcmp(viafb_active_dev, "LCD+CRT")) {
                 /* LCD+CRT */
                 viafb_CRT_ON = STATE_ON;
                 viafb_LCD_ON = STATE_ON;
                 viafb_primary_dev = LCD_Device;
-        } else if (!strncmp(viafb_active_dev, "DVI+LCD", 7)) {
+        } else if (!strcmp(viafb_active_dev, "DVI+LCD")) {
                 /* DVI+LCD */
                 viafb_DVI_ON = STATE_ON;
                 viafb_LCD_ON = STATE_ON;
                 viafb_primary_dev = DVI_Device;
-        } else if (!strncmp(viafb_active_dev, "LCD+DVI", 7)) {
+        } else if (!strcmp(viafb_active_dev, "LCD+DVI")) {
                 /* LCD+DVI */
                 viafb_DVI_ON = STATE_ON;
                 viafb_LCD_ON = STATE_ON;
                 viafb_primary_dev = LCD_Device;
-        } else if (!strncmp(viafb_active_dev, "LCD+LCD2", 8)) {
+        } else if (!strcmp(viafb_active_dev, "LCD+LCD2")) {
                 viafb_LCD_ON = STATE_ON;
                 viafb_LCD2_ON = STATE_ON;
                 viafb_primary_dev = LCD_Device;
-        } else if (!strncmp(viafb_active_dev, "LCD2+LCD", 8)) {
+        } else if (!strcmp(viafb_active_dev, "LCD2+LCD")) {
                 viafb_LCD_ON = STATE_ON;
                 viafb_LCD2_ON = STATE_ON;
                 viafb_primary_dev = LCD2_Device;
-        } else if (!strncmp(viafb_active_dev, "CRT", 3)) {
+        } else if (!strcmp(viafb_active_dev, "CRT")) {
                 /* CRT only */
                 viafb_CRT_ON = STATE_ON;
                 viafb_SAMM_ON = STATE_OFF;
-        } else if (!strncmp(viafb_active_dev, "DVI", 3)) {
+        } else if (!strcmp(viafb_active_dev, "DVI")) {
                 /* DVI only */
                 viafb_DVI_ON = STATE_ON;
                 viafb_SAMM_ON = STATE_OFF;
-        } else if (!strncmp(viafb_active_dev, "LCD", 3)) {
+        } else if (!strcmp(viafb_active_dev, "LCD")) {
                 /* LCD only */
                 viafb_LCD_ON = STATE_ON;
                 viafb_SAMM_ON = STATE_OFF;
-        } else {
-                viafb_CRT_ON = STATE_ON;
-                viafb_SAMM_ON = STATE_OFF;
-        }
+        } else
+                return -EINVAL;
+
+        return 0;
 }
 
 static int parse_port(char *opt_str, int *output_interface)
@@ -1797,7 +1686,7 @@ static const struct file_operations viafb_vt1636_proc_fops = {
 static void viafb_init_proc(struct proc_dir_entry **viafb_entry)
 {
         *viafb_entry = proc_mkdir("viafb", NULL);
-        if (viafb_entry) {
+        if (*viafb_entry) {
                 proc_create("dvp0", 0, *viafb_entry, &viafb_dvp0_proc_fops);
                 proc_create("dvp1", 0, *viafb_entry, &viafb_dvp1_proc_fops);
                 proc_create("dfph", 0, *viafb_entry, &viafb_dfph_proc_fops);
@@ -1822,35 +1711,37 @@ static void viafb_remove_proc(struct proc_dir_entry *viafb_entry)
         remove_proc_entry("viafb", NULL);
 }
 
-static void parse_mode(const char *str, u32 *xres, u32 *yres)
+static int parse_mode(const char *str, u32 *xres, u32 *yres)
 {
         char *ptr;
 
+        if (!str) {
+                *xres = 640;
+                *yres = 480;
+                return 0;
+        }
+
         *xres = simple_strtoul(str, &ptr, 10);
         if (ptr[0] != 'x')
-                goto out_default;
+                return -EINVAL;
 
         *yres = simple_strtoul(&ptr[1], &ptr, 10);
         if (ptr[0])
-                goto out_default;
-
-        return;
+                return -EINVAL;
 
-out_default:
-        printk(KERN_WARNING "viafb received invalid mode string: %s\n", str);
-        *xres = 640;
-        *yres = 480;
+        return 0;
 }
 
 static int __devinit via_pci_probe(struct pci_dev *pdev,
                                    const struct pci_device_id *ent)
 {
         u32 default_xres, default_yres;
-        int vmode_index;
+        struct VideoModeTable *vmode_entry;
+        struct fb_var_screeninfo default_var;
         u32 viafb_par_length;
 
         DEBUG_MSG(KERN_INFO "VIAFB PCI Probe!!\n");
-
+        memset(&default_var, 0, sizeof(default_var));
         viafb_par_length = ALIGN(sizeof(struct viafb_par), BITS_PER_LONG/8);
 
         /* Allocate fb_info and ***_par here, also including some other needed
@@ -1876,7 +1767,6 @@ static int __devinit via_pci_probe(struct pci_dev *pdev,
 
         if (viafb_dual_fb)
                 viafb_SAMM_ON = 1;
-        parse_active_dev();
         parse_lcd_port();
         parse_dvi_port();
 
@@ -1925,9 +1815,7 @@ static int __devinit via_pci_probe(struct pci_dev *pdev,
         }
 
         parse_mode(viafb_mode, &default_xres, &default_yres);
-        vmode_index = viafb_get_mode_index(default_xres, default_yres);
-        DEBUG_MSG(KERN_INFO "0->index=%d\n", vmode_index);
-
+        vmode_entry = viafb_get_mode(default_xres, default_yres);
         if (viafb_SAMM_ON == 1) {
                 parse_mode(viafb_mode1, &viafb_second_xres,
                         &viafb_second_yres);
@@ -1946,19 +1834,6 @@ static int __devinit via_pci_probe(struct pci_dev *pdev,
                         viafb_second_virtual_yres = viafb_second_yres;
         }
 
-        switch (viafb_bpp) {
-        case 0 ... 8:
-                viafb_bpp = 8;
-                break;
-        case 9 ... 16:
-                viafb_bpp = 16;
-                break;
-        case 17 ... 32:
-                viafb_bpp = 32;
-                break;
-        default:
-                viafb_bpp = 8;
-        }
         default_var.xres = default_xres;
         default_var.yres = default_yres;
         switch (default_xres) {
@@ -1971,8 +1846,6 @@ static int __devinit via_pci_probe(struct pci_dev *pdev,
         }
         default_var.yres_virtual = default_yres;
         default_var.bits_per_pixel = viafb_bpp;
-        if (default_var.bits_per_pixel == 15)
-                default_var.bits_per_pixel = 16;
         default_var.pixclock =
             viafb_get_pixclock(default_xres, default_yres, viafb_refresh);
         default_var.left_margin = (default_xres >> 3) & 0xf8;
@@ -1981,6 +1854,8 @@ static int __devinit via_pci_probe(struct pci_dev *pdev,
         default_var.lower_margin = 4;
         default_var.hsync_len = default_var.left_margin;
         default_var.vsync_len = 4;
+        viafb_setup_fixinfo(&viafbinfo->fix, viaparinfo);
+        viafbinfo->var = default_var;
 
         if (viafb_dual_fb) {
                 viafbinfo1 = framebuffer_alloc(viafb_par_length, &pdev->dev);
@@ -2015,8 +1890,6 @@ static int __devinit via_pci_probe(struct pci_dev *pdev,
                 default_var.yres = viafb_second_yres;
                 default_var.xres_virtual = viafb_second_virtual_xres;
                 default_var.yres_virtual = viafb_second_virtual_yres;
-                if (viafb_bpp1 != viafb_bpp)
-                        viafb_bpp1 = viafb_bpp;
                 default_var.bits_per_pixel = viafb_bpp1;
                 default_var.pixclock =
                     viafb_get_pixclock(viafb_second_xres, viafb_second_yres,
@@ -2036,9 +1909,7 @@ static int __devinit via_pci_probe(struct pci_dev *pdev,
                         &viafbinfo1->fix);
         }
 
-        viafb_setup_fixinfo(&viafbinfo->fix, viaparinfo);
-        viafb_check_var(&default_var, viafbinfo);
-        viafbinfo->var = default_var;
+        viafb_check_var(&viafbinfo->var, viafbinfo);
         viafb_update_fix(viafbinfo);
         viaparinfo->depth = fb_get_color_depth(&viafbinfo->var,
                 &viafbinfo->fix);
@@ -2196,12 +2067,20 @@ static struct pci_driver viafb_driver = {
 
 static int __init viafb_init(void)
 {
+        u32 dummy;
 #ifndef MODULE
         char *option = NULL;
         if (fb_get_options("viafb", &option))
                 return -ENODEV;
         viafb_setup(option);
 #endif
+        if (parse_mode(viafb_mode, &dummy, &dummy)
+                || parse_mode(viafb_mode1, &dummy, &dummy)
+                || viafb_bpp < 0 || viafb_bpp > 32
+                || viafb_bpp1 < 0 || viafb_bpp1 > 32
+                || parse_active_dev())
+                return -EINVAL;
+
         printk(KERN_INFO
        "VIA Graphics Intergration Chipset framebuffer %d.%d initializing\n",
                VERSION_MAJOR, VERSION_MINOR);
@@ -2229,15 +2108,12 @@ static struct fb_ops viafb_ops = {
         .fb_cursor = viafb_cursor,
         .fb_ioctl = viafb_ioctl,
         .fb_sync = viafb_sync,
-        .fb_setcmap = viafb_setcmap,
 };
 
 module_init(viafb_init);
 module_exit(viafb_exit);
 
 #ifdef MODULE
-module_param(viafb_memsize, int, S_IRUSR);
-
 module_param(viafb_mode, charp, S_IRUSR);
 MODULE_PARM_DESC(viafb_mode, "Set resolution (default=640x480)");
 
diff --git a/drivers/video/via/viafbdev.h b/drivers/video/via/viafbdev.h
index 0c94d2441922..61b5953cd159 100644
--- a/drivers/video/via/viafbdev.h
+++ b/drivers/video/via/viafbdev.h
@@ -83,22 +83,16 @@ struct viafb_par {
 
 extern unsigned int viafb_second_virtual_yres;
 extern unsigned int viafb_second_virtual_xres;
-extern unsigned int viafb_second_offset;
-extern int viafb_second_size;
 extern int viafb_SAMM_ON;
 extern int viafb_dual_fb;
 extern int viafb_LCD2_ON;
 extern int viafb_LCD_ON;
 extern int viafb_DVI_ON;
 extern int viafb_hotplug;
-extern int viafb_memsize;
 
 extern int strict_strtoul(const char *cp, unsigned int base,
         unsigned long *res);
 
-void viafb_fill_var_timing_info(struct fb_var_screeninfo *var, int refresh,
-                          int mode_index);
-int viafb_get_mode_index(int hres, int vres);
 u8 viafb_gpio_i2c_read_lvds(struct lvds_setting_information
         *plvds_setting_info, struct lvds_chip_information
         *plvds_chip_info, u8 index);
diff --git a/drivers/video/via/viamode.c b/drivers/video/via/viamode.c
index b74f8a67923c..af50e244016c 100644
--- a/drivers/video/via/viamode.c
+++ b/drivers/video/via/viamode.c
@@ -412,7 +412,7 @@ struct io_reg PM1024x768[] = { {VIASR, 0x16, 0xBF, 0x0C},
 };
 
 struct patch_table res_patch_table[] = {
-        {VIA_RES_1024X768, ARRAY_SIZE(PM1024x768), PM1024x768}
+        {ARRAY_SIZE(PM1024x768), PM1024x768}
 };
 
 /* struct VPITTable {
@@ -879,169 +879,151 @@ struct crt_mode_table CRTM2048x1536[] = {
          {2800, 2048, 2048, 752, 2200, 224, 1592, 1536, 1536, 56, 1539, 4} }
 };
 
-/* Video Mode Table */
-/* struct VideoModeTable {*/
-/*  int                               ModeIndex;*/
-/*  struct crt_mode_table             *crtc;*/
-/*  int                               mode_array;*/
-/* };*/
-struct VideoModeTable CLE266Modes[] = {
+struct VideoModeTable viafb_modes[] = {
         /* Display : 480x640 (GTF) */
-        {VIA_RES_480X640, CRTM480x640, ARRAY_SIZE(CRTM480x640)},
+        {CRTM480x640, ARRAY_SIZE(CRTM480x640)},
 
         /* Display : 640x480 */
-        {VIA_RES_640X480, CRTM640x480, ARRAY_SIZE(CRTM640x480)},
+        {CRTM640x480, ARRAY_SIZE(CRTM640x480)},
 
         /* Display : 720x480 (GTF) */
-        {VIA_RES_720X480, CRTM720x480, ARRAY_SIZE(CRTM720x480)},
+        {CRTM720x480, ARRAY_SIZE(CRTM720x480)},
 
         /* Display : 720x576 (GTF) */
-        {VIA_RES_720X576, CRTM720x576, ARRAY_SIZE(CRTM720x576)},
+        {CRTM720x576, ARRAY_SIZE(CRTM720x576)},
 
         /* Display : 800x600 */
-        {VIA_RES_800X600, CRTM800x600, ARRAY_SIZE(CRTM800x600)},
+        {CRTM800x600, ARRAY_SIZE(CRTM800x600)},
 
         /* Display : 800x480 (CVT) */
-        {VIA_RES_800X480, CRTM800x480, ARRAY_SIZE(CRTM800x480)},
+        {CRTM800x480, ARRAY_SIZE(CRTM800x480)},
 
         /* Display : 848x480 (CVT) */
-        {VIA_RES_848X480, CRTM848x480, ARRAY_SIZE(CRTM848x480)},
+        {CRTM848x480, ARRAY_SIZE(CRTM848x480)},
 
         /* Display : 852x480 (GTF) */
-        {VIA_RES_856X480, CRTM852x480, ARRAY_SIZE(CRTM852x480)},
+        {CRTM852x480, ARRAY_SIZE(CRTM852x480)},
 
         /* Display : 1024x512 (GTF) */
-        {VIA_RES_1024X512, CRTM1024x512, ARRAY_SIZE(CRTM1024x512)},
+        {CRTM1024x512, ARRAY_SIZE(CRTM1024x512)},
 
         /* Display : 1024x600 */
-        {VIA_RES_1024X600, CRTM1024x600, ARRAY_SIZE(CRTM1024x600)},
-
-        /* Display : 1024x576 (GTF) */
-        /*{ VIA_RES_1024X576, CRTM1024x576, ARRAY_SIZE(CRTM1024x576)}, */
+        {CRTM1024x600, ARRAY_SIZE(CRTM1024x600)},
 
         /* Display : 1024x768 */
-        {VIA_RES_1024X768, CRTM1024x768, ARRAY_SIZE(CRTM1024x768)},
+        {CRTM1024x768, ARRAY_SIZE(CRTM1024x768)},
 
         /* Display : 1152x864 */
-        {VIA_RES_1152X864, CRTM1152x864, ARRAY_SIZE(CRTM1152x864)},
+        {CRTM1152x864, ARRAY_SIZE(CRTM1152x864)},
 
         /* Display : 1280x768 (GTF) */
-        {VIA_RES_1280X768, CRTM1280x768, ARRAY_SIZE(CRTM1280x768)},
+        {CRTM1280x768, ARRAY_SIZE(CRTM1280x768)},
 
         /* Display : 960x600 (CVT) */
-        {VIA_RES_960X600, CRTM960x600, ARRAY_SIZE(CRTM960x600)},
+        {CRTM960x600, ARRAY_SIZE(CRTM960x600)},
 
         /* Display : 1000x600 (GTF) */
-        {VIA_RES_1000X600, CRTM1000x600, ARRAY_SIZE(CRTM1000x600)},
+        {CRTM1000x600, ARRAY_SIZE(CRTM1000x600)},
 
         /* Display : 1024x576 (GTF) */
-        {VIA_RES_1024X576, CRTM1024x576, ARRAY_SIZE(CRTM1024x576)},
+        {CRTM1024x576, ARRAY_SIZE(CRTM1024x576)},
 
         /* Display : 1088x612 (GTF) */
-        {VIA_RES_1088X612, CRTM1088x612, ARRAY_SIZE(CRTM1088x612)},
+        {CRTM1088x612, ARRAY_SIZE(CRTM1088x612)},
 
         /* Display : 1152x720 (CVT) */
-        {VIA_RES_1152X720, CRTM1152x720, ARRAY_SIZE(CRTM1152x720)},
+        {CRTM1152x720, ARRAY_SIZE(CRTM1152x720)},
 
         /* Display : 1200x720 (GTF) */
-        {VIA_RES_1200X720, CRTM1200x720, ARRAY_SIZE(CRTM1200x720)},
+        {CRTM1200x720, ARRAY_SIZE(CRTM1200x720)},
 
         /* Display : 1280x600 (GTF) */
-        {VIA_RES_1280X600, CRTM1280x600, ARRAY_SIZE(CRTM1280x600)},
+        {CRTM1280x600, ARRAY_SIZE(CRTM1280x600)},
 
         /* Display : 1280x800 (CVT) */
-        {VIA_RES_1280X800, CRTM1280x800, ARRAY_SIZE(CRTM1280x800)},
-
-        /* Display : 1280x800 (GTF) */
-        /*{ M1280x800, CRTM1280x800, ARRAY_SIZE(CRTM1280x800)}, */
+        {CRTM1280x800, ARRAY_SIZE(CRTM1280x800)},
 
         /* Display : 1280x960 */
-        {VIA_RES_1280X960, CRTM1280x960, ARRAY_SIZE(CRTM1280x960)},
+        {CRTM1280x960, ARRAY_SIZE(CRTM1280x960)},
 
         /* Display : 1280x1024 */
-        {VIA_RES_1280X1024, CRTM1280x1024, ARRAY_SIZE(CRTM1280x1024)},
+        {CRTM1280x1024, ARRAY_SIZE(CRTM1280x1024)},
 
         /* Display : 1360x768 (CVT) */
-        {VIA_RES_1360X768, CRTM1360x768, ARRAY_SIZE(CRTM1360x768)},
-
-        /* Display : 1360x768 (CVT Reduce Blanking) */
-        {VIA_RES_1360X768_RB, CRTM1360x768_RB,
-         ARRAY_SIZE(CRTM1360x768_RB)},
+        {CRTM1360x768, ARRAY_SIZE(CRTM1360x768)},
 
         /* Display : 1366x768 */
-        {VIA_RES_1366X768, CRTM1366x768, ARRAY_SIZE(CRTM1366x768)},
+        {CRTM1366x768, ARRAY_SIZE(CRTM1366x768)},
 
         /* Display : 1368x768 (GTF) */
-        /*{ M1368x768,CRTM1368x768,ARRAY_SIZE(CRTM1368x768)}, */
-        /* Display : 1368x768 (GTF) */
-        {VIA_RES_1368X768, CRTM1368x768, ARRAY_SIZE(CRTM1368x768)},
+        {CRTM1368x768, ARRAY_SIZE(CRTM1368x768)},
 
         /* Display : 1440x900 (CVT) */
-        {VIA_RES_1440X900, CRTM1440x900, ARRAY_SIZE(CRTM1440x900)},
-
-        /* Display : 1440x900 (CVT Reduce Blanking) */
-        {VIA_RES_1440X900_RB, CRTM1440x900_RB,
-         ARRAY_SIZE(CRTM1440x900_RB)},
+        {CRTM1440x900, ARRAY_SIZE(CRTM1440x900)},
 
         /* Display : 1440x1050 (GTF) */
-        {VIA_RES_1440X1050, CRTM1440x1050, ARRAY_SIZE(CRTM1440x1050)},
-
-        /* Display : 1400x1050 (CVT Reduce Blanking) */
-        {VIA_RES_1400X1050_RB, CRTM1400x1050_RB,
-         ARRAY_SIZE(CRTM1400x1050_RB)},
+        {CRTM1440x1050, ARRAY_SIZE(CRTM1440x1050)},
 
         /* Display : 1600x900 (CVT) */
-        {VIA_RES_1600X900, CRTM1600x900, ARRAY_SIZE(CRTM1600x900)},
-
-        /* Display : 1600x900 (CVT Reduce Blanking) */
-        {VIA_RES_1600X900_RB, CRTM1600x900_RB,
-         ARRAY_SIZE(CRTM1600x900_RB)},
+        {CRTM1600x900, ARRAY_SIZE(CRTM1600x900)},
 
         /* Display : 1600x1024 (GTF) */
-        {VIA_RES_1600X1024, CRTM1600x1024, ARRAY_SIZE(CRTM1600x1024)},
+        {CRTM1600x1024, ARRAY_SIZE(CRTM1600x1024)},
 
         /* Display : 1600x1200 */
-        {VIA_RES_1600X1200, CRTM1600x1200, ARRAY_SIZE(CRTM1600x1200)},
+        {CRTM1600x1200, ARRAY_SIZE(CRTM1600x1200)},
 
         /* Display : 1680x1050 (CVT) */
-        {VIA_RES_1680X1050, CRTM1680x1050, ARRAY_SIZE(CRTM1680x1050)},
-
-        /* Display : 1680x1050 (CVT Reduce Blanking) */
-        {VIA_RES_1680X1050_RB, CRTM1680x1050_RB,
-         ARRAY_SIZE(CRTM1680x1050_RB)},
+        {CRTM1680x1050, ARRAY_SIZE(CRTM1680x1050)},
 
         /* Display : 1792x1344 (DMT) */
-        {VIA_RES_1792X1344, CRTM1792x1344, ARRAY_SIZE(CRTM1792x1344)},
+        {CRTM1792x1344, ARRAY_SIZE(CRTM1792x1344)},
 
         /* Display : 1856x1392 (DMT) */
-        {VIA_RES_1856X1392, CRTM1856x1392, ARRAY_SIZE(CRTM1856x1392)},
+        {CRTM1856x1392, ARRAY_SIZE(CRTM1856x1392)},
 
         /* Display : 1920x1440 */
-        {VIA_RES_1920X1440, CRTM1920x1440, ARRAY_SIZE(CRTM1920x1440)},
+        {CRTM1920x1440, ARRAY_SIZE(CRTM1920x1440)},
 
         /* Display : 2048x1536 */
-        {VIA_RES_2048X1536, CRTM2048x1536, ARRAY_SIZE(CRTM2048x1536)},
+        {CRTM2048x1536, ARRAY_SIZE(CRTM2048x1536)},
 
         /* Display : 1280x720 */
-        {VIA_RES_1280X720, CRTM1280x720, ARRAY_SIZE(CRTM1280x720)},
+        {CRTM1280x720, ARRAY_SIZE(CRTM1280x720)},
 
         /* Display : 1920x1080 (CVT) */
-        {VIA_RES_1920X1080, CRTM1920x1080, ARRAY_SIZE(CRTM1920x1080)},
-
-        /* Display : 1920x1080 (CVT Reduce Blanking) */
-        {VIA_RES_1920X1080_RB, CRTM1920x1080_RB,
-         ARRAY_SIZE(CRTM1920x1080_RB)},
+        {CRTM1920x1080, ARRAY_SIZE(CRTM1920x1080)},
 
         /* Display : 1920x1200 (CVT) */
-        {VIA_RES_1920X1200, CRTM1920x1200, ARRAY_SIZE(CRTM1920x1200)},
-
-        /* Display : 1920x1200 (CVT Reduce Blanking) */
-        {VIA_RES_1920X1200_RB, CRTM1920x1200_RB,
-         ARRAY_SIZE(CRTM1920x1200_RB)},
+        {CRTM1920x1200, ARRAY_SIZE(CRTM1920x1200)},
 
         /* Display : 1400x1050 (CVT) */
-        {VIA_RES_1400X1050, CRTM1400x1050, ARRAY_SIZE(CRTM1400x1050)}
+        {CRTM1400x1050, ARRAY_SIZE(CRTM1400x1050)}
 };
+
+struct VideoModeTable viafb_rb_modes[] = {
+        /* Display : 1360x768 (CVT Reduce Blanking) */
+        {CRTM1360x768_RB, ARRAY_SIZE(CRTM1360x768_RB)},
+
+        /* Display : 1440x900 (CVT Reduce Blanking) */
+        {CRTM1440x900_RB, ARRAY_SIZE(CRTM1440x900_RB)},
+
+        /* Display : 1400x1050 (CVT Reduce Blanking) */
+        {CRTM1400x1050_RB, ARRAY_SIZE(CRTM1400x1050_RB)},
+
+        /* Display : 1600x900 (CVT Reduce Blanking) */
+        {CRTM1600x900_RB, ARRAY_SIZE(CRTM1600x900_RB)},
+
+        /* Display : 1680x1050 (CVT Reduce Blanking) */
+        {CRTM1680x1050_RB, ARRAY_SIZE(CRTM1680x1050_RB)},
+
+        /* Display : 1920x1080 (CVT Reduce Blanking) */
+        {CRTM1920x1080_RB, ARRAY_SIZE(CRTM1920x1080_RB)},
+
+        /* Display : 1920x1200 (CVT Reduce Blanking) */
+        {CRTM1920x1200_RB, ARRAY_SIZE(CRTM1920x1200_RB)}
+};
+
 struct crt_mode_table CEAM1280x720[] = {
         {REFRESH_60, CLK_74_270M, M1280X720_CEA_R60_HSP,
          M1280X720_CEA_R60_VSP,
@@ -1056,8 +1038,8 @@ struct crt_mode_table CEAM1920x1080[] = {
 };
 struct VideoModeTable CEA_HDMI_Modes[] = {
         /* Display : 1280x720 */
-        {VIA_RES_1280X720, CEAM1280x720, ARRAY_SIZE(CEAM1280x720)},
-        {VIA_RES_1920X1080, CEAM1920x1080, ARRAY_SIZE(CEAM1920x1080)}
+        {CEAM1280x720, ARRAY_SIZE(CEAM1280x720)},
+        {CEAM1920x1080, ARRAY_SIZE(CEAM1920x1080)}
 };
 
 int NUM_TOTAL_RES_MAP_REFRESH = ARRAY_SIZE(res_map_refresh_tbl);
@@ -1069,4 +1051,28 @@ int NUM_TOTAL_CX700_ModeXregs = ARRAY_SIZE(CX700_ModeXregs);
 int NUM_TOTAL_VX855_ModeXregs = ARRAY_SIZE(VX855_ModeXregs);
 int NUM_TOTAL_CLE266_ModeXregs = ARRAY_SIZE(CLE266_ModeXregs);
 int NUM_TOTAL_PATCH_MODE = ARRAY_SIZE(res_patch_table);
-int NUM_TOTAL_MODETABLE = ARRAY_SIZE(CLE266Modes);
+
+
+struct VideoModeTable *viafb_get_mode(int hres, int vres)
+{
+        u32 i;
+        for (i = 0; i < ARRAY_SIZE(viafb_modes); i++)
+                if (viafb_modes[i].mode_array &&
+                        viafb_modes[i].crtc[0].crtc.hor_addr == hres &&
+                        viafb_modes[i].crtc[0].crtc.ver_addr == vres)
+                        return &viafb_modes[i];
+
+        return NULL;
+}
+
+struct VideoModeTable *viafb_get_rb_mode(int hres, int vres)
+{
+        u32 i;
+        for (i = 0; i < ARRAY_SIZE(viafb_rb_modes); i++)
+                if (viafb_rb_modes[i].mode_array &&
+                        viafb_rb_modes[i].crtc[0].crtc.hor_addr == hres &&
+                        viafb_rb_modes[i].crtc[0].crtc.ver_addr == vres)
+                        return &viafb_rb_modes[i];
+
+        return NULL;
+}
diff --git a/drivers/video/via/viamode.h b/drivers/video/via/viamode.h
index a9d6554fabdf..5b1ced86514b 100644
--- a/drivers/video/via/viamode.h
+++ b/drivers/video/via/viamode.h
@@ -32,13 +32,11 @@ struct VPITTable {
 };
 
 struct VideoModeTable {
-        int ModeIndex;
         struct crt_mode_table *crtc;
         int mode_array;
 };
 
 struct patch_table {
-        int mode_index;
         int table_length;
         struct io_reg *io_reg_table;
 };
@@ -59,13 +57,11 @@ extern int NUM_TOTAL_CX700_ModeXregs;
 extern int NUM_TOTAL_VX855_ModeXregs;
 extern int NUM_TOTAL_CLE266_ModeXregs;
 extern int NUM_TOTAL_PATCH_MODE;
-extern int NUM_TOTAL_MODETABLE;
 
 /********************/
 /* Mode Table       */
 /********************/
 
-extern struct VideoModeTable CLE266Modes[];
 extern struct crt_mode_table CEAM1280x720[];
 extern struct crt_mode_table CEAM1920x1080[];
 extern struct VideoModeTable CEA_HDMI_Modes[];
@@ -81,4 +77,8 @@ extern struct io_reg CLE266_ModeXregs[];
 extern struct io_reg PM1024x768[];
 extern struct patch_table res_patch_table[];
 extern struct VPITTable VPIT;
+
+struct VideoModeTable *viafb_get_mode(int hres, int vres);
+struct VideoModeTable *viafb_get_rb_mode(int hres, int vres);
+
 #endif /* __VIAMODE_H__ */
diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c
index 3df17dc8c3d7..d31dc96f838a 100644
--- a/drivers/video/vt8623fb.c
+++ b/drivers/video/vt8623fb.c
@@ -18,7 +18,6 @@
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/tty.h>
-#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <linux/svga.h>
@@ -446,7 +445,7 @@ static int vt8623fb_set_par(struct fb_info *info)
 
         svga_wseq_mask(0x1E, 0xF0, 0xF0); // DI/DVP bus
         svga_wseq_mask(0x2A, 0x0F, 0x0F); // DI/DVP bus
-        svga_wseq_mask(0x16, 0x08, 0xBF); // FIFO read treshold
+        svga_wseq_mask(0x16, 0x08, 0xBF); // FIFO read threshold
         vga_wseq(NULL, 0x17, 0x1F);       // FIFO depth
         vga_wseq(NULL, 0x18, 0x4E);
         svga_wseq_mask(0x1A, 0x08, 0x08); // enable MMIO ?
diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c
index 2376f688ec8b..31b0e17ed090 100644
--- a/drivers/video/w100fb.c
+++ b/drivers/video/w100fb.c
@@ -30,6 +30,7 @@
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/platform_device.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/vmalloc.h>
 #include <asm/io.h>
@@ -628,7 +629,7 @@ static int w100fb_resume(struct platform_device *dev)
 #endif
 
 
-int __init w100fb_probe(struct platform_device *pdev)
+int __devinit w100fb_probe(struct platform_device *pdev)
 {
         int err = -EIO;
         struct w100fb_mach_info *inf;
diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c
index 54cd91610174..fa97d3e7c21a 100644
--- a/drivers/video/xen-fbfront.c
+++ b/drivers/video/xen-fbfront.c
@@ -23,9 +23,13 @@
 #include <linux/errno.h>
 #include <linux/fb.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/mm.h>
+
 #include <asm/xen/hypervisor.h>
+
+#include <xen/xen.h>
 #include <xen/events.h>
 #include <xen/page.h>
 #include <xen/interface/io/fbif.h>
@@ -440,7 +444,7 @@ static int __devinit xenfb_probe(struct xenbus_device *dev,
         fb_info->fix.type = FB_TYPE_PACKED_PIXELS;
         fb_info->fix.accel = FB_ACCEL_NONE;
 
-        fb_info->flags = FBINFO_FLAG_DEFAULT;
+        fb_info->flags = FBINFO_FLAG_DEFAULT | FBINFO_VIRTFB;
 
         ret = fb_alloc_cmap(&fb_info->cmap, 256, 0);
         if (ret < 0) {
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index ed7c8d0ddccb..3fcb83f03881 100644
--- a/drivers/video/xilinxfb.c
+++ b/drivers/video/xilinxfb.c
@@ -34,6 +34,7 @@
 #include <linux/of_platform.h>
 #include <linux/io.h>
 #include <linux/xilinxfb.h>
+#include <linux/slab.h>
 #include <asm/dcr.h>
 
 #define DRIVER_NAME             "xilinxfb"