163 files changed, 8238 insertions, 3662 deletions

diff --git a/drivers/video/68328fb.c b/drivers/video/68328fb.c
index 78488bb41aeb..0dda73da8628 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/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 60c6773eaac4..e0ef3328942c 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -4,6 +4,21 @@
 
 menu "Graphics support"
 
+config FIRMWARE_EDID
+       bool "Enable firmware EDID"
+       default y
+       ---help---
+         This enables access to the EDID transferred from the firmware.
+         On the i386, this is from the Video BIOS. Enable this if DDC/I2C
+         transfers do not work for your driver and if you are using
+         nvidiafb, i810fb or savagefb.
+
+         In general, choosing Y for this option is safe.  If you
+         experience extremely long delays while booting before you get
+         something on your display, try setting this to N.  Matrox cards in
+         combination with certain motherboards and monitors are known to
+         suffer from this problem.
+
 config FB
         tristate "Support for frame buffer devices"
         ---help---
@@ -70,21 +85,12 @@ config FB_MACMODES
        depends on FB
        default n
 
-config FB_FIRMWARE_EDID
-       bool "Enable firmware EDID"
-       depends on FB
-       default y
-       ---help---
-         This enables access to the EDID transferred from the firmware.
-         On the i386, this is from the Video BIOS. Enable this if DDC/I2C
-         transfers do not work for your driver and if you are using
-         nvidiafb, i810fb or savagefb.
-
-         In general, choosing Y for this option is safe.  If you
-         experience extremely long delays while booting before you get
-         something on your display, try setting this to N.  Matrox cards in
-         combination with certain motherboards and monitors are known to
-         suffer from this problem.
+config FB_BACKLIGHT
+        bool
+        depends on FB
+        select BACKLIGHT_LCD_SUPPORT
+        select BACKLIGHT_CLASS_DEVICE
+        default n
 
 config FB_MODE_HELPERS
         bool "Enable Video Mode Handling Helpers"
@@ -416,7 +422,7 @@ config FB_OF
 
 config FB_CONTROL
         bool "Apple \"control\" display support"
-        depends on (FB = y) && PPC_PMAC
+        depends on (FB = y) && PPC_PMAC && PPC32
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -427,7 +433,7 @@ config FB_CONTROL
 
 config FB_PLATINUM
         bool "Apple \"platinum\" display support"
-        depends on (FB = y) && PPC_PMAC
+        depends on (FB = y) && PPC_PMAC && PPC32
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -438,7 +444,7 @@ config FB_PLATINUM
 
 config FB_VALKYRIE
         bool "Apple \"valkyrie\" display support"
-        depends on (FB = y) && (MAC || PPC_PMAC)
+        depends on (FB = y) && (MAC || (PPC_PMAC && PPC32))
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -449,7 +455,7 @@ config FB_VALKYRIE
 
 config FB_CT65550
         bool "Chips 65550 display support"
-        depends on (FB = y) && PPC
+        depends on (FB = y) && PPC32
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -546,10 +552,14 @@ config FB_VESA
           You will get a boot time penguin logo at no additional cost. Please
           read <file:Documentation/fb/vesafb.txt>. If unsure, say Y.
 
-config VIDEO_SELECT
-        bool
-        depends on FB_VESA
-        default y
+config FB_IMAC
+        bool "Intel-based Macintosh Framebuffer Support"
+        depends on (FB = y) && X86 && EFI
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        help
+          This is the frame buffer device driver for the Intel-based Macintosh
 
 config FB_HGA
         tristate "Hercules mono graphics support"
@@ -573,12 +583,6 @@ config FB_HGA_ACCEL
         This will compile the Hercules mono graphics with
         acceleration functions.
 
-
-config VIDEO_SELECT
-        bool
-        depends on (FB = y) && X86
-        default y
-
 config FB_SGIVW
         tristate "SGI Visual Workstation framebuffer support"
         depends on FB && X86_VISWS
@@ -717,6 +721,14 @@ config FB_NVIDIA_I2C
           independently validate video mode parameters, you should say Y
           here.
 
+config FB_NVIDIA_BACKLIGHT
+        bool "Support for backlight control"
+        depends on FB_NVIDIA && PMAC_BACKLIGHT
+        select FB_BACKLIGHT
+        default y
+        help
+          Say Y here if you want to control the backlight of your display.
+
 config FB_RIVA
         tristate "nVidia Riva support"
         depends on FB && PCI
@@ -755,6 +767,14 @@ config FB_RIVA_DEBUG
           of debugging informations to provide to the maintainer when
           something goes wrong.
 
+config FB_RIVA_BACKLIGHT
+        bool "Support for backlight control"
+        depends on FB_RIVA && PMAC_BACKLIGHT
+        select FB_BACKLIGHT
+        default y
+        help
+          Say Y here if you want to control the backlight of your display.
+
 config FB_I810
         tristate "Intel 810/815 support (EXPERIMENTAL)"
         depends on FB && EXPERIMENTAL && PCI && X86_32
@@ -1011,6 +1031,7 @@ config FB_RADEON
 
           There is a product page at
           http://apps.ati.com/ATIcompare/
+
 config FB_RADEON_I2C
         bool "DDC/I2C for ATI Radeon support"
         depends on FB_RADEON
@@ -1018,6 +1039,14 @@ config FB_RADEON_I2C
         help
           Say Y here if you want DDC/I2C support for your Radeon board. 
 
+config FB_RADEON_BACKLIGHT
+        bool "Support for backlight control"
+        depends on FB_RADEON && PMAC_BACKLIGHT
+        select FB_BACKLIGHT
+        default y
+        help
+          Say Y here if you want to control the backlight of your display.
+
 config FB_RADEON_DEBUG
         bool "Lots of debug output from Radeon driver"
         depends on FB_RADEON
@@ -1042,6 +1071,14 @@ config FB_ATY128
           To compile this driver as a module, choose M here: the
           module will be called aty128fb.
 
+config FB_ATY128_BACKLIGHT
+        bool "Support for backlight control"
+        depends on FB_ATY128 && PMAC_BACKLIGHT
+        select FB_BACKLIGHT
+        default y
+        help
+          Say Y here if you want to control the backlight of your display.
+
 config FB_ATY
         tristate "ATI Mach64 display support" if PCI || ATARI
         depends on FB && !SPARC32
@@ -1084,6 +1121,14 @@ config FB_ATY_GX
           is at
           <http://support.ati.com/products/pc/mach64/graphics_xpression.html>.
 
+config FB_ATY_BACKLIGHT
+        bool "Support for backlight control"
+        depends on FB_ATY && PMAC_BACKLIGHT
+        select FB_BACKLIGHT
+        default y
+        help
+          Say Y here if you want to control the backlight of your display.
+
 config FB_S3TRIO
         bool "S3 Trio display support"
         depends on (FB = y) && PPC && BROKEN
@@ -1483,6 +1528,26 @@ config FB_PXA_PARAMETERS
 
           <file:Documentation/fb/pxafb.txt> describes the available parameters.
 
+config FB_MBX
+        tristate "2700G LCD framebuffer support"
+        depends on FB && ARCH_PXA
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        ---help---
+          Framebuffer driver for the Intel 2700G (Marathon) Graphics
+          Accelerator
+
+config FB_MBX_DEBUG
+       bool "Enable debugging info via debugfs"
+       depends on FB_MBX && DEBUG_FS
+       default n
+       ---help---
+         Enable this if you want debugging information using the debug
+         filesystem (debugfs)
+
+         If unsure, say N.
+
 config FB_W100
         tristate "W100 frame buffer support"
         depends on FB && PXA_SHARPSL
@@ -1522,6 +1587,21 @@ config FB_S3C2410_DEBUG
           Turn on debugging messages. Note that you can set/unset at run time
           through sysfs
 
+config FB_PNX4008_DUM
+        tristate "Display Update Module support on Philips PNX4008 board"
+        depends on FB && ARCH_PNX4008
+        ---help---
+          Say Y here to enable support for PNX4008 Display Update Module (DUM)
+
+config FB_PNX4008_DUM_RGB
+        tristate "RGB Framebuffer support on Philips PNX4008 board"
+        depends on FB_PNX4008_DUM
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        ---help---
+          Say Y here to enable support for PNX4008 RGB Framebuffer
+
 config FB_VIRTUAL
         tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"
         depends on FB
@@ -1550,7 +1630,7 @@ if FB || SGI_NEWPORT_CONSOLE
         source "drivers/video/logo/Kconfig"
 endif
 
-if FB && SYSFS
+if SYSFS
         source "drivers/video/backlight/Kconfig"
 endif
 
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 23de3b2c7856..481c6c9695f8 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -4,15 +4,16 @@
 
 # Each configuration option enables a list of files.
 
-obj-$(CONFIG_VT)                  += console/
-obj-$(CONFIG_LOGO)                += logo/
-obj-$(CONFIG_SYSFS)               += backlight/
-
+obj-y                             += fb_notify.o
 obj-$(CONFIG_FB)                  += fb.o
 fb-y                              := fbmem.o fbmon.o fbcmap.o fbsysfs.o \
                                      modedb.o fbcvt.o
 fb-objs                           := $(fb-y)
 
+obj-$(CONFIG_VT)                  += console/
+obj-$(CONFIG_LOGO)                += logo/
+obj-$(CONFIG_SYSFS)               += backlight/
+
 obj-$(CONFIG_FB_CFB_FILLRECT)  += cfbfillrect.o
 obj-$(CONFIG_FB_CFB_COPYAREA)  += cfbcopyarea.o
 obj-$(CONFIG_FB_CFB_IMAGEBLIT) += cfbimgblt.o
@@ -38,6 +39,7 @@ obj-$(CONFIG_FB_SIS)		  += sis/
 obj-$(CONFIG_FB_KYRO)             += kyro/
 obj-$(CONFIG_FB_SAVAGE)           += savage/
 obj-$(CONFIG_FB_GEODE)            += geode/
+obj-$(CONFIG_FB_MBX)              += mbx/
 obj-$(CONFIG_FB_I810)             += vgastate.o
 obj-$(CONFIG_FB_NEOMAGIC)         += neofb.o vgastate.o
 obj-$(CONFIG_FB_VIRGE)            += virgefb.o
@@ -94,9 +96,12 @@ obj-$(CONFIG_FB_TX3912)		  += tx3912fb.o
 obj-$(CONFIG_FB_S1D13XXX)         += s1d13xxxfb.o
 obj-$(CONFIG_FB_IMX)              += imxfb.o
 obj-$(CONFIG_FB_S3C2410)          += s3c2410fb.o
+obj-$(CONFIG_FB_PNX4008_DUM)      += pnx4008/
+obj-$(CONFIG_FB_PNX4008_DUM_RGB)  += pnx4008/
 
 # Platform or fallback drivers go here
 obj-$(CONFIG_FB_VESA)             += vesafb.o
+obj-$(CONFIG_FB_IMAC)             += imacfb.o
 obj-$(CONFIG_FB_VGA16)            += vga16fb.o vgastate.o
 obj-$(CONFIG_FB_OF)               += offb.o
 
diff --git a/drivers/video/S3triofb.c b/drivers/video/S3triofb.c
index 455fda990ff7..397005eb392d 100644
--- a/drivers/video/S3triofb.c
+++ b/drivers/video/S3triofb.c
@@ -23,13 +23,11 @@
 
 */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
@@ -351,30 +349,30 @@ static void __init s3triofb_of_init(struct device_node *dp)
     s3trio_name[sizeof(s3trio_name)-1] = '\0';
     strcpy(fb_fix.id, s3trio_name);
 
-    if((pp = (int *)get_property(dp, "vendor-id", &len)) != NULL
+    if((pp = get_property(dp, "vendor-id", &len)) != NULL
         && *pp!=PCI_VENDOR_ID_S3) {
         printk("%s: can't find S3 Trio board\n", dp->full_name);
         return;
     }
 
-    if((pp = (int *)get_property(dp, "device-id", &len)) != NULL
+    if((pp = get_property(dp, "device-id", &len)) != NULL
         && *pp!=PCI_DEVICE_ID_S3_TRIO) {
         printk("%s: can't find S3 Trio board\n", dp->full_name);
         return;
     }
 
-    if ((pp = (int *)get_property(dp, "depth", &len)) != NULL
+    if ((pp = get_property(dp, "depth", &len)) != NULL
         && len == sizeof(int) && *pp != 8) {
         printk("%s: can't use depth = %d\n", dp->full_name, *pp);
         return;
     }
-    if ((pp = (int *)get_property(dp, "width", &len)) != NULL
+    if ((pp = get_property(dp, "width", &len)) != NULL
         && len == sizeof(int))
         fb_var.xres = fb_var.xres_virtual = *pp;
-    if ((pp = (int *)get_property(dp, "height", &len)) != NULL
+    if ((pp = get_property(dp, "height", &len)) != NULL
         && len == sizeof(int))
         fb_var.yres = fb_var.yres_virtual = *pp;
-    if ((pp = (int *)get_property(dp, "linebytes", &len)) != NULL
+    if ((pp = get_property(dp, "linebytes", &len)) != NULL
         && len == sizeof(int))
         fb_fix.line_length = *pp;
     else
diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c
index 98baecccb3fd..61a8bf159cb0 100644
--- a/drivers/video/acornfb.c
+++ b/drivers/video/acornfb.c
@@ -17,7 +17,6 @@
  *  - Blanking 8bpp displays with VIDC
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index 3033c72dea20..f1ba54f4fc39 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -45,10 +45,8 @@
 #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/config.h>
 #include <linux/interrupt.h>
 #include <linux/fb.h>
 #include <linux/init.h>
diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c
index 466042808daf..70dd8115a4d8 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/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
@@ -561,7 +560,7 @@ static int __init arcfb_probe(struct platform_device *dev)
         platform_set_drvdata(dev, info);
         if (irq) {
                 par->irq = irq;
-                if (request_irq(par->irq, &arcfb_interrupt, SA_SHIRQ,
+                if (request_irq(par->irq, &arcfb_interrupt, IRQF_SHARED,
                                 "arcfb", info)) {
                         printk(KERN_INFO
                                 "arcfb: Failed req IRQ %d\n", par->irq);
diff --git a/drivers/video/asiliantfb.c b/drivers/video/asiliantfb.c
index 29f9f0dfe3b4..1fd22f460b0f 100644
--- a/drivers/video/asiliantfb.c
+++ b/drivers/video/asiliantfb.c
@@ -29,13 +29,11 @@
  *  more details.
  */
 
-#include <linux/config.h>
 #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/vmalloc.h>
 #include <linux/delay.h>
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c
index e69ab65f7843..5831893bf7a0 100644
--- a/drivers/video/atafb.c
+++ b/drivers/video/atafb.c
@@ -53,7 +53,6 @@
 #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/init.h>
diff --git a/drivers/video/aty/Makefile b/drivers/video/aty/Makefile
index 18521397a6e3..a6cc0e9ec790 100644
--- a/drivers/video/aty/Makefile
+++ b/drivers/video/aty/Makefile
@@ -10,5 +10,6 @@ atyfb-objs			:= $(atyfb-y)
 
 radeonfb-y                      := radeon_base.o radeon_pm.o radeon_monitor.o radeon_accel.o
 radeonfb-$(CONFIG_FB_RADEON_I2C)        += radeon_i2c.o
+radeonfb-$(CONFIG_FB_RADEON_BACKLIGHT)  += radeon_backlight.o
 radeonfb-objs                   := $(radeonfb-y)
 
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index f7bbff4ddc6a..276a21530b95 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -46,14 +46,12 @@
  */
 
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.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/vmalloc.h>
 #include <linux/delay.h>
@@ -64,6 +62,7 @@
 #include <linux/pci.h>
 #include <linux/ioport.h>
 #include <linux/console.h>
+#include <linux/backlight.h>
 #include <asm/io.h>
 
 #ifdef CONFIG_PPC_PMAC
@@ -99,7 +98,7 @@
 
 #ifndef CONFIG_PPC_PMAC
 /* default mode */
-static struct fb_var_screeninfo default_var __initdata = {
+static struct fb_var_screeninfo default_var __devinitdata = {
         /* 640x480, 60 Hz, Non-Interlaced (25.175 MHz dotclock) */
         640, 480, 640, 480, 0, 0, 8, 0,
         {0, 8, 0}, {0, 8, 0}, {0, 8, 0}, {0, 0, 0},
@@ -122,7 +121,7 @@ static struct fb_var_screeninfo default_var = {
 
 /* default modedb mode */
 /* 640x480, 60 Hz, Non-Interlaced (25.172 MHz dotclock) */
-static struct fb_videomode defaultmode __initdata = {
+static struct fb_videomode defaultmode __devinitdata = {
         .refresh =      60,
         .xres =         640,
         .yres =         480,
@@ -334,7 +333,7 @@ static const struct aty128_meminfo sdr_sgram =
 static const struct aty128_meminfo ddr_sgram =
         { 4, 4, 3, 3, 2, 3, 1, 16, 31, 16, "64-bit DDR SGRAM" };
 
-static struct fb_fix_screeninfo aty128fb_fix __initdata = {
+static struct fb_fix_screeninfo aty128fb_fix __devinitdata = {
         .id             = "ATY Rage128",
         .type           = FB_TYPE_PACKED_PIXELS,
         .visual         = FB_VISUAL_PSEUDOCOLOR,
@@ -344,15 +343,15 @@ static struct fb_fix_screeninfo aty128fb_fix __initdata = {
         .accel          = FB_ACCEL_ATI_RAGE128,
 };
 
-static char *mode_option __initdata = NULL;
+static char *mode_option __devinitdata = NULL;
 
 #ifdef CONFIG_PPC_PMAC
-static int default_vmode __initdata = VMODE_1024_768_60;
-static int default_cmode __initdata = CMODE_8;
+static int default_vmode __devinitdata = VMODE_1024_768_60;
+static int default_cmode __devinitdata = CMODE_8;
 #endif
 
-static int default_crt_on __initdata = 0;
-static int default_lcd_on __initdata = 1;
+static int default_crt_on __devinitdata = 0;
+static int default_lcd_on __devinitdata = 1;
 
 #ifdef CONFIG_MTRR
 static int mtrr = 1;
@@ -444,9 +443,9 @@ static int aty128_encode_var(struct fb_var_screeninfo *var,
 static int aty128_decode_var(struct fb_var_screeninfo *var,
                              struct aty128fb_par *par);
 #if 0
-static void __init aty128_get_pllinfo(struct aty128fb_par *par,
+static void __devinit aty128_get_pllinfo(struct aty128fb_par *par,
                                       void __iomem *bios);
-static void __init __iomem *aty128_map_ROM(struct pci_dev *pdev, const struct aty128fb_par *par);
+static void __devinit __iomem *aty128_map_ROM(struct pci_dev *pdev, const struct aty128fb_par *par);
 #endif
 static void aty128_timings(struct aty128fb_par *par);
 static void aty128_init_engine(struct aty128fb_par *par);
@@ -457,6 +456,10 @@ static void wait_for_fifo(u16 entries, struct aty128fb_par *par);
 static void wait_for_idle(struct aty128fb_par *par);
 static u32 depth_to_dst(u32 depth);
 
+#ifdef CONFIG_FB_ATY128_BACKLIGHT
+static void aty128_bl_set_power(struct fb_info *info, int power);
+#endif
+
 #define BIOS_IN8(v)     (readb(bios + (v)))
 #define BIOS_IN16(v)    (readb(bios + (v)) | \
                           (readb(bios + (v) + 1) << 8))
@@ -480,16 +483,6 @@ static struct fb_ops aty128fb_ops = {
         .fb_imageblit   = cfb_imageblit,
 };
 
-#ifdef CONFIG_PMAC_BACKLIGHT
-static int aty128_set_backlight_enable(int on, int level, void* data);
-static int aty128_set_backlight_level(int level, void* data);
-
-static struct backlight_controller aty128_backlight_controller = {
-        aty128_set_backlight_enable,
-        aty128_set_backlight_level
-};
-#endif /* CONFIG_PMAC_BACKLIGHT */
-
     /*
      * Functions to read from/write to the mmio registers
      *  - endian conversions may possibly be avoided by
@@ -582,7 +575,7 @@ static void aty_pll_writeupdate(const struct aty128fb_par *par)
 
 
 /* write to the scratch register to test r/w functionality */
-static int __init register_test(const struct aty128fb_par *par)
+static int __devinit register_test(const struct aty128fb_par *par)
 {
         u32 val;
         int flag = 0;
@@ -781,7 +774,7 @@ static u32 depth_to_dst(u32 depth)
 
 
 #ifndef __sparc__
-static void __iomem * __init aty128_map_ROM(const struct aty128fb_par *par, struct pci_dev *dev)
+static void __iomem * __devinit aty128_map_ROM(const struct aty128fb_par *par, struct pci_dev *dev)
 {
         u16 dptr;
         u8 rom_type;
@@ -865,7 +858,7 @@ static void __iomem * __init aty128_map_ROM(const struct aty128fb_par *par, stru
         return NULL;
 }
 
-static void __init aty128_get_pllinfo(struct aty128fb_par *par, unsigned char __iomem *bios)
+static void __devinit aty128_get_pllinfo(struct aty128fb_par *par, unsigned char __iomem *bios)
 {
         unsigned int bios_hdr;
         unsigned int bios_pll;
@@ -912,7 +905,7 @@ static void __iomem *  __devinit aty128_find_mem_vbios(struct aty128fb_par *par)
 #endif /* ndef(__sparc__) */
 
 /* fill in known card constants if pll_block is not available */
-static void __init aty128_timings(struct aty128fb_par *par)
+static void __devinit aty128_timings(struct aty128fb_par *par)
 {
 #ifdef CONFIG_PPC_OF
         /* instead of a table lookup, assume OF has properly
@@ -1258,19 +1251,21 @@ static void aty128_set_crt_enable(struct aty128fb_par *par, int on)
 static void aty128_set_lcd_enable(struct aty128fb_par *par, int on)
 {
         u32 reg;
+#ifdef CONFIG_FB_ATY128_BACKLIGHT
+        struct fb_info *info = pci_get_drvdata(par->pdev);
+#endif
 
         if (on) {
                 reg = aty_ld_le32(LVDS_GEN_CNTL);
                 reg |= LVDS_ON | LVDS_EN | LVDS_BLON | LVDS_DIGION;
                 reg &= ~LVDS_DISPLAY_DIS;
                 aty_st_le32(LVDS_GEN_CNTL, reg);
-#ifdef CONFIG_PMAC_BACKLIGHT
-                aty128_set_backlight_enable(get_backlight_enable(),
-                                            get_backlight_level(), par);
+#ifdef CONFIG_FB_ATY128_BACKLIGHT
+                aty128_bl_set_power(info, FB_BLANK_UNBLANK);
 #endif  
         } else {
-#ifdef CONFIG_PMAC_BACKLIGHT
-                aty128_set_backlight_enable(0, 0, par);
+#ifdef CONFIG_FB_ATY128_BACKLIGHT
+                aty128_bl_set_power(info, FB_BLANK_POWERDOWN);
 #endif  
                 reg = aty_ld_le32(LVDS_GEN_CNTL);
                 reg |= LVDS_DISPLAY_DIS;
@@ -1638,7 +1633,7 @@ static int aty128fb_sync(struct fb_info *info)
 }
 
 #ifndef MODULE
-static int __init aty128fb_setup(char *options)
+static int __devinit aty128fb_setup(char *options)
 {
         char *this_opt;
 
@@ -1691,6 +1686,211 @@ static int __init aty128fb_setup(char *options)
 }
 #endif  /*  MODULE  */
 
+/* Backlight */
+#ifdef CONFIG_FB_ATY128_BACKLIGHT
+#define MAX_LEVEL 0xFF
+
+static struct backlight_properties aty128_bl_data;
+
+/* Call with fb_info->bl_mutex held */
+static int aty128_bl_get_level_brightness(struct aty128fb_par *par,
+                int level)
+{
+        struct fb_info *info = pci_get_drvdata(par->pdev);
+        int atylevel;
+
+        /* Get and convert the value */
+        atylevel = MAX_LEVEL -
+                (info->bl_curve[level] * FB_BACKLIGHT_MAX / MAX_LEVEL);
+
+        if (atylevel < 0)
+                atylevel = 0;
+        else if (atylevel > MAX_LEVEL)
+                atylevel = MAX_LEVEL;
+
+        return atylevel;
+}
+
+/* We turn off the LCD completely instead of just dimming the backlight.
+ * This provides greater power saving and the display is useless without
+ * backlight anyway
+ */
+#define BACKLIGHT_LVDS_OFF
+/* That one prevents proper CRT output with LCD off */
+#undef BACKLIGHT_DAC_OFF
+
+/* Call with fb_info->bl_mutex held */
+static int __aty128_bl_update_status(struct backlight_device *bd)
+{
+        struct aty128fb_par *par = class_get_devdata(&bd->class_dev);
+        unsigned int reg = aty_ld_le32(LVDS_GEN_CNTL);
+        int level;
+
+        if (bd->props->power != FB_BLANK_UNBLANK ||
+            bd->props->fb_blank != FB_BLANK_UNBLANK ||
+            !par->lcd_on)
+                level = 0;
+        else
+                level = bd->props->brightness;
+
+        reg |= LVDS_BL_MOD_EN | LVDS_BLON;
+        if (level > 0) {
+                reg |= LVDS_DIGION;
+                if (!(reg & LVDS_ON)) {
+                        reg &= ~LVDS_BLON;
+                        aty_st_le32(LVDS_GEN_CNTL, reg);
+                        aty_ld_le32(LVDS_GEN_CNTL);
+                        mdelay(10);
+                        reg |= LVDS_BLON;
+                        aty_st_le32(LVDS_GEN_CNTL, reg);
+                }
+                reg &= ~LVDS_BL_MOD_LEVEL_MASK;
+                reg |= (aty128_bl_get_level_brightness(par, level) << LVDS_BL_MOD_LEVEL_SHIFT);
+#ifdef BACKLIGHT_LVDS_OFF
+                reg |= LVDS_ON | LVDS_EN;
+                reg &= ~LVDS_DISPLAY_DIS;
+#endif
+                aty_st_le32(LVDS_GEN_CNTL, reg);
+#ifdef BACKLIGHT_DAC_OFF
+                aty_st_le32(DAC_CNTL, aty_ld_le32(DAC_CNTL) & (~DAC_PDWN));
+#endif
+        } else {
+                reg &= ~LVDS_BL_MOD_LEVEL_MASK;
+                reg |= (aty128_bl_get_level_brightness(par, 0) << LVDS_BL_MOD_LEVEL_SHIFT);
+#ifdef BACKLIGHT_LVDS_OFF
+                reg |= LVDS_DISPLAY_DIS;
+                aty_st_le32(LVDS_GEN_CNTL, reg);
+                aty_ld_le32(LVDS_GEN_CNTL);
+                udelay(10);
+                reg &= ~(LVDS_ON | LVDS_EN | LVDS_BLON | LVDS_DIGION);
+#endif
+                aty_st_le32(LVDS_GEN_CNTL, reg);
+#ifdef BACKLIGHT_DAC_OFF
+                aty_st_le32(DAC_CNTL, aty_ld_le32(DAC_CNTL) | DAC_PDWN);
+#endif
+        }
+
+        return 0;
+}
+
+static int aty128_bl_update_status(struct backlight_device *bd)
+{
+        struct aty128fb_par *par = class_get_devdata(&bd->class_dev);
+        struct fb_info *info = pci_get_drvdata(par->pdev);
+        int ret;
+
+        mutex_lock(&info->bl_mutex);
+        ret = __aty128_bl_update_status(bd);
+        mutex_unlock(&info->bl_mutex);
+
+        return ret;
+}
+
+static int aty128_bl_get_brightness(struct backlight_device *bd)
+{
+        return bd->props->brightness;
+}
+
+static struct backlight_properties aty128_bl_data = {
+        .owner          = THIS_MODULE,
+        .get_brightness = aty128_bl_get_brightness,
+        .update_status  = aty128_bl_update_status,
+        .max_brightness = (FB_BACKLIGHT_LEVELS - 1),
+};
+
+static void aty128_bl_set_power(struct fb_info *info, int power)
+{
+        mutex_lock(&info->bl_mutex);
+
+        if (info->bl_dev) {
+                down(&info->bl_dev->sem);
+                info->bl_dev->props->power = power;
+                __aty128_bl_update_status(info->bl_dev);
+                up(&info->bl_dev->sem);
+        }
+
+        mutex_unlock(&info->bl_mutex);
+}
+
+static void aty128_bl_init(struct aty128fb_par *par)
+{
+        struct fb_info *info = pci_get_drvdata(par->pdev);
+        struct backlight_device *bd;
+        char name[12];
+
+        /* Could be extended to Rage128Pro LVDS output too */
+        if (par->chip_gen != rage_M3)
+                return;
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        if (!pmac_has_backlight_type("ati"))
+                return;
+#endif
+
+        snprintf(name, sizeof(name), "aty128bl%d", info->node);
+
+        bd = backlight_device_register(name, par, &aty128_bl_data);
+        if (IS_ERR(bd)) {
+                info->bl_dev = NULL;
+                printk(KERN_WARNING "aty128: Backlight registration failed\n");
+                goto error;
+        }
+
+        mutex_lock(&info->bl_mutex);
+        info->bl_dev = bd;
+        fb_bl_default_curve(info, 0,
+                 63 * FB_BACKLIGHT_MAX / MAX_LEVEL,
+                219 * FB_BACKLIGHT_MAX / MAX_LEVEL);
+        mutex_unlock(&info->bl_mutex);
+
+        down(&bd->sem);
+        bd->props->brightness = aty128_bl_data.max_brightness;
+        bd->props->power = FB_BLANK_UNBLANK;
+        bd->props->update_status(bd);
+        up(&bd->sem);
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        mutex_lock(&pmac_backlight_mutex);
+        if (!pmac_backlight)
+                pmac_backlight = bd;
+        mutex_unlock(&pmac_backlight_mutex);
+#endif
+
+        printk("aty128: Backlight initialized (%s)\n", name);
+
+        return;
+
+error:
+        return;
+}
+
+static void aty128_bl_exit(struct aty128fb_par *par)
+{
+        struct fb_info *info = pci_get_drvdata(par->pdev);
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        mutex_lock(&pmac_backlight_mutex);
+#endif
+
+        mutex_lock(&info->bl_mutex);
+        if (info->bl_dev) {
+#ifdef CONFIG_PMAC_BACKLIGHT
+                if (pmac_backlight == info->bl_dev)
+                        pmac_backlight = NULL;
+#endif
+
+                backlight_device_unregister(info->bl_dev);
+                info->bl_dev = NULL;
+
+                printk("aty128: Backlight unloaded\n");
+        }
+        mutex_unlock(&info->bl_mutex);
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        mutex_unlock(&pmac_backlight_mutex);
+#endif
+}
+#endif /* CONFIG_FB_ATY128_BACKLIGHT */
 
 /*
  *  Initialisation
@@ -1708,7 +1908,7 @@ static void aty128_early_resume(void *data)
 }
 #endif /* CONFIG_PPC_PMAC */
 
-static int __init aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent)
+static int __devinit aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         struct fb_info *info = pci_get_drvdata(pdev);
         struct aty128fb_par *par = info->par;
@@ -1717,9 +1917,6 @@ static int __init aty128_init(struct pci_dev *pdev, const struct pci_device_id *
         u8 chip_rev;
         u32 dac;
 
-        if (!par->vram_size)    /* may have already been probed */
-                par->vram_size = aty_ld_le32(CONFIG_MEMSIZE) & 0x03FFFFFF;
-
         /* Get the chip revision */
         chip_rev = (aty_ld_le32(CONFIG_CNTL) >> 16) & 0x1F;
 
@@ -1832,20 +2029,18 @@ static int __init aty128_init(struct pci_dev *pdev, const struct pci_device_id *
 
         aty128_init_engine(par);
 
-        if (register_framebuffer(info) < 0)
-                return 0;
-
-#ifdef CONFIG_PMAC_BACKLIGHT
-        /* Could be extended to Rage128Pro LVDS output too */
-        if (par->chip_gen == rage_M3)
-                register_backlight_controller(&aty128_backlight_controller, par, "ati");
-#endif /* CONFIG_PMAC_BACKLIGHT */
-
         par->pm_reg = pci_find_capability(pdev, PCI_CAP_ID_PM);
         par->pdev = pdev;
         par->asleep = 0;
         par->lock_blank = 0;
-        
+
+#ifdef CONFIG_FB_ATY128_BACKLIGHT
+        aty128_bl_init(par);
+#endif
+
+        if (register_framebuffer(info) < 0)
+                return 0;
+
         printk(KERN_INFO "fb%d: %s frame buffer device on %s\n",
                info->node, info->fix.id, video_card);
 
@@ -1854,7 +2049,7 @@ static int __init aty128_init(struct pci_dev *pdev, const struct pci_device_id *
 
 #ifdef CONFIG_PCI
 /* register a card    ++ajoshi */
-static int __init aty128_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+static int __devinit aty128_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         unsigned long fb_addr, reg_addr;
         struct aty128fb_par *par;
@@ -1895,7 +2090,6 @@ static int __init aty128_probe(struct pci_dev *pdev, const struct pci_device_id
         par = info->par;
 
         info->pseudo_palette = par->pseudo_palette;
-        info->fix = aty128fb_fix;
 
         /* Virtualize mmio region */
         info->fix.mmio_start = reg_addr;
@@ -1981,6 +2175,10 @@ static void __devexit aty128_remove(struct pci_dev *pdev)
 
         par = info->par;
 
+#ifdef CONFIG_FB_ATY128_BACKLIGHT
+        aty128_bl_exit(par);
+#endif
+
         unregister_framebuffer(info);
 #ifdef CONFIG_MTRR
         if (par->mtrr.vram_valid)
@@ -2011,10 +2209,10 @@ static int aty128fb_blank(int blank, struct fb_info *fb)
         if (par->lock_blank || par->asleep)
                 return 0;
 
-#ifdef CONFIG_PMAC_BACKLIGHT
+#ifdef CONFIG_FB_ATY128_BACKLIGHT
         if (machine_is(powermac) && blank)
-                set_backlight_enable(0);
-#endif /* CONFIG_PMAC_BACKLIGHT */
+                aty128_bl_set_power(fb, FB_BLANK_POWERDOWN);
+#endif
 
         if (blank & FB_BLANK_VSYNC_SUSPEND)
                 state |= 2;
@@ -2029,10 +2227,12 @@ static int aty128fb_blank(int blank, struct fb_info *fb)
                 aty128_set_crt_enable(par, par->crt_on && !blank);
                 aty128_set_lcd_enable(par, par->lcd_on && !blank);
         }
-#ifdef CONFIG_PMAC_BACKLIGHT
+
+#ifdef CONFIG_FB_ATY128_BACKLIGHT
         if (machine_is(powermac) && !blank)
-                set_backlight_enable(1);
-#endif /* CONFIG_PMAC_BACKLIGHT */
+                aty128_bl_set_power(fb, FB_BLANK_UNBLANK);
+#endif
+
         return 0;
 }
 
@@ -2138,73 +2338,6 @@ static int aty128fb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
         return -EINVAL;
 }
 
-#ifdef CONFIG_PMAC_BACKLIGHT
-static int backlight_conv[] = {
-        0xff, 0xc0, 0xb5, 0xaa, 0x9f, 0x94, 0x89, 0x7e,
-        0x73, 0x68, 0x5d, 0x52, 0x47, 0x3c, 0x31, 0x24
-};
-
-/* We turn off the LCD completely instead of just dimming the backlight.
- * This provides greater power saving and the display is useless without
- * backlight anyway
- */
-#define BACKLIGHT_LVDS_OFF
-/* That one prevents proper CRT output with LCD off */
-#undef BACKLIGHT_DAC_OFF
-
-static int aty128_set_backlight_enable(int on, int level, void *data)
-{
-        struct aty128fb_par *par = data;
-        unsigned int reg = aty_ld_le32(LVDS_GEN_CNTL);
-
-        if (!par->lcd_on)
-                on = 0;
-        reg |= LVDS_BL_MOD_EN | LVDS_BLON;
-        if (on && level > BACKLIGHT_OFF) {
-                reg |= LVDS_DIGION;
-                if (!(reg & LVDS_ON)) {
-                        reg &= ~LVDS_BLON;
-                        aty_st_le32(LVDS_GEN_CNTL, reg);
-                        (void)aty_ld_le32(LVDS_GEN_CNTL);
-                        mdelay(10);
-                        reg |= LVDS_BLON;
-                        aty_st_le32(LVDS_GEN_CNTL, reg);
-                }
-                reg &= ~LVDS_BL_MOD_LEVEL_MASK;
-                reg |= (backlight_conv[level] << LVDS_BL_MOD_LEVEL_SHIFT);
-#ifdef BACKLIGHT_LVDS_OFF
-                reg |= LVDS_ON | LVDS_EN;
-                reg &= ~LVDS_DISPLAY_DIS;
-#endif
-                aty_st_le32(LVDS_GEN_CNTL, reg);
-#ifdef BACKLIGHT_DAC_OFF
-                aty_st_le32(DAC_CNTL, aty_ld_le32(DAC_CNTL) & (~DAC_PDWN));
-#endif          
-        } else {
-                reg &= ~LVDS_BL_MOD_LEVEL_MASK;
-                reg |= (backlight_conv[0] << LVDS_BL_MOD_LEVEL_SHIFT);
-#ifdef BACKLIGHT_LVDS_OFF
-                reg |= LVDS_DISPLAY_DIS;
-                aty_st_le32(LVDS_GEN_CNTL, reg);
-                (void)aty_ld_le32(LVDS_GEN_CNTL);
-                udelay(10);
-                reg &= ~(LVDS_ON | LVDS_EN | LVDS_BLON | LVDS_DIGION);
-#endif          
-                aty_st_le32(LVDS_GEN_CNTL, reg);
-#ifdef BACKLIGHT_DAC_OFF
-                aty_st_le32(DAC_CNTL, aty_ld_le32(DAC_CNTL) | DAC_PDWN);
-#endif          
-        }
-
-        return 0;
-}
-
-static int aty128_set_backlight_level(int level, void* data)
-{
-        return aty128_set_backlight_enable(1, level, data);
-}
-#endif /* CONFIG_PMAC_BACKLIGHT */
-
 #if 0
     /*
      *  Accelerated functions
@@ -2428,7 +2561,7 @@ static int aty128_pci_resume(struct pci_dev *pdev)
 }
 
 
-static int __init aty128fb_init(void)
+static int __devinit aty128fb_init(void)
 {
 #ifndef MODULE
         char *option = NULL;
diff --git a/drivers/video/aty/atyfb.h b/drivers/video/aty/atyfb.h
index e9b7a64c1ac4..55fb8b04489b 100644
--- a/drivers/video/aty/atyfb.h
+++ b/drivers/video/aty/atyfb.h
@@ -2,7 +2,6 @@
  *  ATI Frame Buffer Device Driver Core Definitions
  */
 
-#include <linux/config.h>
 #include <linux/spinlock.h>
 #include <linux/wait.h>
     /*
@@ -151,6 +150,7 @@ struct atyfb_par {
         int lock_blank;
         unsigned long res_start;
         unsigned long res_size;
+        struct pci_dev *pdev;
 #ifdef __sparc__
         struct pci_mmap_map *mmap_map;
         u8 mmaped;
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index eb6aa42be60e..19a71f045784 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -49,7 +49,6 @@
 ******************************************************************************/
 
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
@@ -66,6 +65,7 @@
 #include <linux/interrupt.h>
 #include <linux/spinlock.h>
 #include <linux/wait.h>
+#include <linux/backlight.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -315,12 +315,12 @@ static int vram;
 static int pll;
 static int mclk;
 static int xclk;
-static int comp_sync __initdata = -1;
+static int comp_sync __devinitdata = -1;
 static char *mode;
 
 #ifdef CONFIG_PPC
-static int default_vmode __initdata = VMODE_CHOOSE;
-static int default_cmode __initdata = CMODE_CHOOSE;
+static int default_vmode __devinitdata = VMODE_CHOOSE;
+static int default_cmode __devinitdata = CMODE_CHOOSE;
 
 module_param_named(vmode, default_vmode, int, 0);
 MODULE_PARM_DESC(vmode, "int: video mode for mac");
@@ -329,10 +329,10 @@ MODULE_PARM_DESC(cmode, "int: color mode for mac");
 #endif
 
 #ifdef CONFIG_ATARI
-static unsigned int mach64_count __initdata = 0;
-static unsigned long phys_vmembase[FB_MAX] __initdata = { 0, };
-static unsigned long phys_size[FB_MAX] __initdata = { 0, };
-static unsigned long phys_guiregbase[FB_MAX] __initdata = { 0, };
+static unsigned int mach64_count __devinitdata = 0;
+static unsigned long phys_vmembase[FB_MAX] __devinitdata = { 0, };
+static unsigned long phys_size[FB_MAX] __devinitdata = { 0, };
+static unsigned long phys_guiregbase[FB_MAX] __devinitdata = { 0, };
 #endif
 
 /* top -> down is an evolution of mach64 chipset, any corrections? */
@@ -582,7 +582,7 @@ static u32 atyfb_get_pixclock(struct fb_var_screeninfo *var, struct atyfb_par *p
  *  Apple monitor sense
  */
 
-static int __init read_aty_sense(const struct atyfb_par *par)
+static int __devinit read_aty_sense(const struct atyfb_par *par)
 {
         int sense, i;
 
@@ -1280,6 +1280,14 @@ static int atyfb_set_par(struct fb_info *info)
 
         par->accel_flags = var->accel_flags; /* hack */
 
+        if (var->accel_flags) {
+                info->fbops->fb_sync = atyfb_sync;
+                info->flags &= ~FBINFO_HWACCEL_DISABLED;
+        } else {
+                info->fbops->fb_sync = NULL;
+                info->flags |= FBINFO_HWACCEL_DISABLED;
+        }
+
         if (par->blitter_may_be_busy)
                 wait_for_idle(par);
 
@@ -1559,7 +1567,7 @@ static int aty_enable_irq(struct atyfb_par *par, int reenable)
         u32 int_cntl;
 
         if (!test_and_set_bit(0, &par->irq_flags)) {
-                if (request_irq(par->irq, aty_irq, SA_SHIRQ, "atyfb", par)) {
+                if (request_irq(par->irq, aty_irq, IRQF_SHARED, "atyfb", par)) {
                         clear_bit(0, &par->irq_flags);
                         return -EINVAL;
                 }
@@ -2115,47 +2123,171 @@ static int atyfb_pci_resume(struct pci_dev *pdev)
 
 #endif /*  defined(CONFIG_PM) && defined(CONFIG_PCI) */
 
-#ifdef CONFIG_PMAC_BACKLIGHT
+/* Backlight */
+#ifdef CONFIG_FB_ATY_BACKLIGHT
+#define MAX_LEVEL 0xFF
 
-    /*
-     *   LCD backlight control
-     */
+static struct backlight_properties aty_bl_data;
 
-static int backlight_conv[] = {
-        0x00, 0x3f, 0x4c, 0x59, 0x66, 0x73, 0x80, 0x8d,
-        0x9a, 0xa7, 0xb4, 0xc1, 0xcf, 0xdc, 0xe9, 0xff
-};
+/* Call with fb_info->bl_mutex held */
+static int aty_bl_get_level_brightness(struct atyfb_par *par, int level)
+{
+        struct fb_info *info = pci_get_drvdata(par->pdev);
+        int atylevel;
+
+        /* Get and convert the value */
+        atylevel = info->bl_curve[level] * FB_BACKLIGHT_MAX / MAX_LEVEL;
+
+        if (atylevel < 0)
+                atylevel = 0;
+        else if (atylevel > MAX_LEVEL)
+                atylevel = MAX_LEVEL;
 
-static int aty_set_backlight_enable(int on, int level, void *data)
+        return atylevel;
+}
+
+/* Call with fb_info->bl_mutex held */
+static int __aty_bl_update_status(struct backlight_device *bd)
 {
-        struct fb_info *info = (struct fb_info *) data;
-        struct atyfb_par *par = (struct atyfb_par *) info->par;
+        struct atyfb_par *par = class_get_devdata(&bd->class_dev);
         unsigned int reg = aty_ld_lcd(LCD_MISC_CNTL, par);
+        int level;
+
+        if (bd->props->power != FB_BLANK_UNBLANK ||
+            bd->props->fb_blank != FB_BLANK_UNBLANK)
+                level = 0;
+        else
+                level = bd->props->brightness;
 
         reg |= (BLMOD_EN | BIASMOD_EN);
-        if (on && level > BACKLIGHT_OFF) {
+        if (level > 0) {
                 reg &= ~BIAS_MOD_LEVEL_MASK;
-                reg |= (backlight_conv[level] << BIAS_MOD_LEVEL_SHIFT);
+                reg |= (aty_bl_get_level_brightness(par, level) << BIAS_MOD_LEVEL_SHIFT);
         } else {
                 reg &= ~BIAS_MOD_LEVEL_MASK;
-                reg |= (backlight_conv[0] << BIAS_MOD_LEVEL_SHIFT);
+                reg |= (aty_bl_get_level_brightness(par, 0) << BIAS_MOD_LEVEL_SHIFT);
         }
         aty_st_lcd(LCD_MISC_CNTL, reg, par);
+
         return 0;
 }
 
-static int aty_set_backlight_level(int level, void *data)
+static int aty_bl_update_status(struct backlight_device *bd)
 {
-        return aty_set_backlight_enable(1, level, data);
+        struct atyfb_par *par = class_get_devdata(&bd->class_dev);
+        struct fb_info *info = pci_get_drvdata(par->pdev);
+        int ret;
+
+        mutex_lock(&info->bl_mutex);
+        ret = __aty_bl_update_status(bd);
+        mutex_unlock(&info->bl_mutex);
+
+        return ret;
 }
 
-static struct backlight_controller aty_backlight_controller = {
-        aty_set_backlight_enable,
-        aty_set_backlight_level
+static int aty_bl_get_brightness(struct backlight_device *bd)
+{
+        return bd->props->brightness;
+}
+
+static struct backlight_properties aty_bl_data = {
+        .owner    = THIS_MODULE,
+        .get_brightness = aty_bl_get_brightness,
+        .update_status  = aty_bl_update_status,
+        .max_brightness = (FB_BACKLIGHT_LEVELS - 1),
 };
-#endif /* CONFIG_PMAC_BACKLIGHT */
 
-static void __init aty_calc_mem_refresh(struct atyfb_par *par, int xclk)
+static void aty_bl_set_power(struct fb_info *info, int power)
+{
+        mutex_lock(&info->bl_mutex);
+
+        if (info->bl_dev) {
+                down(&info->bl_dev->sem);
+                info->bl_dev->props->power = power;
+                __aty_bl_update_status(info->bl_dev);
+                up(&info->bl_dev->sem);
+        }
+
+        mutex_unlock(&info->bl_mutex);
+}
+
+static void aty_bl_init(struct atyfb_par *par)
+{
+        struct fb_info *info = pci_get_drvdata(par->pdev);
+        struct backlight_device *bd;
+        char name[12];
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        if (!pmac_has_backlight_type("ati"))
+                return;
+#endif
+
+        snprintf(name, sizeof(name), "atybl%d", info->node);
+
+        bd = backlight_device_register(name, par, &aty_bl_data);
+        if (IS_ERR(bd)) {
+                info->bl_dev = NULL;
+                printk(KERN_WARNING "aty: Backlight registration failed\n");
+                goto error;
+        }
+
+        mutex_lock(&info->bl_mutex);
+        info->bl_dev = bd;
+        fb_bl_default_curve(info, 0,
+                0x3F * FB_BACKLIGHT_MAX / MAX_LEVEL,
+                0xFF * FB_BACKLIGHT_MAX / MAX_LEVEL);
+        mutex_unlock(&info->bl_mutex);
+
+        down(&bd->sem);
+        bd->props->brightness = aty_bl_data.max_brightness;
+        bd->props->power = FB_BLANK_UNBLANK;
+        bd->props->update_status(bd);
+        up(&bd->sem);
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        mutex_lock(&pmac_backlight_mutex);
+        if (!pmac_backlight)
+                pmac_backlight = bd;
+        mutex_unlock(&pmac_backlight_mutex);
+#endif
+
+        printk("aty: Backlight initialized (%s)\n", name);
+
+        return;
+
+error:
+        return;
+}
+
+static void aty_bl_exit(struct atyfb_par *par)
+{
+        struct fb_info *info = pci_get_drvdata(par->pdev);
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        mutex_lock(&pmac_backlight_mutex);
+#endif
+
+        mutex_lock(&info->bl_mutex);
+        if (info->bl_dev) {
+#ifdef CONFIG_PMAC_BACKLIGHT
+                if (pmac_backlight == info->bl_dev)
+                        pmac_backlight = NULL;
+#endif
+
+                backlight_device_unregister(info->bl_dev);
+
+                printk("aty: Backlight unloaded\n");
+        }
+        mutex_unlock(&info->bl_mutex);
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        mutex_unlock(&pmac_backlight_mutex);
+#endif
+}
+
+#endif /* CONFIG_FB_ATY_BACKLIGHT */
+
+static void __devinit aty_calc_mem_refresh(struct atyfb_par *par, int xclk)
 {
         const int ragepro_tbl[] = {
                 44, 50, 55, 66, 75, 80, 100
@@ -2215,7 +2347,7 @@ static int __devinit atyfb_get_timings_from_lcd(struct atyfb_par *par,
 }
 #endif /* defined(__i386__) && defined(CONFIG_FB_ATY_GENERIC_LCD) */
 
-static int __init aty_init(struct fb_info *info, const char *name)
+static int __devinit aty_init(struct fb_info *info, const char *name)
 {
         struct atyfb_par *par = (struct atyfb_par *) info->par;
         const char *ramname = NULL, *xtal;
@@ -2296,12 +2428,15 @@ static int __init aty_init(struct fb_info *info, const char *name)
                         break;
                 }
                 switch (clk_type) {
+#ifdef CONFIG_ATARI
                 case CLK_ATI18818_1:
                         par->pll_ops = &aty_pll_ati18818_1;
                         break;
+#else
                 case CLK_IBMRGB514:
                         par->pll_ops = &aty_pll_ibm514;
                         break;
+#endif
 #if 0 /* dead code */
                 case CLK_STG1703:
                         par->pll_ops = &aty_pll_stg1703;
@@ -2506,16 +2641,24 @@ static int __init aty_init(struct fb_info *info, const char *name)
 
         info->fbops = &atyfb_ops;
         info->pseudo_palette = pseudo_palette;
-        info->flags = FBINFO_FLAG_DEFAULT;
+        info->flags = FBINFO_DEFAULT           |
+                      FBINFO_HWACCEL_IMAGEBLIT |
+                      FBINFO_HWACCEL_FILLRECT  |
+                      FBINFO_HWACCEL_COPYAREA  |
+                      FBINFO_HWACCEL_YPAN;
 
 #ifdef CONFIG_PMAC_BACKLIGHT
         if (M64_HAS(G3_PB_1_1) && machine_is_compatible("PowerBook1,1")) {
                 /* these bits let the 101 powerbook wake up from sleep -- paulus */
                 aty_st_lcd(POWER_MANAGEMENT, aty_ld_lcd(POWER_MANAGEMENT, par)
                            | (USE_F32KHZ | TRISTATE_MEM_EN), par);
-        } else if (M64_HAS(MOBIL_BUS))
-                register_backlight_controller(&aty_backlight_controller, info, "ati");
-#endif /* CONFIG_PMAC_BACKLIGHT */
+        } else
+#endif
+        if (M64_HAS(MOBIL_BUS)) {
+#ifdef CONFIG_FB_ATY_BACKLIGHT
+                aty_bl_init (par);
+#endif
+        }
 
         memset(&var, 0, sizeof(var));
 #ifdef CONFIG_PPC
@@ -2631,7 +2774,7 @@ aty_init_exit:
 }
 
 #ifdef CONFIG_ATARI
-static int __init store_video_par(char *video_str, unsigned char m64_num)
+static int __devinit store_video_par(char *video_str, unsigned char m64_num)
 {
         char *p;
         unsigned long vmembase, size, guiregbase;
@@ -2673,9 +2816,9 @@ static int atyfb_blank(int blank, struct fb_info *info)
         if (par->lock_blank || par->asleep)
                 return 0;
 
-#ifdef CONFIG_PMAC_BACKLIGHT
+#ifdef CONFIG_FB_ATY_BACKLIGHT
         if (machine_is(powermac) && blank > FB_BLANK_NORMAL)
-                set_backlight_enable(0);
+                aty_bl_set_power(info, FB_BLANK_POWERDOWN);
 #elif defined(CONFIG_FB_ATY_GENERIC_LCD)
         if (par->lcd_table && blank > FB_BLANK_NORMAL &&
             (aty_ld_lcd(LCD_GEN_CNTL, par) & LCD_ON)) {
@@ -2705,9 +2848,9 @@ static int atyfb_blank(int blank, struct fb_info *info)
         }
         aty_st_le32(CRTC_GEN_CNTL, gen_cntl, par);
 
-#ifdef CONFIG_PMAC_BACKLIGHT
+#ifdef CONFIG_FB_ATY_BACKLIGHT
         if (machine_is(powermac) && blank <= FB_BLANK_NORMAL)
-                set_backlight_enable(1);
+                aty_bl_set_power(info, FB_BLANK_UNBLANK);
 #elif defined(CONFIG_FB_ATY_GENERIC_LCD)
         if (par->lcd_table && blank <= FB_BLANK_NORMAL &&
             (aty_ld_lcd(LCD_GEN_CNTL, par) & LCD_ON)) {
@@ -2966,7 +3109,7 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
         }
 
         pcp = pdev->sysdata;
-        if (node == pcp->prom_node) {
+        if (node == pcp->prom_node->node) {
                 struct fb_var_screeninfo *var = &default_var;
                 unsigned int N, P, Q, M, T, R;
                 u32 v_total, h_total;
@@ -3440,6 +3583,7 @@ static int __devinit atyfb_pci_probe(struct pci_dev *pdev, const struct pci_devi
         par->res_start = res_start;
         par->res_size = res_size;
         par->irq = pdev->irq;
+        par->pdev = pdev;
 
         /* Setup "info" structure */
 #ifdef __sparc__
@@ -3571,6 +3715,11 @@ static void __devexit atyfb_remove(struct fb_info *info)
         aty_set_crtc(par, &saved_crtc);
         par->pll_ops->set_pll(info, &saved_pll);
 
+#ifdef CONFIG_FB_ATY_BACKLIGHT
+        if (M64_HAS(MOBIL_BUS))
+                aty_bl_exit(par);
+#endif
+
         unregister_framebuffer(info);
 
 #ifdef CONFIG_MTRR
@@ -3640,7 +3789,7 @@ static struct pci_driver atyfb_driver = {
 #endif /* CONFIG_PCI */
 
 #ifndef MODULE
-static int __init atyfb_setup(char *options)
+static int __devinit atyfb_setup(char *options)
 {
         char *this_opt;
 
@@ -3712,7 +3861,7 @@ static int __init atyfb_setup(char *options)
 }
 #endif  /*  MODULE  */
 
-static int __init atyfb_init(void)
+static int __devinit atyfb_init(void)
 {
 #ifndef MODULE
     char *option = NULL;
diff --git a/drivers/video/aty/mach64_accel.c b/drivers/video/aty/mach64_accel.c
index c98f4a442134..1490e5e1c232 100644
--- a/drivers/video/aty/mach64_accel.c
+++ b/drivers/video/aty/mach64_accel.c
@@ -200,8 +200,6 @@ void atyfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
         if (!area->width || !area->height)
                 return;
         if (!par->accel_flags) {
-                if (par->blitter_may_be_busy)
-                        wait_for_idle(par);
                 cfb_copyarea(info, area);
                 return;
         }
@@ -248,8 +246,6 @@ void atyfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
         if (!rect->width || !rect->height)
                 return;
         if (!par->accel_flags) {
-                if (par->blitter_may_be_busy)
-                        wait_for_idle(par);
                 cfb_fillrect(info, rect);
                 return;
         }
@@ -288,14 +284,10 @@ void atyfb_imageblit(struct fb_info *info, const struct fb_image *image)
                 return;
         if (!par->accel_flags ||
             (image->depth != 1 && info->var.bits_per_pixel != image->depth)) {
-                if (par->blitter_may_be_busy)
-                        wait_for_idle(par);
-
                 cfb_imageblit(info, image);
                 return;
         }
 
-        wait_for_idle(par);
         pix_width = pix_width_save = aty_ld_le32(DP_PIX_WIDTH, par);
         host_cntl = aty_ld_le32(HOST_CNTL, par) | HOST_BYTE_ALIGN;
 
@@ -425,8 +417,6 @@ void atyfb_imageblit(struct fb_info *info, const struct fb_image *image)
                 }
         }
 
-        wait_for_idle(par);
-
         /* restore pix_width */
         wait_for_fifo(1, par);
         aty_st_le32(DP_PIX_WIDTH, pix_width_save, par);
diff --git a/drivers/video/aty/mach64_cursor.c b/drivers/video/aty/mach64_cursor.c
index ad8b7496f853..2a7f381c330f 100644
--- a/drivers/video/aty/mach64_cursor.c
+++ b/drivers/video/aty/mach64_cursor.c
@@ -66,11 +66,6 @@ static const u8 cursor_bits_lookup[16] = {
         0x01, 0x41, 0x11, 0x51, 0x05, 0x45, 0x15, 0x55
 };
 
-static const u8 cursor_mask_lookup[16] = {
-        0xaa, 0x2a, 0x8a, 0x0a, 0xa2, 0x22, 0x82, 0x02,
-        0xa8, 0x28, 0x88, 0x08, 0xa0, 0x20, 0x80, 0x00
-};
-
 static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
 {
         struct atyfb_par *par = (struct atyfb_par *) info->par;
@@ -130,13 +125,13 @@ static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
                 fg_idx = cursor->image.fg_color;
                 bg_idx = cursor->image.bg_color;
 
-                fg = (info->cmap.red[fg_idx] << 24) |
-                     (info->cmap.green[fg_idx] << 16) |
-                     (info->cmap.blue[fg_idx] << 8) | 15;
+                fg = ((info->cmap.red[fg_idx] & 0xff) << 24) |
+                     ((info->cmap.green[fg_idx] & 0xff) << 16) |
+                     ((info->cmap.blue[fg_idx] & 0xff) << 8) | 0xff;
 
-                bg = (info->cmap.red[bg_idx] << 24) |
-                     (info->cmap.green[bg_idx] << 16) |
-                     (info->cmap.blue[bg_idx] << 8);
+                bg = ((info->cmap.red[bg_idx] & 0xff) << 24) |
+                     ((info->cmap.green[bg_idx] & 0xff) << 16) |
+                     ((info->cmap.blue[bg_idx] & 0xff) << 8);
 
                 wait_for_fifo(2, par);
                 aty_st_le32(CUR_CLR0, bg, par);
@@ -166,19 +161,17 @@ static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
                         switch (cursor->rop) {
                         case ROP_XOR:
                             // Upper 4 bits of mask data
-                            fb_writeb(cursor_mask_lookup[m >> 4 ] |
-                                cursor_bits_lookup[(b ^ m) >> 4], dst++);
+                            fb_writeb(cursor_bits_lookup[(b ^ m) >> 4], dst++);
                             // Lower 4 bits of mask
-                            fb_writeb(cursor_mask_lookup[m & 0x0f ] |
-                                cursor_bits_lookup[(b ^ m) & 0x0f], dst++);
+                            fb_writeb(cursor_bits_lookup[(b ^ m) & 0x0f],
+                                      dst++);
                             break;
                         case ROP_COPY:
                             // Upper 4 bits of mask data
-                            fb_writeb(cursor_mask_lookup[m >> 4 ] |
-                                cursor_bits_lookup[(b & m) >> 4], dst++);
+                            fb_writeb(cursor_bits_lookup[(b & m) >> 4], dst++);
                             // Lower 4 bits of mask
-                            fb_writeb(cursor_mask_lookup[m & 0x0f ] |
-                                cursor_bits_lookup[(b & m) & 0x0f], dst++);
+                            fb_writeb(cursor_bits_lookup[(b & m) & 0x0f],
+                                      dst++);
                             break;
                         }
                 }
@@ -194,7 +187,7 @@ static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
         return 0;
 }
 
-int __init aty_init_cursor(struct fb_info *info)
+int __devinit aty_init_cursor(struct fb_info *info)
 {
         unsigned long addr;
 
diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c
new file mode 100644
index 000000000000..585eb7b9e636
--- /dev/null
+++ b/drivers/video/aty/radeon_backlight.c
@@ -0,0 +1,247 @@
+/*
+ * Backlight code for ATI Radeon based graphic cards
+ *
+ * Copyright (c) 2000 Ani Joshi <ajoshi@kernel.crashing.org>
+ * Copyright (c) 2003 Benjamin Herrenschmidt <benh@kernel.crashing.org>
+ * Copyright (c) 2006 Michael Hanselmann <linux-kernel@hansmi.ch>
+ *
+ * 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 "radeonfb.h"
+#include <linux/backlight.h>
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+#include <asm/backlight.h>
+#endif
+
+#define MAX_RADEON_LEVEL 0xFF
+
+static struct backlight_properties radeon_bl_data;
+
+struct radeon_bl_privdata {
+        struct radeonfb_info *rinfo;
+        uint8_t negative;
+};
+
+static int radeon_bl_get_level_brightness(struct radeon_bl_privdata *pdata,
+                int level)
+{
+        struct fb_info *info = pdata->rinfo->info;
+        int rlevel;
+
+        mutex_lock(&info->bl_mutex);
+
+        /* Get and convert the value */
+        rlevel = pdata->rinfo->info->bl_curve[level] *
+                 FB_BACKLIGHT_MAX / MAX_RADEON_LEVEL;
+
+        mutex_unlock(&info->bl_mutex);
+
+        if (rlevel < 0)
+                rlevel = 0;
+        else if (rlevel > MAX_RADEON_LEVEL)
+                rlevel = MAX_RADEON_LEVEL;
+
+        if (pdata->negative)
+                rlevel = MAX_RADEON_LEVEL - rlevel;
+
+        return rlevel;
+}
+
+static int radeon_bl_update_status(struct backlight_device *bd)
+{
+        struct radeon_bl_privdata *pdata = class_get_devdata(&bd->class_dev);
+        struct radeonfb_info *rinfo = pdata->rinfo;
+        u32 lvds_gen_cntl, tmpPixclksCntl;
+        int level;
+
+        if (rinfo->mon1_type != MT_LCD)
+                return 0;
+
+        /* We turn off the LCD completely instead of just dimming the
+         * backlight. This provides some greater power saving and the display
+         * is useless without backlight anyway.
+         */
+        if (bd->props->power != FB_BLANK_UNBLANK ||
+            bd->props->fb_blank != FB_BLANK_UNBLANK)
+                level = 0;
+        else
+                level = bd->props->brightness;
+
+        del_timer_sync(&rinfo->lvds_timer);
+        radeon_engine_idle();
+
+        lvds_gen_cntl = INREG(LVDS_GEN_CNTL);
+        if (level > 0) {
+                lvds_gen_cntl &= ~LVDS_DISPLAY_DIS;
+                if (!(lvds_gen_cntl & LVDS_BLON) || !(lvds_gen_cntl & LVDS_ON)) {
+                        lvds_gen_cntl |= (rinfo->init_state.lvds_gen_cntl & LVDS_DIGON);
+                        lvds_gen_cntl |= LVDS_BLON | LVDS_EN;
+                        OUTREG(LVDS_GEN_CNTL, lvds_gen_cntl);
+                        lvds_gen_cntl &= ~LVDS_BL_MOD_LEVEL_MASK;
+                        lvds_gen_cntl |=
+                                (radeon_bl_get_level_brightness(pdata, level) <<
+                                 LVDS_BL_MOD_LEVEL_SHIFT);
+                        lvds_gen_cntl |= LVDS_ON;
+                        lvds_gen_cntl |= (rinfo->init_state.lvds_gen_cntl & LVDS_BL_MOD_EN);
+                        rinfo->pending_lvds_gen_cntl = lvds_gen_cntl;
+                        mod_timer(&rinfo->lvds_timer,
+                                  jiffies + msecs_to_jiffies(rinfo->panel_info.pwr_delay));
+                } else {
+                        lvds_gen_cntl &= ~LVDS_BL_MOD_LEVEL_MASK;
+                        lvds_gen_cntl |=
+                                (radeon_bl_get_level_brightness(pdata, level) <<
+                                 LVDS_BL_MOD_LEVEL_SHIFT);
+                        OUTREG(LVDS_GEN_CNTL, lvds_gen_cntl);
+                }
+                rinfo->init_state.lvds_gen_cntl &= ~LVDS_STATE_MASK;
+                rinfo->init_state.lvds_gen_cntl |= rinfo->pending_lvds_gen_cntl
+                        & LVDS_STATE_MASK;
+        } else {
+                /* Asic bug, when turning off LVDS_ON, we have to make sure
+                   RADEON_PIXCLK_LVDS_ALWAYS_ON bit is off
+                */
+                tmpPixclksCntl = INPLL(PIXCLKS_CNTL);
+                if (rinfo->is_mobility || rinfo->is_IGP)
+                        OUTPLLP(PIXCLKS_CNTL, 0, ~PIXCLK_LVDS_ALWAYS_ONb);
+                lvds_gen_cntl &= ~(LVDS_BL_MOD_LEVEL_MASK | LVDS_BL_MOD_EN);
+                lvds_gen_cntl |= (radeon_bl_get_level_brightness(pdata, 0) <<
+                                  LVDS_BL_MOD_LEVEL_SHIFT);
+                lvds_gen_cntl |= LVDS_DISPLAY_DIS;
+                OUTREG(LVDS_GEN_CNTL, lvds_gen_cntl);
+                udelay(100);
+                lvds_gen_cntl &= ~(LVDS_ON | LVDS_EN);
+                OUTREG(LVDS_GEN_CNTL, lvds_gen_cntl);
+                lvds_gen_cntl &= ~(LVDS_DIGON);
+                rinfo->pending_lvds_gen_cntl = lvds_gen_cntl;
+                mod_timer(&rinfo->lvds_timer,
+                          jiffies + msecs_to_jiffies(rinfo->panel_info.pwr_delay));
+                if (rinfo->is_mobility || rinfo->is_IGP)
+                        OUTPLL(PIXCLKS_CNTL, tmpPixclksCntl);
+        }
+        rinfo->init_state.lvds_gen_cntl &= ~LVDS_STATE_MASK;
+        rinfo->init_state.lvds_gen_cntl |= (lvds_gen_cntl & LVDS_STATE_MASK);
+
+        return 0;
+}
+
+static int radeon_bl_get_brightness(struct backlight_device *bd)
+{
+        return bd->props->brightness;
+}
+
+static struct backlight_properties radeon_bl_data = {
+        .owner          = THIS_MODULE,
+        .get_brightness = radeon_bl_get_brightness,
+        .update_status  = radeon_bl_update_status,
+        .max_brightness = (FB_BACKLIGHT_LEVELS - 1),
+};
+
+void radeonfb_bl_init(struct radeonfb_info *rinfo)
+{
+        struct backlight_device *bd;
+        struct radeon_bl_privdata *pdata;
+        char name[12];
+
+        if (rinfo->mon1_type != MT_LCD)
+                return;
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        if (!pmac_has_backlight_type("ati") &&
+            !pmac_has_backlight_type("mnca"))
+                return;
+#endif
+
+        pdata = kmalloc(sizeof(struct radeon_bl_privdata), GFP_KERNEL);
+        if (!pdata) {
+                printk("radeonfb: Memory allocation failed\n");
+                goto error;
+        }
+
+        snprintf(name, sizeof(name), "radeonbl%d", rinfo->info->node);
+
+        bd = backlight_device_register(name, pdata, &radeon_bl_data);
+        if (IS_ERR(bd)) {
+                rinfo->info->bl_dev = NULL;
+                printk("radeonfb: Backlight registration failed\n");
+                goto error;
+        }
+
+        pdata->rinfo = rinfo;
+
+        /* Pardon me for that hack... maybe some day we can figure out in what
+         * direction backlight should work on a given panel?
+         */
+        pdata->negative =
+                (rinfo->family != CHIP_FAMILY_RV200 &&
+                 rinfo->family != CHIP_FAMILY_RV250 &&
+                 rinfo->family != CHIP_FAMILY_RV280 &&
+                 rinfo->family != CHIP_FAMILY_RV350);
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        pdata->negative = pdata->negative ||
+                machine_is_compatible("PowerBook4,3") ||
+                machine_is_compatible("PowerBook6,3") ||
+                machine_is_compatible("PowerBook6,5");
+#endif
+
+        mutex_lock(&rinfo->info->bl_mutex);
+        rinfo->info->bl_dev = bd;
+        fb_bl_default_curve(rinfo->info, 0,
+                 63 * FB_BACKLIGHT_MAX / MAX_RADEON_LEVEL,
+                217 * FB_BACKLIGHT_MAX / MAX_RADEON_LEVEL);
+        mutex_unlock(&rinfo->info->bl_mutex);
+
+        down(&bd->sem);
+        bd->props->brightness = radeon_bl_data.max_brightness;
+        bd->props->power = FB_BLANK_UNBLANK;
+        bd->props->update_status(bd);
+        up(&bd->sem);
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        mutex_lock(&pmac_backlight_mutex);
+        if (!pmac_backlight)
+                pmac_backlight = bd;
+        mutex_unlock(&pmac_backlight_mutex);
+#endif
+
+        printk("radeonfb: Backlight initialized (%s)\n", name);
+
+        return;
+
+error:
+        kfree(pdata);
+        return;
+}
+
+void radeonfb_bl_exit(struct radeonfb_info *rinfo)
+{
+#ifdef CONFIG_PMAC_BACKLIGHT
+        mutex_lock(&pmac_backlight_mutex);
+#endif
+
+        mutex_lock(&rinfo->info->bl_mutex);
+        if (rinfo->info->bl_dev) {
+                struct radeon_bl_privdata *pdata;
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+                if (pmac_backlight == rinfo->info->bl_dev)
+                        pmac_backlight = NULL;
+#endif
+
+                pdata = class_get_devdata(&rinfo->info->bl_dev->class_dev);
+                backlight_device_unregister(rinfo->info->bl_dev);
+                kfree(pdata);
+                rinfo->info->bl_dev = NULL;
+
+                printk("radeonfb: Backlight unloaded\n");
+        }
+        mutex_unlock(&rinfo->info->bl_mutex);
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        mutex_unlock(&pmac_backlight_mutex);
+#endif
+}
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 387a18a47ac2..0ed577e7cc21 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -52,14 +52,12 @@
 
 #define RADEON_VERSION  "0.2.0"
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.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/time.h>
@@ -78,10 +76,6 @@
 #include <asm/pci-bridge.h>
 #include "../macmodes.h"
 
-#ifdef CONFIG_PMAC_BACKLIGHT
-#include <asm/backlight.h>
-#endif
-
 #ifdef CONFIG_BOOTX_TEXT
 #include <asm/btext.h>
 #endif
@@ -272,25 +266,13 @@ static int force_measure_pll = 0;
 #ifdef CONFIG_MTRR
 static int nomtrr = 0;
 #endif
+static int force_sleep;
+static int ignore_devlist;
 
 /*
  * prototypes
  */
 
-
-#ifdef CONFIG_PPC_OF
-
-#ifdef CONFIG_PMAC_BACKLIGHT
-static int radeon_set_backlight_enable(int on, int level, void *data);
-static int radeon_set_backlight_level(int level, void *data);
-static struct backlight_controller radeon_backlight_controller = {
-        radeon_set_backlight_enable,
-        radeon_set_backlight_level
-};
-#endif /* CONFIG_PMAC_BACKLIGHT */
-
-#endif /* CONFIG_PPC_OF */
-
 static void radeon_unmap_ROM(struct radeonfb_info *rinfo, struct pci_dev *dev)
 {
         if (!rinfo->bios_seg)
@@ -431,11 +413,11 @@ static int  __devinit radeon_find_mem_vbios(struct radeonfb_info *rinfo)
 static int __devinit radeon_read_xtal_OF (struct radeonfb_info *rinfo)
 {
         struct device_node *dp = rinfo->of_node;
-        u32 *val;
+        const u32 *val;
 
         if (dp == NULL)
                 return -ENODEV;
-        val = (u32 *) get_property(dp, "ATY,RefCLK", NULL);
+        val = get_property(dp, "ATY,RefCLK", NULL);
         if (!val || !*val) {
                 printk(KERN_WARNING "radeonfb: No ATY,RefCLK property !\n");
                 return -EINVAL;
@@ -443,11 +425,11 @@ static int __devinit radeon_read_xtal_OF (struct radeonfb_info *rinfo)
 
         rinfo->pll.ref_clk = (*val) / 10;
 
-        val = (u32 *) get_property(dp, "ATY,SCLK", NULL);
+        val = get_property(dp, "ATY,SCLK", NULL);
         if (val && *val)
                 rinfo->pll.sclk = (*val) / 10;
 
-        val = (u32 *) get_property(dp, "ATY,MCLK", NULL);
+        val = get_property(dp, "ATY,MCLK", NULL);
         if (val && *val)
                 rinfo->pll.mclk = (*val) / 10;
 
@@ -1913,116 +1895,6 @@ static int __devinit radeon_set_fbinfo (struct radeonfb_info *rinfo)
         return 0;
 }
 
-
-#ifdef CONFIG_PMAC_BACKLIGHT
-
-/* TODO: Dbl check these tables, we don't go up to full ON backlight
- * in these, possibly because we noticed MacOS doesn't, but I'd prefer
- * having some more official numbers from ATI
- */
-static int backlight_conv_m6[] = {
-        0xff, 0xc0, 0xb5, 0xaa, 0x9f, 0x94, 0x89, 0x7e,
-        0x73, 0x68, 0x5d, 0x52, 0x47, 0x3c, 0x31, 0x24
-};
-static int backlight_conv_m7[] = {
-        0x00, 0x3f, 0x4a, 0x55, 0x60, 0x6b, 0x76, 0x81,
-        0x8c, 0x97, 0xa2, 0xad, 0xb8, 0xc3, 0xce, 0xd9
-};
-
-#define BACKLIGHT_LVDS_OFF
-#undef BACKLIGHT_DAC_OFF
-
-/* We turn off the LCD completely instead of just dimming the backlight.
- * This provides some greater power saving and the display is useless
- * without backlight anyway.
- */
-static int radeon_set_backlight_enable(int on, int level, void *data)
-{
-        struct radeonfb_info *rinfo = (struct radeonfb_info *)data;
-        u32 lvds_gen_cntl, tmpPixclksCntl;
-        int* conv_table;
-
-        if (rinfo->mon1_type != MT_LCD)
-                return 0;
-
-        /* Pardon me for that hack... maybe some day we can figure
-         * out in what direction backlight should work on a given
-         * panel ?
-         */
-        if ((rinfo->family == CHIP_FAMILY_RV200 ||
-             rinfo->family == CHIP_FAMILY_RV250 ||
-             rinfo->family == CHIP_FAMILY_RV280 ||
-             rinfo->family == CHIP_FAMILY_RV350) &&
-            !machine_is_compatible("PowerBook4,3") &&
-            !machine_is_compatible("PowerBook6,3") &&
-            !machine_is_compatible("PowerBook6,5"))
-                conv_table = backlight_conv_m7;
-        else
-                conv_table = backlight_conv_m6;
-
-        del_timer_sync(&rinfo->lvds_timer);
-        radeon_engine_idle();
-
-        lvds_gen_cntl = INREG(LVDS_GEN_CNTL);
-        if (on && (level > BACKLIGHT_OFF)) {
-                lvds_gen_cntl &= ~LVDS_DISPLAY_DIS;
-                if (!(lvds_gen_cntl & LVDS_BLON) || !(lvds_gen_cntl & LVDS_ON)) {
-                        lvds_gen_cntl |= (rinfo->init_state.lvds_gen_cntl & LVDS_DIGON);
-                        lvds_gen_cntl |= LVDS_BLON | LVDS_EN;
-                        OUTREG(LVDS_GEN_CNTL, lvds_gen_cntl);
-                        lvds_gen_cntl &= ~LVDS_BL_MOD_LEVEL_MASK;
-                        lvds_gen_cntl |= (conv_table[level] <<
-                                          LVDS_BL_MOD_LEVEL_SHIFT);
-                        lvds_gen_cntl |= LVDS_ON;
-                        lvds_gen_cntl |= (rinfo->init_state.lvds_gen_cntl & LVDS_BL_MOD_EN);
-                        rinfo->pending_lvds_gen_cntl = lvds_gen_cntl;
-                        mod_timer(&rinfo->lvds_timer,
-                                  jiffies + msecs_to_jiffies(rinfo->panel_info.pwr_delay));
-                } else {
-                        lvds_gen_cntl &= ~LVDS_BL_MOD_LEVEL_MASK;
-                        lvds_gen_cntl |= (conv_table[level] <<
-                                          LVDS_BL_MOD_LEVEL_SHIFT);
-                        OUTREG(LVDS_GEN_CNTL, lvds_gen_cntl);
-                }
-                rinfo->init_state.lvds_gen_cntl &= ~LVDS_STATE_MASK;
-                rinfo->init_state.lvds_gen_cntl |= rinfo->pending_lvds_gen_cntl
-                        & LVDS_STATE_MASK;
-        } else {
-                /* Asic bug, when turning off LVDS_ON, we have to make sure
-                   RADEON_PIXCLK_LVDS_ALWAYS_ON bit is off
-                */
-                tmpPixclksCntl = INPLL(PIXCLKS_CNTL);
-                if (rinfo->is_mobility || rinfo->is_IGP)
-                        OUTPLLP(PIXCLKS_CNTL, 0, ~PIXCLK_LVDS_ALWAYS_ONb);
-                lvds_gen_cntl &= ~(LVDS_BL_MOD_LEVEL_MASK | LVDS_BL_MOD_EN);
-                lvds_gen_cntl |= (conv_table[0] <<
-                                  LVDS_BL_MOD_LEVEL_SHIFT);
-                lvds_gen_cntl |= LVDS_DISPLAY_DIS;
-                OUTREG(LVDS_GEN_CNTL, lvds_gen_cntl);
-                udelay(100);
-                lvds_gen_cntl &= ~(LVDS_ON | LVDS_EN);
-                OUTREG(LVDS_GEN_CNTL, lvds_gen_cntl);
-                lvds_gen_cntl &= ~(LVDS_DIGON);
-                rinfo->pending_lvds_gen_cntl = lvds_gen_cntl;
-                mod_timer(&rinfo->lvds_timer,
-                          jiffies + msecs_to_jiffies(rinfo->panel_info.pwr_delay));
-                if (rinfo->is_mobility || rinfo->is_IGP)
-                        OUTPLL(PIXCLKS_CNTL, tmpPixclksCntl);
-        }
-        rinfo->init_state.lvds_gen_cntl &= ~LVDS_STATE_MASK;
-        rinfo->init_state.lvds_gen_cntl |= (lvds_gen_cntl & LVDS_STATE_MASK);
-
-        return 0;
-}
-
-
-static int radeon_set_backlight_level(int level, void *data)
-{
-        return radeon_set_backlight_enable(1, level, data);
-}
-#endif /* CONFIG_PMAC_BACKLIGHT */
-
-
 /*
  * This reconfigure the card's internal memory map. In theory, we'd like
  * to setup the card's memory at the same address as it's PCI bus address,
@@ -2457,9 +2329,9 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev,
                 /* -2 is special: means  ON on mobility chips and do not
                  * change on others
                  */
-                radeonfb_pm_init(rinfo, rinfo->is_mobility ? 1 : -1);
+                radeonfb_pm_init(rinfo, rinfo->is_mobility ? 1 : -1, ignore_devlist, force_sleep);
         } else
-                radeonfb_pm_init(rinfo, default_dynclk);
+                radeonfb_pm_init(rinfo, default_dynclk, ignore_devlist, force_sleep);
 
         pci_set_drvdata(pdev, info);
 
@@ -2477,14 +2349,7 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev,
                                                  MTRR_TYPE_WRCOMB, 1);
 #endif
 
-#ifdef CONFIG_PMAC_BACKLIGHT
-        if (rinfo->mon1_type == MT_LCD) {
-                register_backlight_controller(&radeon_backlight_controller,
-                                              rinfo, "ati");
-                register_backlight_controller(&radeon_backlight_controller,
-                                              rinfo, "mnca");
-        }
-#endif
+        radeonfb_bl_init(rinfo);
 
         printk ("radeonfb (%s): %s\n", pci_name(rinfo->pdev), rinfo->name);
 
@@ -2514,7 +2379,6 @@ err_release_pci0:
 err_release_fb:
         framebuffer_release(info);
 err_disable:
-        pci_disable_device(pdev);
 err_out:
         return ret;
 }
@@ -2528,7 +2392,8 @@ static void __devexit radeonfb_pci_unregister (struct pci_dev *pdev)
  
         if (!rinfo)
                 return;
- 
+
+        radeonfb_bl_exit(rinfo);
         radeonfb_pm_exit(rinfo);
 
         if (rinfo->mon1_EDID)
@@ -2570,7 +2435,6 @@ static void __devexit radeonfb_pci_unregister (struct pci_dev *pdev)
 #endif        
         fb_dealloc_cmap(&info->cmap);
         framebuffer_release(info);
-        pci_disable_device(pdev);
 }
 
 
@@ -2615,6 +2479,12 @@ static int __init radeonfb_setup (char *options)
                         force_measure_pll = 1;
                 } else if (!strncmp(this_opt, "ignore_edid", 11)) {
                         ignore_edid = 1;
+#if defined(CONFIG_PM) && defined(CONFIG_X86)
+                } else if (!strncmp(this_opt, "force_sleep", 11)) {
+                        force_sleep = 1;
+                } else if (!strncmp(this_opt, "ignore_devlist", 14)) {
+                        ignore_devlist = 1;
+#endif
                 } else
                         mode_option = this_opt;
         }
@@ -2670,3 +2540,9 @@ module_param(panel_yres, int, 0);
 MODULE_PARM_DESC(panel_yres, "int: set panel yres");
 module_param(mode_option, charp, 0);
 MODULE_PARM_DESC(mode_option, "Specify resolution as \"<xres>x<yres>[-<bpp>][@<refresh>]\" ");
+#if defined(CONFIG_PM) && defined(CONFIG_X86)
+module_param(force_sleep, bool, 0);
+MODULE_PARM_DESC(force_sleep, "bool: force D2 sleep mode on all hardware");
+module_param(ignore_devlist, bool, 0);
+MODULE_PARM_DESC(ignore_devlist, "bool: ignore workarounds for bugs in specific laptops");
+#endif
diff --git a/drivers/video/aty/radeon_i2c.c b/drivers/video/aty/radeon_i2c.c
index a9d0414e4655..9aaca58c074a 100644
--- a/drivers/video/aty/radeon_i2c.c
+++ b/drivers/video/aty/radeon_i2c.c
@@ -1,4 +1,3 @@
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
diff --git a/drivers/video/aty/radeon_monitor.c b/drivers/video/aty/radeon_monitor.c
index 98c05bc0de44..ea531a6f45d1 100644
--- a/drivers/video/aty/radeon_monitor.c
+++ b/drivers/video/aty/radeon_monitor.c
@@ -64,13 +64,13 @@ static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_
 {
         static char *propnames[] = { "DFP,EDID", "LCD,EDID", "EDID",
                                      "EDID1", "EDID2",  NULL };
-        u8 *pedid = NULL;
-        u8 *pmt = NULL;
+        const u8 *pedid = NULL;
+        const u8 *pmt = NULL;
         u8 *tmp;
         int i, mt = MT_NONE;  
         
         RTRACE("analyzing OF properties...\n");
-        pmt = (u8 *)get_property(dp, "display-type", NULL);
+        pmt = get_property(dp, "display-type", NULL);
         if (!pmt)
                 return MT_NONE;
         RTRACE("display-type: %s\n", pmt);
@@ -89,7 +89,7 @@ static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_
         }
 
         for (i = 0; propnames[i] != NULL; ++i) {
-                pedid = (u8 *)get_property(dp, propnames[i], NULL);
+                pedid = get_property(dp, propnames[i], NULL);
                 if (pedid != NULL)
                         break;
         }
@@ -124,14 +124,14 @@ static int __devinit radeon_probe_OF_head(struct radeonfb_info *rinfo, int head_
                 return MT_NONE;
 
         if (rinfo->has_CRTC2) {
-                char *pname;
+                const char *pname;
                 int len, second = 0;
 
                 dp = dp->child;
                 do {
                         if (!dp)
                                 return MT_NONE;
-                        pname = (char *)get_property(dp, "name", NULL);
+                        pname = get_property(dp, "name", NULL);
                         if (!pname)
                                 return MT_NONE;
                         len = strlen(pname);
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
index c7091761cef4..365de5dcc888 100644
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
@@ -27,6 +27,99 @@
 
 #include "ati_ids.h"
 
+static void radeon_reinitialize_M10(struct radeonfb_info *rinfo);
+
+/*
+ * Workarounds for bugs in PC laptops:
+ * - enable D2 sleep in some IBM Thinkpads
+ * - special case for Samsung P35
+ *
+ * Whitelist by subsystem vendor/device because
+ * its the subsystem vendor's fault!
+ */
+
+#if defined(CONFIG_PM) && defined(CONFIG_X86)
+struct radeon_device_id {
+        const char *ident;                     /* (arbitrary) Name */
+        const unsigned short subsystem_vendor; /* Subsystem Vendor ID */
+        const unsigned short subsystem_device; /* Subsystem Device ID */
+        const enum radeon_pm_mode pm_mode_modifier; /* modify pm_mode */
+        const reinit_function_ptr new_reinit_func;   /* changed reinit_func */
+};
+
+#define BUGFIX(model, sv, sd, pm, fn) { \
+        .ident = model, \
+        .subsystem_vendor = sv, \
+        .subsystem_device = sd, \
+        .pm_mode_modifier = pm, \
+        .new_reinit_func  = fn  \
+}
+
+static struct radeon_device_id radeon_workaround_list[] = {
+        BUGFIX("IBM Thinkpad R32",
+               PCI_VENDOR_ID_IBM, 0x1905,
+               radeon_pm_d2, NULL),
+        BUGFIX("IBM Thinkpad R40",
+               PCI_VENDOR_ID_IBM, 0x0526,
+               radeon_pm_d2, NULL),
+        BUGFIX("IBM Thinkpad R40",
+               PCI_VENDOR_ID_IBM, 0x0527,
+               radeon_pm_d2, NULL),
+        BUGFIX("IBM Thinkpad R50/R51/T40/T41",
+               PCI_VENDOR_ID_IBM, 0x0531,
+               radeon_pm_d2, NULL),
+        BUGFIX("IBM Thinkpad R51/T40/T41/T42",
+               PCI_VENDOR_ID_IBM, 0x0530,
+               radeon_pm_d2, NULL),
+        BUGFIX("IBM Thinkpad T30",
+               PCI_VENDOR_ID_IBM, 0x0517,
+               radeon_pm_d2, NULL),
+        BUGFIX("IBM Thinkpad T40p",
+               PCI_VENDOR_ID_IBM, 0x054d,
+               radeon_pm_d2, NULL),
+        BUGFIX("IBM Thinkpad T42",
+               PCI_VENDOR_ID_IBM, 0x0550,
+               radeon_pm_d2, NULL),
+        BUGFIX("IBM Thinkpad X31/X32",
+               PCI_VENDOR_ID_IBM, 0x052f,
+               radeon_pm_d2, NULL),
+        BUGFIX("Samsung P35",
+               PCI_VENDOR_ID_SAMSUNG, 0xc00c,
+               radeon_pm_off, radeon_reinitialize_M10),
+        { .ident = NULL }
+};
+
+static int radeon_apply_workarounds(struct radeonfb_info *rinfo)
+{
+        struct radeon_device_id *id;
+
+        for (id = radeon_workaround_list; id->ident != NULL; id++ )
+                if ((id->subsystem_vendor == rinfo->pdev->subsystem_vendor ) &&
+                    (id->subsystem_device == rinfo->pdev->subsystem_device )) {
+
+                        /* we found a device that requires workaround */
+                        printk(KERN_DEBUG "radeonfb: %s detected"
+                               ", enabling workaround\n", id->ident);
+
+                        rinfo->pm_mode |= id->pm_mode_modifier;
+
+                        if (id->new_reinit_func != NULL)
+                                rinfo->reinit_func = id->new_reinit_func;
+
+                        return 1;
+                }
+        return 0;  /* not found */
+}
+
+#else  /* defined(CONFIG_PM) && defined(CONFIG_X86) */
+static inline int radeon_apply_workarounds(struct radeonfb_info *rinfo)
+{
+        return 0;
+}
+#endif /* defined(CONFIG_PM) && defined(CONFIG_X86) */
+
+
+
 static void radeon_pm_disable_dynamic_mode(struct radeonfb_info *rinfo)
 {
         u32 tmp;
@@ -852,18 +945,26 @@ static void radeon_pm_setup_for_suspend(struct radeonfb_info *rinfo)
         /* because both INPLL and OUTPLL take the same lock, that's why. */
         tmp = INPLL( pllMCLK_MISC) | MCLK_MISC__EN_MCLK_TRISTATE_IN_SUSPEND;
         OUTPLL( pllMCLK_MISC, tmp);
-        
-        /* AGP PLL control */
-        if (rinfo->family <= CHIP_FAMILY_RV280) {
-                OUTREG(BUS_CNTL1, INREG(BUS_CNTL1) |  BUS_CNTL1__AGPCLK_VALID);
 
-                OUTREG(BUS_CNTL1,
-                       (INREG(BUS_CNTL1) & ~BUS_CNTL1__MOBILE_PLATFORM_SEL_MASK)
-                       | (2<<BUS_CNTL1__MOBILE_PLATFORM_SEL__SHIFT));   // 440BX
-        } else {
-                OUTREG(BUS_CNTL1, INREG(BUS_CNTL1));
-                OUTREG(BUS_CNTL1, (INREG(BUS_CNTL1) & ~0x4000) | 0x8000);
+        /* BUS_CNTL1__MOBILE_PLATORM_SEL setting is northbridge chipset
+         * and radeon chip dependent. Thus we only enable it on Mac for
+         * now (until we get more info on how to compute the correct
+         * value for various X86 bridges).
+         */
+#ifdef CONFIG_PPC_PMAC
+        if (machine_is(powermac)) {
+                /* AGP PLL control */
+                if (rinfo->family <= CHIP_FAMILY_RV280) {
+                        OUTREG(BUS_CNTL1, INREG(BUS_CNTL1) |  BUS_CNTL1__AGPCLK_VALID);
+                        OUTREG(BUS_CNTL1,
+                               (INREG(BUS_CNTL1) & ~BUS_CNTL1__MOBILE_PLATFORM_SEL_MASK)
+                               | (2<<BUS_CNTL1__MOBILE_PLATFORM_SEL__SHIFT));   // 440BX
+                } else {
+                        OUTREG(BUS_CNTL1, INREG(BUS_CNTL1));
+                        OUTREG(BUS_CNTL1, (INREG(BUS_CNTL1) & ~0x4000) | 0x8000);
+                }
         }
+#endif
 
         OUTREG(CRTC_OFFSET_CNTL, (INREG(CRTC_OFFSET_CNTL)
                                   & ~CRTC_OFFSET_CNTL__CRTC_STEREO_SYNC_OUT_EN));
@@ -1167,7 +1268,7 @@ static void radeon_pm_full_reset_sdram(struct radeonfb_info *rinfo)
                           0x21320032, 0xa1320032, 0x21320032, 0xffffffff,
                           0x31320032 };
 
-                u32 *mrtable = default_mrtable;
+                const u32 *mrtable = default_mrtable;
                 int i, mrtable_size = ARRAY_SIZE(default_mrtable);
 
                 mdelay(30);
@@ -1186,7 +1287,7 @@ static void radeon_pm_full_reset_sdram(struct radeonfb_info *rinfo)
                 if (rinfo->of_node != NULL) {
                         int size;
 
-                        mrtable = (u32 *)get_property(rinfo->of_node, "ATY,MRT", &size);
+                        mrtable = get_property(rinfo->of_node, "ATY,MRT", &size);
                         if (mrtable)
                                 mrtable_size = size >> 2;
                         else
@@ -2520,25 +2621,28 @@ static int radeon_restore_pci_cfg(struct radeonfb_info *rinfo)
 }
 
 
-int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
+int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
 {
         struct fb_info *info = pci_get_drvdata(pdev);
         struct radeonfb_info *rinfo = info->par;
         int i;
 
-        if (state.event == pdev->dev.power.power_state.event)
+        if (mesg.event == pdev->dev.power.power_state.event)
                 return 0;
 
-        printk(KERN_DEBUG "radeonfb (%s): suspending to state: %d...\n",
-               pci_name(pdev), state.event);
+        printk(KERN_DEBUG "radeonfb (%s): suspending for event: %d...\n",
+               pci_name(pdev), mesg.event);
 
         /* For suspend-to-disk, we cheat here. We don't suspend anything and
          * let fbcon continue drawing until we are all set. That shouldn't
          * really cause any problem at this point, provided that the wakeup
          * code knows that any state in memory may not match the HW
          */
-        if (state.event == PM_EVENT_FREEZE)
+        switch (mesg.event) {
+        case PM_EVENT_FREEZE:           /* about to take snapshot */
+        case PM_EVENT_PRETHAW:          /* before restoring snapshot */
                 goto done;
+        }
 
         acquire_console_sem();
 
@@ -2605,7 +2709,7 @@ int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
         release_console_sem();
 
  done:
-        pdev->dev.power.power_state = state;
+        pdev->dev.power.power_state = mesg;
 
         return 0;
 }
@@ -2713,7 +2817,7 @@ static void radeonfb_early_resume(void *data)
 
 #endif /* CONFIG_PM */
 
-void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk)
+void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk, int ignore_devlist, int force_sleep)
 {
         /* Find PM registers in config space if any*/
         rinfo->pm_reg = pci_find_capability(rinfo->pdev, PCI_CAP_ID_PM);
@@ -2729,22 +2833,13 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk)
         }
 
 #if defined(CONFIG_PM)
+#if defined(CONFIG_PPC_PMAC)
         /* Check if we can power manage on suspend/resume. We can do
          * D2 on M6, M7 and M9, and we can resume from D3 cold a few other
          * "Mac" cards, but that's all. We need more infos about what the
          * BIOS does tho. Right now, all this PM stuff is pmac-only for that
          * reason. --BenH
          */
-        /* Special case for Samsung P35 laptops
-         */
-        if ((rinfo->pdev->vendor == PCI_VENDOR_ID_ATI) &&
-            (rinfo->pdev->device == PCI_CHIP_RV350_NP) &&
-            (rinfo->pdev->subsystem_vendor == PCI_VENDOR_ID_SAMSUNG) &&
-            (rinfo->pdev->subsystem_device == 0xc00c)) {
-                rinfo->reinit_func = radeon_reinitialize_M10;
-                rinfo->pm_mode |= radeon_pm_off;
-        }
-#if defined(CONFIG_PPC_PMAC)
         if (machine_is(powermac) && rinfo->of_node) {
                 if (rinfo->is_mobility && rinfo->pm_reg &&
                     rinfo->family <= CHIP_FAMILY_RV250)
@@ -2790,6 +2885,18 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk)
         }
 #endif /* defined(CONFIG_PPC_PMAC) */
 #endif /* defined(CONFIG_PM) */
+
+        if (ignore_devlist)
+                printk(KERN_DEBUG
+                       "radeonfb: skipping test for device workarounds\n");
+        else
+                radeon_apply_workarounds(rinfo);
+
+        if (force_sleep) {
+                printk(KERN_DEBUG
+                       "radeonfb: forcefully enabling D2 sleep mode\n");
+                rinfo->pm_mode |= radeon_pm_d2;
+        }
 }
 
 void radeonfb_pm_exit(struct radeonfb_info *rinfo)
diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h
index 217e00ab4a2d..d5ff224a6258 100644
--- a/drivers/video/aty/radeonfb.h
+++ b/drivers/video/aty/radeonfb.h
@@ -1,7 +1,6 @@
 #ifndef __RADEONFB_H__
 #define __RADEONFB_H__
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -274,6 +273,8 @@ enum radeon_pm_mode {
         radeon_pm_off   = 0x00000002,   /* Can resume from D3 cold */
 };
 
+typedef void (*reinit_function_ptr)(struct radeonfb_info *rinfo);
+
 struct radeonfb_info {
         struct fb_info          *info;
 
@@ -339,7 +340,7 @@ struct radeonfb_info {
         int                     dynclk;
         int                     no_schedule;
         enum radeon_pm_mode     pm_mode;
-        void                    (*reinit_func)(struct radeonfb_info *rinfo);
+        reinit_function_ptr     reinit_func;
 
         /* Lock on register access */
         spinlock_t              reg_lock;
@@ -382,7 +383,7 @@ struct radeonfb_info {
 /* Note about this function: we have some rare cases where we must not schedule,
  * this typically happen with our special "wake up early" hook which allows us to
  * wake up the graphic chip (and thus get the console back) before everything else
- * on some machines that support that mecanism. At this point, interrupts are off
+ * on some machines that support that mechanism. At this point, interrupts are off
  * and scheduling is not permitted
  */
 static inline void _radeon_msleep(struct radeonfb_info *rinfo, unsigned long ms)
@@ -601,7 +602,7 @@ extern int radeon_probe_i2c_connector(struct radeonfb_info *rinfo, int conn, u8
 /* PM Functions */
 extern int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t state);
 extern int radeonfb_pci_resume(struct pci_dev *pdev);
-extern void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk);
+extern void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk, int ignore_devlist, int force_sleep);
 extern void radeonfb_pm_exit(struct radeonfb_info *rinfo);
 
 /* Monitor probe functions */
@@ -625,4 +626,13 @@ extern int radeon_screen_blank(struct radeonfb_info *rinfo, int blank, int mode_
 extern void radeon_write_mode (struct radeonfb_info *rinfo, struct radeon_regs *mode,
                                int reg_only);
 
+/* Backlight functions */
+#ifdef CONFIG_FB_RADEON_BACKLIGHT
+extern void radeonfb_bl_init(struct radeonfb_info *rinfo);
+extern void radeonfb_bl_exit(struct radeonfb_info *rinfo);
+#else
+static inline void radeonfb_bl_init(struct radeonfb_info *rinfo) {}
+static inline void radeonfb_bl_exit(struct radeonfb_info *rinfo) {}
+#endif
+
 #endif /* __RADEONFB_H__ */
diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c
index 789450bb0bc9..f25d5d648333 100644
--- a/drivers/video/au1100fb.c
+++ b/drivers/video/au1100fb.c
@@ -7,6 +7,8 @@
  *      Karl Lessard <klessard@sunrisetelecom.com>
  *      <c.pellegrin@exadron.com>
  *
+ * PM support added by Rodolfo Giometti <giometti@linux.it>
+ *
  * Copyright 2002 MontaVista Software
  * Author: MontaVista Software, Inc.
  *              ppopov@mvista.com or source@mvista.com
@@ -38,7 +40,6 @@
  *  with this program; if not, write  to the Free Software Foundation, Inc.,
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -155,7 +156,7 @@ int au1100fb_setmode(struct au1100fb_device *fbdev)
 
                         info->fix.visual = FB_VISUAL_TRUECOLOR;
                         info->fix.line_length = info->var.xres_virtual << 1; /* depth=16 */
-        }
+                }
         } else {
                 /* mono */
                 info->fix.visual = FB_VISUAL_MONO10;
@@ -163,20 +164,16 @@ int au1100fb_setmode(struct au1100fb_device *fbdev)
         }
 
         info->screen_size = info->fix.line_length * info->var.yres_virtual;
+        info->var.rotate = ((fbdev->panel->control_base&LCD_CONTROL_SM_MASK) \
+                                >> LCD_CONTROL_SM_BIT) * 90;
 
         /* Determine BPP mode and format */
-        fbdev->regs->lcd_control = fbdev->panel->control_base |
-                            ((info->var.rotate/90) << LCD_CONTROL_SM_BIT);
-
-        fbdev->regs->lcd_intenable = 0;
-        fbdev->regs->lcd_intstatus = 0;
-
+        fbdev->regs->lcd_control = fbdev->panel->control_base;
         fbdev->regs->lcd_horztiming = fbdev->panel->horztiming;
-
         fbdev->regs->lcd_verttiming = fbdev->panel->verttiming;
-
         fbdev->regs->lcd_clkcontrol = fbdev->panel->clkcontrol_base;
-
+        fbdev->regs->lcd_intenable = 0;
+        fbdev->regs->lcd_intstatus = 0;
         fbdev->regs->lcd_dmaaddr0 = LCD_DMA_SA_N(fbdev->fb_phys);
 
         if (panel_is_dual(fbdev->panel)) {
@@ -205,6 +202,8 @@ int au1100fb_setmode(struct au1100fb_device *fbdev)
 
         /* Resume controller */
         fbdev->regs->lcd_control |= LCD_CONTROL_GO;
+        mdelay(10);
+        au1100fb_fb_blank(VESA_NO_BLANKING, info);
 
         return 0;
 }
@@ -602,17 +601,52 @@ int au1100fb_drv_remove(struct device *dev)
         return 0;
 }
 
+#ifdef CONFIG_PM
+static u32 sys_clksrc;
+static struct au1100fb_regs fbregs;
+
 int au1100fb_drv_suspend(struct device *dev, pm_message_t state)
 {
-        /* TODO */
+        struct au1100fb_device *fbdev = dev_get_drvdata(dev);
+
+        if (!fbdev)
+                return 0;
+
+        /* Save the clock source state */
+        sys_clksrc = au_readl(SYS_CLKSRC);
+
+        /* Blank the LCD */
+        au1100fb_fb_blank(VESA_POWERDOWN, &fbdev->info);
+
+        /* Stop LCD clocking */
+        au_writel(sys_clksrc & ~SYS_CS_ML_MASK, SYS_CLKSRC);
+
+        memcpy(&fbregs, fbdev->regs, sizeof(struct au1100fb_regs));
+
         return 0;
 }
 
 int au1100fb_drv_resume(struct device *dev)
 {
-        /* TODO */
+        struct au1100fb_device *fbdev = dev_get_drvdata(dev);
+
+        if (!fbdev)
+                return 0;
+
+        memcpy(fbdev->regs, &fbregs, sizeof(struct au1100fb_regs));
+
+        /* Restart LCD clocking */
+        au_writel(sys_clksrc, SYS_CLKSRC);
+
+        /* Unblank the LCD */
+        au1100fb_fb_blank(VESA_NO_BLANKING, &fbdev->info);
+
         return 0;
 }
+#else
+#define au1100fb_drv_suspend NULL
+#define au1100fb_drv_resume NULL
+#endif
 
 static struct device_driver au1100fb_driver = {
         .name           = "au1100-lcd",
@@ -706,8 +740,7 @@ void __exit au1100fb_cleanup(void)
 {
         driver_unregister(&au1100fb_driver);
 
-        if (drv_info.opt_mode)
-                kfree(drv_info.opt_mode);
+        kfree(drv_info.opt_mode);
 }
 
 module_init(au1100fb_init);
diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c
index 600d3e0e08b7..c6a5f0ccc107 100644
--- a/drivers/video/au1200fb.c
+++ b/drivers/video/au1200fb.c
@@ -1694,7 +1694,7 @@ static int au1200fb_drv_probe(struct device *dev)
 
         /* Now hook interrupt too */
         if ((ret = request_irq(AU1200_LCD_INT, au1200fb_handle_irq,
-                          SA_INTERRUPT | SA_SHIRQ, "lcd", (void *)dev)) < 0) {
+                          IRQF_DISABLED | IRQF_SHARED, "lcd", (void *)dev)) < 0) {
                 print_err("fail to request interrupt line %d (err: %d)",
                           AU1200_LCD_INT, ret);
                 goto failed;
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index b895eaaa73fd..02f15297a021 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -50,6 +50,14 @@ config BACKLIGHT_CORGI
           If you have a Sharp Zaurus SL-C7xx, SL-Cxx00 or SL-6000x say y to enable the
           backlight driver.
 
+config BACKLIGHT_LOCOMO
+        tristate "Sharp LOCOMO LCD/Backlight Driver"
+        depends on BACKLIGHT_DEVICE && SHARP_LOCOMO
+        default y
+        help
+          If you have a Sharp Zaurus SL-5500 (Collie) or SL-5600 (Poodle) say y to
+          enable the LCD/backlight driver.
+
 config BACKLIGHT_HP680
         tristate "HP Jornada 680 Backlight Driver"
         depends on BACKLIGHT_DEVICE && SH_HP6XX
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index 744210c38e74..65e5553fc849 100644
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@ -4,4 +4,4 @@ obj-$(CONFIG_LCD_CLASS_DEVICE)     += lcd.o
 obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o
 obj-$(CONFIG_BACKLIGHT_CORGI)   += corgi_bl.o
 obj-$(CONFIG_BACKLIGHT_HP680)   += hp680_bl.o
-obj-$(CONFIG_SHARP_LOCOMO)      += locomolcd.o
+obj-$(CONFIG_BACKLIGHT_LOCOMO)  += locomolcd.o
diff --git a/drivers/video/backlight/hp680_bl.c b/drivers/video/backlight/hp680_bl.c
index a71e984c93d4..fe1488374f62 100644
--- a/drivers/video/backlight/hp680_bl.c
+++ b/drivers/video/backlight/hp680_bl.c
@@ -20,14 +20,14 @@
 
 #include <asm/cpu/dac.h>
 #include <asm/hp6xx/hp6xx.h>
-#include <asm/hd64461/hd64461.h>
+#include <asm/hd64461.h>
 
 #define HP680_MAX_INTENSITY 255
 #define HP680_DEFAULT_INTENSITY 10
 
 static int hp680bl_suspended;
 static int current_intensity = 0;
-static spinlock_t bl_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(bl_lock);
 static struct backlight_device *hp680_backlight_device;
 
 static void hp680bl_send_intensity(struct backlight_device *bd)
@@ -163,6 +163,6 @@ static void __exit hp680bl_exit(void)
 module_init(hp680bl_init);
 module_exit(hp680bl_exit);
 
-MODULE_AUTHOR("Andriy Skulysh <askulysh@image.kiev.ua>");
+MODULE_AUTHOR("Andriy Skulysh <askulysh@gmail.com>");
 MODULE_DESCRIPTION("HP Jornada 680 Backlight Driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c
index 60831bb23685..628571c63bac 100644
--- a/drivers/video/backlight/locomolcd.c
+++ b/drivers/video/backlight/locomolcd.c
@@ -11,12 +11,13 @@
  */
 
 /* LCD power functions */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/interrupt.h>
+#include <linux/fb.h>
+#include <linux/backlight.h>
 
 #include <asm/hardware/locomo.h>
 #include <asm/irq.h>
@@ -25,23 +26,26 @@
 
 #include "../../../arch/arm/mach-sa1100/generic.h"
 
+static struct backlight_device *locomolcd_bl_device;
 static struct locomo_dev *locomolcd_dev;
+static unsigned long locomolcd_flags;
+#define LOCOMOLCD_SUSPENDED     0x01
 
 static void locomolcd_on(int comadj)
 {
-        locomo_gpio_set_dir(locomolcd_dev, LOCOMO_GPIO_LCD_VSHA_ON, 0);
-        locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_VSHA_ON, 1);
+        locomo_gpio_set_dir(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VSHA_ON, 0);
+        locomo_gpio_write(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VSHA_ON, 1);
         mdelay(2);
 
-        locomo_gpio_set_dir(locomolcd_dev, LOCOMO_GPIO_LCD_VSHD_ON, 0);
-        locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_VSHD_ON, 1);
+        locomo_gpio_set_dir(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VSHD_ON, 0);
+        locomo_gpio_write(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VSHD_ON, 1);
         mdelay(2);
 
         locomo_m62332_senddata(locomolcd_dev, comadj, 0);
         mdelay(5);
 
-        locomo_gpio_set_dir(locomolcd_dev, LOCOMO_GPIO_LCD_VEE_ON, 0);
-        locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_VEE_ON, 1);
+        locomo_gpio_set_dir(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VEE_ON, 0);
+        locomo_gpio_write(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VEE_ON, 1);
         mdelay(10);
 
         /* TFTCRST | CPSOUT=0 | CPSEN */
@@ -54,8 +58,8 @@ static void locomolcd_on(int comadj)
         locomo_writel((0x04 | 0x01), locomolcd_dev->mapbase + LOCOMO_TC);
         mdelay(10);
 
-        locomo_gpio_set_dir(locomolcd_dev, LOCOMO_GPIO_LCD_MOD, 0);
-        locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_MOD, 1);
+        locomo_gpio_set_dir(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_MOD, 0);
+        locomo_gpio_write(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_MOD, 1);
 }
 
 static void locomolcd_off(int comadj)
@@ -64,16 +68,16 @@ static void locomolcd_off(int comadj)
         locomo_writel(0x06, locomolcd_dev->mapbase + LOCOMO_TC);
         mdelay(1);
 
-        locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_VSHA_ON, 0);
+        locomo_gpio_write(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VSHA_ON, 0);
         mdelay(110);
 
-        locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_VEE_ON, 0);
+        locomo_gpio_write(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VEE_ON, 0);
         mdelay(700);
 
         /* TFTCRST=0 | CPSOUT=0 | CPSEN = 0 */
         locomo_writel(0, locomolcd_dev->mapbase + LOCOMO_TC);
-        locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_MOD, 0);
-        locomo_gpio_write(locomolcd_dev, LOCOMO_GPIO_LCD_VSHD_ON, 0);
+        locomo_gpio_write(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_MOD, 0);
+        locomo_gpio_write(locomolcd_dev->dev.parent, LOCOMO_GPIO_LCD_VSHD_ON, 0);
 }
 
 void locomolcd_power(int on)
@@ -89,12 +93,10 @@ void locomolcd_power(int on)
         }
 
         /* read comadj */
-        if (comadj == -1) {
-                if (machine_is_poodle())
-                        comadj = 118;
-                if (machine_is_collie())
-                        comadj = 128;
-        }
+        if (comadj == -1 && machine_is_collie())
+                comadj = 128;
+        if (comadj == -1 && machine_is_poodle())
+                comadj = 118;
 
         if (on)
                 locomolcd_on(comadj);
@@ -105,26 +107,100 @@ void locomolcd_power(int on)
 }
 EXPORT_SYMBOL(locomolcd_power);
 
-static int poodle_lcd_probe(struct locomo_dev *dev)
+
+static int current_intensity;
+
+static int locomolcd_set_intensity(struct backlight_device *bd)
+{
+        int intensity = bd->props->brightness;
+
+        if (bd->props->power != FB_BLANK_UNBLANK)
+                intensity = 0;
+        if (bd->props->fb_blank != FB_BLANK_UNBLANK)
+                intensity = 0;
+        if (locomolcd_flags & LOCOMOLCD_SUSPENDED)
+                intensity = 0;
+
+        switch (intensity) {
+        /* AC and non-AC are handled differently, but produce same results in sharp code? */
+        case 0: locomo_frontlight_set(locomolcd_dev, 0, 0, 161); break;
+        case 1: locomo_frontlight_set(locomolcd_dev, 117, 0, 161); break;
+        case 2: locomo_frontlight_set(locomolcd_dev, 163, 0, 148); break;
+        case 3: locomo_frontlight_set(locomolcd_dev, 194, 0, 161); break;
+        case 4: locomo_frontlight_set(locomolcd_dev, 194, 1, 161); break;
+
+        default:
+                return -ENODEV;
+        }
+        current_intensity = intensity;
+        return 0;
+}
+
+static int locomolcd_get_intensity(struct backlight_device *bd)
+{
+        return current_intensity;
+}
+
+static struct backlight_properties locomobl_data = {
+        .owner          = THIS_MODULE,
+        .get_brightness = locomolcd_get_intensity,
+        .update_status  = locomolcd_set_intensity,
+        .max_brightness = 4,
+};
+
+#ifdef CONFIG_PM
+static int locomolcd_suspend(struct locomo_dev *dev, pm_message_t state)
+{
+        locomolcd_flags |= LOCOMOLCD_SUSPENDED;
+        locomolcd_set_intensity(locomolcd_bl_device);
+        return 0;
+}
+
+static int locomolcd_resume(struct locomo_dev *dev)
+{
+        locomolcd_flags &= ~LOCOMOLCD_SUSPENDED;
+        locomolcd_set_intensity(locomolcd_bl_device);
+        return 0;
+}
+#else
+#define locomolcd_suspend       NULL
+#define locomolcd_resume        NULL
+#endif
+
+static int locomolcd_probe(struct locomo_dev *ldev)
 {
         unsigned long flags;
 
         local_irq_save(flags);
-        locomolcd_dev = dev;
+        locomolcd_dev = ldev;
+
+        locomo_gpio_set_dir(ldev->dev.parent, LOCOMO_GPIO_FL_VR, 0);
 
         /* the poodle_lcd_power function is called for the first time
          * from fs_initcall, which is before locomo is activated.
          * We need to recall poodle_lcd_power here*/
-#ifdef CONFIG_MACH_POODLE
-        locomolcd_power(1);
-#endif
+        if (machine_is_poodle())
+                locomolcd_power(1);
+
         local_irq_restore(flags);
+
+        locomolcd_bl_device = backlight_device_register("locomo-bl", NULL, &locomobl_data);
+
+        if (IS_ERR (locomolcd_bl_device))
+                return PTR_ERR (locomolcd_bl_device);
+
+        /* Set up frontlight so that screen is readable */
+        locomobl_data.brightness = 2;
+        locomolcd_set_intensity(locomolcd_bl_device);
+
         return 0;
 }
 
-static int poodle_lcd_remove(struct locomo_dev *dev)
+static int locomolcd_remove(struct locomo_dev *dev)
 {
         unsigned long flags;
+
+        backlight_device_unregister(locomolcd_bl_device);
         local_irq_save(flags);
         locomolcd_dev = NULL;
         local_irq_restore(flags);
@@ -136,19 +212,33 @@ static struct locomo_driver poodle_lcd_driver = {
                 .name = "locomo-backlight",
         },
         .devid  = LOCOMO_DEVID_BACKLIGHT,
-        .probe  = poodle_lcd_probe,
-        .remove = poodle_lcd_remove,
+        .probe  = locomolcd_probe,
+        .remove = locomolcd_remove,
+        .suspend = locomolcd_suspend,
+        .resume = locomolcd_resume,
 };
 
-static int __init poodle_lcd_init(void)
+
+static int __init locomolcd_init(void)
 {
         int ret = locomo_driver_register(&poodle_lcd_driver);
-        if (ret) return ret;
+        if (ret)
+                return ret;
 
 #ifdef CONFIG_SA1100_COLLIE
         sa1100fb_lcd_power = locomolcd_power;
 #endif
         return 0;
 }
-device_initcall(poodle_lcd_init);
 
+static void __exit locomolcd_exit(void)
+{
+        locomo_driver_unregister(&poodle_lcd_driver);
+}
+
+module_init(locomolcd_init);
+module_exit(locomolcd_exit);
+
+MODULE_AUTHOR("John Lenz <lenz@cs.wisc.edu>, Pavel Machek <pavel@suse.cz>");
+MODULE_DESCRIPTION("Collie LCD driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c
index 6577fdfdfc16..c66e3d52cbf3 100644
--- a/drivers/video/bw2.c
+++ b/drivers/video/bw2.c
@@ -1,6 +1,6 @@
 /* bw2.c: BWTWO frame buffer driver
  *
- * Copyright (C) 2003 David S. Miller (davem@redhat.com)
+ * Copyright (C) 2003, 2006 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1996,1998 Jakub Jelinek (jj@ultra.linux.cz)
  * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx)
  * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be)
@@ -19,14 +19,11 @@
 #include <linux/mm.h>
 
 #include <asm/io.h>
-#include <asm/sbus.h>
 #include <asm/oplib.h>
+#include <asm/prom.h>
+#include <asm/of_device.h>
 #include <asm/fbio.h>
 
-#ifdef CONFIG_SPARC32
-#include <asm/sun4paddr.h>
-#endif
-
 #include "sbuslib.h"
 
 /*
@@ -59,30 +56,30 @@ static struct fb_ops bw2_ops = {
 #define BWTWO_REGISTER_OFFSET 0x400000
 
 struct bt_regs {
-        volatile u32 addr;
-        volatile u32 color_map;
-        volatile u32 control;
-        volatile u32 cursor;
+        u32 addr;
+        u32 color_map;
+        u32 control;
+        u32 cursor;
 };
 
 struct bw2_regs {
         struct bt_regs  cmap;
-        volatile u8     control;
-        volatile u8     status;
-        volatile u8     cursor_start;
-        volatile u8     cursor_end;
-        volatile u8     h_blank_start;
-        volatile u8     h_blank_end;
-        volatile u8     h_sync_start;
-        volatile u8     h_sync_end;
-        volatile u8     comp_sync_end;
-        volatile u8     v_blank_start_high;
-        volatile u8     v_blank_start_low;
-        volatile u8     v_blank_end;
-        volatile u8     v_sync_start;
-        volatile u8     v_sync_end;
-        volatile u8     xfer_holdoff_start;
-        volatile u8     xfer_holdoff_end;
+        u8      control;
+        u8      status;
+        u8      cursor_start;
+        u8      cursor_end;
+        u8      h_blank_start;
+        u8      h_blank_end;
+        u8      h_sync_start;
+        u8      h_sync_end;
+        u8      comp_sync_end;
+        u8      v_blank_start_high;
+        u8      v_blank_start_low;
+        u8      v_blank_end;
+        u8      v_sync_start;
+        u8      v_sync_end;
+        u8      xfer_holdoff_start;
+        u8      xfer_holdoff_end;
 };
 
 /* Status Register Constants */
@@ -117,9 +114,8 @@ struct bw2_par {
 #define BW2_FLAG_BLANKED        0x00000001
 
         unsigned long           physbase;
+        unsigned long           which_io;
         unsigned long           fbsize;
-
-        struct sbus_dev         *sdev;
 };
 
 /**
@@ -174,9 +170,7 @@ static int bw2_mmap(struct fb_info *info, struct vm_area_struct *vma)
 
         return sbusfb_mmap_helper(bw2_mmap_map,
                                   par->physbase, par->fbsize,
-                                  (par->sdev ?
-                                   par->sdev->reg_addrs[0].which_io :
-                                   0),
+                                  par->which_io,
                                   vma);
 }
 
@@ -288,139 +282,124 @@ static void bw2_do_default_mode(struct bw2_par *par, struct fb_info *info,
 struct all_info {
         struct fb_info info;
         struct bw2_par par;
-        struct list_head list;
 };
-static LIST_HEAD(bw2_list);
 
-static void bw2_init_one(struct sbus_dev *sdev)
+static int __devinit bw2_init_one(struct of_device *op)
 {
+        struct device_node *dp = op->node;
         struct all_info *all;
-        struct resource *resp;
-#ifdef CONFIG_SUN4
-        struct resource res;
-#endif
-        int linebytes;
+        int linebytes, err;
 
-        all = kmalloc(sizeof(*all), GFP_KERNEL);
-        if (!all) {
-                printk(KERN_ERR "bw2: Cannot allocate memory.\n");
-                return;
-        }
-        memset(all, 0, sizeof(*all));
-
-        INIT_LIST_HEAD(&all->list);
+        all = kzalloc(sizeof(*all), GFP_KERNEL);
+        if (!all)
+                return -ENOMEM;
 
         spin_lock_init(&all->par.lock);
-        all->par.sdev = sdev;
-
-#ifdef CONFIG_SUN4
-        if (!sdev) {
-                all->par.physbase = sun4_bwtwo_physaddr;
-                res.start = sun4_bwtwo_physaddr;
-                res.end = res.start + BWTWO_REGISTER_OFFSET + sizeof(struct bw2_regs) - 1;
-                res.flags = IORESOURCE_IO;
-                resp = &res;
-                all->info.var.xres = all->info.var.xres_virtual = 1152;
-                all->info.var.yres = all->info.var.yres_virtual = 900;
-                all->info.var.bits_per_pixel = 1;
-                linebytes = 1152 / 8;
-        } else
-#else
-        {
-                BUG_ON(!sdev);
-                all->par.physbase = sdev->reg_addrs[0].phys_addr;
-                resp = &sdev->resource[0];
-                sbusfb_fill_var(&all->info.var, (sdev ? sdev->prom_node : 0), 1);
-                linebytes = prom_getintdefault(sdev->prom_node, "linebytes",
-                                               all->info.var.xres);
-        }
-#endif
+
+        all->par.physbase = op->resource[0].start;
+        all->par.which_io = op->resource[0].flags & IORESOURCE_BITS;
+
+        sbusfb_fill_var(&all->info.var, dp->node, 1);
+        linebytes = of_getintprop_default(dp, "linebytes",
+                                          all->info.var.xres);
+
         all->info.var.red.length = all->info.var.green.length =
                 all->info.var.blue.length = all->info.var.bits_per_pixel;
         all->info.var.red.offset = all->info.var.green.offset =
                 all->info.var.blue.offset = 0;
 
-        all->par.regs = sbus_ioremap(resp, BWTWO_REGISTER_OFFSET,
-                             sizeof(struct bw2_regs), "bw2 regs");
+        all->par.regs = of_ioremap(&op->resource[0], BWTWO_REGISTER_OFFSET,
+                                   sizeof(struct bw2_regs), "bw2 regs");
 
-        if (sdev && !prom_getbool(sdev->prom_node, "width"))
+        if (!of_find_property(dp, "width", NULL))
                 bw2_do_default_mode(&all->par, &all->info, &linebytes);
 
         all->par.fbsize = PAGE_ALIGN(linebytes * all->info.var.yres);
 
         all->info.flags = FBINFO_DEFAULT;
         all->info.fbops = &bw2_ops;
-#if defined(CONFIG_SPARC32)
-        if (sdev)
-                all->info.screen_base = (char __iomem *)
-                        prom_getintdefault(sdev->prom_node, "address", 0);
-#endif
-        if (!all->info.screen_base)
-                all->info.screen_base =
-                        sbus_ioremap(resp, 0, all->par.fbsize, "bw2 ram");
+
+        all->info.screen_base =
+                sbus_ioremap(&op->resource[0], 0, all->par.fbsize, "bw2 ram");
         all->info.par = &all->par;
 
         bw2_blank(0, &all->info);
 
         bw2_init_fix(&all->info, linebytes);
 
-        if (register_framebuffer(&all->info) < 0) {
-                printk(KERN_ERR "bw2: Could not register framebuffer.\n");
+        err= register_framebuffer(&all->info);
+        if (err < 0) {
+                of_iounmap(all->par.regs, sizeof(struct bw2_regs));
+                of_iounmap(all->info.screen_base, all->par.fbsize);
                 kfree(all);
-                return;
+                return err;
         }
 
-        list_add(&all->list, &bw2_list);
+        dev_set_drvdata(&op->dev, all);
+
+        printk("%s: bwtwo at %lx:%lx\n",
+               dp->full_name,
+               all->par.which_io, all->par.physbase);
 
-        printk("bw2: bwtwo at %lx:%lx\n",
-               (long) (sdev ? sdev->reg_addrs[0].which_io : 0),
-               (long) all->par.physbase);
+        return 0;
 }
 
-int __init bw2_init(void)
+static int __devinit bw2_probe(struct of_device *dev, const struct of_device_id *match)
 {
-        struct sbus_bus *sbus;
-        struct sbus_dev *sdev;
+        struct of_device *op = to_of_device(&dev->dev);
 
-        if (fb_get_options("bw2fb", NULL))
-                return -ENODEV;
+        return bw2_init_one(op);
+}
 
-#ifdef CONFIG_SUN4
-        bw2_init_one(NULL);
-#endif
-        for_all_sbusdev(sdev, sbus) {
-                if (!strcmp(sdev->prom_name, "bwtwo"))
-                        bw2_init_one(sdev);
-        }
+static int __devexit bw2_remove(struct of_device *dev)
+{
+        struct all_info *all = dev_get_drvdata(&dev->dev);
+
+        unregister_framebuffer(&all->info);
+
+        of_iounmap(all->par.regs, sizeof(struct bw2_regs));
+        of_iounmap(all->info.screen_base, all->par.fbsize);
+
+        kfree(all);
+
+        dev_set_drvdata(&dev->dev, NULL);
 
         return 0;
 }
 
-void __exit bw2_exit(void)
-{
-        struct list_head *pos, *tmp;
+static struct of_device_id bw2_match[] = {
+        {
+                .name = "bwtwo",
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(of, bw2_match);
 
-        list_for_each_safe(pos, tmp, &bw2_list) {
-                struct all_info *all = list_entry(pos, typeof(*all), list);
+static struct of_platform_driver bw2_driver = {
+        .name           = "bw2",
+        .match_table    = bw2_match,
+        .probe          = bw2_probe,
+        .remove         = __devexit_p(bw2_remove),
+};
 
-                unregister_framebuffer(&all->info);
-                kfree(all);
-        }
+static int __init bw2_init(void)
+{
+        if (fb_get_options("bw2fb", NULL))
+                return -ENODEV;
+
+        return of_register_driver(&bw2_driver, &of_bus_type);
 }
 
-int __init
-bw2_setup(char *arg)
+static void __exit bw2_exit(void)
 {
-        /* No cmdline options yet... */
-        return 0;
+        return of_unregister_driver(&bw2_driver);
 }
 
-module_init(bw2_init);
 
-#ifdef MODULE
+module_init(bw2_init);
 module_exit(bw2_exit);
-#endif
 
 MODULE_DESCRIPTION("framebuffer driver for BWTWO chipsets");
-MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
+MODULE_AUTHOR("David S. Miller <davem@davemloft.net>");
+MODULE_VERSION("2.0");
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/cfbcopyarea.c b/drivers/video/cfbcopyarea.c
index 74415325b016..6faea4034e3d 100644
--- a/drivers/video/cfbcopyarea.c
+++ b/drivers/video/cfbcopyarea.c
@@ -24,7 +24,6 @@
 
 
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/drivers/video/cfbfillrect.c b/drivers/video/cfbfillrect.c
index e5ff62e9cfb8..f00b50aab606 100644
--- a/drivers/video/cfbfillrect.c
+++ b/drivers/video/cfbfillrect.c
@@ -17,7 +17,6 @@
  *  the native cpu endians. I also need to deal with MSB position in the word.
  *
  */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/fb.h>
diff --git a/drivers/video/cfbimgblt.c b/drivers/video/cfbimgblt.c
index 8ba6152db2fd..51d35386a945 100644
--- a/drivers/video/cfbimgblt.c
+++ b/drivers/video/cfbimgblt.c
@@ -29,7 +29,6 @@
  *  Also need to add code to deal with cards endians that are different than
  *  the native cpu endians. I also need to deal with MSB position in the word.
  */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/fb.h>
@@ -230,6 +229,7 @@ static inline void fast_imageblit(const struct fb_image *image, struct fb_info *
                 tab = cfb_tab16;
                 break;
         case 32:
+        default:
                 tab = cfb_tab32;
                 break;
         }
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c
index 63b6c79c8a0a..7f926c619b61 100644
--- a/drivers/video/cg14.c
+++ b/drivers/video/cg14.c
@@ -1,6 +1,6 @@
 /* cg14.c: CGFOURTEEN frame buffer driver
  *
- * Copyright (C) 2003 David S. Miller (davem@redhat.com)
+ * Copyright (C) 2003, 2006 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1996,1998 Jakub Jelinek (jj@ultra.linux.cz)
  * Copyright (C) 1995 Miguel de Icaza (miguel@nuclecu.unam.mx)
  *
@@ -18,8 +18,8 @@
 #include <linux/mm.h>
 
 #include <asm/io.h>
-#include <asm/sbus.h>
-#include <asm/oplib.h>
+#include <asm/prom.h>
+#include <asm/of_device.h>
 #include <asm/fbio.h>
 
 #include "sbuslib.h"
@@ -99,73 +99,73 @@ static struct fb_ops cg14_ops = {
 #define CG14_MCR_PIXMODE_32             3
 
 struct cg14_regs{
-        volatile u8 mcr;        /* Master Control Reg */
-        volatile u8 ppr;        /* Packed Pixel Reg */
-        volatile u8 tms[2];     /* Test Mode Status Regs */
-        volatile u8 msr;        /* Master Status Reg */
-        volatile u8 fsr;        /* Fault Status Reg */
-        volatile u8 rev;        /* Revision & Impl */
-        volatile u8 ccr;        /* Clock Control Reg */
-        volatile u32 tmr;       /* Test Mode Read Back */
-        volatile u8 mod;        /* Monitor Operation Data Reg */
-        volatile u8 acr;        /* Aux Control */
+        u8 mcr; /* Master Control Reg */
+        u8 ppr; /* Packed Pixel Reg */
+        u8 tms[2];      /* Test Mode Status Regs */
+        u8 msr; /* Master Status Reg */
+        u8 fsr; /* Fault Status Reg */
+        u8 rev; /* Revision & Impl */
+        u8 ccr; /* Clock Control Reg */
+        u32 tmr;        /* Test Mode Read Back */
+        u8 mod; /* Monitor Operation Data Reg */
+        u8 acr; /* Aux Control */
         u8 xxx0[6];
-        volatile u16 hct;       /* Hor Counter */
-        volatile u16 vct;       /* Vert Counter */
-        volatile u16 hbs;       /* Hor Blank Start */
-        volatile u16 hbc;       /* Hor Blank Clear */
-        volatile u16 hss;       /* Hor Sync Start */
-        volatile u16 hsc;       /* Hor Sync Clear */
-        volatile u16 csc;       /* Composite Sync Clear */
-        volatile u16 vbs;       /* Vert Blank Start */
-        volatile u16 vbc;       /* Vert Blank Clear */
-        volatile u16 vss;       /* Vert Sync Start */
-        volatile u16 vsc;       /* Vert Sync Clear */
-        volatile u16 xcs;
-        volatile u16 xcc;
-        volatile u16 fsa;       /* Fault Status Address */
-        volatile u16 adr;       /* Address Registers */
+        u16 hct;        /* Hor Counter */
+        u16 vct;        /* Vert Counter */
+        u16 hbs;        /* Hor Blank Start */
+        u16 hbc;        /* Hor Blank Clear */
+        u16 hss;        /* Hor Sync Start */
+        u16 hsc;        /* Hor Sync Clear */
+        u16 csc;        /* Composite Sync Clear */
+        u16 vbs;        /* Vert Blank Start */
+        u16 vbc;        /* Vert Blank Clear */
+        u16 vss;        /* Vert Sync Start */
+        u16 vsc;        /* Vert Sync Clear */
+        u16 xcs;
+        u16 xcc;
+        u16 fsa;        /* Fault Status Address */
+        u16 adr;        /* Address Registers */
         u8 xxx1[0xce];
-        volatile u8 pcg[0x100]; /* Pixel Clock Generator */
-        volatile u32 vbr;       /* Frame Base Row */
-        volatile u32 vmcr;      /* VBC Master Control */
-        volatile u32 vcr;       /* VBC refresh */
-        volatile u32 vca;       /* VBC Config */
+        u8 pcg[0x100]; /* Pixel Clock Generator */
+        u32 vbr;        /* Frame Base Row */
+        u32 vmcr;       /* VBC Master Control */
+        u32 vcr;        /* VBC refresh */
+        u32 vca;        /* VBC Config */
 };
 
 #define CG14_CCR_ENABLE 0x04
 #define CG14_CCR_SELECT 0x02    /* HW/Full screen */
 
 struct cg14_cursor {
-        volatile u32 cpl0[32];  /* Enable plane 0 */
-        volatile u32 cpl1[32];  /* Color selection plane */
-        volatile u8 ccr;        /* Cursor Control Reg */
+        u32 cpl0[32];   /* Enable plane 0 */
+        u32 cpl1[32];  /* Color selection plane */
+        u8 ccr; /* Cursor Control Reg */
         u8 xxx0[3];
-        volatile u16 cursx;     /* Cursor x,y position */
-        volatile u16 cursy;     /* Cursor x,y position */
-        volatile u32 color0;
-        volatile u32 color1;
+        u16 cursx;      /* Cursor x,y position */
+        u16 cursy;      /* Cursor x,y position */
+        u32 color0;
+        u32 color1;
         u32 xxx1[0x1bc];
-        volatile u32 cpl0i[32]; /* Enable plane 0 autoinc */
-        volatile u32 cpl1i[32]; /* Color selection autoinc */
+        u32 cpl0i[32];  /* Enable plane 0 autoinc */
+        u32 cpl1i[32]; /* Color selection autoinc */
 };
 
 struct cg14_dac {
-        volatile u8 addr;       /* Address Register */
+        u8 addr;        /* Address Register */
         u8 xxx0[255];
-        volatile u8 glut;       /* Gamma table */
+        u8 glut;        /* Gamma table */
         u8 xxx1[255];
-        volatile u8 select;     /* Register Select */
+        u8 select;      /* Register Select */
         u8 xxx2[255];
-        volatile u8 mode;       /* Mode Register */
+        u8 mode;        /* Mode Register */
 };
 
 struct cg14_xlut{
-        volatile u8 x_xlut [256];
-        volatile u8 x_xlutd [256];
+        u8 x_xlut [256];
+        u8 x_xlutd [256];
         u8 xxx0[0x600];
-        volatile u8 x_xlut_inc [256];
-        volatile u8 x_xlutd_inc [256];
+        u8 x_xlut_inc [256];
+        u8 x_xlutd_inc [256];
 };
 
 /* Color look up table (clut) */
@@ -204,7 +204,6 @@ struct cg14_par {
 
         int                     mode;
         int                     ramsize;
-        struct sbus_dev         *sdev;
 };
 
 static void __cg14_reset(struct cg14_par *par)
@@ -355,14 +354,9 @@ static int cg14_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
  *  Initialisation
  */
 
-static void cg14_init_fix(struct fb_info *info, int linebytes)
+static void cg14_init_fix(struct fb_info *info, int linebytes, struct device_node *dp)
 {
-        struct cg14_par *par = (struct cg14_par *)info->par;
-        const char *name;
-
-        name = "cgfourteen";
-        if (par->sdev)
-                name = par->sdev->prom_name;
+        const char *name = dp->name;
 
         strlcpy(info->fix.id, name, sizeof(info->fix.id));
 
@@ -456,98 +450,81 @@ static struct sbus_mmap_map __cg14_mmap_map[CG14_MMAP_ENTRIES] __initdata = {
 struct all_info {
         struct fb_info info;
         struct cg14_par par;
-        struct list_head list;
 };
-static LIST_HEAD(cg14_list);
 
-static void cg14_init_one(struct sbus_dev *sdev, int node, int parent_node)
+static void cg14_unmap_regs(struct all_info *all)
 {
-        struct all_info *all;
-        unsigned long phys, rphys;
-        u32 bases[6];
-        int is_8mb, linebytes, i;
-
-        if (!sdev) {
-                if (prom_getproperty(node, "address",
-                                     (char *) &bases[0], sizeof(bases)) <= 0
-                    || !bases[0]) {
-                        printk(KERN_ERR "cg14: Device is not mapped.\n");
-                        return;
-                }
-                if (__get_iospace(bases[0]) != __get_iospace(bases[1])) {
-                        printk(KERN_ERR "cg14: I/O spaces don't match.\n");
-                        return;
-                }
-        }
+        if (all->par.regs)
+                of_iounmap(all->par.regs, sizeof(struct cg14_regs));
+        if (all->par.clut)
+                of_iounmap(all->par.clut, sizeof(struct cg14_clut));
+        if (all->par.cursor)
+                of_iounmap(all->par.cursor, sizeof(struct cg14_cursor));
+        if (all->info.screen_base)
+                of_iounmap(all->info.screen_base, all->par.fbsize);
+}
 
-        all = kmalloc(sizeof(*all), GFP_KERNEL);
-        if (!all) {
-                printk(KERN_ERR "cg14: Cannot allocate memory.\n");
-                return;
-        }
-        memset(all, 0, sizeof(*all));
+static int __devinit cg14_init_one(struct of_device *op)
+{
+        struct device_node *dp = op->node;
+        struct all_info *all;
+        int is_8mb, linebytes, i, err;
 
-        INIT_LIST_HEAD(&all->list);
+        all = kzalloc(sizeof(*all), GFP_KERNEL);
+        if (!all)
+                return -ENOMEM;
 
         spin_lock_init(&all->par.lock);
 
-        sbusfb_fill_var(&all->info.var, node, 8);
+        sbusfb_fill_var(&all->info.var, dp->node, 8);
         all->info.var.red.length = 8;
         all->info.var.green.length = 8;
         all->info.var.blue.length = 8;
 
-        linebytes = prom_getintdefault(node, "linebytes",
-                                       all->info.var.xres);
+        linebytes = of_getintprop_default(dp, "linebytes",
+                                          all->info.var.xres);
         all->par.fbsize = PAGE_ALIGN(linebytes * all->info.var.yres);
 
-        all->par.sdev = sdev;
-        if (sdev) {
-                rphys = sdev->reg_addrs[0].phys_addr;
-                all->par.physbase = phys = sdev->reg_addrs[1].phys_addr;
-                all->par.iospace = sdev->reg_addrs[0].which_io;
-
-                all->par.regs = sbus_ioremap(&sdev->resource[0], 0,
-                                     sizeof(struct cg14_regs),
-                                     "cg14 regs");
-                all->par.clut = sbus_ioremap(&sdev->resource[0], CG14_CLUT1,
-                                     sizeof(struct cg14_clut),
-                                     "cg14 clut");
-                all->par.cursor = sbus_ioremap(&sdev->resource[0], CG14_CURSORREGS,
-                                     sizeof(struct cg14_cursor),
-                                     "cg14 cursor");
-                all->info.screen_base = sbus_ioremap(&sdev->resource[1], 0,
-                                     all->par.fbsize, "cg14 ram");
+        if (!strcmp(dp->parent->name, "sbus") ||
+            !strcmp(dp->parent->name, "sbi")) {
+                all->par.physbase = op->resource[0].start;
+                all->par.iospace = op->resource[0].flags & IORESOURCE_BITS;
         } else {
-                rphys = __get_phys(bases[0]);
-                all->par.physbase = phys = __get_phys(bases[1]);
-                all->par.iospace = __get_iospace(bases[0]);
-                all->par.regs = (struct cg14_regs __iomem *)(unsigned long)bases[0];
-                all->par.clut = (struct cg14_clut __iomem *)((unsigned long)bases[0] +
-                                                     CG14_CLUT1);
-                all->par.cursor =
-                        (struct cg14_cursor __iomem *)((unsigned long)bases[0] +
-                                               CG14_CURSORREGS);
-
-                all->info.screen_base = (char __iomem *)(unsigned long)bases[1];
+                all->par.physbase = op->resource[1].start;
+                all->par.iospace = op->resource[0].flags & IORESOURCE_BITS;
         }
 
-        prom_getproperty(node, "reg", (char *) &bases[0], sizeof(bases));
-        is_8mb = (bases[5] == 0x800000);
+        all->par.regs = of_ioremap(&op->resource[0], 0,
+                                   sizeof(struct cg14_regs), "cg14 regs");
+        all->par.clut = of_ioremap(&op->resource[0], CG14_CLUT1,
+                                   sizeof(struct cg14_clut), "cg14 clut");
+        all->par.cursor = of_ioremap(&op->resource[0], CG14_CURSORREGS,
+                                   sizeof(struct cg14_cursor), "cg14 cursor");
 
-        if (sizeof(all->par.mmap_map) != sizeof(__cg14_mmap_map)) {
-                extern void __cg14_mmap_sized_wrongly(void);
+        all->info.screen_base = of_ioremap(&op->resource[1], 0,
+                                           all->par.fbsize, "cg14 ram");
 
-                __cg14_mmap_sized_wrongly();
-        }
+        if (!all->par.regs || !all->par.clut || !all->par.cursor ||
+            !all->info.screen_base)
+                cg14_unmap_regs(all);
+
+        is_8mb = (((op->resource[1].end - op->resource[1].start) + 1) ==
+                  (8 * 1024 * 1024));
+
+        BUILD_BUG_ON(sizeof(all->par.mmap_map) != sizeof(__cg14_mmap_map));
                 
-        memcpy(&all->par.mmap_map, &__cg14_mmap_map, sizeof(all->par.mmap_map));
+        memcpy(&all->par.mmap_map, &__cg14_mmap_map,
+               sizeof(all->par.mmap_map));
+
         for (i = 0; i < CG14_MMAP_ENTRIES; i++) {
                 struct sbus_mmap_map *map = &all->par.mmap_map[i];
 
                 if (!map->size)
                         break;
                 if (map->poff & 0x80000000)
-                        map->poff = (map->poff & 0x7fffffff) + rphys - phys;
+                        map->poff = (map->poff & 0x7fffffff) +
+                                (op->resource[0].start -
+                                 op->resource[1].start);
                 if (is_8mb &&
                     map->size >= 0x100000 &&
                     map->size <= 0x400000)
@@ -564,84 +541,87 @@ static void cg14_init_one(struct sbus_dev *sdev, int node, int parent_node)
         __cg14_reset(&all->par);
 
         if (fb_alloc_cmap(&all->info.cmap, 256, 0)) {
-                printk(KERN_ERR "cg14: Could not allocate color map.\n");
+                cg14_unmap_regs(all);
                 kfree(all);
-                return;
+                return -ENOMEM;
         }
         fb_set_cmap(&all->info.cmap, &all->info);
 
-        cg14_init_fix(&all->info, linebytes);
+        cg14_init_fix(&all->info, linebytes, dp);
 
-        if (register_framebuffer(&all->info) < 0) {
-                printk(KERN_ERR "cg14: Could not register framebuffer.\n");
+        err = register_framebuffer(&all->info);
+        if (err < 0) {
                 fb_dealloc_cmap(&all->info.cmap);
+                cg14_unmap_regs(all);
                 kfree(all);
-                return;
+                return err;
         }
 
-        list_add(&all->list, &cg14_list);
+        dev_set_drvdata(&op->dev, all);
 
-        printk("cg14: cgfourteen at %lx:%lx, %dMB\n",
-               all->par.iospace, all->par.physbase, all->par.ramsize >> 20);
+        printk("%s: cgfourteen at %lx:%lx, %dMB\n",
+               dp->full_name,
+               all->par.iospace, all->par.physbase,
+               all->par.ramsize >> 20);
 
+        return 0;
 }
 
-int __init cg14_init(void)
+static int __devinit cg14_probe(struct of_device *dev, const struct of_device_id *match)
 {
-        struct sbus_bus *sbus;
-        struct sbus_dev *sdev;
+        struct of_device *op = to_of_device(&dev->dev);
 
-        if (fb_get_options("cg14fb", NULL))
-                return -ENODEV;
+        return cg14_init_one(op);
+}
 
-#ifdef CONFIG_SPARC32
-        {
-                int root, node;
-
-                root = prom_getchild(prom_root_node);
-                root = prom_searchsiblings(root, "obio");
-                if (root) {
-                        node = prom_searchsiblings(prom_getchild(root),
-                                                   "cgfourteen");
-                        if (node)
-                                cg14_init_one(NULL, node, root);
-                }
-        }
-#endif
-        for_all_sbusdev(sdev, sbus) {
-                if (!strcmp(sdev->prom_name, "cgfourteen"))
-                        cg14_init_one(sdev, sdev->prom_node, sbus->prom_node);
-        }
+static int __devexit cg14_remove(struct of_device *dev)
+{
+        struct all_info *all = dev_get_drvdata(&dev->dev);
+
+        unregister_framebuffer(&all->info);
+        fb_dealloc_cmap(&all->info.cmap);
+
+        cg14_unmap_regs(all);
+
+        kfree(all);
+
+        dev_set_drvdata(&dev->dev, NULL);
 
         return 0;
 }
 
-void __exit cg14_exit(void)
-{
-        struct list_head *pos, *tmp;
+static struct of_device_id cg14_match[] = {
+        {
+                .name = "cgfourteen",
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(of, cg14_match);
 
-        list_for_each_safe(pos, tmp, &cg14_list) {
-                struct all_info *all = list_entry(pos, typeof(*all), list);
+static struct of_platform_driver cg14_driver = {
+        .name           = "cg14",
+        .match_table    = cg14_match,
+        .probe          = cg14_probe,
+        .remove         = __devexit_p(cg14_remove),
+};
 
-                unregister_framebuffer(&all->info);
-                fb_dealloc_cmap(&all->info.cmap);
-                kfree(all);
-        }
+int __init cg14_init(void)
+{
+        if (fb_get_options("cg14fb", NULL))
+                return -ENODEV;
+
+        return of_register_driver(&cg14_driver, &of_bus_type);
 }
 
-int __init
-cg14_setup(char *arg)
+void __exit cg14_exit(void)
 {
-        /* No cmdline options yet... */
-        return 0;
+        of_unregister_driver(&cg14_driver);
 }
 
 module_init(cg14_init);
-
-#ifdef MODULE
 module_exit(cg14_exit);
-#endif
 
 MODULE_DESCRIPTION("framebuffer driver for CGfourteen chipsets");
-MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
+MODULE_AUTHOR("David S. Miller <davem@davemloft.net>");
+MODULE_VERSION("2.0");
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c
index 3de6e1b5ab2f..9c8c753ef454 100644
--- a/drivers/video/cg3.c
+++ b/drivers/video/cg3.c
@@ -1,6 +1,6 @@
 /* cg3.c: CGTHREE frame buffer driver
  *
- * Copyright (C) 2003 David S. Miller (davem@redhat.com)
+ * Copyright (C) 2003, 2006 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1996,1998 Jakub Jelinek (jj@ultra.linux.cz)
  * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx)
  * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be)
@@ -19,8 +19,9 @@
 #include <linux/mm.h>
 
 #include <asm/io.h>
-#include <asm/sbus.h>
 #include <asm/oplib.h>
+#include <asm/prom.h>
+#include <asm/of_device.h>
 #include <asm/fbio.h>
 
 #include "sbuslib.h"
@@ -80,30 +81,30 @@ enum cg3_type {
 };
 
 struct bt_regs {
-        volatile u32 addr;
-        volatile u32 color_map;
-        volatile u32 control;
-        volatile u32 cursor;
+        u32 addr;
+        u32 color_map;
+        u32 control;
+        u32 cursor;
 };
 
 struct cg3_regs {
         struct bt_regs  cmap;
-        volatile u8     control;
-        volatile u8     status;
-        volatile u8     cursor_start;
-        volatile u8     cursor_end;
-        volatile u8     h_blank_start;
-        volatile u8     h_blank_end;
-        volatile u8     h_sync_start;
-        volatile u8     h_sync_end;
-        volatile u8     comp_sync_end;
-        volatile u8     v_blank_start_high;
-        volatile u8     v_blank_start_low;
-        volatile u8     v_blank_end;
-        volatile u8     v_sync_start;
-        volatile u8     v_sync_end;
-        volatile u8     xfer_holdoff_start;
-        volatile u8     xfer_holdoff_end;
+        u8      control;
+        u8      status;
+        u8      cursor_start;
+        u8      cursor_end;
+        u8      h_blank_start;
+        u8      h_blank_end;
+        u8      h_sync_start;
+        u8      h_sync_end;
+        u8      comp_sync_end;
+        u8      v_blank_start_high;
+        u8      v_blank_start_low;
+        u8      v_blank_end;
+        u8      v_sync_start;
+        u8      v_sync_end;
+        u8      xfer_holdoff_start;
+        u8      xfer_holdoff_end;
 };
 
 /* Offset of interesting structures in the OBIO space */
@@ -120,9 +121,8 @@ struct cg3_par {
 #define CG3_FLAG_RDI            0x00000002
 
         unsigned long           physbase;
+        unsigned long           which_io;
         unsigned long           fbsize;
-
-        struct sbus_dev         *sdev;
 };
 
 /**
@@ -235,7 +235,7 @@ static int cg3_mmap(struct fb_info *info, struct vm_area_struct *vma)
 
         return sbusfb_mmap_helper(cg3_mmap_map,
                                   par->physbase, par->fbsize,
-                                  par->sdev->reg_addrs[0].which_io,
+                                  par->which_io,
                                   vma);
 }
 
@@ -252,11 +252,9 @@ static int cg3_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
  */
 
 static void
-cg3_init_fix(struct fb_info *info, int linebytes)
+cg3_init_fix(struct fb_info *info, int linebytes, struct device_node *dp)
 {
-        struct cg3_par *par = (struct cg3_par *)info->par;
-
-        strlcpy(info->fix.id, par->sdev->prom_name, sizeof(info->fix.id));
+        strlcpy(info->fix.id, dp->name, sizeof(info->fix.id));
 
         info->fix.type = FB_TYPE_PACKED_PIXELS;
         info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
@@ -267,16 +265,15 @@ cg3_init_fix(struct fb_info *info, int linebytes)
 }
 
 static void cg3_rdi_maybe_fixup_var(struct fb_var_screeninfo *var,
-                                    struct sbus_dev *sdev)
+                                    struct device_node *dp)
 {
-        char buffer[40];
+        char *params;
         char *p;
         int ww, hh;
 
-        *buffer = 0;
-        prom_getstring(sdev->prom_node, "params", buffer, sizeof(buffer));
-        if (*buffer) {
-                ww = simple_strtoul(buffer, &p, 10);
+        params = of_get_property(dp, "params", NULL);
+        if (params) {
+                ww = simple_strtoul(params, &p, 10);
                 if (ww && *p == 'x') {
                         hh = simple_strtoul(p + 1, &p, 10);
                         if (hh && *p == '-') {
@@ -348,11 +345,11 @@ static void cg3_do_default_mode(struct cg3_par *par)
                 sbus_writeb(p[1], regp);
         }
         for (p = cg3_dacvals; *p; p += 2) {
-                volatile u8 __iomem *regp;
+                u8 __iomem *regp;
 
-                regp = (volatile u8 __iomem *)&par->regs->cmap.addr;
+                regp = (u8 __iomem *)&par->regs->cmap.addr;
                 sbus_writeb(p[0], regp);
-                regp = (volatile u8 __iomem *)&par->regs->cmap.control;
+                regp = (u8 __iomem *)&par->regs->cmap.control;
                 sbus_writeb(p[1], regp);
         }
 }
@@ -360,129 +357,137 @@ static void cg3_do_default_mode(struct cg3_par *par)
 struct all_info {
         struct fb_info info;
         struct cg3_par par;
-        struct list_head list;
 };
-static LIST_HEAD(cg3_list);
 
-static void cg3_init_one(struct sbus_dev *sdev)
+static int __devinit cg3_init_one(struct of_device *op)
 {
+        struct device_node *dp = op->node;
         struct all_info *all;
-        int linebytes;
-
-        all = kmalloc(sizeof(*all), GFP_KERNEL);
-        if (!all) {
-                printk(KERN_ERR "cg3: Cannot allocate memory.\n");
-                return;
-        }
-        memset(all, 0, sizeof(*all));
+        int linebytes, err;
 
-        INIT_LIST_HEAD(&all->list);
+        all = kzalloc(sizeof(*all), GFP_KERNEL);
+        if (!all)
+                return -ENOMEM;
 
         spin_lock_init(&all->par.lock);
-        all->par.sdev = sdev;
 
-        all->par.physbase = sdev->reg_addrs[0].phys_addr;
+        all->par.physbase = op->resource[0].start;
+        all->par.which_io = op->resource[0].flags & IORESOURCE_BITS;
 
-        sbusfb_fill_var(&all->info.var, sdev->prom_node, 8);
+        sbusfb_fill_var(&all->info.var, dp->node, 8);
         all->info.var.red.length = 8;
         all->info.var.green.length = 8;
         all->info.var.blue.length = 8;
-        if (!strcmp(sdev->prom_name, "cgRDI"))
+        if (!strcmp(dp->name, "cgRDI"))
                 all->par.flags |= CG3_FLAG_RDI;
         if (all->par.flags & CG3_FLAG_RDI)
-                cg3_rdi_maybe_fixup_var(&all->info.var, sdev);
+                cg3_rdi_maybe_fixup_var(&all->info.var, dp);
 
-        linebytes = prom_getintdefault(sdev->prom_node, "linebytes",
-                                       all->info.var.xres);
+        linebytes = of_getintprop_default(dp, "linebytes",
+                                          all->info.var.xres);
         all->par.fbsize = PAGE_ALIGN(linebytes * all->info.var.yres);
 
-        all->par.regs = sbus_ioremap(&sdev->resource[0], CG3_REGS_OFFSET,
-                             sizeof(struct cg3_regs), "cg3 regs");
+        all->par.regs = of_ioremap(&op->resource[0], CG3_REGS_OFFSET,
+                                   sizeof(struct cg3_regs), "cg3 regs");
 
         all->info.flags = FBINFO_DEFAULT;
         all->info.fbops = &cg3_ops;
-#ifdef CONFIG_SPARC32
-        all->info.screen_base = (char __iomem *)
-                prom_getintdefault(sdev->prom_node, "address", 0);
-#endif
-        if (!all->info.screen_base)
-                all->info.screen_base =
-                        sbus_ioremap(&sdev->resource[0], CG3_RAM_OFFSET,
-                                     all->par.fbsize, "cg3 ram");
+        all->info.screen_base =
+                of_ioremap(&op->resource[0], CG3_RAM_OFFSET,
+                           all->par.fbsize, "cg3 ram");
         all->info.par = &all->par;
 
         cg3_blank(0, &all->info);
 
-        if (!prom_getbool(sdev->prom_node, "width"))
+        if (!of_find_property(dp, "width", NULL))
                 cg3_do_default_mode(&all->par);
 
         if (fb_alloc_cmap(&all->info.cmap, 256, 0)) {
-                printk(KERN_ERR "cg3: Could not allocate color map.\n");
+                of_iounmap(all->par.regs, sizeof(struct cg3_regs));
+                of_iounmap(all->info.screen_base, all->par.fbsize);
                 kfree(all);
-                return;
+                return -ENOMEM;
         }
         fb_set_cmap(&all->info.cmap, &all->info);
 
-        cg3_init_fix(&all->info, linebytes);
+        cg3_init_fix(&all->info, linebytes, dp);
 
-        if (register_framebuffer(&all->info) < 0) {
-                printk(KERN_ERR "cg3: Could not register framebuffer.\n");
+        err = register_framebuffer(&all->info);
+        if (err < 0) {
                 fb_dealloc_cmap(&all->info.cmap);
+                of_iounmap(all->par.regs, sizeof(struct cg3_regs));
+                of_iounmap(all->info.screen_base, all->par.fbsize);
                 kfree(all);
-                return;
+                return err;
         }
 
-        list_add(&all->list, &cg3_list);
+        dev_set_drvdata(&op->dev, all);
+
+        printk("%s: cg3 at %lx:%lx\n",
+               dp->full_name, all->par.which_io, all->par.physbase);
 
-        printk("cg3: %s at %lx:%lx\n",
-               sdev->prom_name,
-               (long) sdev->reg_addrs[0].which_io,
-               (long) sdev->reg_addrs[0].phys_addr);
+        return 0;
 }
 
-int __init cg3_init(void)
+static int __devinit cg3_probe(struct of_device *dev, const struct of_device_id *match)
 {
-        struct sbus_bus *sbus;
-        struct sbus_dev *sdev;
+        struct of_device *op = to_of_device(&dev->dev);
 
-        if (fb_get_options("cg3fb", NULL))
-                return -ENODEV;
+        return cg3_init_one(op);
+}
 
-        for_all_sbusdev(sdev, sbus) {
-                if (!strcmp(sdev->prom_name, "cgthree") ||
-                    !strcmp(sdev->prom_name, "cgRDI"))
-                        cg3_init_one(sdev);
-        }
+static int __devexit cg3_remove(struct of_device *dev)
+{
+        struct all_info *all = dev_get_drvdata(&dev->dev);
+
+        unregister_framebuffer(&all->info);
+        fb_dealloc_cmap(&all->info.cmap);
+
+        of_iounmap(all->par.regs, sizeof(struct cg3_regs));
+        of_iounmap(all->info.screen_base, all->par.fbsize);
+
+        kfree(all);
+
+        dev_set_drvdata(&dev->dev, NULL);
 
         return 0;
 }
 
-void __exit cg3_exit(void)
-{
-        struct list_head *pos, *tmp;
+static struct of_device_id cg3_match[] = {
+        {
+                .name = "cgthree",
+        },
+        {
+                .name = "cgRDI",
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(of, cg3_match);
 
-        list_for_each_safe(pos, tmp, &cg3_list) {
-                struct all_info *all = list_entry(pos, typeof(*all), list);
+static struct of_platform_driver cg3_driver = {
+        .name           = "cg3",
+        .match_table    = cg3_match,
+        .probe          = cg3_probe,
+        .remove         = __devexit_p(cg3_remove),
+};
 
-                unregister_framebuffer(&all->info);
-                fb_dealloc_cmap(&all->info.cmap);
-                kfree(all);
-        }
+static int __init cg3_init(void)
+{
+        if (fb_get_options("cg3fb", NULL))
+                return -ENODEV;
+
+        return of_register_driver(&cg3_driver, &of_bus_type);
 }
 
-int __init
-cg3_setup(char *arg)
+static void __exit cg3_exit(void)
 {
-        /* No cmdline options yet... */
-        return 0;
+        of_unregister_driver(&cg3_driver);
 }
 
 module_init(cg3_init);
-
-#ifdef MODULE
 module_exit(cg3_exit);
-#endif
 
 MODULE_DESCRIPTION("framebuffer driver for CGthree chipsets");
-MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
+MODULE_AUTHOR("David S. Miller <davem@davemloft.net>");
+MODULE_VERSION("2.0");
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c
index 7aab91ead681..64146be2eeb0 100644
--- a/drivers/video/cg6.c
+++ b/drivers/video/cg6.c
@@ -1,6 +1,6 @@
 /* cg6.c: CGSIX (GX, GXplus, TGX) frame buffer driver
  *
- * Copyright (C) 2003 David S. Miller (davem@redhat.com)
+ * Copyright (C) 2003, 2006 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1996,1998 Jakub Jelinek (jj@ultra.linux.cz)
  * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx)
  * Copyright (C) 1996 Eddie C. Dost (ecd@skynet.be)
@@ -19,8 +19,8 @@
 #include <linux/mm.h>
 
 #include <asm/io.h>
-#include <asm/sbus.h>
-#include <asm/oplib.h>
+#include <asm/prom.h>
+#include <asm/of_device.h>
 #include <asm/fbio.h>
 
 #include "sbuslib.h"
@@ -164,89 +164,89 @@ static struct fb_ops cg6_ops = {
 
 /* The contents are unknown */
 struct cg6_tec {
-        volatile int tec_matrix;
-        volatile int tec_clip;
-        volatile int tec_vdc;
+        int tec_matrix;
+        int tec_clip;
+        int tec_vdc;
 };
 
 struct cg6_thc {
-        uint thc_pad0[512];
-        volatile uint thc_hs;           /* hsync timing */
-        volatile uint thc_hsdvs;
-        volatile uint thc_hd;
-        volatile uint thc_vs;           /* vsync timing */
-        volatile uint thc_vd;
-        volatile uint thc_refresh;
-        volatile uint thc_misc;
-        uint thc_pad1[56];
-        volatile uint thc_cursxy;       /* cursor x,y position (16 bits each) */
-        volatile uint thc_cursmask[32]; /* cursor mask bits */
-        volatile uint thc_cursbits[32]; /* what to show where mask enabled */
+        u32 thc_pad0[512];
+        u32 thc_hs;             /* hsync timing */
+        u32 thc_hsdvs;
+        u32 thc_hd;
+        u32 thc_vs;             /* vsync timing */
+        u32 thc_vd;
+        u32 thc_refresh;
+        u32 thc_misc;
+        u32 thc_pad1[56];
+        u32 thc_cursxy; /* cursor x,y position (16 bits each) */
+        u32 thc_cursmask[32];   /* cursor mask bits */
+        u32 thc_cursbits[32];   /* what to show where mask enabled */
 };
 
 struct cg6_fbc {
-        u32             xxx0[1];
-        volatile u32    mode;
-        volatile u32    clip;
-        u32             xxx1[1];            
-        volatile u32    s;
-        volatile u32    draw;
-        volatile u32    blit;
-        volatile u32    font;
-        u32             xxx2[24];
-        volatile u32    x0, y0, z0, color0;
-        volatile u32    x1, y1, z1, color1;
-        volatile u32    x2, y2, z2, color2;
-        volatile u32    x3, y3, z3, color3;
-        volatile u32    offx, offy;
-        u32             xxx3[2];
-        volatile u32    incx, incy;
-        u32             xxx4[2];
-        volatile u32    clipminx, clipminy;
-        u32             xxx5[2];
-        volatile u32    clipmaxx, clipmaxy;
-        u32             xxx6[2];
-        volatile u32    fg;
-        volatile u32    bg;
-        volatile u32    alu;
-        volatile u32    pm;
-        volatile u32    pixelm;
-        u32             xxx7[2];
-        volatile u32    patalign;
-        volatile u32    pattern[8];
-        u32             xxx8[432];
-        volatile u32    apointx, apointy, apointz;
-        u32             xxx9[1];
-        volatile u32    rpointx, rpointy, rpointz;
-        u32             xxx10[5];
-        volatile u32    pointr, pointg, pointb, pointa;
-        volatile u32    alinex, aliney, alinez;
-        u32             xxx11[1];
-        volatile u32    rlinex, rliney, rlinez;
-        u32             xxx12[5];
-        volatile u32    liner, lineg, lineb, linea;
-        volatile u32    atrix, atriy, atriz;
-        u32             xxx13[1];
-        volatile u32    rtrix, rtriy, rtriz;
-        u32             xxx14[5];
-        volatile u32    trir, trig, trib, tria;
-        volatile u32    aquadx, aquady, aquadz;
-        u32             xxx15[1];
-        volatile u32    rquadx, rquady, rquadz;
-        u32             xxx16[5];
-        volatile u32    quadr, quadg, quadb, quada;
-        volatile u32    arectx, arecty, arectz;
-        u32             xxx17[1];
-        volatile u32    rrectx, rrecty, rrectz;
-        u32             xxx18[5];
-        volatile u32    rectr, rectg, rectb, recta;
+        u32     xxx0[1];
+        u32     mode;
+        u32     clip;
+        u32     xxx1[1];            
+        u32     s;
+        u32     draw;
+        u32     blit;
+        u32     font;
+        u32     xxx2[24];
+        u32     x0, y0, z0, color0;
+        u32     x1, y1, z1, color1;
+        u32     x2, y2, z2, color2;
+        u32     x3, y3, z3, color3;
+        u32     offx, offy;
+        u32     xxx3[2];
+        u32     incx, incy;
+        u32     xxx4[2];
+        u32     clipminx, clipminy;
+        u32     xxx5[2];
+        u32     clipmaxx, clipmaxy;
+        u32     xxx6[2];
+        u32     fg;
+        u32     bg;
+        u32     alu;
+        u32     pm;
+        u32     pixelm;
+        u32     xxx7[2];
+        u32     patalign;
+        u32     pattern[8];
+        u32     xxx8[432];
+        u32     apointx, apointy, apointz;
+        u32     xxx9[1];
+        u32     rpointx, rpointy, rpointz;
+        u32     xxx10[5];
+        u32     pointr, pointg, pointb, pointa;
+        u32     alinex, aliney, alinez;
+        u32     xxx11[1];
+        u32     rlinex, rliney, rlinez;
+        u32     xxx12[5];
+        u32     liner, lineg, lineb, linea;
+        u32     atrix, atriy, atriz;
+        u32     xxx13[1];
+        u32     rtrix, rtriy, rtriz;
+        u32     xxx14[5];
+        u32     trir, trig, trib, tria;
+        u32     aquadx, aquady, aquadz;
+        u32     xxx15[1];
+        u32     rquadx, rquady, rquadz;
+        u32     xxx16[5];
+        u32     quadr, quadg, quadb, quada;
+        u32     arectx, arecty, arectz;
+        u32     xxx17[1];
+        u32     rrectx, rrecty, rrectz;
+        u32     xxx18[5];
+        u32     rectr, rectg, rectb, recta;
 };
 
 struct bt_regs {
-        volatile u32 addr;
-        volatile u32 color_map;
-        volatile u32 control;
-        volatile u32 cursor;
+        u32 addr;
+        u32 color_map;
+        u32 control;
+        u32 cursor;
 };
 
 struct cg6_par {
@@ -255,15 +255,14 @@ struct cg6_par {
         struct cg6_fbc          __iomem *fbc;
         struct cg6_thc          __iomem *thc;
         struct cg6_tec          __iomem *tec;
-        volatile u32            __iomem *fhc;
+        u32                     __iomem *fhc;
 
         u32                     flags;
 #define CG6_FLAG_BLANKED        0x00000001
 
         unsigned long           physbase;
+        unsigned long           which_io;
         unsigned long           fbsize;
-
-        struct sbus_dev         *sdev;
 };
 
 static int cg6_sync(struct fb_info *info)
@@ -529,8 +528,7 @@ static int cg6_mmap(struct fb_info *info, struct vm_area_struct *vma)
 
         return sbusfb_mmap_helper(cg6_mmap_map,
                                   par->physbase, par->fbsize,
-                                  par->sdev->reg_addrs[0].which_io,
-                                  vma);
+                                  par->which_io, vma);
 }
 
 static int cg6_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
@@ -658,62 +656,75 @@ static void cg6_chip_init(struct fb_info *info)
 struct all_info {
         struct fb_info info;
         struct cg6_par par;
-        struct list_head list;
 };
-static LIST_HEAD(cg6_list);
 
-static void cg6_init_one(struct sbus_dev *sdev)
+static void cg6_unmap_regs(struct all_info *all)
 {
-        struct all_info *all;
-        int linebytes;
+        if (all->par.fbc)
+                of_iounmap(all->par.fbc, 4096);
+        if (all->par.tec)
+                of_iounmap(all->par.tec, sizeof(struct cg6_tec));
+        if (all->par.thc)
+                of_iounmap(all->par.thc, sizeof(struct cg6_thc));
+        if (all->par.bt)
+                of_iounmap(all->par.bt, sizeof(struct bt_regs));
+        if (all->par.fhc)
+                of_iounmap(all->par.fhc, sizeof(u32));
+
+        if (all->info.screen_base)
+                of_iounmap(all->info.screen_base, all->par.fbsize);
+}
 
-        all = kmalloc(sizeof(*all), GFP_KERNEL);
-        if (!all) {
-                printk(KERN_ERR "cg6: Cannot allocate memory.\n");
-                return;
-        }
-        memset(all, 0, sizeof(*all));
+static int __devinit cg6_init_one(struct of_device *op)
+{
+        struct device_node *dp = op->node;
+        struct all_info *all;
+        int linebytes, err;
 
-        INIT_LIST_HEAD(&all->list);
+        all = kzalloc(sizeof(*all), GFP_KERNEL);
+        if (!all)
+                return -ENOMEM;
 
         spin_lock_init(&all->par.lock);
-        all->par.sdev = sdev;
 
-        all->par.physbase = sdev->reg_addrs[0].phys_addr;
+        all->par.physbase = op->resource[0].start;
+        all->par.which_io = op->resource[0].flags & IORESOURCE_BITS;
 
-        sbusfb_fill_var(&all->info.var, sdev->prom_node, 8);
+        sbusfb_fill_var(&all->info.var, dp->node, 8);
         all->info.var.red.length = 8;
         all->info.var.green.length = 8;
         all->info.var.blue.length = 8;
 
-        linebytes = prom_getintdefault(sdev->prom_node, "linebytes",
-                                       all->info.var.xres);
+        linebytes = of_getintprop_default(dp, "linebytes",
+                                          all->info.var.xres);
         all->par.fbsize = PAGE_ALIGN(linebytes * all->info.var.yres);
-        if (prom_getbool(sdev->prom_node, "dblbuf"))
+        if (of_find_property(dp, "dblbuf", NULL))
                 all->par.fbsize *= 4;
 
-        all->par.fbc = sbus_ioremap(&sdev->resource[0], CG6_FBC_OFFSET,
-                             4096, "cgsix fbc");
-        all->par.tec = sbus_ioremap(&sdev->resource[0], CG6_TEC_OFFSET,
-                             sizeof(struct cg6_tec), "cgsix tec");
-        all->par.thc = sbus_ioremap(&sdev->resource[0], CG6_THC_OFFSET,
-                             sizeof(struct cg6_thc), "cgsix thc");
-        all->par.bt = sbus_ioremap(&sdev->resource[0], CG6_BROOKTREE_OFFSET,
-                             sizeof(struct bt_regs), "cgsix dac");
-        all->par.fhc = sbus_ioremap(&sdev->resource[0], CG6_FHC_OFFSET,
-                             sizeof(u32), "cgsix fhc");
+        all->par.fbc = of_ioremap(&op->resource[0], CG6_FBC_OFFSET,
+                                  4096, "cgsix fbc");
+        all->par.tec = of_ioremap(&op->resource[0], CG6_TEC_OFFSET,
+                                  sizeof(struct cg6_tec), "cgsix tec");
+        all->par.thc = of_ioremap(&op->resource[0], CG6_THC_OFFSET,
+                                  sizeof(struct cg6_thc), "cgsix thc");
+        all->par.bt = of_ioremap(&op->resource[0], CG6_BROOKTREE_OFFSET,
+                                 sizeof(struct bt_regs), "cgsix dac");
+        all->par.fhc = of_ioremap(&op->resource[0], CG6_FHC_OFFSET,
+                                  sizeof(u32), "cgsix fhc");
 
         all->info.flags = FBINFO_DEFAULT | FBINFO_HWACCEL_IMAGEBLIT |
                           FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT;
         all->info.fbops = &cg6_ops;
-#ifdef CONFIG_SPARC32
-        all->info.screen_base = (char __iomem *)
-                prom_getintdefault(sdev->prom_node, "address", 0);
-#endif
-        if (!all->info.screen_base)
-                all->info.screen_base = 
-                        sbus_ioremap(&sdev->resource[0], CG6_RAM_OFFSET,
-                                     all->par.fbsize, "cgsix ram");
+
+        all->info.screen_base =  of_ioremap(&op->resource[0], CG6_RAM_OFFSET,
+                                            all->par.fbsize, "cgsix ram");
+        if (!all->par.fbc || !all->par.tec || !all->par.thc ||
+            !all->par.bt || !all->par.fhc || !all->info.screen_base) {
+                cg6_unmap_regs(all);
+                kfree(all);
+                return -ENOMEM;
+        }
+
         all->info.par = &all->par;
 
         all->info.var.accel_flags = FB_ACCELF_TEXT;
@@ -723,72 +734,90 @@ static void cg6_init_one(struct sbus_dev *sdev)
         cg6_blank(0, &all->info);
 
         if (fb_alloc_cmap(&all->info.cmap, 256, 0)) {
-                printk(KERN_ERR "cg6: Could not allocate color map.\n");
+                cg6_unmap_regs(all);
                 kfree(all);
-                return;
+                return -ENOMEM;
         }
 
         fb_set_cmap(&all->info.cmap, &all->info);
         cg6_init_fix(&all->info, linebytes);
 
-        if (register_framebuffer(&all->info) < 0) {
-                printk(KERN_ERR "cg6: Could not register framebuffer.\n");
+        err = register_framebuffer(&all->info);
+        if (err < 0) {
+                cg6_unmap_regs(all);
                 fb_dealloc_cmap(&all->info.cmap);
                 kfree(all);
-                return;
+                return err;
         }
 
-        list_add(&all->list, &cg6_list);
+        dev_set_drvdata(&op->dev, all);
 
-        printk("cg6: CGsix [%s] at %lx:%lx\n",
+        printk("%s: CGsix [%s] at %lx:%lx\n",
+               dp->full_name,
                all->info.fix.id,
-               (long) sdev->reg_addrs[0].which_io,
-               (long) sdev->reg_addrs[0].phys_addr);
+               all->par.which_io, all->par.physbase);
+
+        return 0;
 }
 
-int __init cg6_init(void)
+static int __devinit cg6_probe(struct of_device *dev, const struct of_device_id *match)
 {
-        struct sbus_bus *sbus;
-        struct sbus_dev *sdev;
+        struct of_device *op = to_of_device(&dev->dev);
 
-        if (fb_get_options("cg6fb", NULL))
-                return -ENODEV;
+        return cg6_init_one(op);
+}
 
-        for_all_sbusdev(sdev, sbus) {
-                if (!strcmp(sdev->prom_name, "cgsix") ||
-                    !strcmp(sdev->prom_name, "cgthree+"))
-                        cg6_init_one(sdev);
-        }
+static int __devexit cg6_remove(struct of_device *dev)
+{
+        struct all_info *all = dev_get_drvdata(&dev->dev);
+
+        unregister_framebuffer(&all->info);
+        fb_dealloc_cmap(&all->info.cmap);
+
+        cg6_unmap_regs(all);
+
+        kfree(all);
+
+        dev_set_drvdata(&dev->dev, NULL);
 
         return 0;
 }
 
-void __exit cg6_exit(void)
-{
-        struct list_head *pos, *tmp;
+static struct of_device_id cg6_match[] = {
+        {
+                .name = "cgsix",
+        },
+        {
+                .name = "cgthree+",
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(of, cg6_match);
 
-        list_for_each_safe(pos, tmp, &cg6_list) {
-                struct all_info *all = list_entry(pos, typeof(*all), list);
+static struct of_platform_driver cg6_driver = {
+        .name           = "cg6",
+        .match_table    = cg6_match,
+        .probe          = cg6_probe,
+        .remove         = __devexit_p(cg6_remove),
+};
 
-                unregister_framebuffer(&all->info);
-                fb_dealloc_cmap(&all->info.cmap);
-                kfree(all);
-        }
+static int __init cg6_init(void)
+{
+        if (fb_get_options("cg6fb", NULL))
+                return -ENODEV;
+
+        return of_register_driver(&cg6_driver, &of_bus_type);
 }
 
-int __init
-cg6_setup(char *arg)
+static void __exit cg6_exit(void)
 {
-        /* No cmdline options yet... */
-        return 0;
+        of_unregister_driver(&cg6_driver);
 }
 
 module_init(cg6_init);
-
-#ifdef MODULE
 module_exit(cg6_exit);
-#endif
 
 MODULE_DESCRIPTION("framebuffer driver for CGsix chipsets");
-MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
+MODULE_AUTHOR("David S. Miller <davem@davemloft.net>");
+MODULE_VERSION("2.0");
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index 72ff6bf75e5e..73cb426bf2d7 100644
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -14,13 +14,11 @@
  *  more details.
  */
 
-#include <linux/config.h>
 #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/vmalloc.h>
 #include <linux/delay.h>
@@ -148,9 +146,23 @@ static int chipsfb_set_par(struct fb_info *info)
 static int chipsfb_blank(int blank, struct fb_info *info)
 {
 #ifdef CONFIG_PMAC_BACKLIGHT
-        // used to disable backlight only for blank > 1, but it seems
-        // useful at blank = 1 too (saves battery, extends backlight life)
-        set_backlight_enable(!blank);
+        mutex_lock(&pmac_backlight_mutex);
+
+        if (pmac_backlight) {
+                /* used to disable backlight only for blank > 1, but it seems
+                 * useful at blank = 1 too (saves battery, extends backlight
+                 * life)
+                 */
+                down(&pmac_backlight->sem);
+                if (blank)
+                        pmac_backlight->props->power = FB_BLANK_POWERDOWN;
+                else
+                        pmac_backlight->props->power = FB_BLANK_UNBLANK;
+                pmac_backlight->props->update_status(pmac_backlight);
+                up(&pmac_backlight->sem);
+        }
+
+        mutex_unlock(&pmac_backlight_mutex);
 #endif /* CONFIG_PMAC_BACKLIGHT */
 
         return 1;       /* get fb_blank to set the colormap to all black */
@@ -401,7 +413,14 @@ chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
 
 #ifdef CONFIG_PMAC_BACKLIGHT
         /* turn on the backlight */
-        set_backlight_enable(1);
+        mutex_lock(&pmac_backlight_mutex);
+        if (pmac_backlight) {
+                down(&pmac_backlight->sem);
+                pmac_backlight->props->power = FB_BLANK_UNBLANK;
+                pmac_backlight->props->update_status(pmac_backlight);
+                up(&pmac_backlight->sem);
+        }
+        mutex_unlock(&pmac_backlight_mutex);
 #endif /* CONFIG_PMAC_BACKLIGHT */
 
 #ifdef CONFIG_PPC
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index 1103010af54a..daf43f535a0b 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -36,13 +36,11 @@
 
 #define CIRRUSFB_VERSION "2.0-pre2"
 
-#include <linux/config.h>
 #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>
@@ -2227,7 +2225,6 @@ static void cirrusfb_pci_unmap (struct cirrusfb_info *cinfo)
                 release_region(0x3C0, 32);
         pci_release_regions(pdev);
         framebuffer_release(cinfo->info);
-        pci_disable_device(pdev);
 }
 #endif /* CONFIG_PCI */
 
@@ -2458,7 +2455,6 @@ err_release_regions:
 err_release_fb:
         framebuffer_release(info);
 err_disable:
-        pci_disable_device(pdev);
 err_out:
         return ret;
 }
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 4444bef68fba..aa3935df852a 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -6,7 +6,7 @@ menu "Console display driver support"
 
 config VGA_CONSOLE
         bool "VGA text console" if EMBEDDED || !X86
-        depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !ARCH_VERSATILE
+        depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !ARCH_VERSATILE && !SUPERH
         default y
         help
           Saying Y here will allow you to use Linux in text mode through a
diff --git a/drivers/video/console/bitblit.c b/drivers/video/console/bitblit.c
index eea422eb1ab5..308850df16fe 100644
--- a/drivers/video/console/bitblit.c
+++ b/drivers/video/console/bitblit.c
@@ -10,7 +10,6 @@
  *  more details.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/fb.h>
diff --git a/drivers/video/console/dummycon.c b/drivers/video/console/dummycon.c
index 1ecda91e5a9c..d9315d99445f 100644
--- a/drivers/video/console/dummycon.c
+++ b/drivers/video/console/dummycon.c
@@ -7,9 +7,9 @@
 
 #include <linux/types.h>
 #include <linux/kdev_t.h>
-#include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/vt_kern.h>
+#include <linux/screen_info.h>
 #include <linux/init.h>
 #include <linux/module.h>
 
@@ -22,7 +22,6 @@
 #define DUMMY_ROWS      ORIG_VIDEO_LINES
 #elif defined(__hppa__)
 /* set by Kconfig. Use 80x25 for 640x480 and 160x64 for 1280x1024 */
-#include <linux/config.h>
 #define DUMMY_COLUMNS   CONFIG_DUMMY_CONSOLE_COLUMNS
 #define DUMMY_ROWS      CONFIG_DUMMY_CONSOLE_ROWS
 #else
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 47ba1a79adcd..1b4f75d1f8a9 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -58,14 +58,12 @@
 
 #undef FBCONDEBUG
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/sched.h>
 #include <linux/fs.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>        /* MSch: for IRQ probe */
-#include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/string.h>
 #include <linux/kd.h>
@@ -125,6 +123,8 @@ static int softback_lines;
 static int first_fb_vc;
 static int last_fb_vc = MAX_NR_CONSOLES - 1;
 static int fbcon_is_default = 1; 
+static int fbcon_has_exited;
+
 /* font data */
 static char fontname[40];
 
@@ -140,7 +140,6 @@ static const struct consw fb_con;
 
 #define advance_row(p, delta) (unsigned short *)((unsigned long)(p) + (delta) * vc->vc_size_row)
 
-static void fbcon_free_font(struct display *);
 static int fbcon_set_origin(struct vc_data *);
 
 #define CURSOR_DRAW_DELAY               (1)
@@ -194,6 +193,9 @@ static void fbcon_redraw_move(struct vc_data *vc, struct display *p,
                               int line, int count, int dy);
 static void fbcon_modechanged(struct fb_info *info);
 static void fbcon_set_all_vcs(struct fb_info *info);
+static void fbcon_start(void);
+static void fbcon_exit(void);
+static struct class_device *fbcon_class_device;
 
 #ifdef CONFIG_MAC
 /*
@@ -252,7 +254,7 @@ static void fbcon_rotate_all(struct fb_info *info, u32 rotate)
         if (!ops || ops->currcon < 0 || rotate > 3)
                 return;
 
-        for (i = 0; i < MAX_NR_CONSOLES; i++) {
+        for (i = first_fb_vc; i <= last_fb_vc; i++) {
                 vc = vc_cons[i].d;
                 if (!vc || vc->vc_mode != KD_TEXT ||
                     registered_fb[con2fb_map[i]] != info)
@@ -389,15 +391,18 @@ static void fb_flashcursor(void *private)
         int c;
         int mode;
 
-        if (ops->currcon != -1)
+        acquire_console_sem();
+        if (ops && ops->currcon != -1)
                 vc = vc_cons[ops->currcon].d;
 
         if (!vc || !CON_IS_VISIBLE(vc) ||
             fbcon_is_inactive(vc, info) ||
             registered_fb[con2fb_map[vc->vc_num]] != info ||
-            vc_cons[ops->currcon].d->vc_deccm != 1)
+            vc_cons[ops->currcon].d->vc_deccm != 1) {
+                release_console_sem();
                 return;
-        acquire_console_sem();
+        }
+
         p = &fb_display[vc->vc_num];
         c = scr_readw((u16 *) vc->vc_pos);
         mode = (!ops->cursor_flash || ops->cursor_state.enable) ?
@@ -528,7 +533,7 @@ static int search_fb_in_map(int idx)
 {
         int i, retval = 0;
 
-        for (i = 0; i < MAX_NR_CONSOLES; i++) {
+        for (i = first_fb_vc; i <= last_fb_vc; i++) {
                 if (con2fb_map[i] == idx)
                         retval = 1;
         }
@@ -539,7 +544,7 @@ static int search_for_mapped_con(void)
 {
         int i, retval = 0;
 
-        for (i = 0; i < MAX_NR_CONSOLES; i++) {
+        for (i = first_fb_vc; i <= last_fb_vc; i++) {
                 if (con2fb_map[i] != -1)
                         retval = 1;
         }
@@ -561,6 +566,7 @@ static int fbcon_takeover(int show_logo)
 
         err = take_over_console(&fb_con, first_fb_vc, last_fb_vc,
                                 fbcon_is_default);
+
         if (err) {
                 for (i = first_fb_vc; i <= last_fb_vc; i++) {
                         con2fb_map[i] = -1;
@@ -795,8 +801,8 @@ static int set_con2fb_map(int unit, int newidx, int user)
         if (oldidx == newidx)
                 return 0;
 
-        if (!info)
-                err =  -EINVAL;
+        if (!info || fbcon_has_exited)
+                return -EINVAL;
 
         if (!err && !search_for_mapped_con()) {
                 info_idx = newidx;
@@ -832,6 +838,9 @@ static int set_con2fb_map(int unit, int newidx, int user)
                 con2fb_init_display(vc, info, unit, show_logo);
         }
 
+        if (!search_fb_in_map(info_idx))
+                info_idx = newidx;
+
         release_console_sem();
         return err;
 }
@@ -1034,6 +1043,7 @@ static const char *fbcon_startup(void)
 #endif                          /* CONFIG_MAC */
 
         fbcon_add_cursor_timer(info);
+        fbcon_has_exited = 0;
         return display_desc;
 }
 
@@ -1061,17 +1071,36 @@ static void fbcon_init(struct vc_data *vc, int init)
 
         /* If we are not the first console on this
            fb, copy the font from that console */
-        t = &fb_display[svc->vc_num];
-        if (!vc->vc_font.data) {
-                vc->vc_font.data = (void *)(p->fontdata = t->fontdata);
-                vc->vc_font.width = (*default_mode)->vc_font.width;
-                vc->vc_font.height = (*default_mode)->vc_font.height;
-                p->userfont = t->userfont;
-                if (p->userfont)
-                        REFCOUNT(p->fontdata)++;
+        t = &fb_display[fg_console];
+        if (!p->fontdata) {
+                if (t->fontdata) {
+                        struct vc_data *fvc = vc_cons[fg_console].d;
+
+                        vc->vc_font.data = (void *)(p->fontdata =
+                                                    fvc->vc_font.data);
+                        vc->vc_font.width = fvc->vc_font.width;
+                        vc->vc_font.height = fvc->vc_font.height;
+                        p->userfont = t->userfont;
+
+                        if (p->userfont)
+                                REFCOUNT(p->fontdata)++;
+                } else {
+                        const struct font_desc *font = NULL;
+
+                        if (!fontname[0] || !(font = find_font(fontname)))
+                                font = get_default_font(info->var.xres,
+                                                        info->var.yres);
+                        vc->vc_font.width = font->width;
+                        vc->vc_font.height = font->height;
+                        vc->vc_font.data = (void *)(p->fontdata = font->data);
+                        vc->vc_font.charcount = 256; /* FIXME  Need to
+                                                        support more fonts */
+                }
         }
+
         if (p->userfont)
                 charcnt = FNTCHARCNT(p->fontdata);
+
         vc->vc_can_do_color = (fb_get_color_depth(&info->var, &info->fix)!=1);
         vc->vc_complement_mask = vc->vc_can_do_color ? 0x7700 : 0x0800;
         if (charcnt == 256) {
@@ -1145,13 +1174,47 @@ static void fbcon_init(struct vc_data *vc, int init)
         ops->p = &fb_display[fg_console];
 }
 
+static void fbcon_free_font(struct display *p)
+{
+        if (p->userfont && p->fontdata && (--REFCOUNT(p->fontdata) == 0))
+                kfree(p->fontdata - FONT_EXTRA_WORDS * sizeof(int));
+        p->fontdata = NULL;
+        p->userfont = 0;
+}
+
 static void fbcon_deinit(struct vc_data *vc)
 {
         struct display *p = &fb_display[vc->vc_num];
+        struct fb_info *info;
+        struct fbcon_ops *ops;
+        int idx;
 
-        if (info_idx != -1)
-            return;
         fbcon_free_font(p);
+        idx = con2fb_map[vc->vc_num];
+
+        if (idx == -1)
+                goto finished;
+
+        info = registered_fb[idx];
+
+        if (!info)
+                goto finished;
+
+        ops = info->fbcon_par;
+
+        if (!ops)
+                goto finished;
+
+        if (CON_IS_VISIBLE(vc))
+                fbcon_del_cursor_timer(info);
+
+        ops->flags &= ~FBCON_FLAGS_INIT;
+finished:
+
+        if (!con_is_bound(&fb_con))
+                fbcon_exit();
+
+        return;
 }
 
 /* ====================================================================== */
@@ -2099,12 +2162,11 @@ static int fbcon_switch(struct vc_data *vc)
                 if (info->fbops->fb_set_par)
                         info->fbops->fb_set_par(info);
 
-                if (old_info != info) {
+                if (old_info != info)
                         fbcon_del_cursor_timer(old_info);
-                        fbcon_add_cursor_timer(info);
-                }
         }
 
+        fbcon_add_cursor_timer(info);
         set_blitting_type(vc, info);
         ops->cursor_reset = 1;
 
@@ -2222,14 +2284,6 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
         return 0;
 }
 
-static void fbcon_free_font(struct display *p)
-{
-        if (p->userfont && p->fontdata && (--REFCOUNT(p->fontdata) == 0))
-                kfree(p->fontdata - FONT_EXTRA_WORDS * sizeof(int));
-        p->fontdata = NULL;
-        p->userfont = 0;
-}
-
 static int fbcon_get_font(struct vc_data *vc, struct console_font *font)
 {
         u8 *fontdata = vc->vc_font.data;
@@ -2443,7 +2497,7 @@ static int fbcon_set_font(struct vc_data *vc, struct console_font *font, unsigne
 
         FNTSUM(new_data) = csum;
         /* Check if the same font is on some other console already */
-        for (i = 0; i < MAX_NR_CONSOLES; i++) {
+        for (i = first_fb_vc; i <= last_fb_vc; i++) {
                 struct vc_data *tmp = vc_cons[i].d;
                 
                 if (fb_display[i].userfont &&
@@ -2768,7 +2822,7 @@ static void fbcon_set_all_vcs(struct fb_info *info)
         if (!ops || ops->currcon < 0)
                 return;
 
-        for (i = 0; i < MAX_NR_CONSOLES; i++) {
+        for (i = first_fb_vc; i <= last_fb_vc; i++) {
                 vc = vc_cons[i].d;
                 if (!vc || vc->vc_mode != KD_TEXT ||
                     registered_fb[con2fb_map[i]] != info)
@@ -2830,22 +2884,57 @@ static int fbcon_mode_deleted(struct fb_info *info,
         return found;
 }
 
+static int fbcon_fb_unregistered(int idx)
+{
+        int i;
+
+        for (i = first_fb_vc; i <= last_fb_vc; i++) {
+                if (con2fb_map[i] == idx)
+                        con2fb_map[i] = -1;
+        }
+
+        if (idx == info_idx) {
+                info_idx = -1;
+
+                for (i = 0; i < FB_MAX; i++) {
+                        if (registered_fb[i] != NULL) {
+                                info_idx = i;
+                                break;
+                        }
+                }
+        }
+
+        if (info_idx != -1) {
+                for (i = first_fb_vc; i <= last_fb_vc; i++) {
+                        if (con2fb_map[i] == -1)
+                                con2fb_map[i] = info_idx;
+                }
+        }
+
+        if (!num_registered_fb)
+                unregister_con_driver(&fb_con);
+
+        return 0;
+}
+
 static int fbcon_fb_registered(int idx)
 {
         int ret = 0, i;
 
         if (info_idx == -1) {
-                for (i = 0; i < MAX_NR_CONSOLES; i++) {
+                for (i = first_fb_vc; i <= last_fb_vc; i++) {
                         if (con2fb_map_boot[i] == idx) {
                                 info_idx = idx;
                                 break;
                         }
                 }
+
                 if (info_idx != -1)
                         ret = fbcon_takeover(1);
         } else {
-                for (i = 0; i < MAX_NR_CONSOLES; i++) {
-                        if (con2fb_map_boot[i] == idx)
+                for (i = first_fb_vc; i <= last_fb_vc; i++) {
+                        if (con2fb_map_boot[i] == idx &&
+                            con2fb_map[i] == -1)
                                 set_con2fb_map(i, idx, 0);
                 }
         }
@@ -2882,7 +2971,7 @@ static void fbcon_new_modelist(struct fb_info *info)
         struct fb_var_screeninfo var;
         struct fb_videomode *mode;
 
-        for (i = 0; i < MAX_NR_CONSOLES; i++) {
+        for (i = first_fb_vc; i <= last_fb_vc; i++) {
                 if (registered_fb[con2fb_map[i]] != info)
                         continue;
                 if (!fb_display[i].mode)
@@ -2910,6 +2999,14 @@ static int fbcon_event_notify(struct notifier_block *self,
         struct fb_con2fbmap *con2fb;
         int ret = 0;
 
+        /*
+         * ignore all events except driver registration and deregistration
+         * if fbcon is not active
+         */
+        if (fbcon_has_exited && !(action == FB_EVENT_FB_REGISTERED ||
+                                  action == FB_EVENT_FB_UNREGISTERED))
+                goto done;
+
         switch(action) {
         case FB_EVENT_SUSPEND:
                 fbcon_suspended(info);
@@ -2930,6 +3027,9 @@ static int fbcon_event_notify(struct notifier_block *self,
         case FB_EVENT_FB_REGISTERED:
                 ret = fbcon_fb_registered(info->node);
                 break;
+        case FB_EVENT_FB_UNREGISTERED:
+                ret = fbcon_fb_unregistered(info->node);
+                break;
         case FB_EVENT_SET_CONSOLE_MAP:
                 con2fb = event->data;
                 ret = set_con2fb_map(con2fb->console - 1,
@@ -2945,16 +3045,9 @@ static int fbcon_event_notify(struct notifier_block *self,
         case FB_EVENT_NEW_MODELIST:
                 fbcon_new_modelist(info);
                 break;
-        case FB_EVENT_SET_CON_ROTATE:
-                fbcon_rotate(info, *(int *)event->data);
-                break;
-        case FB_EVENT_GET_CON_ROTATE:
-                ret = fbcon_get_rotate(info);
-                break;
-        case FB_EVENT_SET_CON_ROTATE_ALL:
-                fbcon_rotate_all(info, *(int *)event->data);
         }
 
+done:
         return ret;
 }
 
@@ -2992,27 +3085,181 @@ static struct notifier_block fbcon_event_notifier = {
         .notifier_call  = fbcon_event_notify,
 };
 
-static int __init fb_console_init(void)
+static ssize_t store_rotate(struct class_device *class_device,
+                            const char *buf, size_t count)
 {
-        int i;
+        struct fb_info *info;
+        int rotate, idx;
+        char **last = NULL;
+
+        if (fbcon_has_exited)
+                return count;
 
         acquire_console_sem();
-        fb_register_client(&fbcon_event_notifier);
+        idx = con2fb_map[fg_console];
+
+        if (idx == -1 || registered_fb[idx] == NULL)
+                goto err;
+
+        info = registered_fb[idx];
+        rotate = simple_strtoul(buf, last, 0);
+        fbcon_rotate(info, rotate);
+err:
         release_console_sem();
+        return count;
+}
 
-        for (i = 0; i < MAX_NR_CONSOLES; i++)
-                con2fb_map[i] = -1;
+static ssize_t store_rotate_all(struct class_device *class_device,
+                                const char *buf, size_t count)
+{
+        struct fb_info *info;
+        int rotate, idx;
+        char **last = NULL;
+
+        if (fbcon_has_exited)
+                return count;
+
+        acquire_console_sem();
+        idx = con2fb_map[fg_console];
+
+        if (idx == -1 || registered_fb[idx] == NULL)
+                goto err;
 
+        info = registered_fb[idx];
+        rotate = simple_strtoul(buf, last, 0);
+        fbcon_rotate_all(info, rotate);
+err:
+        release_console_sem();
+        return count;
+}
+
+static ssize_t show_rotate(struct class_device *class_device, char *buf)
+{
+        struct fb_info *info;
+        int rotate = 0, idx;
+
+        if (fbcon_has_exited)
+                return 0;
+
+        acquire_console_sem();
+        idx = con2fb_map[fg_console];
+
+        if (idx == -1 || registered_fb[idx] == NULL)
+                goto err;
+
+        info = registered_fb[idx];
+        rotate = fbcon_get_rotate(info);
+err:
+        release_console_sem();
+        return snprintf(buf, PAGE_SIZE, "%d\n", rotate);
+}
+
+static struct class_device_attribute class_device_attrs[] = {
+        __ATTR(rotate, S_IRUGO|S_IWUSR, show_rotate, store_rotate),
+        __ATTR(rotate_all, S_IWUSR, NULL, store_rotate_all),
+};
+
+static int fbcon_init_class_device(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++)
+                class_device_create_file(fbcon_class_device,
+                                         &class_device_attrs[i]);
+        return 0;
+}
+
+static void fbcon_start(void)
+{
         if (num_registered_fb) {
+                int i;
+
+                acquire_console_sem();
+
                 for (i = 0; i < FB_MAX; i++) {
                         if (registered_fb[i] != NULL) {
                                 info_idx = i;
                                 break;
                         }
                 }
+
+                release_console_sem();
                 fbcon_takeover(0);
         }
+}
+
+static void fbcon_exit(void)
+{
+        struct fb_info *info;
+        int i, j, mapped;
+
+        if (fbcon_has_exited)
+                return;
+
+#ifdef CONFIG_ATARI
+        free_irq(IRQ_AUTO_4, fb_vbl_handler);
+#endif
+#ifdef CONFIG_MAC
+        if (MACH_IS_MAC && vbl_detected)
+                free_irq(IRQ_MAC_VBL, fb_vbl_handler);
+#endif
+
+        kfree((void *)softback_buf);
+        softback_buf = 0UL;
+
+        for (i = 0; i < FB_MAX; i++) {
+                mapped = 0;
+                info = registered_fb[i];
+
+                if (info == NULL)
+                        continue;
+
+                for (j = first_fb_vc; j <= last_fb_vc; j++) {
+                        if (con2fb_map[j] == i)
+                                mapped = 1;
+                }
+
+                if (mapped) {
+                        if (info->fbops->fb_release)
+                                info->fbops->fb_release(info, 0);
+                        module_put(info->fbops->owner);
+
+                        if (info->fbcon_par) {
+                                fbcon_del_cursor_timer(info);
+                                kfree(info->fbcon_par);
+                                info->fbcon_par = NULL;
+                        }
 
+                        if (info->queue.func == fb_flashcursor)
+                                info->queue.func = NULL;
+                }
+        }
+
+        fbcon_has_exited = 1;
+}
+
+static int __init fb_console_init(void)
+{
+        int i;
+
+        acquire_console_sem();
+        fb_register_client(&fbcon_event_notifier);
+        fbcon_class_device =
+            class_device_create(fb_class, NULL, MKDEV(0, 0), NULL, "fbcon");
+
+        if (IS_ERR(fbcon_class_device)) {
+                printk(KERN_WARNING "Unable to create class_device "
+                       "for fbcon; errno = %ld\n",
+                       PTR_ERR(fbcon_class_device));
+                fbcon_class_device = NULL;
+        } else
+                fbcon_init_class_device();
+
+        for (i = 0; i < MAX_NR_CONSOLES; i++)
+                con2fb_map[i] = -1;
+
+        release_console_sem();
+        fbcon_start();
         return 0;
 }
 
@@ -3020,12 +3267,24 @@ module_init(fb_console_init);
 
 #ifdef MODULE
 
+static void __exit fbcon_deinit_class_device(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++)
+                class_device_remove_file(fbcon_class_device,
+                                         &class_device_attrs[i]);
+}
+
 static void __exit fb_console_exit(void)
 {
         acquire_console_sem();
         fb_unregister_client(&fbcon_event_notifier);
+        fbcon_deinit_class_device();
+        class_device_destroy(fb_class, MKDEV(0, 0));
+        fbcon_exit();
         release_console_sem();
-        give_up_console(&fb_con);
+        unregister_con_driver(&fb_con);
 }       
 
 module_exit(fb_console_exit);
diff --git a/drivers/video/console/fbcon.h b/drivers/video/console/fbcon.h
index c38c3d8e7a74..f244ad066d68 100644
--- a/drivers/video/console/fbcon.h
+++ b/drivers/video/console/fbcon.h
@@ -11,7 +11,6 @@
 #ifndef _VIDEO_FBCON_H
 #define _VIDEO_FBCON_H
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/vt_buffer.h>
 #include <linux/vt_kern.h>
@@ -175,6 +174,7 @@ extern void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info);
 #endif
 extern void fbcon_set_bitops(struct fbcon_ops *ops);
 extern int  soft_cursor(struct fb_info *info, struct fb_cursor *cursor);
+extern struct class *fb_class;
 
 #define FBCON_ATTRIBUTE_UNDERLINE 1
 #define FBCON_ATTRIBUTE_REVERSE   2
diff --git a/drivers/video/console/fbcon_ccw.c b/drivers/video/console/fbcon_ccw.c
index 990289a69b78..4481c80b8b2a 100644
--- a/drivers/video/console/fbcon_ccw.c
+++ b/drivers/video/console/fbcon_ccw.c
@@ -8,7 +8,6 @@
  *  more details.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/fb.h>
diff --git a/drivers/video/console/fbcon_cw.c b/drivers/video/console/fbcon_cw.c
index d44c5fa515fb..7f92c06afea7 100644
--- a/drivers/video/console/fbcon_cw.c
+++ b/drivers/video/console/fbcon_cw.c
@@ -8,7 +8,6 @@
  *  more details.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/fb.h>
diff --git a/drivers/video/console/fbcon_rotate.c b/drivers/video/console/fbcon_rotate.c
index 2dc091fbd5c9..00884e013f0f 100644
--- a/drivers/video/console/fbcon_rotate.c
+++ b/drivers/video/console/fbcon_rotate.c
@@ -8,7 +8,6 @@
  *  more details.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/fb.h>
diff --git a/drivers/video/console/fbcon_ud.c b/drivers/video/console/fbcon_ud.c
index f56ed068a5bc..ab91005e64dc 100644
--- a/drivers/video/console/fbcon_ud.c
+++ b/drivers/video/console/fbcon_ud.c
@@ -8,7 +8,6 @@
  *  more details.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/fb.h>
diff --git a/drivers/video/console/font_acorn_8x8.c b/drivers/video/console/font_acorn_8x8.c
index 2d2e39632e2d..40f3d4eeb198 100644
--- a/drivers/video/console/font_acorn_8x8.c
+++ b/drivers/video/console/font_acorn_8x8.c
@@ -1,6 +1,5 @@
 /* Acorn-like font definition, with PC graphics characters */
 
-#include <linux/config.h>
 #include <linux/font.h>
 
 static const unsigned char acorndata_8x8[] = {
diff --git a/drivers/video/console/fonts.c b/drivers/video/console/fonts.c
index 0cc1bfda76a6..c960728b7e82 100644
--- a/drivers/video/console/fonts.c
+++ b/drivers/video/console/fonts.c
@@ -12,7 +12,6 @@
  * for more details.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/string.h>
diff --git a/drivers/video/console/mdacon.c b/drivers/video/console/mdacon.c
index 7f939d066a5a..eb4d03fa5391 100644
--- a/drivers/video/console/mdacon.c
+++ b/drivers/video/console/mdacon.c
@@ -31,7 +31,6 @@
 #include <linux/fs.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/string.h>
 #include <linux/kd.h>
@@ -198,7 +197,7 @@ static int __init mdacon_setup(char *str)
 __setup("mdacon=", mdacon_setup);
 #endif
 
-static int __init mda_detect(void)
+static int mda_detect(void)
 {
         int count=0;
         u16 *p, p_save;
@@ -283,7 +282,7 @@ static int __init mda_detect(void)
         return 1;
 }
 
-static void __init mda_initialize(void)
+static void mda_initialize(void)
 {
         write_mda_b(97, 0x00);          /* horizontal total */
         write_mda_b(80, 0x01);          /* horizontal displayed */
@@ -308,7 +307,7 @@ static void __init mda_initialize(void)
         outb_p(0x00, mda_gfx_port);
 }
 
-static const char __init *mdacon_startup(void)
+static const char *mdacon_startup(void)
 {
         mda_num_columns = 80;
         mda_num_lines   = 25;
diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c
index e99fe30e568c..7fa1afeae8dc 100644
--- a/drivers/video/console/newport_con.c
+++ b/drivers/video/console/newport_con.c
@@ -12,7 +12,6 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
-#include <linux/tty.h>
 #include <linux/kd.h>
 #include <linux/selection.h>
 #include <linux/console.h>
@@ -51,6 +50,7 @@ static int topscan;
 static int xcurs_correction = 29;
 static int newport_xsize;
 static int newport_ysize;
+static int newport_has_init;
 
 static int newport_set_def_font(int unit, struct console_font *op);
 
@@ -283,6 +283,15 @@ static void newport_get_revisions(void)
                 xcurs_correction = 21;
 }
 
+static void newport_exit(void)
+{
+        int i;
+
+        /* free memory used by user font */
+        for (i = 0; i < MAX_NR_CONSOLES; i++)
+                newport_set_def_font(i, NULL);
+}
+
 /* Can't be __init, take_over_console may call it later */
 static const char *newport_startup(void)
 {
@@ -290,8 +299,10 @@ static const char *newport_startup(void)
 
         if (!sgi_gfxaddr)
                 return NULL;
-        npregs = (struct newport_regs *)        /* ioremap cannot fail */
-                 ioremap(sgi_gfxaddr, sizeof(struct newport_regs));
+
+        if (!npregs)
+                npregs = (struct newport_regs *)/* ioremap cannot fail */
+                        ioremap(sgi_gfxaddr, sizeof(struct newport_regs));
         npregs->cset.config = NPORT_CFG_GD0;
 
         if (newport_wait(npregs))
@@ -307,11 +318,11 @@ static const char *newport_startup(void)
         newport_reset();
         newport_get_revisions();
         newport_get_screensize();
+        newport_has_init = 1;
 
         return "SGI Newport";
 
 out_unmap:
-        iounmap((void *)npregs);
         return NULL;
 }
 
@@ -324,11 +335,10 @@ static void newport_init(struct vc_data *vc, int init)
 
 static void newport_deinit(struct vc_data *c)
 {
-        int i;
-
-        /* free memory used by user font */
-        for (i = 0; i < MAX_NR_CONSOLES; i++)
-                newport_set_def_font(i, NULL);
+        if (!con_is_bound(&newport_con) && newport_has_init) {
+                newport_exit();
+                newport_has_init = 0;
+        }
 }
 
 static void newport_clear(struct vc_data *vc, int sy, int sx, int height,
@@ -728,16 +738,23 @@ const struct consw newport_con = {
 #ifdef MODULE
 static int __init newport_console_init(void)
 {
+
+        if (!sgi_gfxaddr)
+                return NULL;
+
+        if (!npregs)
+                npregs = (struct newport_regs *)/* ioremap cannot fail */
+                        ioremap(sgi_gfxaddr, sizeof(struct newport_regs));
+
         return take_over_console(&newport_con, 0, MAX_NR_CONSOLES - 1, 1);
 }
+module_init(newport_console_init);
 
 static void __exit newport_console_exit(void)
 {
         give_up_console(&newport_con);
         iounmap((void *)npregs);
 }
-
-module_init(newport_console_init);
 module_exit(newport_console_exit);
 #endif
 
diff --git a/drivers/video/console/promcon.c b/drivers/video/console/promcon.c
index 04f42fcaac59..b78eac63459f 100644
--- a/drivers/video/console/promcon.c
+++ b/drivers/video/console/promcon.c
@@ -5,13 +5,11 @@
  * Copyright (C) 1998  Jakub Jelinek  (jj@ultra.linux.cz)
  */
 
-#include <linux/config.h>
 #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/console.h>
@@ -109,7 +107,7 @@ promcon_end(struct vc_data *conp, char *b)
         return b - p;
 }
 
-const char __init *promcon_startup(void)
+const char *promcon_startup(void)
 {
         const char *display_desc = "PROM";
         int node;
@@ -133,7 +131,7 @@ const char __init *promcon_startup(void)
         return display_desc;
 }
 
-static void __init 
+static void
 promcon_init_unimap(struct vc_data *conp)
 {
         mm_segment_t old_fs = get_fs();
diff --git a/drivers/video/console/softcursor.c b/drivers/video/console/softcursor.c
index 3957fc7523e2..557c563e4aed 100644
--- a/drivers/video/console/softcursor.c
+++ b/drivers/video/console/softcursor.c
@@ -10,7 +10,6 @@
 
 #include <linux/module.h>
 #include <linux/string.h>
-#include <linux/tty.h>
 #include <linux/fb.h>
 #include <linux/slab.h>
 
diff --git a/drivers/video/console/sticon.c b/drivers/video/console/sticon.c
index fd5940f41271..45586aaabd1e 100644
--- a/drivers/video/console/sticon.c
+++ b/drivers/video/console/sticon.c
@@ -37,7 +37,6 @@
 
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/errno.h>
 #include <linux/vt_kern.h>
@@ -75,7 +74,7 @@ static inline void cursor_undrawn(void)
     cursor_drawn = 0;
 }
 
-static const char *__init sticon_startup(void)
+static const char *sticon_startup(void)
 {
     return "STI console";
 }
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index 74ac2acaf72c..88e7038eab88 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -13,7 +13,6 @@
  * 
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
diff --git a/drivers/video/console/tileblit.c b/drivers/video/console/tileblit.c
index 153352ca9461..d981fe4d86c6 100644
--- a/drivers/video/console/tileblit.c
+++ b/drivers/video/console/tileblit.c
@@ -8,7 +8,6 @@
  *  more details.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/fb.h>
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index e64d42e2449e..0a2c10a1abf8 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -33,13 +33,11 @@
  *  more details.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/sched.h>
 #include <linux/fs.h>
 #include <linux/kernel.h>
-#include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/string.h>
 #include <linux/kd.h>
@@ -49,6 +47,7 @@
 #include <linux/spinlock.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
+#include <linux/screen_info.h>
 #include <linux/smp_lock.h>
 #include <video/vga.h>
 #include <asm/io.h>
@@ -114,6 +113,7 @@ static int 		vga_512_chars;
 static int              vga_video_font_height;
 static int              vga_scan_lines;
 static unsigned int     vga_rolled_over = 0;
+static int              vga_init_done;
 
 static int __init no_scroll(char *str)
 {
@@ -190,7 +190,7 @@ static void vgacon_scrollback_init(int pitch)
         }
 }
 
-static void __init vgacon_scrollback_startup(void)
+static void vgacon_scrollback_startup(void)
 {
         vgacon_scrollback = alloc_bootmem(CONFIG_VGACON_SOFT_SCROLLBACK_SIZE
                                           * 1024);
@@ -355,7 +355,7 @@ static int vgacon_scrolldelta(struct vc_data *c, int lines)
 }
 #endif /* CONFIG_VGACON_SOFT_SCROLLBACK */
 
-static const char __init *vgacon_startup(void)
+static const char *vgacon_startup(void)
 {
         const char *display_desc = NULL;
         u16 saved1, saved2;
@@ -389,7 +389,7 @@ static const char __init *vgacon_startup(void)
                 vga_video_port_val = VGA_CRT_DM;
                 if ((ORIG_VIDEO_EGA_BX & 0xff) != 0x10) {
                         static struct resource ega_console_resource =
-                            { "ega", 0x3B0, 0x3BF };
+                            { .name = "ega", .start = 0x3B0, .end = 0x3BF };
                         vga_video_type = VIDEO_TYPE_EGAM;
                         vga_vram_size = 0x8000;
                         display_desc = "EGA+";
@@ -397,9 +397,9 @@ static const char __init *vgacon_startup(void)
                                          &ega_console_resource);
                 } else {
                         static struct resource mda1_console_resource =
-                            { "mda", 0x3B0, 0x3BB };
+                            { .name = "mda", .start = 0x3B0, .end = 0x3BB };
                         static struct resource mda2_console_resource =
-                            { "mda", 0x3BF, 0x3BF };
+                            { .name = "mda", .start = 0x3BF, .end = 0x3BF };
                         vga_video_type = VIDEO_TYPE_MDA;
                         vga_vram_size = 0x2000;
                         display_desc = "*MDA";
@@ -422,14 +422,14 @@ static const char __init *vgacon_startup(void)
 
                         if (!ORIG_VIDEO_ISVGA) {
                                 static struct resource ega_console_resource
-                                    = { "ega", 0x3C0, 0x3DF };
+                                    = { .name = "ega", .start = 0x3C0, .end = 0x3DF };
                                 vga_video_type = VIDEO_TYPE_EGAC;
                                 display_desc = "EGA";
                                 request_resource(&ioport_resource,
                                                  &ega_console_resource);
                         } else {
                                 static struct resource vga_console_resource
-                                    = { "vga+", 0x3C0, 0x3DF };
+                                    = { .name = "vga+", .start = 0x3C0, .end = 0x3DF };
                                 vga_video_type = VIDEO_TYPE_VGAC;
                                 display_desc = "VGA+";
                                 request_resource(&ioport_resource,
@@ -473,7 +473,7 @@ static const char __init *vgacon_startup(void)
                         }
                 } else {
                         static struct resource cga_console_resource =
-                            { "cga", 0x3D4, 0x3D5 };
+                            { .name = "cga", .start = 0x3D4, .end = 0x3D5 };
                         vga_video_type = VIDEO_TYPE_CGA;
                         vga_vram_size = 0x2000;
                         display_desc = "*CGA";
@@ -523,7 +523,12 @@ static const char __init *vgacon_startup(void)
 
         vgacon_xres = ORIG_VIDEO_COLS * VGA_FONTWIDTH;
         vgacon_yres = vga_scan_lines;
-        vgacon_scrollback_startup();
+
+        if (!vga_init_done) {
+                vgacon_scrollback_startup();
+                vga_init_done = 1;
+        }
+
         return display_desc;
 }
 
@@ -531,10 +536,20 @@ static void vgacon_init(struct vc_data *c, int init)
 {
         unsigned long p;
 
-        /* We cannot be loaded as a module, therefore init is always 1 */
+        /*
+         * We cannot be loaded as a module, therefore init is always 1,
+         * but vgacon_init can be called more than once, and init will
+         * not be 1.
+         */
         c->vc_can_do_color = vga_can_do_color;
-        c->vc_cols = vga_video_num_columns;
-        c->vc_rows = vga_video_num_lines;
+
+        /* set dimensions manually if init != 0 since vc_resize() will fail */
+        if (init) {
+                c->vc_cols = vga_video_num_columns;
+                c->vc_rows = vga_video_num_lines;
+        } else
+                vc_resize(c, vga_video_num_columns, vga_video_num_lines);
+
         c->vc_scan_lines = vga_scan_lines;
         c->vc_font.height = vga_video_font_height;
         c->vc_complement_mask = 0x7700;
diff --git a/drivers/video/controlfb.c b/drivers/video/controlfb.c
index 655301a8671c..8cc6c0e2d27a 100644
--- a/drivers/video/controlfb.c
+++ b/drivers/video/controlfb.c
@@ -31,13 +31,11 @@
  *  more details.
  */
 
-#include <linux/config.h>
 #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/vmalloc.h>
 #include <linux/delay.h>
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c
index 55a3514157ed..aae6d9c26e88 100644
--- a/drivers/video/cyber2000fb.c
+++ b/drivers/video/cyber2000fb.c
@@ -36,13 +36,11 @@
  * (which, incidentally, is about the same saving as a 2.5in hard disk
  * entering standby mode.)
  */
-#include <linux/config.h>
 #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>
diff --git a/drivers/video/cyber2000fb.h b/drivers/video/cyber2000fb.h
index bd7e1c040781..de4fc43e51c1 100644
--- a/drivers/video/cyber2000fb.h
+++ b/drivers/video/cyber2000fb.h
@@ -9,7 +9,6 @@
  *
  * Integraphics Cyber2000 frame buffer device
  */
-#include <linux/config.h>
 
 /*
  * Internal CyberPro sizes and offsets.
diff --git a/drivers/video/cyberfb.c b/drivers/video/cyberfb.c
index a3e189f90a7d..c40e72dafb0e 100644
--- a/drivers/video/cyberfb.c
+++ b/drivers/video/cyberfb.c
@@ -81,7 +81,6 @@
 #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/zorro.h>
diff --git a/drivers/video/cyblafb.c b/drivers/video/cyblafb.c
index 0ae0a97b0fed..94a66c2d2cf5 100644
--- a/drivers/video/cyblafb.c
+++ b/drivers/video/cyblafb.c
@@ -14,7 +14,6 @@
 
 #define CYBLAFB_PIXMAPSIZE 8192
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/fb.h>
diff --git a/drivers/video/dnfb.c b/drivers/video/dnfb.c
index 5abd3cb00671..b083ea7e9c69 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/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c
index 082759447bf6..737257d278f0 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/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
@@ -605,11 +604,6 @@ static void clearfb16(struct fb_info *info)
                 fb_writeb(0, dst);
 }
 
-static void epson1355fb_platform_release(struct device *device)
-{
-        dev_err(device, "This driver is broken, please bug the authors so they will fix it.\n");
-}
-
 static int epson1355fb_remove(struct platform_device *dev)
 {
         struct fb_info *info = platform_get_drvdata(dev);
@@ -733,13 +727,7 @@ static struct platform_driver epson1355fb_driver = {
         },
 };
 
-static struct platform_device epson1355fb_device = {
-        .name   = "epson1355fb",
-        .id     = 0,
-        .dev    = {
-                .release = epson1355fb_platform_release,
-        }
-};
+static struct platform_device *epson1355fb_device;
 
 int __init epson1355fb_init(void)
 {
@@ -749,11 +737,21 @@ int __init epson1355fb_init(void)
                 return -ENODEV;
 
         ret = platform_driver_register(&epson1355fb_driver);
+
         if (!ret) {
-                ret = platform_device_register(&epson1355fb_device);
-                if (ret)
+                epson1355fb_device = platform_device_alloc("epson1355fb", 0);
+
+                if (epson1355fb_device)
+                        ret = platform_device_add(epson1355fb_device);
+                else
+                        ret = -ENOMEM;
+
+                if (ret) {
+                        platform_device_put(epson1355fb_device);
                         platform_driver_unregister(&epson1355fb_driver);
+                }
         }
+
         return ret;
 }
 
@@ -762,7 +760,7 @@ module_init(epson1355fb_init);
 #ifdef MODULE
 static void __exit epson1355fb_exit(void)
 {
-        platform_device_unregister(&epson1355fb_device);
+        platform_device_unregister(epson1355fb_device);
         platform_driver_unregister(&epson1355fb_driver);
 }
 
diff --git a/drivers/video/fb_notify.c b/drivers/video/fb_notify.c
new file mode 100644
index 000000000000..8c020389e4fa
--- /dev/null
+++ b/drivers/video/fb_notify.c
@@ -0,0 +1,46 @@
+/*
+ *  linux/drivers/video/fb_notify.c
+ *
+ *  Copyright (C) 2006 Antonino Daplas <adaplas@pol.net>
+ *
+ *      2001 - Documented with DocBook
+ *      - Brad Douglas <brad@neruo.com>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file COPYING in the main directory of this archive
+ * for more details.
+ */
+#include <linux/fb.h>
+#include <linux/notifier.h>
+
+static BLOCKING_NOTIFIER_HEAD(fb_notifier_list);
+
+/**
+ *      fb_register_client - register a client notifier
+ *      @nb: notifier block to callback on events
+ */
+int fb_register_client(struct notifier_block *nb)
+{
+        return blocking_notifier_chain_register(&fb_notifier_list, nb);
+}
+EXPORT_SYMBOL(fb_register_client);
+
+/**
+ *      fb_unregister_client - unregister a client notifier
+ *      @nb: notifier block to callback on events
+ */
+int fb_unregister_client(struct notifier_block *nb)
+{
+        return blocking_notifier_chain_unregister(&fb_notifier_list, nb);
+}
+EXPORT_SYMBOL(fb_unregister_client);
+
+/**
+ * fb_notifier_call_chain - notify clients of fb_events
+ *
+ */
+int fb_notifier_call_chain(unsigned long val, void *v)
+{
+        return blocking_notifier_call_chain(&fb_notifier_list, val, v);
+}
+EXPORT_SYMBOL_GPL(fb_notifier_call_chain);
diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
index 1f98392a43b3..e8b135f3d80d 100644
--- a/drivers/video/fbcmap.c
+++ b/drivers/video/fbcmap.c
@@ -13,7 +13,6 @@
 
 #include <linux/string.h>
 #include <linux/module.h>
-#include <linux/tty.h>
 #include <linux/fb.h>
 #include <linux/slab.h>
 
diff --git a/drivers/video/fbcvt.c b/drivers/video/fbcvt.c
index ac90883dc3aa..b5498999c4ec 100644
--- a/drivers/video/fbcvt.c
+++ b/drivers/video/fbcvt.c
@@ -376,4 +376,3 @@ int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb)
 
         return 0;
 }
-EXPORT_SYMBOL(fb_find_mode_cvt);
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 372aa1776827..17961e3ecaa0 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -11,7 +11,6 @@
  * for more details.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 
 #include <linux/compat.h>
@@ -24,7 +23,7 @@
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/mman.h>
-#include <linux/tty.h>
+#include <linux/vt.h>
 #include <linux/init.h>
 #include <linux/linux_logo.h>
 #include <linux/proc_fs.h>
@@ -32,9 +31,7 @@
 #ifdef CONFIG_KMOD
 #include <linux/kmod.h>
 #endif
-#include <linux/devfs_fs_kernel.h>
 #include <linux/err.h>
-#include <linux/kernel.h>
 #include <linux/device.h>
 #include <linux/efi.h>
 
@@ -55,7 +52,6 @@
 
 #define FBPIXMAPSIZE    (1024 * 8)
 
-static BLOCKING_NOTIFIER_HEAD(fb_notifier_list);
 struct fb_info *registered_fb[FB_MAX];
 int num_registered_fb;
 
@@ -162,7 +158,6 @@ char* fb_get_buffer_offset(struct fb_info *info, struct fb_pixmap *buf, u32 size
 }
 
 #ifdef CONFIG_LOGO
-#include <linux/linux_logo.h>
 
 static inline unsigned safe_shift(unsigned d, int n)
 {
@@ -336,11 +331,11 @@ static void fb_rotate_logo_ud(const u8 *in, u8 *out, u32 width, u32 height)
 
 static void fb_rotate_logo_cw(const u8 *in, u8 *out, u32 width, u32 height)
 {
-        int i, j, w = width - 1;
+        int i, j, h = height - 1;
 
         for (i = 0; i < height; i++)
                 for (j = 0; j < width; j++)
-                        out[height * j + w - i] = *in++;
+                                out[height * j + h - i] = *in++;
 }
 
 static void fb_rotate_logo_ccw(const u8 *in, u8 *out, u32 width, u32 height)
@@ -358,24 +353,24 @@ static void fb_rotate_logo(struct fb_info *info, u8 *dst,
         u32 tmp;
 
         if (rotate == FB_ROTATE_UD) {
-                image->dx = info->var.xres - image->width;
-                image->dy = info->var.yres - image->height;
                 fb_rotate_logo_ud(image->data, dst, image->width,
                                   image->height);
+                image->dx = info->var.xres - image->width;
+                image->dy = info->var.yres - image->height;
         } else if (rotate == FB_ROTATE_CW) {
-                tmp = image->width;
-                image->width = image->height;
-                image->height = tmp;
-                image->dx = info->var.xres - image->height;
                 fb_rotate_logo_cw(image->data, dst, image->width,
                                   image->height);
-        } else if (rotate == FB_ROTATE_CCW) {
                 tmp = image->width;
                 image->width = image->height;
                 image->height = tmp;
-                image->dy = info->var.yres - image->width;
+                image->dx = info->var.xres - image->width;
+        } else if (rotate == FB_ROTATE_CCW) {
                 fb_rotate_logo_ccw(image->data, dst, image->width,
                                    image->height);
+                tmp = image->width;
+                image->width = image->height;
+                image->height = tmp;
+                image->dy = info->var.yres - image->height;
         }
 
         image->data = dst;
@@ -435,7 +430,7 @@ int fb_prepare_logo(struct fb_info *info, int rotate)
                         depth = info->var.green.length;
         }
 
-        if (info->fix.visual == FB_VISUAL_STATIC_PSEUDOCOLOR) {
+        if (info->fix.visual == FB_VISUAL_STATIC_PSEUDOCOLOR && depth > 4) {
                 /* assume console colormap */
                 depth = 4;
         }
@@ -795,8 +790,7 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
 
                     event.info = info;
                     event.data = &mode1;
-                    ret = blocking_notifier_call_chain(&fb_notifier_list,
-                                              FB_EVENT_MODE_DELETE, &event);
+                    ret = fb_notifier_call_chain(FB_EVENT_MODE_DELETE, &event);
                 }
 
                 if (!ret)
@@ -841,8 +835,7 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
 
                                 info->flags &= ~FBINFO_MISC_USEREVENT;
                                 event.info = info;
-                                blocking_notifier_call_chain(&fb_notifier_list,
-                                                evnt, &event);
+                                fb_notifier_call_chain(evnt, &event);
                         }
                 }
         }
@@ -865,8 +858,7 @@ fb_blank(struct fb_info *info, int blank)
 
                 event.info = info;
                 event.data = &blank;
-                blocking_notifier_call_chain(&fb_notifier_list,
-                                FB_EVENT_BLANK, &event);
+                fb_notifier_call_chain(FB_EVENT_BLANK, &event);
         }
 
         return ret;
@@ -937,8 +929,7 @@ fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                 con2fb.framebuffer = -1;
                 event.info = info;
                 event.data = &con2fb;
-                blocking_notifier_call_chain(&fb_notifier_list,
-                                    FB_EVENT_GET_CONSOLE_MAP, &event);
+                fb_notifier_call_chain(FB_EVENT_GET_CONSOLE_MAP, &event);
                 return copy_to_user(argp, &con2fb,
                                     sizeof(con2fb)) ? -EFAULT : 0;
         case FBIOPUT_CON2FBMAP:
@@ -956,9 +947,8 @@ fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                     return -EINVAL;
                 event.info = info;
                 event.data = &con2fb;
-                return blocking_notifier_call_chain(&fb_notifier_list,
-                                           FB_EVENT_SET_CONSOLE_MAP,
-                                           &event);
+                return fb_notifier_call_chain(FB_EVENT_SET_CONSOLE_MAP,
+                                              &event);
         case FBIOBLANK:
                 acquire_console_sem();
                 info->flags |= FBINFO_MISC_USEREVENT;
@@ -1278,8 +1268,8 @@ static struct file_operations fb_fops = {
 #endif
 };
 
-static struct class *fb_class;
-
+struct class *fb_class;
+EXPORT_SYMBOL(fb_class);
 /**
  *      register_framebuffer - registers a frame buffer device
  *      @fb_info: frame buffer info structure
@@ -1333,11 +1323,8 @@ register_framebuffer(struct fb_info *fb_info)
         fb_add_videomode(&mode, &fb_info->modelist);
         registered_fb[i] = fb_info;
 
-        devfs_mk_cdev(MKDEV(FB_MAJOR, i),
-                        S_IFCHR | S_IRUGO | S_IWUGO, "fb/%d", i);
         event.info = fb_info;
-        blocking_notifier_call_chain(&fb_notifier_list,
-                            FB_EVENT_FB_REGISTERED, &event);
+        fb_notifier_call_chain(FB_EVENT_FB_REGISTERED, &event);
         return 0;
 }
 
@@ -1355,42 +1342,27 @@ register_framebuffer(struct fb_info *fb_info)
 int
 unregister_framebuffer(struct fb_info *fb_info)
 {
+        struct fb_event event;
         int i;
 
         i = fb_info->node;
         if (!registered_fb[i])
                 return -EINVAL;
-        devfs_remove("fb/%d", i);
 
-        if (fb_info->pixmap.addr && (fb_info->pixmap.flags & FB_PIXMAP_DEFAULT))
+        if (fb_info->pixmap.addr &&
+            (fb_info->pixmap.flags & FB_PIXMAP_DEFAULT))
                 kfree(fb_info->pixmap.addr);
         fb_destroy_modelist(&fb_info->modelist);
         registered_fb[i]=NULL;
         num_registered_fb--;
         fb_cleanup_class_device(fb_info);
         class_device_destroy(fb_class, MKDEV(FB_MAJOR, i));
+        event.info = fb_info;
+        fb_notifier_call_chain(FB_EVENT_FB_UNREGISTERED, &event);
         return 0;
 }
 
 /**
- *      fb_register_client - register a client notifier
- *      @nb: notifier block to callback on events
- */
-int fb_register_client(struct notifier_block *nb)
-{
-        return blocking_notifier_chain_register(&fb_notifier_list, nb);
-}
-
-/**
- *      fb_unregister_client - unregister a client notifier
- *      @nb: notifier block to callback on events
- */
-int fb_unregister_client(struct notifier_block *nb)
-{
-        return blocking_notifier_chain_unregister(&fb_notifier_list, nb);
-}
-
-/**
  *      fb_set_suspend - low level driver signals suspend
  *      @info: framebuffer affected
  *      @state: 0 = resuming, !=0 = suspending
@@ -1405,13 +1377,11 @@ void fb_set_suspend(struct fb_info *info, int state)
 
         event.info = info;
         if (state) {
-                blocking_notifier_call_chain(&fb_notifier_list,
-                                FB_EVENT_SUSPEND, &event);
+                fb_notifier_call_chain(FB_EVENT_SUSPEND, &event);
                 info->state = FBINFO_STATE_SUSPENDED;
         } else {
                 info->state = FBINFO_STATE_RUNNING;
-                blocking_notifier_call_chain(&fb_notifier_list,
-                                FB_EVENT_RESUME, &event);
+                fb_notifier_call_chain(FB_EVENT_RESUME, &event);
         }
 }
 
@@ -1429,7 +1399,6 @@ fbmem_init(void)
 {
         create_proc_read_entry("fb", 0, NULL, fbmem_read_proc, NULL);
 
-        devfs_mk_dir("fb");
         if (register_chrdev(FB_MAJOR,"fb",&fb_fops))
                 printk("unable to get major %d for fb devs\n", FB_MAJOR);
 
@@ -1483,36 +1452,12 @@ int fb_new_modelist(struct fb_info *info)
 
         if (!list_empty(&info->modelist)) {
                 event.info = info;
-                err = blocking_notifier_call_chain(&fb_notifier_list,
-                                           FB_EVENT_NEW_MODELIST,
-                                           &event);
+                err = fb_notifier_call_chain(FB_EVENT_NEW_MODELIST, &event);
         }
 
         return err;
 }
 
-/**
- * fb_con_duit - user<->fbcon passthrough
- * @info: struct fb_info
- * @event: notification event to be passed to fbcon
- * @data: private data
- *
- * DESCRIPTION
- * This function is an fbcon-user event passing channel
- * which bypasses fbdev.  This is hopefully temporary
- * until a user interface for fbcon is created
- */
-int fb_con_duit(struct fb_info *info, int event, void *data)
-{
-        struct fb_event evnt;
-
-        evnt.info = info;
-        evnt.data = data;
-
-        return blocking_notifier_call_chain(&fb_notifier_list, event, &evnt);
-}
-EXPORT_SYMBOL(fb_con_duit);
-
 static char *video_options[FB_MAX];
 static int ofonly;
 
@@ -1619,9 +1564,6 @@ EXPORT_SYMBOL(fb_blank);
 EXPORT_SYMBOL(fb_pan_display);
 EXPORT_SYMBOL(fb_get_buffer_offset);
 EXPORT_SYMBOL(fb_set_suspend);
-EXPORT_SYMBOL(fb_register_client);
-EXPORT_SYMBOL(fb_unregister_client);
 EXPORT_SYMBOL(fb_get_options);
-EXPORT_SYMBOL(fb_new_modelist);
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c
index 53beeb4a9998..de93139ccbb5 100644
--- a/drivers/video/fbmon.c
+++ b/drivers/video/fbmon.c
@@ -26,12 +26,11 @@
  * for more details.
  *
  */
-#include <linux/tty.h>
 #include <linux/fb.h>
 #include <linux/module.h>
+#include <linux/pci.h>
 #include <video/edid.h>
 #ifdef CONFIG_PPC_OF
-#include <linux/pci.h>
 #include <asm/prom.h>
 #include <asm/pci-bridge.h>
 #endif
@@ -605,6 +604,7 @@ static int fb_get_monitor_limits(unsigned char *edid, struct fb_monspecs *specs)
         block = edid + DETAILED_TIMING_DESCRIPTIONS_START;
 
         DPRINTK("      Monitor Operating Limits: ");
+
         for (i = 0; i < 4; i++, block += DETAILED_TIMING_DESCRIPTION_SIZE) {
                 if (edid_is_limits_block(block)) {
                         specs->hfmin = H_MIN_RATE * 1000;
@@ -618,11 +618,12 @@ static int fb_get_monitor_limits(unsigned char *edid, struct fb_monspecs *specs)
                         break;
                 }
         }
-        
+
         /* estimate monitor limits based on modes supported */
         if (retval) {
-                struct fb_videomode *modes;
+                struct fb_videomode *modes, *mode;
                 int num_modes, i, hz, hscan, pixclock;
+                int vtotal, htotal;
 
                 modes = fb_create_modedb(edid, &num_modes);
                 if (!modes) {
@@ -632,20 +633,38 @@ static int fb_get_monitor_limits(unsigned char *edid, struct fb_monspecs *specs)
 
                 retval = 0;
                 for (i = 0; i < num_modes; i++) {
-                        hz = modes[i].refresh;
+                        mode = &modes[i];
                         pixclock = PICOS2KHZ(modes[i].pixclock) * 1000;
-                        hscan = (modes[i].yres * 105 * hz + 5000)/100;
+                        htotal = mode->xres + mode->right_margin + mode->hsync_len
+                                + mode->left_margin;
+                        vtotal = mode->yres + mode->lower_margin + mode->vsync_len
+                                + mode->upper_margin;
+
+                        if (mode->vmode & FB_VMODE_INTERLACED)
+                                vtotal /= 2;
+
+                        if (mode->vmode & FB_VMODE_DOUBLE)
+                                vtotal *= 2;
+
+                        hscan = (pixclock + htotal / 2) / htotal;
+                        hscan = (hscan + 500) / 1000 * 1000;
+                        hz = (hscan + vtotal / 2) / vtotal;
                         
                         if (specs->dclkmax == 0 || specs->dclkmax < pixclock)
                                 specs->dclkmax = pixclock;
+
                         if (specs->dclkmin == 0 || specs->dclkmin > pixclock)
                                 specs->dclkmin = pixclock;
+
                         if (specs->hfmax == 0 || specs->hfmax < hscan)
                                 specs->hfmax = hscan;
+
                         if (specs->hfmin == 0 || specs->hfmin > hscan)
                                 specs->hfmin = hscan;
+
                         if (specs->vfmax == 0 || specs->vfmax < hz)
                                 specs->vfmax = hz;
+
                         if (specs->vfmin == 0 || specs->vfmin > hz)
                                 specs->vfmin = hz;
                 }
@@ -1281,8 +1300,7 @@ int fb_validate_mode(const struct fb_var_screeninfo *var, struct fb_info *info)
                 -EINVAL : 0;
 }
 
-#if defined(CONFIG_FB_FIRMWARE_EDID) && defined(__i386__)
-#include <linux/pci.h>
+#if defined(CONFIG_FIRMWARE_EDID) && defined(CONFIG_X86)
 
 /*
  * We need to ensure that the EDID block is only returned for
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c
index 34e07399756b..c151dcf68786 100644
--- a/drivers/video/fbsysfs.c
+++ b/drivers/video/fbsysfs.c
@@ -18,6 +18,7 @@
 #include <linux/kernel.h>
 #include <linux/fb.h>
 #include <linux/console.h>
+#include <linux/module.h>
 
 /**
  * framebuffer_alloc - creates a new frame buffer info structure
@@ -55,6 +56,10 @@ struct fb_info *framebuffer_alloc(size_t size, struct device *dev)
 
         info->device = dev;
 
+#ifdef CONFIG_FB_BACKLIGHT
+        mutex_init(&info->bl_mutex);
+#endif
+
         return info;
 #undef PADDING
 #undef BYTES_PER_LONG
@@ -95,13 +100,22 @@ static int mode_string(char *buf, unsigned int offset,
                        const struct fb_videomode *mode)
 {
         char m = 'U';
+        char v = 'p';
+
         if (mode->flag & FB_MODE_IS_DETAILED)
                 m = 'D';
         if (mode->flag & FB_MODE_IS_VESA)
                 m = 'V';
         if (mode->flag & FB_MODE_IS_STANDARD)
                 m = 'S';
-        return snprintf(&buf[offset], PAGE_SIZE - offset, "%c:%dx%d-%d\n", m, mode->xres, mode->yres, mode->refresh);
+
+        if (mode->vmode & FB_VMODE_INTERLACED)
+                v = 'i';
+        if (mode->vmode & FB_VMODE_DOUBLE)
+                v = 'd';
+
+        return snprintf(&buf[offset], PAGE_SIZE - offset, "%c:%dx%d%c-%d\n",
+                        m, mode->xres, mode->yres, v, mode->refresh);
 }
 
 static ssize_t store_mode(struct class_device *class_device, const char * buf,
@@ -233,45 +247,6 @@ static ssize_t show_rotate(struct class_device *class_device, char *buf)
         return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->var.rotate);
 }
 
-static ssize_t store_con_rotate(struct class_device *class_device,
-                                const char *buf, size_t count)
-{
-        struct fb_info *fb_info = class_get_devdata(class_device);
-        int rotate;
-        char **last = NULL;
-
-        acquire_console_sem();
-        rotate = simple_strtoul(buf, last, 0);
-        fb_con_duit(fb_info, FB_EVENT_SET_CON_ROTATE, &rotate);
-        release_console_sem();
-        return count;
-}
-
-static ssize_t store_con_rotate_all(struct class_device *class_device,
-                                const char *buf, size_t count)
-{
-        struct fb_info *fb_info = class_get_devdata(class_device);
-        int rotate;
-        char **last = NULL;
-
-        acquire_console_sem();
-        rotate = simple_strtoul(buf, last, 0);
-        fb_con_duit(fb_info, FB_EVENT_SET_CON_ROTATE_ALL, &rotate);
-        release_console_sem();
-        return count;
-}
-
-static ssize_t show_con_rotate(struct class_device *class_device, char *buf)
-{
-        struct fb_info *fb_info = class_get_devdata(class_device);
-        int rotate;
-
-        acquire_console_sem();
-        rotate = fb_con_duit(fb_info, FB_EVENT_GET_CON_ROTATE, NULL);
-        release_console_sem();
-        return snprintf(buf, PAGE_SIZE, "%d\n", rotate);
-}
-
 static ssize_t store_virtual(struct class_device *class_device,
                              const char * buf, size_t count)
 {
@@ -414,6 +389,77 @@ static ssize_t show_fbstate(struct class_device *class_device, char *buf)
         return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->state);
 }
 
+#ifdef CONFIG_FB_BACKLIGHT
+static ssize_t store_bl_curve(struct class_device *class_device,
+                const char *buf, size_t count)
+{
+        struct fb_info *fb_info = class_get_devdata(class_device);
+        u8 tmp_curve[FB_BACKLIGHT_LEVELS];
+        unsigned int i;
+
+        /* Some drivers don't use framebuffer_alloc(), but those also
+         * don't have backlights.
+         */
+        if (!fb_info || !fb_info->bl_dev)
+                return -ENODEV;
+
+        if (count != (FB_BACKLIGHT_LEVELS / 8 * 24))
+                return -EINVAL;
+
+        for (i = 0; i < (FB_BACKLIGHT_LEVELS / 8); ++i)
+                if (sscanf(&buf[i * 24],
+                        "%2hhx %2hhx %2hhx %2hhx %2hhx %2hhx %2hhx %2hhx\n",
+                        &tmp_curve[i * 8 + 0],
+                        &tmp_curve[i * 8 + 1],
+                        &tmp_curve[i * 8 + 2],
+                        &tmp_curve[i * 8 + 3],
+                        &tmp_curve[i * 8 + 4],
+                        &tmp_curve[i * 8 + 5],
+                        &tmp_curve[i * 8 + 6],
+                        &tmp_curve[i * 8 + 7]) != 8)
+                        return -EINVAL;
+
+        /* If there has been an error in the input data, we won't
+         * reach this loop.
+         */
+        mutex_lock(&fb_info->bl_mutex);
+        for (i = 0; i < FB_BACKLIGHT_LEVELS; ++i)
+                fb_info->bl_curve[i] = tmp_curve[i];
+        mutex_unlock(&fb_info->bl_mutex);
+
+        return count;
+}
+
+static ssize_t show_bl_curve(struct class_device *class_device, char *buf)
+{
+        struct fb_info *fb_info = class_get_devdata(class_device);
+        ssize_t len = 0;
+        unsigned int i;
+
+        /* Some drivers don't use framebuffer_alloc(), but those also
+         * don't have backlights.
+         */
+        if (!fb_info || !fb_info->bl_dev)
+                return -ENODEV;
+
+        mutex_lock(&fb_info->bl_mutex);
+        for (i = 0; i < FB_BACKLIGHT_LEVELS; i += 8)
+                len += snprintf(&buf[len], PAGE_SIZE,
+                                "%02x %02x %02x %02x %02x %02x %02x %02x\n",
+                                fb_info->bl_curve[i + 0],
+                                fb_info->bl_curve[i + 1],
+                                fb_info->bl_curve[i + 2],
+                                fb_info->bl_curve[i + 3],
+                                fb_info->bl_curve[i + 4],
+                                fb_info->bl_curve[i + 5],
+                                fb_info->bl_curve[i + 6],
+                                fb_info->bl_curve[i + 7]);
+        mutex_unlock(&fb_info->bl_mutex);
+
+        return len;
+}
+#endif
+
 /* When cmap is added back in it should be a binary attribute
  * not a text one. Consideration should also be given to converting
  * fbdev to use configfs instead of sysfs */
@@ -429,9 +475,10 @@ static struct class_device_attribute class_device_attrs[] = {
         __ATTR(name, S_IRUGO, show_name, NULL),
         __ATTR(stride, S_IRUGO, show_stride, NULL),
         __ATTR(rotate, S_IRUGO|S_IWUSR, show_rotate, store_rotate),
-        __ATTR(con_rotate, S_IRUGO|S_IWUSR, show_con_rotate, store_con_rotate),
-        __ATTR(con_rotate_all, S_IWUSR, NULL, store_con_rotate_all),
         __ATTR(state, S_IRUGO|S_IWUSR, show_fbstate, store_fbstate),
+#ifdef CONFIG_FB_BACKLIGHT
+        __ATTR(bl_curve, S_IRUGO|S_IWUSR, show_bl_curve, store_bl_curve),
+#endif
 };
 
 int fb_init_class_device(struct fb_info *fb_info)
@@ -454,4 +501,25 @@ void fb_cleanup_class_device(struct fb_info *fb_info)
                                          &class_device_attrs[i]);
 }
 
+#ifdef CONFIG_FB_BACKLIGHT
+/* This function generates a linear backlight curve
+ *
+ *     0: off
+ *   1-7: min
+ * 8-127: linear from min to max
+ */
+void fb_bl_default_curve(struct fb_info *fb_info, u8 off, u8 min, u8 max)
+{
+        unsigned int i, flat, count, range = (max - min);
 
+        fb_info->bl_curve[0] = off;
+
+        for (flat = 1; flat < (FB_BACKLIGHT_LEVELS / 16); ++flat)
+                fb_info->bl_curve[flat] = min;
+
+        count = FB_BACKLIGHT_LEVELS * 15 / 16;
+        for (i = 0; i < count; ++i)
+                fb_info->bl_curve[flat + i] = min + (range * (i + 1) / count);
+}
+EXPORT_SYMBOL_GPL(fb_bl_default_curve);
+#endif
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index 7633e41adda1..2a0e8210d398 100644
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -1,6 +1,6 @@
 /* ffb.c: Creator/Elite3D frame buffer driver
  *
- * Copyright (C) 2003 David S. Miller (davem@redhat.com)
+ * Copyright (C) 2003, 2006 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1997,1998,1999 Jakub Jelinek (jj@ultra.linux.cz)
  *
  * Driver layout based loosely on tgafb.c, see that file for credits.
@@ -19,7 +19,8 @@
 
 #include <asm/io.h>
 #include <asm/upa.h>
-#include <asm/oplib.h>
+#include <asm/prom.h>
+#include <asm/of_device.h>
 #include <asm/fbio.h>
 
 #include "sbuslib.h"
@@ -184,161 +185,161 @@ static struct fb_ops ffb_ops = {
 
 struct ffb_fbc {
         /* Next vertex registers */
-        u32             xxx1[3];
-        volatile u32    alpha;
-        volatile u32    red;
-        volatile u32    green;
-        volatile u32    blue;
-        volatile u32    depth;
-        volatile u32    y;
-        volatile u32    x;
-        u32             xxx2[2];
-        volatile u32    ryf;
-        volatile u32    rxf;
-        u32             xxx3[2];
+        u32     xxx1[3];
+        u32     alpha;
+        u32     red;
+        u32     green;
+        u32     blue;
+        u32     depth;
+        u32     y;
+        u32     x;
+        u32     xxx2[2];
+        u32     ryf;
+        u32     rxf;
+        u32     xxx3[2];
         
-        volatile u32    dmyf;
-        volatile u32    dmxf;
-        u32             xxx4[2];
-        volatile u32    ebyi;
-        volatile u32    ebxi;
-        u32             xxx5[2];
-        volatile u32    by;
-        volatile u32    bx;
-        u32             dy;
-        u32             dx;
-        volatile u32    bh;
-        volatile u32    bw;
-        u32             xxx6[2];
+        u32     dmyf;
+        u32     dmxf;
+        u32     xxx4[2];
+        u32     ebyi;
+        u32     ebxi;
+        u32     xxx5[2];
+        u32     by;
+        u32     bx;
+        u32     dy;
+        u32     dx;
+        u32     bh;
+        u32     bw;
+        u32     xxx6[2];
         
-        u32             xxx7[32];
+        u32     xxx7[32];
         
         /* Setup unit vertex state register */
-        volatile u32    suvtx;
-        u32             xxx8[63];
+        u32     suvtx;
+        u32     xxx8[63];
         
         /* Control registers */
-        volatile u32    ppc;
-        volatile u32    wid;
-        volatile u32    fg;
-        volatile u32    bg;
-        volatile u32    consty;
-        volatile u32    constz;
-        volatile u32    xclip;
-        volatile u32    dcss;
-        volatile u32    vclipmin;
-        volatile u32    vclipmax;
-        volatile u32    vclipzmin;
-        volatile u32    vclipzmax;
-        volatile u32    dcsf;
-        volatile u32    dcsb;
-        volatile u32    dczf;
-        volatile u32    dczb;
+        u32     ppc;
+        u32     wid;
+        u32     fg;
+        u32     bg;
+        u32     consty;
+        u32     constz;
+        u32     xclip;
+        u32     dcss;
+        u32     vclipmin;
+        u32     vclipmax;
+        u32     vclipzmin;
+        u32     vclipzmax;
+        u32     dcsf;
+        u32     dcsb;
+        u32     dczf;
+        u32     dczb;
         
-        u32             xxx9;
-        volatile u32    blendc;
-        volatile u32    blendc1;
-        volatile u32    blendc2;
-        volatile u32    fbramitc;
-        volatile u32    fbc;
-        volatile u32    rop;
-        volatile u32    cmp;
-        volatile u32    matchab;
-        volatile u32    matchc;
-        volatile u32    magnab;
-        volatile u32    magnc;
-        volatile u32    fbcfg0;
-        volatile u32    fbcfg1;
-        volatile u32    fbcfg2;
-        volatile u32    fbcfg3;
+        u32     xxx9;
+        u32     blendc;
+        u32     blendc1;
+        u32     blendc2;
+        u32     fbramitc;
+        u32     fbc;
+        u32     rop;
+        u32     cmp;
+        u32     matchab;
+        u32     matchc;
+        u32     magnab;
+        u32     magnc;
+        u32     fbcfg0;
+        u32     fbcfg1;
+        u32     fbcfg2;
+        u32     fbcfg3;
         
-        u32             ppcfg;
-        volatile u32    pick;
-        volatile u32    fillmode;
-        volatile u32    fbramwac;
-        volatile u32    pmask;
-        volatile u32    xpmask;
-        volatile u32    ypmask;
-        volatile u32    zpmask;
-        volatile u32    clip0min;
-        volatile u32    clip0max;
-        volatile u32    clip1min;
-        volatile u32    clip1max;
-        volatile u32    clip2min;
-        volatile u32    clip2max;
-        volatile u32    clip3min;
-        volatile u32    clip3max;
+        u32     ppcfg;
+        u32     pick;
+        u32     fillmode;
+        u32     fbramwac;
+        u32     pmask;
+        u32     xpmask;
+        u32     ypmask;
+        u32     zpmask;
+        u32     clip0min;
+        u32     clip0max;
+        u32     clip1min;
+        u32     clip1max;
+        u32     clip2min;
+        u32     clip2max;
+        u32     clip3min;
+        u32     clip3max;
         
         /* New 3dRAM III support regs */
-        volatile u32    rawblend2;
-        volatile u32    rawpreblend;
-        volatile u32    rawstencil;
-        volatile u32    rawstencilctl;
-        volatile u32    threedram1;
-        volatile u32    threedram2;
-        volatile u32    passin;
-        volatile u32    rawclrdepth;
-        volatile u32    rawpmask;
-        volatile u32    rawcsrc;
-        volatile u32    rawmatch;
-        volatile u32    rawmagn;
-        volatile u32    rawropblend;
-        volatile u32    rawcmp;
-        volatile u32    rawwac;
-        volatile u32    fbramid;
+        u32     rawblend2;
+        u32     rawpreblend;
+        u32     rawstencil;
+        u32     rawstencilctl;
+        u32     threedram1;
+        u32     threedram2;
+        u32     passin;
+        u32     rawclrdepth;
+        u32     rawpmask;
+        u32     rawcsrc;
+        u32     rawmatch;
+        u32     rawmagn;
+        u32     rawropblend;
+        u32     rawcmp;
+        u32     rawwac;
+        u32     fbramid;
         
-        volatile u32    drawop;
-        u32             xxx10[2];
-        volatile u32    fontlpat;
-        u32             xxx11;
-        volatile u32    fontxy;
-        volatile u32    fontw;
-        volatile u32    fontinc;
-        volatile u32    font;
-        u32             xxx12[3];
-        volatile u32    blend2;
-        volatile u32    preblend;
-        volatile u32    stencil;
-        volatile u32    stencilctl;
-
-        u32             xxx13[4];       
-        volatile u32    dcss1;
-        volatile u32    dcss2;
-        volatile u32    dcss3;
-        volatile u32    widpmask;
-        volatile u32    dcs2;
-        volatile u32    dcs3;
-        volatile u32    dcs4;
-        u32             xxx14;
-        volatile u32    dcd2;
-        volatile u32    dcd3;
-        volatile u32    dcd4;
-        u32             xxx15;
+        u32     drawop;
+        u32     xxx10[2];
+        u32     fontlpat;
+        u32     xxx11;
+        u32     fontxy;
+        u32     fontw;
+        u32     fontinc;
+        u32     font;
+        u32     xxx12[3];
+        u32     blend2;
+        u32     preblend;
+        u32     stencil;
+        u32     stencilctl;
+
+        u32     xxx13[4];       
+        u32     dcss1;
+        u32     dcss2;
+        u32     dcss3;
+        u32     widpmask;
+        u32     dcs2;
+        u32     dcs3;
+        u32     dcs4;
+        u32     xxx14;
+        u32     dcd2;
+        u32     dcd3;
+        u32     dcd4;
+        u32     xxx15;
         
-        volatile u32    pattern[32];
+        u32     pattern[32];
         
-        u32             xxx16[256];
+        u32     xxx16[256];
         
-        volatile u32    devid;
-        u32             xxx17[63];
+        u32     devid;
+        u32     xxx17[63];
         
-        volatile u32    ucsr;
-        u32             xxx18[31];
+        u32     ucsr;
+        u32     xxx18[31];
         
-        volatile u32    mer;
+        u32     mer;
 };
 
 struct ffb_dac {
-        volatile u32    type;
-        volatile u32    value;
-        volatile u32    type2;
-        volatile u32    value2;
+        u32     type;
+        u32     value;
+        u32     type2;
+        u32     value2;
 };
 
 struct ffb_par {
         spinlock_t              lock;
-        struct ffb_fbc          *fbc;
-        struct ffb_dac          *dac;
+        struct ffb_fbc __iomem  *fbc;
+        struct ffb_dac __iomem  *dac;
 
         u32                     flags;
 #define FFB_FLAG_AFB            0x00000001
@@ -353,16 +354,13 @@ struct ffb_par {
         unsigned long           physbase;
         unsigned long           fbsize;
 
-        char                    name[64];
-        int                     prom_node;
-        int                     prom_parent_node;
         int                     dac_rev;
         int                     board_type;
 };
 
 static void FFBFifo(struct ffb_par *par, int n)
 {
-        struct ffb_fbc *fbc;
+        struct ffb_fbc __iomem *fbc;
         int cache = par->fifo_cache;
 
         if (cache - n < 0) {
@@ -375,7 +373,7 @@ static void FFBFifo(struct ffb_par *par, int n)
 
 static void FFBWait(struct ffb_par *par)
 {
-        struct ffb_fbc *fbc;
+        struct ffb_fbc __iomem *fbc;
         int limit = 10000;
 
         fbc = par->fbc;
@@ -408,8 +406,8 @@ static __inline__ void ffb_rop(struct ffb_par *par, u32 rop)
 
 static void ffb_switch_from_graph(struct ffb_par *par)
 {
-        struct ffb_fbc *fbc = par->fbc;
-        struct ffb_dac *dac = par->dac;
+        struct ffb_fbc __iomem *fbc = par->fbc;
+        struct ffb_dac __iomem *dac = par->dac;
         unsigned long flags;
 
         spin_lock_irqsave(&par->lock, flags);
@@ -462,7 +460,7 @@ static int ffb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
 static void ffb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
 {
         struct ffb_par *par = (struct ffb_par *) info->par;
-        struct ffb_fbc *fbc = par->fbc;
+        struct ffb_fbc __iomem *fbc = par->fbc;
         unsigned long flags;
         u32 fg;
 
@@ -505,7 +503,7 @@ static void
 ffb_copyarea(struct fb_info *info, const struct fb_copyarea *area) 
 {
         struct ffb_par *par = (struct ffb_par *) info->par;
-        struct ffb_fbc *fbc = par->fbc;
+        struct ffb_fbc __iomem *fbc = par->fbc;
         unsigned long flags;
 
         if (area->dx != area->sx ||
@@ -541,7 +539,7 @@ ffb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
 static void ffb_imageblit(struct fb_info *info, const struct fb_image *image)
 {
         struct ffb_par *par = (struct ffb_par *) info->par;
-        struct ffb_fbc *fbc = par->fbc;
+        struct ffb_fbc __iomem *fbc = par->fbc;
         const u8 *data = image->data;
         unsigned long flags;
         u32 fg, bg, xy;
@@ -664,7 +662,7 @@ static int
 ffb_blank(int blank, struct fb_info *info)
 {
         struct ffb_par *par = (struct ffb_par *) info->par;
-        struct ffb_dac *dac = par->dac;
+        struct ffb_dac __iomem *dac = par->dac;
         unsigned long flags;
         u32 tmp;
 
@@ -883,78 +881,42 @@ ffb_init_fix(struct fb_info *info)
         info->fix.accel = FB_ACCEL_SUN_CREATOR;
 }
 
-static int ffb_apply_upa_parent_ranges(int parent,
-                                       struct linux_prom64_registers *regs)
-{
-        struct linux_prom64_ranges ranges[PROMREG_MAX];
-        char name[128];
-        int len, i;
-
-        prom_getproperty(parent, "name", name, sizeof(name));
-        if (strcmp(name, "upa") != 0)
-                return 0;
-
-        len = prom_getproperty(parent, "ranges", (void *) ranges, sizeof(ranges));
-        if (len <= 0)
-                return 1;
-
-        len /= sizeof(struct linux_prom64_ranges);
-        for (i = 0; i < len; i++) {
-                struct linux_prom64_ranges *rng = &ranges[i];
-                u64 phys_addr = regs->phys_addr;
-
-                if (phys_addr >= rng->ot_child_base &&
-                    phys_addr < (rng->ot_child_base + rng->or_size)) {
-                        regs->phys_addr -= rng->ot_child_base;
-                        regs->phys_addr += rng->ot_parent_base;
-                        return 0;
-                }
-        }
-
-        return 1;
-}
-
 struct all_info {
         struct fb_info info;
         struct ffb_par par;
         u32 pseudo_palette[256];
-        struct list_head list;
 };
-static LIST_HEAD(ffb_list);
 
-static void ffb_init_one(int node, int parent)
+static int ffb_init_one(struct of_device *op)
 {
-        struct linux_prom64_registers regs[2*PROMREG_MAX];
-        struct ffb_fbc *fbc;
-        struct ffb_dac *dac;
+        struct device_node *dp = op->node;
+        struct ffb_fbc __iomem *fbc;
+        struct ffb_dac __iomem *dac;
         struct all_info *all;
+        int err;
 
-        if (prom_getproperty(node, "reg", (void *) regs, sizeof(regs)) <= 0) {
-                printk("ffb: Cannot get reg device node property.\n");
-                return;
-        }
+        all = kzalloc(sizeof(*all), GFP_KERNEL);
+        if (!all)
+                return -ENOMEM;
 
-        if (ffb_apply_upa_parent_ranges(parent, &regs[0])) {
-                printk("ffb: Cannot apply parent ranges to regs.\n");
-                return;
+        spin_lock_init(&all->par.lock);
+        all->par.fbc = of_ioremap(&op->resource[2], 0,
+                                  sizeof(struct ffb_fbc), "ffb fbc");
+        if (!all->par.fbc) {
+                kfree(all);
+                return -ENOMEM;
         }
 
-        all = kmalloc(sizeof(*all), GFP_KERNEL);
-        if (!all) {
-                printk(KERN_ERR "ffb: Cannot allocate memory.\n");
-                return;
+        all->par.dac = of_ioremap(&op->resource[1], 0,
+                                  sizeof(struct ffb_dac), "ffb dac");
+        if (!all->par.dac) {
+                of_iounmap(all->par.fbc, sizeof(struct ffb_fbc));
+                kfree(all);
+                return -ENOMEM;
         }
-        memset(all, 0, sizeof(*all));
-
-        INIT_LIST_HEAD(&all->list);     
 
-        spin_lock_init(&all->par.lock);
-        all->par.fbc = (struct ffb_fbc *)(regs[0].phys_addr + FFB_FBC_REGS_POFF);
-        all->par.dac = (struct ffb_dac *)(regs[0].phys_addr + FFB_DAC_POFF);
         all->par.rop_cache = FFB_ROP_NEW;
-        all->par.physbase = regs[0].phys_addr;
-        all->par.prom_node = node;
-        all->par.prom_parent_node = parent;
+        all->par.physbase = op->resource[0].start;
 
         /* Don't mention copyarea, so SCROLL_REDRAW is always
          * used.  It is the fastest on this chip.
@@ -968,7 +930,7 @@ static void ffb_init_one(int node, int parent)
         all->info.par = &all->par;
         all->info.pseudo_palette = all->pseudo_palette;
 
-        sbusfb_fill_var(&all->info.var, all->par.prom_node, 32);
+        sbusfb_fill_var(&all->info.var, dp->node, 32);
         all->par.fbsize = PAGE_ALIGN(all->info.var.xres *
                                      all->info.var.yres *
                                      4);
@@ -976,14 +938,13 @@ static void ffb_init_one(int node, int parent)
 
         all->info.var.accel_flags = FB_ACCELF_TEXT;
 
-        prom_getstring(node, "name", all->par.name, sizeof(all->par.name));
-        if (!strcmp(all->par.name, "SUNW,afb"))
+        if (!strcmp(dp->name, "SUNW,afb"))
                 all->par.flags |= FFB_FLAG_AFB;
 
-        all->par.board_type = prom_getintdefault(node, "board_type", 0);
+        all->par.board_type = of_getintprop_default(dp, "board_type", 0);
 
         fbc = all->par.fbc;
-        if((upa_readl(&fbc->ucsr) & FFB_UCSR_ALL_ERRORS) != 0)
+        if ((upa_readl(&fbc->ucsr) & FFB_UCSR_ALL_ERRORS) != 0)
                 upa_writel(FFB_UCSR_ALL_ERRORS, &fbc->ucsr);
 
         ffb_switch_from_graph(&all->par);
@@ -1008,81 +969,88 @@ static void ffb_init_one(int node, int parent)
         if (fb_alloc_cmap(&all->info.cmap, 256, 0)) {
                 printk(KERN_ERR "ffb: Could not allocate color map.\n");
                 kfree(all);
-                return;
+                return -ENOMEM;
         }
 
         ffb_init_fix(&all->info);
 
-        if (register_framebuffer(&all->info) < 0) {
+        err = register_framebuffer(&all->info);
+        if (err < 0) {
                 printk(KERN_ERR "ffb: Could not register framebuffer.\n");
                 fb_dealloc_cmap(&all->info.cmap);
                 kfree(all);
-                return;
+                return err;
         }
 
-        list_add(&all->list, &ffb_list);
+        dev_set_drvdata(&op->dev, all);
 
-        printk("ffb: %s at %016lx type %d DAC %d\n",
+        printk("%s: %s at %016lx, type %d, DAC revision %d\n",
+               dp->full_name,
                ((all->par.flags & FFB_FLAG_AFB) ? "AFB" : "FFB"),
-               regs[0].phys_addr, all->par.board_type, all->par.dac_rev);
+               all->par.physbase, all->par.board_type, all->par.dac_rev);
+
+        return 0;
 }
 
-static void ffb_scan_siblings(int root)
+static int __devinit ffb_probe(struct of_device *dev, const struct of_device_id *match)
 {
-        int node, child;
-
-        child = prom_getchild(root);
-        for (node = prom_searchsiblings(child, "SUNW,ffb"); node;
-             node = prom_searchsiblings(prom_getsibling(node), "SUNW,ffb"))
-                ffb_init_one(node, root);
-        for (node = prom_searchsiblings(child, "SUNW,afb"); node;
-             node = prom_searchsiblings(prom_getsibling(node), "SUNW,afb"))
-                ffb_init_one(node, root);
+        struct of_device *op = to_of_device(&dev->dev);
+
+        return ffb_init_one(op);
 }
 
-int __init ffb_init(void)
+static int __devexit ffb_remove(struct of_device *dev)
 {
-        int root;
+        struct all_info *all = dev_get_drvdata(&dev->dev);
 
-        if (fb_get_options("ffb", NULL))
-                return -ENODEV;
+        unregister_framebuffer(&all->info);
+        fb_dealloc_cmap(&all->info.cmap);
 
-        ffb_scan_siblings(prom_root_node);
+        of_iounmap(all->par.fbc, sizeof(struct ffb_fbc));
+        of_iounmap(all->par.dac, sizeof(struct ffb_dac));
 
-        root = prom_getchild(prom_root_node);
-        for (root = prom_searchsiblings(root, "upa"); root;
-             root = prom_searchsiblings(prom_getsibling(root), "upa"))
-                ffb_scan_siblings(root);
+        kfree(all);
+
+        dev_set_drvdata(&dev->dev, NULL);
 
         return 0;
 }
 
-void __exit ffb_exit(void)
-{
-        struct list_head *pos, *tmp;
+static struct of_device_id ffb_match[] = {
+        {
+                .name = "SUNW,ffb",
+        },
+        {
+                .name = "SUNW,afb",
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(of, ffb_match);
+
+static struct of_platform_driver ffb_driver = {
+        .name           = "ffb",
+        .match_table    = ffb_match,
+        .probe          = ffb_probe,
+        .remove         = __devexit_p(ffb_remove),
+};
 
-        list_for_each_safe(pos, tmp, &ffb_list) {
-                struct all_info *all = list_entry(pos, typeof(*all), list);
+int __init ffb_init(void)
+{
+        if (fb_get_options("ffb", NULL))
+                return -ENODEV;
 
-                unregister_framebuffer(&all->info);
-                fb_dealloc_cmap(&all->info.cmap);
-                kfree(all);
-        }
+        return of_register_driver(&ffb_driver, &of_bus_type);
 }
 
-int __init
-ffb_setup(char *arg)
+void __exit ffb_exit(void)
 {
-        /* No cmdline options yet... */
-        return 0;
+        of_unregister_driver(&ffb_driver);
 }
 
 module_init(ffb_init);
-
-#ifdef MODULE
 module_exit(ffb_exit);
-#endif
 
 MODULE_DESCRIPTION("framebuffer driver for Creator/Elite3D chipsets");
-MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
+MODULE_AUTHOR("David S. Miller <davem@davemloft.net>");
+MODULE_VERSION("2.0");
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/g364fb.c b/drivers/video/g364fb.c
index 605d1a132020..1b981b635675 100644
--- a/drivers/video/g364fb.c
+++ b/drivers/video/g364fb.c
@@ -21,7 +21,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c
index 5e25b9860196..bf0e60b5a3b6 100644
--- a/drivers/video/gbefb.c
+++ b/drivers/video/gbefb.c
@@ -9,7 +9,6 @@
  *  more details.
  */
 
-#include <linux/config.h>
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c
index 20e69156d728..bcf9cea54d8b 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/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
@@ -376,8 +375,6 @@ static int __init gx1fb_probe(struct pci_dev *pdev, const struct pci_device_id *
                 release_mem_region(gx1_gx_base() + 0x8300, 0x100);
         }
 
-        pci_disable_device(pdev);
-
         if (info)
                 framebuffer_release(info);
         return ret;
@@ -399,7 +396,6 @@ static void gx1fb_remove(struct pci_dev *pdev)
         iounmap(par->dc_regs);
         release_mem_region(gx1_gx_base() + 0x8300, 0x100);
 
-        pci_disable_device(pdev);
         pci_set_drvdata(pdev, NULL);
 
         framebuffer_release(info);
diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c
index 89c34b15f5d4..0d3643fc6293 100644
--- a/drivers/video/geode/gxfb_core.c
+++ b/drivers/video/geode/gxfb_core.c
@@ -25,7 +25,6 @@
 #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>
@@ -354,8 +353,6 @@ static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *i
                 pci_release_region(pdev, 2);
         }
 
-        pci_disable_device(pdev);
-
         if (info)
                 framebuffer_release(info);
         return ret;
@@ -377,7 +374,6 @@ static void gxfb_remove(struct pci_dev *pdev)
         iounmap(par->dc_regs);
         pci_release_region(pdev, 2);
 
-        pci_disable_device(pdev);
         pci_set_drvdata(pdev, NULL);
 
         framebuffer_release(info);
diff --git a/drivers/video/hgafb.c b/drivers/video/hgafb.c
index 4e39035cf335..fb9e67228543 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/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c
index f04ca721f94c..3afb472763c0 100644
--- a/drivers/video/hitfb.c
+++ b/drivers/video/hitfb.c
@@ -4,36 +4,32 @@
  * (C) 1999 Mihai Spatar
  * (C) 2000 YAEGASHI Takeshi
  * (C) 2003, 2004 Paul Mundt
- * (C) 2003, 2004 Andriy Skulysh
+ * (C) 2003, 2004, 2006 Andriy Skulysh
  *
  *  This file is subject to the terms and conditions of the GNU General Public
  *  License. See the file COPYING in the main directory of this archive for
  *  more details.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.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/init.h>
+#include <linux/platform_device.h>
 #include <linux/fb.h>
 
 #include <asm/machvec.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 #include <asm/io.h>
-#include <asm/hd64461/hd64461.h>
-
-#ifdef MACH_HP600
+#include <asm/hd64461.h>
 #include <asm/cpu/dac.h>
 #include <asm/hp6xx/hp6xx.h>
-#endif
 
 #define WIDTH 640
 
@@ -47,7 +43,6 @@ static struct fb_var_screeninfo hitfb_var __initdata = {
 static struct fb_fix_screeninfo hitfb_fix __initdata = {
         .id             = "Hitachi HD64461",
         .type           = FB_TYPE_PACKED_PIXELS,
-        .ypanstep       = 8,
         .accel          = FB_ACCEL_NONE,
 };
 
@@ -75,26 +70,14 @@ static inline void hitfb_accel_set_dest(int truecolor, u16 dx, u16 dy,
         if (truecolor)
                 saddr <<= 1;
 
-        fb_writew(width, HD64461_BBTDWR);
-        fb_writew(height, HD64461_BBTDHR);
+        fb_writew(width-1, HD64461_BBTDWR);
+        fb_writew(height-1, HD64461_BBTDHR);
 
         fb_writew(saddr & 0xffff, HD64461_BBTDSARL);
         fb_writew(saddr >> 16, HD64461_BBTDSARH);
 
 }
 
-static inline void hitfb_accel_solidfill(int truecolor, u16 dx, u16 dy,
-                                         u16 width, u16 height, u16 color)
-{
-        hitfb_accel_set_dest(truecolor, dx, dy, width, height);
-
-        fb_writew(0x00f0, HD64461_BBTROPR);
-        fb_writew(16, HD64461_BBTMDR);
-        fb_writew(color, HD64461_GRSCR);
-
-        hitfb_accel_start(truecolor);
-}
-
 static inline void hitfb_accel_bitblt(int truecolor, u16 sx, u16 sy, u16 dx,
                                       u16 dy, u16 width, u16 height, u16 rop,
                                       u32 mask_addr)
@@ -102,6 +85,8 @@ static inline void hitfb_accel_bitblt(int truecolor, u16 sx, u16 sy, u16 dx,
         u32 saddr, daddr;
         u32 maddr = 0;
 
+        height--;
+        width--;
         fb_writew(rop, HD64461_BBTROPR);
         if ((sy < dy) || ((sy == dy) && (sx <= dx))) {
                 saddr = WIDTH * (sy + height) + sx + width;
@@ -148,6 +133,7 @@ static void hitfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect)
         if (rect->rop != ROP_COPY)
                 cfb_fillrect(p, rect);
         else {
+                hitfb_accel_wait();
                 fb_writew(0x00f0, HD64461_BBTROPR);
                 fb_writew(16, HD64461_BBTMDR);
 
@@ -163,16 +149,15 @@ static void hitfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect)
                                              rect->height);
                         hitfb_accel_start(0);
                 }
-                hitfb_accel_wait();
         }
 }
 
 static void hitfb_copyarea(struct fb_info *p, const struct fb_copyarea *area)
 {
+        hitfb_accel_wait();
         hitfb_accel_bitblt(p->var.bits_per_pixel == 16, area->sx, area->sy,
                            area->dx, area->dy, area->width, area->height,
                            0x00cc, 0);
-        hitfb_accel_wait();
 }
 
 static int hitfb_pan_display(struct fb_var_screeninfo *var,
@@ -184,7 +169,7 @@ static int hitfb_pan_display(struct fb_var_screeninfo *var,
         if (xoffset != 0)
                 return -EINVAL;
 
-        fb_writew(yoffset, HD64461_LCDCBAR);
+        fb_writew((yoffset*info->fix.line_length)>>10, HD64461_LCDCBAR);
 
         return 0;
 }
@@ -194,12 +179,6 @@ int hitfb_blank(int blank_mode, struct fb_info *info)
         unsigned short v;
 
         if (blank_mode) {
-#ifdef MACH_HP600
-                sh_dac_disable(DAC_LCD_BRIGHTNESS);
-                v = fb_readw(HD64461_GPBDR);
-                v |= HD64461_GPBDR_LCDOFF;
-                fb_writew(v, HD64461_GPBDR);
-#endif
                 v = fb_readw(HD64461_LDR1);
                 v &= ~HD64461_LDR1_DON;
                 fb_writew(v, HD64461_LDR1);
@@ -215,19 +194,18 @@ int hitfb_blank(int blank_mode, struct fb_info *info)
                 v = fb_readw(HD64461_STBCR);
                 v &= ~HD64461_STBCR_SLCDST;
                 fb_writew(v, HD64461_STBCR);
-#ifdef MACH_HP600
-                sh_dac_enable(DAC_LCD_BRIGHTNESS);
-                v = fb_readw(HD64461_GPBDR);
-                v &= ~HD64461_GPBDR_LCDOFF;
-                fb_writew(v, HD64461_GPBDR);
-#endif
-                v = fb_readw(HD64461_LDR1);
-                v |= HD64461_LDR1_DON;
-                fb_writew(v, HD64461_LDR1);
 
                 v = fb_readw(HD64461_LCDCCR);
-                v &= ~HD64461_LCDCCR_MOFF;
+                v &= ~(HD64461_LCDCCR_MOFF | HD64461_LCDCCR_STREQ);
                 fb_writew(v, HD64461_LCDCCR);
+
+                do {
+                    v = fb_readw(HD64461_LCDCCR);
+                } while(v&HD64461_LCDCCR_STBACK);
+
+                v = fb_readw(HD64461_LDR1);
+                v |= HD64461_LDR1_DON;
+                fb_writew(v, HD64461_LDR1);
         }
         return 0;
 }
@@ -235,7 +213,7 @@ int hitfb_blank(int blank_mode, struct fb_info *info)
 static int hitfb_setcolreg(unsigned regno, unsigned red, unsigned green,
                            unsigned blue, unsigned transp, struct fb_info *info)
 {
-        if (regno >= info->cmap.len)
+        if (regno >= 256)
                 return 1;
 
         switch (info->var.bits_per_pixel) {
@@ -246,6 +224,8 @@ static int hitfb_setcolreg(unsigned regno, unsigned red, unsigned green,
                 fb_writew(blue >> 10, HD64461_CPTWDR);
                 break;
         case 16:
+                if (regno >= 16)
+                        return 1;
                 ((u32 *) (info->pseudo_palette))[regno] =
                     ((red & 0xf800)) |
                     ((green & 0xfc00) >> 5) | ((blue & 0xf800) >> 11);
@@ -254,26 +234,113 @@ static int hitfb_setcolreg(unsigned regno, unsigned red, unsigned green,
         return 0;
 }
 
+static int hitfb_sync(struct fb_info *info)
+{
+        hitfb_accel_wait();
+
+        return 0;
+}
+
+static int hitfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+        int maxy;
+
+        var->xres = info->var.xres;
+        var->xres_virtual = info->var.xres;
+        var->yres = info->var.yres;
+
+        if ((var->bits_per_pixel != 8) && (var->bits_per_pixel != 16))
+                var->bits_per_pixel = info->var.bits_per_pixel;
+
+        if (var->yres_virtual < var->yres)
+                var->yres_virtual = var->yres;
+
+        maxy = info->fix.smem_len / var->xres;
+
+        if (var->bits_per_pixel == 16)
+                maxy /= 2;
+
+        if (var->yres_virtual > maxy)
+                var->yres_virtual = maxy;
+
+        var->xoffset = 0;
+        var->yoffset = 0;
+
+        switch (var->bits_per_pixel) {
+        case 8:
+                var->red.offset = 0;
+                var->red.length = 8;
+                var->green.offset = 0;
+                var->green.length = 8;
+                var->blue.offset = 0;
+                var->blue.length = 8;
+                var->transp.offset = 0;
+                var->transp.length = 0;
+                break;
+        case 16:                /* RGB 565 */
+                var->red.offset = 11;
+                var->red.length = 5;
+                var->green.offset = 5;
+                var->green.length = 6;
+                var->blue.offset = 0;
+                var->blue.length = 5;
+                var->transp.offset = 0;
+                var->transp.length = 0;
+                break;
+        }
+
+        return 0;
+}
+
+static int hitfb_set_par(struct fb_info *info)
+{
+        unsigned short ldr3;
+
+        switch (info->var.bits_per_pixel) {
+        case 8:
+                info->fix.line_length = info->var.xres;
+                info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+                info->fix.ypanstep = 16;
+                break;
+        case 16:
+                info->fix.line_length = info->var.xres*2;
+                info->fix.visual = FB_VISUAL_TRUECOLOR;
+                info->fix.ypanstep = 8;
+                break;
+        }
+
+        fb_writew(info->fix.line_length, HD64461_LCDCLOR);
+        ldr3 = fb_readw(HD64461_LDR3);
+        ldr3 &= ~15;
+        ldr3 |= (info->var.bits_per_pixel == 8) ? 4 : 8;
+        fb_writew(ldr3, HD64461_LDR3);
+        return 0;
+}
+
 static struct fb_ops hitfb_ops = {
         .owner          = THIS_MODULE,
+        .fb_check_var   = hitfb_check_var,
+        .fb_set_par             = hitfb_set_par,
         .fb_setcolreg   = hitfb_setcolreg,
         .fb_blank       = hitfb_blank,
+        .fb_sync        = hitfb_sync,
         .fb_pan_display = hitfb_pan_display,
         .fb_fillrect    = hitfb_fillrect,
         .fb_copyarea    = hitfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
 };
 
-int __init hitfb_init(void)
+static int __init hitfb_probe(struct platform_device *dev)
 {
         unsigned short lcdclor, ldr3, ldvndr;
-        int size;
 
         if (fb_get_options("hitfb", NULL))
                 return -ENODEV;
 
+        hitfb_fix.mmio_start = CONFIG_HD64461_IOBASE+0x1000;
+        hitfb_fix.mmio_len = 0x1000;
         hitfb_fix.smem_start = CONFIG_HD64461_IOBASE + 0x02000000;
-        hitfb_fix.smem_len = (MACH_HP690) ? 1024 * 1024 : 512 * 1024;
+        hitfb_fix.smem_len = 512 * 1024;
 
         lcdclor = fb_readw(HD64461_LCDCLOR);
         ldvndr = fb_readw(HD64461_LDVNDR);
@@ -323,12 +390,12 @@ int __init hitfb_init(void)
         fb_info.var = hitfb_var;
         fb_info.fix = hitfb_fix;
         fb_info.pseudo_palette = pseudo_palette;
-        fb_info.flags = FBINFO_DEFAULT;
+        fb_info.flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
+                FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
 
         fb_info.screen_base = (void *)hitfb_fix.smem_start;
 
-        size = (fb_info.var.bits_per_pixel == 8) ? 256 : 16;
-        fb_alloc_cmap(&fb_info.cmap, size, 0);
+        fb_alloc_cmap(&fb_info.cmap, 256, 0);
 
         if (register_framebuffer(&fb_info) < 0)
                 return -EINVAL;
@@ -338,9 +405,75 @@ int __init hitfb_init(void)
         return 0;
 }
 
+static int __devexit hitfb_remove(struct platform_device *dev)
+{
+        return unregister_framebuffer(&fb_info);
+}
+
+#ifdef CONFIG_PM
+static int hitfb_suspend(struct platform_device *dev, pm_message_t state)
+{
+        u16 v;
+
+        hitfb_blank(1,0);
+        v = fb_readw(HD64461_STBCR);
+        v |= HD64461_STBCR_SLCKE_IST;
+        fb_writew(v, HD64461_STBCR);
+
+        return 0;
+}
+
+static int hitfb_resume(struct platform_device *dev)
+{
+        u16 v;
+
+        v = fb_readw(HD64461_STBCR);
+        v &= ~HD64461_STBCR_SLCKE_OST;
+        msleep(100);
+        v = fb_readw(HD64461_STBCR);
+        v &= ~HD64461_STBCR_SLCKE_IST;
+        fb_writew(v, HD64461_STBCR);
+        hitfb_blank(0,0);
+
+        return 0;
+}
+#endif
+
+static struct platform_driver hitfb_driver = {
+        .probe          = hitfb_probe,
+        .remove         = __devexit_p(hitfb_remove),
+#ifdef CONFIG_PM
+        .suspend        = hitfb_suspend,
+        .resume         = hitfb_resume,
+#endif
+        .driver         = {
+                .name   = "hitfb",
+        },
+};
+
+static struct platform_device hitfb_device = {
+        .name   = "hitfb",
+        .id     = -1,
+};
+
+static int __init hitfb_init(void)
+{
+        int ret;
+
+        ret = platform_driver_register(&hitfb_driver);
+        if (!ret) {
+                ret = platform_device_register(&hitfb_device);
+                if (ret)
+                        platform_driver_unregister(&hitfb_driver);
+        }
+        return ret;
+}
+
+
 static void __exit hitfb_exit(void)
 {
-        unregister_framebuffer(&fb_info);
+        platform_device_unregister(&hitfb_device);
+        platform_driver_unregister(&hitfb_driver);
 }
 
 module_init(hitfb_init);
diff --git a/drivers/video/hpfb.c b/drivers/video/hpfb.c
index abd920a663a0..91cf3b577d15 100644
--- a/drivers/video/hpfb.c
+++ b/drivers/video/hpfb.c
@@ -11,7 +11,6 @@
 #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/init.h>
diff --git a/drivers/video/i810/i810-i2c.c b/drivers/video/i810/i810-i2c.c
index 3fe3ae1aff12..7d06b38e80a0 100644
--- a/drivers/video/i810/i810-i2c.c
+++ b/drivers/video/i810/i810-i2c.c
@@ -8,7 +8,6 @@
  *  License. See the file COPYING in the main directory of this archive for
  *  more details.
  */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -99,7 +98,6 @@ static int i810_setup_i2c_bus(struct i810fb_i2c_chan *chan, const char *name)
         chan->algo.getsda               = i810i2c_getsda;
         chan->algo.getscl               = i810i2c_getscl;
         chan->algo.udelay               = 10;
-        chan->algo.mdelay               = 10;
         chan->algo.timeout              = (HZ/2);
         chan->algo.data                 = chan;
 
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index 44aa2ffff973..d42edaccb84c 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -29,12 +29,10 @@
  */
 
 #include <linux/module.h>
-#include <linux/config.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/fb.h>
 #include <linux/init.h>
@@ -1556,15 +1554,17 @@ static struct fb_ops i810fb_ops __devinitdata = {
 /***********************************************************************
  *                         Power Management                            *
  ***********************************************************************/
-static int i810fb_suspend(struct pci_dev *dev, pm_message_t state)
+static int i810fb_suspend(struct pci_dev *dev, pm_message_t mesg)
 {
         struct fb_info *info = pci_get_drvdata(dev);
         struct i810fb_par *par = info->par;
 
-        par->cur_state = state.event;
+        par->cur_state = mesg.event;
 
-        if (state.event == PM_EVENT_FREEZE) {
-                dev->dev.power.power_state = state;
+        switch (mesg.event) {
+        case PM_EVENT_FREEZE:
+        case PM_EVENT_PRETHAW:
+                dev->dev.power.power_state = mesg;
                 return 0;
         }
 
@@ -1580,7 +1580,7 @@ static int i810fb_suspend(struct pci_dev *dev, pm_message_t state)
 
         pci_save_state(dev);
         pci_disable_device(dev);
-        pci_set_power_state(dev, pci_choose_state(dev, state));
+        pci_set_power_state(dev, pci_choose_state(dev, mesg));
         release_console_sem();
 
         return 0;
@@ -2110,9 +2110,6 @@ static void i810fb_release_resource(struct fb_info *info,
         if (par->res_flags & MMIO_REQ)
                 release_mem_region(par->mmio_start_phys, MMIO_SIZE);
 
-        if (par->res_flags & PCI_DEVICE_ENABLED)
-                pci_disable_device(par->dev);
-
         framebuffer_release(info);
 
 }
diff --git a/drivers/video/igafb.c b/drivers/video/igafb.c
index 6b88050d21bf..67f384f86758 100644
--- a/drivers/video/igafb.c
+++ b/drivers/video/igafb.c
@@ -33,7 +33,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
@@ -232,9 +231,6 @@ static int igafb_mmap(struct fb_info *info,
 
         size = vma->vm_end - vma->vm_start;
 
-        /* To stop the swapper from even considering these pages. */
-        vma->vm_flags |= (VM_SHM | VM_LOCKED);
-
         /* Each page, see which map applies */
         for (page = 0; page < size; ) {
                 map_size = 0;
diff --git a/drivers/video/imacfb.c b/drivers/video/imacfb.c
new file mode 100644
index 000000000000..18ea4a549105
--- /dev/null
+++ b/drivers/video/imacfb.c
@@ -0,0 +1,380 @@
+/*
+ * framebuffer driver for Intel Based Mac's
+ *
+ * (c) 2006 Edgar Hucek <gimli@dark-green.com>
+ * Original imac driver written by Gerd Knorr <kraxel@goldbach.in-berlin.de>
+ *
+ */
+
+#include <linux/delay.h>
+#include <linux/errno.h>
+#include <linux/fb.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/screen_info.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/dmi.h>
+#include <linux/efi.h>
+
+#include <asm/io.h>
+
+#include <video/vga.h>
+
+typedef enum _MAC_TYPE {
+        M_I17,
+        M_I20,
+        M_MINI,
+        M_MACBOOK,
+        M_UNKNOWN
+} MAC_TYPE;
+
+/* --------------------------------------------------------------------- */
+
+static struct fb_var_screeninfo imacfb_defined __initdata = {
+        .activate               = FB_ACTIVATE_NOW,
+        .height                 = -1,
+        .width                  = -1,
+        .right_margin           = 32,
+        .upper_margin           = 16,
+        .lower_margin           = 4,
+        .vsync_len              = 4,
+        .vmode                  = FB_VMODE_NONINTERLACED,
+};
+
+static struct fb_fix_screeninfo imacfb_fix __initdata = {
+        .id                     = "IMAC VGA",
+        .type                   = FB_TYPE_PACKED_PIXELS,
+        .accel                  = FB_ACCEL_NONE,
+        .visual                 = FB_VISUAL_TRUECOLOR,
+};
+
+static int inverse;
+static int model                = M_UNKNOWN;
+static int manual_height;
+static int manual_width;
+
+static int set_system(struct dmi_system_id *id)
+{
+        printk(KERN_INFO "imacfb: %s detected - set system to %ld\n",
+                id->ident, (long)id->driver_data);
+
+        model = (long)id->driver_data;
+
+        return 0;
+}
+
+static struct dmi_system_id __initdata dmi_system_table[] = {
+        { set_system, "iMac4,1", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
+          DMI_MATCH(DMI_PRODUCT_NAME,"iMac4,1") }, (void*)M_I17},
+        { set_system, "MacBookPro1,1", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
+          DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro1,1") }, (void*)M_I17},
+        { set_system, "MacBook1,1", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
+          DMI_MATCH(DMI_PRODUCT_NAME,"MacBook1,1")}, (void *)M_MACBOOK},
+        { set_system, "Macmini1,1", {
+          DMI_MATCH(DMI_BIOS_VENDOR,"Apple Computer, Inc."),
+          DMI_MATCH(DMI_PRODUCT_NAME,"Macmini1,1")}, (void *)M_MINI},
+        {},
+};
+
+#define DEFAULT_FB_MEM  1024*1024*16
+
+/* --------------------------------------------------------------------- */
+
+static int imacfb_setcolreg(unsigned regno, unsigned red, unsigned green,
+                            unsigned blue, unsigned transp,
+                            struct fb_info *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.
+         */
+
+        if (regno >= info->cmap.len)
+                return 1;
+
+        if (regno < 16) {
+                red   >>= 8;
+                green >>= 8;
+                blue  >>= 8;
+                ((u32 *)(info->pseudo_palette))[regno] =
+                        (red   << info->var.red.offset)   |
+                        (green << info->var.green.offset) |
+                        (blue  << info->var.blue.offset);
+        }
+        return 0;
+}
+
+static struct fb_ops imacfb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_setcolreg   = imacfb_setcolreg,
+        .fb_fillrect    = cfb_fillrect,
+        .fb_copyarea    = cfb_copyarea,
+        .fb_imageblit   = cfb_imageblit,
+};
+
+static int __init imacfb_setup(char *options)
+{
+        char *this_opt;
+
+        if (!options || !*options)
+                return 0;
+
+        while ((this_opt = strsep(&options, ",")) != NULL) {
+                if (!*this_opt) continue;
+
+                if (!strcmp(this_opt, "inverse"))
+                        inverse = 1;
+                else if (!strcmp(this_opt, "i17"))
+                        model = M_I17;
+                else if (!strcmp(this_opt, "i20"))
+                        model = M_I20;
+                else if (!strcmp(this_opt, "mini"))
+                        model = M_MINI;
+                else if (!strcmp(this_opt, "macbook"))
+                        model = M_MACBOOK;
+                else if (!strncmp(this_opt, "height:", 7))
+                        manual_height = simple_strtoul(this_opt+7, NULL, 0);
+                else if (!strncmp(this_opt, "width:", 6))
+                        manual_width = simple_strtoul(this_opt+6, NULL, 0);
+        }
+        return 0;
+}
+
+static int __init imacfb_probe(struct platform_device *dev)
+{
+        struct fb_info *info;
+        int err;
+        unsigned int size_vmode;
+        unsigned int size_remap;
+        unsigned int size_total;
+
+        screen_info.lfb_depth = 32;
+        screen_info.lfb_size = DEFAULT_FB_MEM / 0x10000;
+        screen_info.pages=1;
+        screen_info.blue_size = 8;
+        screen_info.blue_pos = 0;
+        screen_info.green_size = 8;
+        screen_info.green_pos = 8;
+        screen_info.red_size = 8;
+        screen_info.red_pos = 16;
+        screen_info.rsvd_size = 8;
+        screen_info.rsvd_pos = 24;
+
+        switch (model) {
+        case M_I17:
+                screen_info.lfb_width = 1440;
+                screen_info.lfb_height = 900;
+                screen_info.lfb_linelength = 1472 * 4;
+                screen_info.lfb_base = 0x80010000;
+                break;
+        case M_I20:
+                screen_info.lfb_width = 1680;
+                screen_info.lfb_height = 1050;
+                screen_info.lfb_linelength = 1728 * 4;
+                screen_info.lfb_base = 0x80010000;
+                break;
+        case M_MINI:
+                screen_info.lfb_width = 1024;
+                screen_info.lfb_height = 768;
+                screen_info.lfb_linelength = 2048 * 4;
+                screen_info.lfb_base = 0x80000000;
+                break;
+        case M_MACBOOK:
+                screen_info.lfb_width = 1280;
+                screen_info.lfb_height = 800;
+                screen_info.lfb_linelength = 2048 * 4;
+                screen_info.lfb_base = 0x80000000;
+                break;
+        }
+
+        /* if the user wants to manually specify height/width,
+           we will override the defaults */
+        /* TODO: eventually get auto-detection working */
+        if (manual_height > 0)
+                screen_info.lfb_height = manual_height;
+        if (manual_width > 0)
+                screen_info.lfb_width = manual_width;
+
+        imacfb_fix.smem_start = screen_info.lfb_base;
+        imacfb_defined.bits_per_pixel = screen_info.lfb_depth;
+        imacfb_defined.xres = screen_info.lfb_width;
+        imacfb_defined.yres = screen_info.lfb_height;
+        imacfb_fix.line_length = screen_info.lfb_linelength;
+
+        /*   size_vmode -- that is the amount of memory needed for the
+         *                 used video mode, i.e. the minimum amount of
+         *                 memory we need. */
+        size_vmode = imacfb_defined.yres * imacfb_fix.line_length;
+
+        /*   size_total -- all video memory we have. Used for
+         *                 entries, ressource allocation and bounds
+         *                 checking. */
+        size_total = screen_info.lfb_size * 65536;
+        if (size_total < size_vmode)
+                size_total = size_vmode;
+
+        /*   size_remap -- the amount of video memory we are going to
+         *                 use for imacfb.  With modern cards it is no
+         *                 option to simply use size_total as that
+         *                 wastes plenty of kernel address space. */
+        size_remap  = size_vmode * 2;
+        if (size_remap < size_vmode)
+                size_remap = size_vmode;
+        if (size_remap > size_total)
+                size_remap = size_total;
+        imacfb_fix.smem_len = size_remap;
+
+#ifndef __i386__
+        screen_info.imacpm_seg = 0;
+#endif
+
+        if (!request_mem_region(imacfb_fix.smem_start, size_total, "imacfb")) {
+                printk(KERN_WARNING
+                       "imacfb: cannot reserve video memory at 0x%lx\n",
+                        imacfb_fix.smem_start);
+                /* We cannot make this fatal. Sometimes this comes from magic
+                   spaces our resource handlers simply don't know about */
+        }
+
+        info = framebuffer_alloc(sizeof(u32) * 16, &dev->dev);
+        if (!info) {
+                err = -ENOMEM;
+                goto err_release_mem;
+        }
+        info->pseudo_palette = info->par;
+        info->par = NULL;
+
+        info->screen_base = ioremap(imacfb_fix.smem_start, imacfb_fix.smem_len);
+        if (!info->screen_base) {
+                printk(KERN_ERR "imacfb: abort, cannot ioremap video memory "
+                                "0x%x @ 0x%lx\n",
+                        imacfb_fix.smem_len, imacfb_fix.smem_start);
+                err = -EIO;
+                goto err_unmap;
+        }
+
+        printk(KERN_INFO "imacfb: framebuffer at 0x%lx, mapped to 0x%p, "
+               "using %dk, total %dk\n",
+               imacfb_fix.smem_start, info->screen_base,
+               size_remap/1024, size_total/1024);
+        printk(KERN_INFO "imacfb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
+               imacfb_defined.xres, imacfb_defined.yres,
+               imacfb_defined.bits_per_pixel, imacfb_fix.line_length,
+               screen_info.pages);
+
+        imacfb_defined.xres_virtual = imacfb_defined.xres;
+        imacfb_defined.yres_virtual = imacfb_fix.smem_len /
+                                        imacfb_fix.line_length;
+        printk(KERN_INFO "imacfb: scrolling: redraw\n");
+        imacfb_defined.yres_virtual = imacfb_defined.yres;
+
+        /* some dummy values for timing to make fbset happy */
+        imacfb_defined.pixclock     = 10000000 / imacfb_defined.xres *
+                                        1000 / imacfb_defined.yres;
+        imacfb_defined.left_margin  = (imacfb_defined.xres / 8) & 0xf8;
+        imacfb_defined.hsync_len    = (imacfb_defined.xres / 8) & 0xf8;
+
+        imacfb_defined.red.offset    = screen_info.red_pos;
+        imacfb_defined.red.length    = screen_info.red_size;
+        imacfb_defined.green.offset  = screen_info.green_pos;
+        imacfb_defined.green.length  = screen_info.green_size;
+        imacfb_defined.blue.offset   = screen_info.blue_pos;
+        imacfb_defined.blue.length   = screen_info.blue_size;
+        imacfb_defined.transp.offset = screen_info.rsvd_pos;
+        imacfb_defined.transp.length = screen_info.rsvd_size;
+
+        printk(KERN_INFO "imacfb: %s: "
+               "size=%d:%d:%d:%d, shift=%d:%d:%d:%d\n",
+               "Truecolor",
+               screen_info.rsvd_size,
+               screen_info.red_size,
+               screen_info.green_size,
+               screen_info.blue_size,
+               screen_info.rsvd_pos,
+               screen_info.red_pos,
+               screen_info.green_pos,
+               screen_info.blue_pos);
+
+        imacfb_fix.ypanstep  = 0;
+        imacfb_fix.ywrapstep = 0;
+
+        /* request failure does not faze us, as vgacon probably has this
+         * region already (FIXME) */
+        request_region(0x3c0, 32, "imacfb");
+
+        info->fbops = &imacfb_ops;
+        info->var = imacfb_defined;
+        info->fix = imacfb_fix;
+        info->flags = FBINFO_FLAG_DEFAULT;
+
+        if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
+                err = -ENOMEM;
+                goto err_unmap;
+        }
+        if (register_framebuffer(info)<0) {
+                err = -EINVAL;
+                goto err_fb_dealoc;
+        }
+        printk(KERN_INFO "fb%d: %s frame buffer device\n",
+               info->node, info->fix.id);
+        return 0;
+
+err_fb_dealoc:
+        fb_dealloc_cmap(&info->cmap);
+err_unmap:
+        iounmap(info->screen_base);
+        framebuffer_release(info);
+err_release_mem:
+        release_mem_region(imacfb_fix.smem_start, size_total);
+        return err;
+}
+
+static struct platform_driver imacfb_driver = {
+        .probe  = imacfb_probe,
+        .driver = {
+                .name   = "imacfb",
+        },
+};
+
+static struct platform_device imacfb_device = {
+        .name   = "imacfb",
+};
+
+static int __init imacfb_init(void)
+{
+        int ret;
+        char *option = NULL;
+
+        if (!efi_enabled)
+                return -ENODEV;
+        if (!dmi_check_system(dmi_system_table))
+                return -ENODEV;
+        if (model == M_UNKNOWN)
+                return -ENODEV;
+
+        if (fb_get_options("imacfb", &option))
+                return -ENODEV;
+
+        imacfb_setup(option);
+        ret = platform_driver_register(&imacfb_driver);
+
+        if (!ret) {
+                ret = platform_device_register(&imacfb_device);
+                if (ret)
+                        platform_driver_unregister(&imacfb_driver);
+        }
+        return ret;
+}
+module_init(imacfb_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/imsttfb.c b/drivers/video/imsttfb.c
index f73c642b50c2..5715b8ad0ddc 100644
--- a/drivers/video/imsttfb.c
+++ b/drivers/video/imsttfb.c
@@ -16,13 +16,11 @@
  *  more details.
  */
 
-#include <linux/config.h>
 #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/vmalloc.h>
 #include <linux/delay.h>
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index 1718baaeed2a..0f9b2fdc28b1 100644
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@@ -18,7 +18,6 @@
 
 //#define DEBUG 1
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index f6e30b3d1081..6f9de04193d2 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -108,13 +108,11 @@
  *
  */
 
-#include <linux/config.h>
 #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>
@@ -123,6 +121,7 @@
 #include <linux/pci.h>
 #include <linux/vmalloc.h>
 #include <linux/pagemap.h>
+#include <linux/screen_info.h>
 
 #include <asm/io.h>
 
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c
index bbd82fffc3f6..f887f1efd3fe 100644
--- a/drivers/video/intelfb/intelfbhw.c
+++ b/drivers/video/intelfb/intelfbhw.c
@@ -19,13 +19,11 @@
 
 /* $DHD: intelfb/intelfbhw.c,v 1.9 2003/06/27 15:06:25 dawes Exp $ */
 
-#include <linux/config.h>
 #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>
diff --git a/drivers/video/kyro/fbdev.c b/drivers/video/kyro/fbdev.c
index 477ad297de4e..f0d614a80f1f 100644
--- a/drivers/video/kyro/fbdev.c
+++ b/drivers/video/kyro/fbdev.c
@@ -9,7 +9,6 @@
  * for more details.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -17,7 +16,6 @@
 #include <linux/mm.h>
 #include <linux/errno.h>
 #include <linux/string.h>
-#include <linux/tty.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <linux/ioctl.h>
diff --git a/drivers/video/leo.c b/drivers/video/leo.c
index a23cfdb9d826..f3a24338d9ac 100644
--- a/drivers/video/leo.c
+++ b/drivers/video/leo.c
@@ -1,6 +1,6 @@
 /* leo.c: LEO frame buffer driver
  *
- * Copyright (C) 2003 David S. Miller (davem@redhat.com)
+ * Copyright (C) 2003, 2006 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1996-1999 Jakub Jelinek (jj@ultra.linux.cz)
  * Copyright (C) 1997 Michal Rehacek (Michal.Rehacek@st.mff.cuni.cz)
  *
@@ -18,8 +18,8 @@
 #include <linux/mm.h>
 
 #include <asm/io.h>
-#include <asm/sbus.h>
-#include <asm/oplib.h>
+#include <asm/prom.h>
+#include <asm/of_device.h>
 #include <asm/fbio.h>
 
 #include "sbuslib.h"
@@ -80,10 +80,10 @@ static struct fb_ops leo_ops = {
 
 struct leo_cursor {
         u8              xxx0[16];
-        volatile u32    cur_type;
-        volatile u32    cur_misc;
-        volatile u32    cur_cursxy;
-        volatile u32    cur_data;
+        u32     cur_type;
+        u32     cur_misc;
+        u32     cur_cursxy;
+        u32     cur_data;
 };
 
 #define LEO_KRN_TYPE_CLUT0      0x00001000
@@ -99,27 +99,27 @@ struct leo_cursor {
 #define LEO_KRN_CSR_UNK2        0x00000001
 
 struct leo_lx_krn {
-        volatile u32    krn_type;
-        volatile u32    krn_csr;
-        volatile u32    krn_value;
+        u32     krn_type;
+        u32     krn_csr;
+        u32     krn_value;
 };
 
 struct leo_lc_ss0_krn {
-        volatile u32    misc;
+        u32     misc;
         u8              xxx0[0x800-4];
-        volatile u32    rev;
+        u32     rev;
 };
 
 struct leo_lc_ss0_usr {
-        volatile u32    csr;
-        volatile u32    addrspace;
-        volatile u32    fontmsk;
-        volatile u32    fontt;
-        volatile u32    extent;
-        volatile u32    src;
+        u32     csr;
+        u32     addrspace;
+        u32     fontmsk;
+        u32     fontt;
+        u32     extent;
+        u32     src;
         u32             dst;
-        volatile u32    copy;
-        volatile u32    fill;
+        u32     copy;
+        u32     fill;
 };
 
 struct leo_lc_ss1_krn {
@@ -132,47 +132,47 @@ struct leo_lc_ss1_usr {
 
 struct leo_ld {
         u8              xxx0[0xe00];
-        volatile u32    csr;
-        volatile u32    wid;
-        volatile u32    wmask;
-        volatile u32    widclip;
-        volatile u32    vclipmin;
-        volatile u32    vclipmax;
-        volatile u32    pickmin;        /* SS1 only */
-        volatile u32    pickmax;        /* SS1 only */
-        volatile u32    fg;
-        volatile u32    bg;
-        volatile u32    src;            /* Copy/Scroll (SS0 only) */
-        volatile u32    dst;            /* Copy/Scroll/Fill (SS0 only) */
-        volatile u32    extent;         /* Copy/Scroll/Fill size (SS0 only) */
+        u32     csr;
+        u32     wid;
+        u32     wmask;
+        u32     widclip;
+        u32     vclipmin;
+        u32     vclipmax;
+        u32     pickmin;        /* SS1 only */
+        u32     pickmax;        /* SS1 only */
+        u32     fg;
+        u32     bg;
+        u32     src;            /* Copy/Scroll (SS0 only) */
+        u32     dst;            /* Copy/Scroll/Fill (SS0 only) */
+        u32     extent;         /* Copy/Scroll/Fill size (SS0 only) */
         u32             xxx1[3];
-        volatile u32    setsem;         /* SS1 only */
-        volatile u32    clrsem;         /* SS1 only */
-        volatile u32    clrpick;        /* SS1 only */
-        volatile u32    clrdat;         /* SS1 only */
-        volatile u32    alpha;          /* SS1 only */
+        u32     setsem;         /* SS1 only */
+        u32     clrsem;         /* SS1 only */
+        u32     clrpick;        /* SS1 only */
+        u32     clrdat;         /* SS1 only */
+        u32     alpha;          /* SS1 only */
         u8              xxx2[0x2c];
-        volatile u32    winbg;
-        volatile u32    planemask;
-        volatile u32    rop;
-        volatile u32    z;
-        volatile u32    dczf;           /* SS1 only */
-        volatile u32    dczb;           /* SS1 only */
-        volatile u32    dcs;            /* SS1 only */
-        volatile u32    dczs;           /* SS1 only */
-        volatile u32    pickfb;         /* SS1 only */
-        volatile u32    pickbb;         /* SS1 only */
-        volatile u32    dcfc;           /* SS1 only */
-        volatile u32    forcecol;       /* SS1 only */
-        volatile u32    door[8];        /* SS1 only */
-        volatile u32    pick[5];        /* SS1 only */
+        u32     winbg;
+        u32     planemask;
+        u32     rop;
+        u32     z;
+        u32     dczf;           /* SS1 only */
+        u32     dczb;           /* SS1 only */
+        u32     dcs;            /* SS1 only */
+        u32     dczs;           /* SS1 only */
+        u32     pickfb;         /* SS1 only */
+        u32     pickbb;         /* SS1 only */
+        u32     dcfc;           /* SS1 only */
+        u32     forcecol;       /* SS1 only */
+        u32     door[8];        /* SS1 only */
+        u32     pick[5];        /* SS1 only */
 };
 
 #define LEO_SS1_MISC_ENABLE     0x00000001
 #define LEO_SS1_MISC_STEREO     0x00000002
 struct leo_ld_ss1 {
-        u8              xxx0[0xef4];
-        volatile u32    ss1_misc;
+        u8      xxx0[0xef4];
+        u32     ss1_misc;
 };
 
 struct leo_ld_gbl {
@@ -193,9 +193,8 @@ struct leo_par {
 #define LEO_FLAG_BLANKED        0x00000001
 
         unsigned long           physbase;
+        unsigned long           which_io;
         unsigned long           fbsize;
-
-        struct sbus_dev         *sdev;
 };
 
 static void leo_wait(struct leo_lx_krn __iomem *lx_krn)
@@ -368,8 +367,7 @@ static int leo_mmap(struct fb_info *info, struct vm_area_struct *vma)
 
         return sbusfb_mmap_helper(leo_mmap_map,
                                   par->physbase, par->fbsize,
-                                  par->sdev->reg_addrs[0].which_io,
-                                  vma);
+                                  par->which_io, vma);
 }
 
 static int leo_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
@@ -385,11 +383,9 @@ static int leo_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
  */
 
 static void
-leo_init_fix(struct fb_info *info)
+leo_init_fix(struct fb_info *info, struct device_node *dp)
 {
-        struct leo_par *par = (struct leo_par *)info->par;
-
-        strlcpy(info->fix.id, par->sdev->prom_name, sizeof(info->fix.id));
+        strlcpy(info->fix.id, dp->name, sizeof(info->fix.id));
 
         info->fix.type = FB_TYPE_PACKED_PIXELS;
         info->fix.visual = FB_VISUAL_TRUECOLOR;
@@ -532,60 +528,74 @@ static void leo_fixup_var_rgb(struct fb_var_screeninfo *var)
 struct all_info {
         struct fb_info info;
         struct leo_par par;
-        struct list_head list;
 };
-static LIST_HEAD(leo_list);
 
-static void leo_init_one(struct sbus_dev *sdev)
+static void leo_unmap_regs(struct all_info *all)
 {
-        struct all_info *all;
-        int linebytes;
+        if (all->par.lc_ss0_usr)
+                of_iounmap(all->par.lc_ss0_usr, 0x1000);
+        if (all->par.ld_ss0)
+                of_iounmap(all->par.ld_ss0, 0x1000);
+        if (all->par.ld_ss1)
+                of_iounmap(all->par.ld_ss1, 0x1000);
+        if (all->par.lx_krn)
+                of_iounmap(all->par.lx_krn, 0x1000);
+        if (all->par.cursor)
+                of_iounmap(all->par.cursor, sizeof(struct leo_cursor));
+        if (all->info.screen_base)
+                of_iounmap(all->info.screen_base, 0x800000);
+}
 
-        all = kmalloc(sizeof(*all), GFP_KERNEL);
-        if (!all) {
-                printk(KERN_ERR "leo: Cannot allocate memory.\n");
-                return;
-        }
-        memset(all, 0, sizeof(*all));
+static int __devinit leo_init_one(struct of_device *op)
+{
+        struct device_node *dp = op->node;
+        struct all_info *all;
+        int linebytes, err;
 
-        INIT_LIST_HEAD(&all->list);
+        all = kzalloc(sizeof(*all), GFP_KERNEL);
+        if (!all)
+                return -ENOMEM;
 
         spin_lock_init(&all->par.lock);
-        all->par.sdev = sdev;
 
-        all->par.physbase = sdev->reg_addrs[0].phys_addr;
+        all->par.physbase = op->resource[0].start;
+        all->par.which_io = op->resource[0].flags & IORESOURCE_BITS;
 
-        sbusfb_fill_var(&all->info.var, sdev->prom_node, 32);
+        sbusfb_fill_var(&all->info.var, dp->node, 32);
         leo_fixup_var_rgb(&all->info.var);
 
-        linebytes = prom_getintdefault(sdev->prom_node, "linebytes",
-                                       all->info.var.xres);
+        linebytes = of_getintprop_default(dp, "linebytes",
+                                          all->info.var.xres);
         all->par.fbsize = PAGE_ALIGN(linebytes * all->info.var.yres);
 
-#ifdef CONFIG_SPARC32
-        all->info.screen_base = (char __iomem *)
-                prom_getintdefault(sdev->prom_node, "address", 0);
-#endif
-        if (!all->info.screen_base)
-                all->info.screen_base = 
-                        sbus_ioremap(&sdev->resource[0], LEO_OFF_SS0,
-                                     0x800000, "leo ram");
-
         all->par.lc_ss0_usr =
-                sbus_ioremap(&sdev->resource[0], LEO_OFF_LC_SS0_USR,
-                             0x1000, "leolc ss0usr");
+                of_ioremap(&op->resource[0], LEO_OFF_LC_SS0_USR,
+                           0x1000, "leolc ss0usr");
         all->par.ld_ss0 =
-                sbus_ioremap(&sdev->resource[0], LEO_OFF_LD_SS0,
-                             0x1000, "leold ss0");
+                of_ioremap(&op->resource[0], LEO_OFF_LD_SS0,
+                           0x1000, "leold ss0");
         all->par.ld_ss1 =
-                sbus_ioremap(&sdev->resource[0], LEO_OFF_LD_SS1,
-                             0x1000, "leold ss1");
+                of_ioremap(&op->resource[0], LEO_OFF_LD_SS1,
+                           0x1000, "leold ss1");
         all->par.lx_krn =
-                sbus_ioremap(&sdev->resource[0], LEO_OFF_LX_KRN,
-                             0x1000, "leolx krn");
+                of_ioremap(&op->resource[0], LEO_OFF_LX_KRN,
+                           0x1000, "leolx krn");
         all->par.cursor =
-                sbus_ioremap(&sdev->resource[0], LEO_OFF_LX_CURSOR,
-                             sizeof(struct leo_cursor), "leolx cursor");
+                of_ioremap(&op->resource[0], LEO_OFF_LX_CURSOR,
+                           sizeof(struct leo_cursor), "leolx cursor");
+        all->info.screen_base = 
+                of_ioremap(&op->resource[0], LEO_OFF_SS0,
+                           0x800000, "leo ram");
+        if (!all->par.lc_ss0_usr ||
+            !all->par.ld_ss0 ||
+            !all->par.ld_ss1 ||
+            !all->par.lx_krn ||
+            !all->par.cursor ||
+            !all->info.screen_base) {
+                leo_unmap_regs(all);
+                kfree(all);
+                return -ENOMEM;
+        }
 
         all->info.flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
         all->info.fbops = &leo_ops;
@@ -597,69 +607,85 @@ static void leo_init_one(struct sbus_dev *sdev)
         leo_blank(0, &all->info);
 
         if (fb_alloc_cmap(&all->info.cmap, 256, 0)) {
-                printk(KERN_ERR "leo: Could not allocate color map.\n");
+                leo_unmap_regs(all);
                 kfree(all);
-                return;
+                return -ENOMEM;;
         }
 
-        leo_init_fix(&all->info);
+        leo_init_fix(&all->info, dp);
 
-        if (register_framebuffer(&all->info) < 0) {
-                printk(KERN_ERR "leo: Could not register framebuffer.\n");
+        err = register_framebuffer(&all->info);
+        if (err < 0) {
                 fb_dealloc_cmap(&all->info.cmap);
+                leo_unmap_regs(all);
                 kfree(all);
-                return;
+                return err;
         }
 
-        list_add(&all->list, &leo_list);
+        dev_set_drvdata(&op->dev, all);
+
+        printk("%s: leo at %lx:%lx\n",
+               dp->full_name,
+               all->par.which_io, all->par.physbase);
 
-        printk("leo: %s at %lx:%lx\n",
-               sdev->prom_name,
-               (long) sdev->reg_addrs[0].which_io,
-               (long) sdev->reg_addrs[0].phys_addr);
+        return 0;
 }
 
-int __init leo_init(void)
+static int __devinit leo_probe(struct of_device *dev, const struct of_device_id *match)
 {
-        struct sbus_bus *sbus;
-        struct sbus_dev *sdev;
+        struct of_device *op = to_of_device(&dev->dev);
 
-        if (fb_get_options("leofb", NULL))
-                return -ENODEV;
+        return leo_init_one(op);
+}
 
-        for_all_sbusdev(sdev, sbus) {
-                if (!strcmp(sdev->prom_name, "leo"))
-                        leo_init_one(sdev);
-        }
+static int __devexit leo_remove(struct of_device *dev)
+{
+        struct all_info *all = dev_get_drvdata(&dev->dev);
+
+        unregister_framebuffer(&all->info);
+        fb_dealloc_cmap(&all->info.cmap);
+
+        leo_unmap_regs(all);
+
+        kfree(all);
+
+        dev_set_drvdata(&dev->dev, NULL);
 
         return 0;
 }
 
-void __exit leo_exit(void)
-{
-        struct list_head *pos, *tmp;
+static struct of_device_id leo_match[] = {
+        {
+                .name = "leo",
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(of, leo_match);
+
+static struct of_platform_driver leo_driver = {
+        .name           = "leo",
+        .match_table    = leo_match,
+        .probe          = leo_probe,
+        .remove         = __devexit_p(leo_remove),
+};
 
-        list_for_each_safe(pos, tmp, &leo_list) {
-                struct all_info *all = list_entry(pos, typeof(*all), list);
+static int __init leo_init(void)
+{
+        if (fb_get_options("leofb", NULL))
+                return -ENODEV;
 
-                unregister_framebuffer(&all->info);
-                fb_dealloc_cmap(&all->info.cmap);
-                kfree(all);
-        }
+        return of_register_driver(&leo_driver, &of_bus_type);
 }
 
-int __init
-leo_setup(char *arg)
+static void __exit leo_exit(void)
 {
-        /* No cmdline options yet... */
-        return 0;
+        of_unregister_driver(&leo_driver);
 }
 
 module_init(leo_init);
-#ifdef MODULE
 module_exit(leo_exit);
-#endif
 
 MODULE_DESCRIPTION("framebuffer driver for LEO chipsets");
-MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
+MODULE_AUTHOR("David S. Miller <davem@davemloft.net>");
+MODULE_VERSION("2.0");
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c
index 788fa812c871..80c03618eb53 100644
--- a/drivers/video/logo/logo.c
+++ b/drivers/video/logo/logo.c
@@ -9,7 +9,6 @@
  *  Copyright (C) 2003 Geert Uytterhoeven <geert@linux-m68k.org>
  */
 
-#include <linux/config.h>
 #include <linux/linux_logo.h>
 #include <linux/stddef.h>
 #include <linux/module.h>
diff --git a/drivers/video/macfb.c b/drivers/video/macfb.c
index e6cbd9de944a..80a043807161 100644
--- a/drivers/video/macfb.c
+++ b/drivers/video/macfb.c
@@ -24,7 +24,6 @@
 #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/nubus.h>
diff --git a/drivers/video/macmodes.c b/drivers/video/macmodes.c
index c0385c6f7db5..ab2149531a04 100644
--- a/drivers/video/macmodes.c
+++ b/drivers/video/macmodes.c
@@ -15,7 +15,6 @@
  *  more details.
  */
 
-#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/fb.h>
 #include <linux/string.h>
@@ -327,7 +326,6 @@ int mac_var_to_vmode(const struct fb_var_screeninfo *var, int *vmode,
     }
     return -EINVAL;
 }
-EXPORT_SYMBOL(mac_var_to_vmode);
 
 /**
  *      mac_map_monitor_sense - Convert monitor sense to vmode
@@ -371,8 +369,9 @@ EXPORT_SYMBOL(mac_map_monitor_sense);
  *
  */
 
-int __init mac_find_mode(struct fb_var_screeninfo *var, struct fb_info *info,
-                         const char *mode_option, unsigned int default_bpp)
+int __devinit mac_find_mode(struct fb_var_screeninfo *var,
+                            struct fb_info *info, const char *mode_option,
+                            unsigned int default_bpp)
 {
     const struct fb_videomode *db = NULL;
     unsigned int dbsize = 0;
diff --git a/drivers/video/macmodes.h b/drivers/video/macmodes.h
index 232f5a09a499..babeb81f467d 100644
--- a/drivers/video/macmodes.h
+++ b/drivers/video/macmodes.h
@@ -55,9 +55,10 @@ extern int mac_vmode_to_var(int vmode, int cmode,
 extern int mac_var_to_vmode(const struct fb_var_screeninfo *var, int *vmode,
                             int *cmode);
 extern int mac_map_monitor_sense(int sense);
-extern int __init mac_find_mode(struct fb_var_screeninfo *var,
-                                struct fb_info *info, const char *mode_option,
-                                unsigned int default_bpp);
+extern int __devinit mac_find_mode(struct fb_var_screeninfo *var,
+                                   struct fb_info *info,
+                                   const char *mode_option,
+                                   unsigned int default_bpp);
 
 
     /*
diff --git a/drivers/video/matrox/g450_pll.c b/drivers/video/matrox/g450_pll.c
index 440272ad10e7..7c76e079ca7d 100644
--- a/drivers/video/matrox/g450_pll.c
+++ b/drivers/video/matrox/g450_pll.c
@@ -331,7 +331,15 @@ static int __g450_setclk(WPMINFO unsigned int fout, unsigned int pll,
                                         tmp |= M1064_XPIXCLKCTRL_PLL_UP;
                                 }
                                 matroxfb_DAC_out(PMINFO M1064_XPIXCLKCTRL, tmp);
+#ifdef __powerpc__
+                                /* This is necessary to avoid jitter on PowerPC
+                                 * (OpenFirmware) systems, but apparently
+                                 * introduces jitter, at least on a x86-64
+                                 * using DVI.
+                                 * A simple workaround is disable for non-PPC.
+                                 */
                                 matroxfb_DAC_out(PMINFO M1064_XDVICLKCTRL, 0);
+#endif /* __powerpc__ */
                                 matroxfb_DAC_out(PMINFO M1064_XPWRCTRL, xpwrctrl);
 
                                 matroxfb_DAC_unlock_irqrestore(flags);
diff --git a/drivers/video/matrox/i2c-matroxfb.c b/drivers/video/matrox/i2c-matroxfb.c
index 57abbae5520f..795c1a99a680 100644
--- a/drivers/video/matrox/i2c-matroxfb.c
+++ b/drivers/video/matrox/i2c-matroxfb.c
@@ -95,12 +95,12 @@ static struct i2c_adapter matrox_i2c_adapter_template =
 
 static struct i2c_algo_bit_data matrox_i2c_algo_template =
 {
-        NULL,
-        matroxfb_gpio_setsda,
-        matroxfb_gpio_setscl,
-        matroxfb_gpio_getsda,
-        matroxfb_gpio_getscl,
-        10, 10, 100,
+        .setsda         = matroxfb_gpio_setsda,
+        .setscl         = matroxfb_gpio_setscl,
+        .getsda         = matroxfb_gpio_getsda,
+        .getscl         = matroxfb_gpio_getscl,
+        .udelay         = 10,
+        .timeout        = 100,
 };
 
 static int i2c_bus_reg(struct i2c_bit_adapter* b, struct matrox_fb_info* minfo, 
diff --git a/drivers/video/matrox/matroxfb_DAC1064.c b/drivers/video/matrox/matroxfb_DAC1064.c
index a456e67a5b00..c4b570b4a4df 100644
--- a/drivers/video/matrox/matroxfb_DAC1064.c
+++ b/drivers/video/matrox/matroxfb_DAC1064.c
@@ -12,7 +12,6 @@
  *
  */
 
-#include <linux/config.h>
 
 #include "matroxfb_DAC1064.h"
 #include "matroxfb_misc.h"
diff --git a/drivers/video/matrox/matroxfb_DAC1064.h b/drivers/video/matrox/matroxfb_DAC1064.h
index 56513a5d220b..df39c3193735 100644
--- a/drivers/video/matrox/matroxfb_DAC1064.h
+++ b/drivers/video/matrox/matroxfb_DAC1064.h
@@ -1,7 +1,6 @@
 #ifndef __MATROXFB_DAC1064_H__
 #define __MATROXFB_DAC1064_H__
 
-#include <linux/config.h>
 
 #include "matroxfb_base.h"
 
diff --git a/drivers/video/matrox/matroxfb_Ti3026.c b/drivers/video/matrox/matroxfb_Ti3026.c
index 23ebad0a12d8..a5690a5f29d5 100644
--- a/drivers/video/matrox/matroxfb_Ti3026.c
+++ b/drivers/video/matrox/matroxfb_Ti3026.c
@@ -78,7 +78,6 @@
  *
  */
 
-#include <linux/config.h>
 
 #include "matroxfb_Ti3026.h"
 #include "matroxfb_misc.h"
diff --git a/drivers/video/matrox/matroxfb_Ti3026.h b/drivers/video/matrox/matroxfb_Ti3026.h
index 536e5f69de9f..27872aaa0a17 100644
--- a/drivers/video/matrox/matroxfb_Ti3026.h
+++ b/drivers/video/matrox/matroxfb_Ti3026.h
@@ -1,7 +1,6 @@
 #ifndef __MATROXFB_TI3026_H__
 #define __MATROXFB_TI3026_H__
 
-#include <linux/config.h>
 
 #include "matroxfb_base.h"
 
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index 23c1827b2d0b..4a57dabb77d4 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -99,9 +99,10 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/version.h>
 
+#define __OLD_VIDIOC_
+
 #include "matroxfb_base.h"
 #include "matroxfb_misc.h"
 #include "matroxfb_accel.h"
@@ -158,9 +159,9 @@ static void update_crtc2(WPMINFO unsigned int pos) {
 
         /* Make sure that displays are compatible */
         if (info && (info->fbcon.var.bits_per_pixel == ACCESS_FBINFO(fbcon).var.bits_per_pixel)
-                 && (info->fbcon.var.xres_virtual == ACCESS_FBINFO(fbcon).var.xres_virtual)
-                 && (info->fbcon.var.green.length == ACCESS_FBINFO(fbcon).var.green.length)
-                 ) {
+                 && (info->fbcon.var.xres_virtual == ACCESS_FBINFO(fbcon).var.xres_virtual)
+                 && (info->fbcon.var.green.length == ACCESS_FBINFO(fbcon).var.green.length)
+                 ) {
                 switch (ACCESS_FBINFO(fbcon).var.bits_per_pixel) {
                         case 16:
                         case 32:
@@ -224,7 +225,7 @@ static irqreturn_t matrox_irq(int irq, void *dev_id, struct pt_regs *fp)
 
 int matroxfb_enable_irq(WPMINFO int reenable) {
         u_int32_t bm;
-        
+
         if (ACCESS_FBINFO(devflags.accelerator) == FB_ACCEL_MATROX_MGAG400)
                 bm = 0x220;
         else
@@ -232,7 +233,7 @@ int matroxfb_enable_irq(WPMINFO int reenable) {
 
         if (!test_and_set_bit(0, &ACCESS_FBINFO(irq_flags))) {
                 if (request_irq(ACCESS_FBINFO(pcidev)->irq, matrox_irq,
-                                SA_SHIRQ, "matroxfb", MINFO)) {
+                                IRQF_SHARED, "matroxfb", MINFO)) {
                         clear_bit(0, &ACCESS_FBINFO(irq_flags));
                         return -EINVAL;
                 }
@@ -241,7 +242,7 @@ int matroxfb_enable_irq(WPMINFO int reenable) {
                 mga_outl(M_IEN, mga_inl(M_IEN) | bm);
         } else if (reenable) {
                 u_int32_t ien;
-                
+
                 ien = mga_inl(M_IEN);
                 if ((ien & bm) != bm) {
                         printk(KERN_DEBUG "matroxfb: someone disabled IRQ [%08X]\n", ien);
@@ -347,7 +348,7 @@ static void matrox_pan_var(WPMINFO struct fb_var_screeninfo *var) {
                 mga_setr(M_EXTVGA_INDEX, 0x00, p2);
         }
         matroxfb_DAC_unlock_irqrestore(flags);
-        
+
         update_crtc2(PMINFO pos);
 
         CRITEND
@@ -390,7 +391,7 @@ static void matroxfb_remove(WPMINFO int dummy) {
 static int matroxfb_open(struct fb_info *info, int user)
 {
         MINFO_FROM_INFO(info);
-        
+
         DBG_LOOP(__FUNCTION__)
 
         if (ACCESS_FBINFO(dead)) {
@@ -406,7 +407,7 @@ static int matroxfb_open(struct fb_info *info, int user)
 static int matroxfb_release(struct fb_info *info, int user)
 {
         MINFO_FROM_INFO(info);
-        
+
         DBG_LOOP(__FUNCTION__)
 
         if (user) {
@@ -854,7 +855,7 @@ static int matroxfb_get_vblank(WPMINFO struct fb_vblank *vblank)
                 vblank->flags |= FB_VBLANK_VBLANKING;
         if (test_bit(0, &ACCESS_FBINFO(irq_flags))) {
                 vblank->flags |= FB_VBLANK_HAVE_COUNT;
-                /* Only one writer, aligned int value... 
+                /* Only one writer, aligned int value...
                    it should work without lock and without atomic_t */
                 vblank->count = ACCESS_FBINFO(crtc1).vsync.cnt;
         }
@@ -870,7 +871,7 @@ static int matroxfb_ioctl(struct fb_info *info,
 {
         void __user *argp = (void __user *)arg;
         MINFO_FROM_INFO(info);
-        
+
         DBG(__FUNCTION__)
 
         if (ACCESS_FBINFO(dead)) {
@@ -1081,7 +1082,7 @@ static int matroxfb_ioctl(struct fb_info *info,
                 case VIDIOC_QUERYCAP:
                         {
                                 struct v4l2_capability r;
-                                
+
                                 memset(&r, 0, sizeof(r));
                                 strcpy(r.driver, "matroxfb");
                                 strcpy(r.card, "Matrox");
@@ -1091,7 +1092,7 @@ static int matroxfb_ioctl(struct fb_info *info,
                                 if (copy_to_user(argp, &r, sizeof(r)))
                                         return -EFAULT;
                                 return 0;
-                                
+
                         }
                 case VIDIOC_QUERYCTRL:
                         {
@@ -1690,8 +1691,8 @@ static int initMatrox2(WPMINFO struct board* b){
                 pci_read_config_dword(ACCESS_FBINFO(pcidev), PCI_COMMAND, &cmd);
                 mga_option &= 0x7FFFFFFF; /* clear BIG_ENDIAN */
                 mga_option |= MX_OPTION_BSWAP;
-                /* disable palette snooping */
-                cmd &= ~PCI_COMMAND_VGA_PALETTE;
+                /* disable palette snooping */
+                cmd &= ~PCI_COMMAND_VGA_PALETTE;
                 if (pci_dev_present(intel_82437)) {
                         if (!(mga_option & 0x20000000) && !ACCESS_FBINFO(devflags.nopciretry)) {
                                 printk(KERN_WARNING "matroxfb: Disabling PCI retries due to i82437 present\n");
@@ -1809,12 +1810,12 @@ static int initMatrox2(WPMINFO struct board* b){
 
                 if (fv) {
                         tmp = fv * (vesafb_defined.upper_margin + vesafb_defined.yres
-                                  + vesafb_defined.lower_margin + vesafb_defined.vsync_len);
+                                  + vesafb_defined.lower_margin + vesafb_defined.vsync_len);
                         if ((tmp < fh) || (fh == 0)) fh = tmp;
                 }
                 if (fh) {
                         tmp = fh * (vesafb_defined.left_margin + vesafb_defined.xres
-                                  + vesafb_defined.right_margin + vesafb_defined.hsync_len);
+                                  + vesafb_defined.right_margin + vesafb_defined.hsync_len);
                         if ((tmp < maxclk) || (maxclk == 0)) maxclk = tmp;
                 }
                 tmp = (maxclk + 499) / 500;
@@ -1890,14 +1891,14 @@ static int initMatrox2(WPMINFO struct board* b){
 
         /* there is no console on this fb... but we have to initialize hardware
          * until someone tells me what is proper thing to do */
-        if (!ACCESS_FBINFO(initialized)) {
-                printk(KERN_INFO "fb%d: initializing hardware\n",
-                       ACCESS_FBINFO(fbcon.node));
-                /* We have to use FB_ACTIVATE_FORCE, as we had to put vesafb_defined to the fbcon.var
-                 * already before, so register_framebuffer works correctly. */
-                vesafb_defined.activate |= FB_ACTIVATE_FORCE;
-                fb_set_var(&ACCESS_FBINFO(fbcon), &vesafb_defined);
-        }
+        if (!ACCESS_FBINFO(initialized)) {
+                printk(KERN_INFO "fb%d: initializing hardware\n",
+                       ACCESS_FBINFO(fbcon.node));
+                /* We have to use FB_ACTIVATE_FORCE, as we had to put vesafb_defined to the fbcon.var
+                 * already before, so register_framebuffer works correctly. */
+                vesafb_defined.activate |= FB_ACTIVATE_FORCE;
+                fb_set_var(&ACCESS_FBINFO(fbcon), &vesafb_defined);
+        }
 
         return 0;
 failVideoIO:;
@@ -2356,7 +2357,7 @@ static int __init matroxfb_setup(char *options) {
                 else if (!strncmp(this_opt, "dfp:", 4)) {
                         dfp_type = simple_strtoul(this_opt+4, NULL, 0);
                         dfp = 1;
-                }       
+                }
 #ifdef CONFIG_PPC_PMAC
                 else if (!strncmp(this_opt, "vmode:", 6)) {
                         unsigned int vmode = simple_strtoul(this_opt+6, NULL, 0);
diff --git a/drivers/video/matrox/matroxfb_base.h b/drivers/video/matrox/matroxfb_base.h
index b71737178d0d..9c25c2f7966b 100644
--- a/drivers/video/matrox/matroxfb_base.h
+++ b/drivers/video/matrox/matroxfb_base.h
@@ -25,13 +25,11 @@
 /* Guard accelerator accesses with spin_lock_irqsave... */
 #undef MATROXFB_USE_SPINLOCKS
 
-#include <linux/config.h>
 #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>
diff --git a/drivers/video/matrox/matroxfb_misc.c b/drivers/video/matrox/matroxfb_misc.c
index 263d801ef78f..18886b629cb1 100644
--- a/drivers/video/matrox/matroxfb_misc.c
+++ b/drivers/video/matrox/matroxfb_misc.c
@@ -84,7 +84,6 @@
  *
  */
 
-#include <linux/config.h>
 
 #include "matroxfb_misc.h"
 #include <linux/interrupt.h>
diff --git a/drivers/video/maxinefb.c b/drivers/video/maxinefb.c
index f85421bf7cb5..38c8d38de4fd 100644
--- a/drivers/video/maxinefb.c
+++ b/drivers/video/maxinefb.c
@@ -29,7 +29,6 @@
 #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/init.h>
diff --git a/drivers/video/mbx/Makefile b/drivers/video/mbx/Makefile
new file mode 100644
index 000000000000..16c1165cf9c7
--- /dev/null
+++ b/drivers/video/mbx/Makefile
@@ -0,0 +1,4 @@
+# Makefile for the 2700G controller driver.
+
+obj-$(CONFIG_FB_MBX)       += mbxfb.o
+obj-$(CONFIG_FB_MBX_DEBUG) += mbxfbdebugfs.o
diff --git a/drivers/video/mbx/mbxdebugfs.c b/drivers/video/mbx/mbxdebugfs.c
new file mode 100644
index 000000000000..84aab3ad024e
--- /dev/null
+++ b/drivers/video/mbx/mbxdebugfs.c
@@ -0,0 +1,188 @@
+#include <linux/debugfs.h>
+
+#define BIG_BUFFER_SIZE (1024)
+
+static char big_buffer[BIG_BUFFER_SIZE];
+
+struct mbxfb_debugfs_data {
+        struct dentry *dir;
+        struct dentry *sysconf;
+        struct dentry *clock;
+        struct dentry *display;
+        struct dentry *gsctl;
+};
+
+static int open_file_generic(struct inode *inode, struct file *file)
+{
+        file->private_data = inode->u.generic_ip;
+        return 0;
+}
+
+static ssize_t write_file_dummy(struct file *file, const char __user *buf,
+                                size_t count, loff_t *ppos)
+{
+        return count;
+}
+
+static ssize_t sysconf_read_file(struct file *file, char __user *userbuf,
+                                 size_t count, loff_t *ppos)
+{
+        char * s = big_buffer;
+
+        s += sprintf(s, "SYSCFG = %08lx\n", SYSCFG);
+        s += sprintf(s, "PFBASE = %08lx\n", PFBASE);
+        s += sprintf(s, "PFCEIL = %08lx\n", PFCEIL);
+        s += sprintf(s, "POLLFLAG = %08lx\n", POLLFLAG);
+        s += sprintf(s, "SYSRST = %08lx\n", SYSRST);
+
+        return  simple_read_from_buffer(userbuf, count, ppos,
+                                        big_buffer, s-big_buffer);
+}
+
+
+static ssize_t gsctl_read_file(struct file *file, char __user *userbuf,
+                               size_t count, loff_t *ppos)
+{
+        char * s = big_buffer;
+
+        s += sprintf(s, "GSCTRL = %08lx\n", GSCTRL);
+        s += sprintf(s, "VSCTRL = %08lx\n", VSCTRL);
+        s += sprintf(s, "GBBASE = %08lx\n", GBBASE);
+        s += sprintf(s, "VBBASE = %08lx\n", VBBASE);
+        s += sprintf(s, "GDRCTRL = %08lx\n", GDRCTRL);
+        s += sprintf(s, "VCMSK = %08lx\n", VCMSK);
+        s += sprintf(s, "GSCADR = %08lx\n", GSCADR);
+        s += sprintf(s, "VSCADR = %08lx\n", VSCADR);
+        s += sprintf(s, "VUBASE = %08lx\n", VUBASE);
+        s += sprintf(s, "VVBASE = %08lx\n", VVBASE);
+        s += sprintf(s, "GSADR = %08lx\n", GSADR);
+        s += sprintf(s, "VSADR = %08lx\n", VSADR);
+        s += sprintf(s, "HCCTRL = %08lx\n", HCCTRL);
+        s += sprintf(s, "HCSIZE = %08lx\n", HCSIZE);
+        s += sprintf(s, "HCPOS = %08lx\n", HCPOS);
+        s += sprintf(s, "HCBADR = %08lx\n", HCBADR);
+        s += sprintf(s, "HCCKMSK = %08lx\n", HCCKMSK);
+        s += sprintf(s, "GPLUT = %08lx\n", GPLUT);
+
+        return  simple_read_from_buffer(userbuf, count, ppos,
+                                        big_buffer, s-big_buffer);
+}
+
+static ssize_t display_read_file(struct file *file, char __user *userbuf,
+                                 size_t count, loff_t *ppos)
+{
+        char * s = big_buffer;
+
+        s += sprintf(s, "DSCTRL = %08lx\n", DSCTRL);
+        s += sprintf(s, "DHT01 = %08lx\n", DHT01);
+        s += sprintf(s, "DHT02 = %08lx\n", DHT02);
+        s += sprintf(s, "DHT03 = %08lx\n", DHT03);
+        s += sprintf(s, "DVT01 = %08lx\n", DVT01);
+        s += sprintf(s, "DVT02 = %08lx\n", DVT02);
+        s += sprintf(s, "DVT03 = %08lx\n", DVT03);
+        s += sprintf(s, "DBCOL = %08lx\n", DBCOL);
+        s += sprintf(s, "BGCOLOR = %08lx\n", BGCOLOR);
+        s += sprintf(s, "DINTRS = %08lx\n", DINTRS);
+        s += sprintf(s, "DINTRE = %08lx\n", DINTRE);
+        s += sprintf(s, "DINTRCNT = %08lx\n", DINTRCNT);
+        s += sprintf(s, "DSIG = %08lx\n", DSIG);
+        s += sprintf(s, "DMCTRL = %08lx\n", DMCTRL);
+        s += sprintf(s, "CLIPCTRL = %08lx\n", CLIPCTRL);
+        s += sprintf(s, "SPOCTRL = %08lx\n", SPOCTRL);
+        s += sprintf(s, "SVCTRL = %08lx\n", SVCTRL);
+        s += sprintf(s, "DLSTS = %08lx\n", DLSTS);
+        s += sprintf(s, "DLLCTRL = %08lx\n", DLLCTRL);
+        s += sprintf(s, "DVLNUM = %08lx\n", DVLNUM);
+        s += sprintf(s, "DUCTRL = %08lx\n", DUCTRL);
+        s += sprintf(s, "DVECTRL = %08lx\n", DVECTRL);
+        s += sprintf(s, "DHDET = %08lx\n", DHDET);
+        s += sprintf(s, "DVDET = %08lx\n", DVDET);
+        s += sprintf(s, "DODMSK = %08lx\n", DODMSK);
+        s += sprintf(s, "CSC01 = %08lx\n", CSC01);
+        s += sprintf(s, "CSC02 = %08lx\n", CSC02);
+        s += sprintf(s, "CSC03 = %08lx\n", CSC03);
+        s += sprintf(s, "CSC04 = %08lx\n", CSC04);
+        s += sprintf(s, "CSC05 = %08lx\n", CSC05);
+
+        return  simple_read_from_buffer(userbuf, count, ppos,
+                                        big_buffer, s-big_buffer);
+}
+
+static ssize_t clock_read_file(struct file *file, char __user *userbuf,
+                               size_t count, loff_t *ppos)
+{
+        char * s = big_buffer;
+
+        s += sprintf(s, "SYSCLKSRC = %08lx\n", SYSCLKSRC);
+        s += sprintf(s, "PIXCLKSRC = %08lx\n", PIXCLKSRC);
+        s += sprintf(s, "CLKSLEEP = %08lx\n", CLKSLEEP);
+        s += sprintf(s, "COREPLL = %08lx\n", COREPLL);
+        s += sprintf(s, "DISPPLL = %08lx\n", DISPPLL);
+        s += sprintf(s, "PLLSTAT = %08lx\n", PLLSTAT);
+        s += sprintf(s, "VOVRCLK = %08lx\n", VOVRCLK);
+        s += sprintf(s, "PIXCLK = %08lx\n", PIXCLK);
+        s += sprintf(s, "MEMCLK = %08lx\n", MEMCLK);
+        s += sprintf(s, "M24CLK = %08lx\n", M24CLK);
+        s += sprintf(s, "MBXCLK = %08lx\n", MBXCLK);
+        s += sprintf(s, "SDCLK = %08lx\n", SDCLK);
+        s += sprintf(s, "PIXCLKDIV = %08lx\n", PIXCLKDIV);
+
+        return  simple_read_from_buffer(userbuf, count, ppos,
+                                        big_buffer, s-big_buffer);
+}
+
+static struct file_operations sysconf_fops = {
+        .read = sysconf_read_file,
+        .write = write_file_dummy,
+        .open = open_file_generic,
+};
+
+static struct file_operations clock_fops = {
+        .read = clock_read_file,
+        .write = write_file_dummy,
+        .open = open_file_generic,
+};
+
+static struct file_operations display_fops = {
+        .read = display_read_file,
+        .write = write_file_dummy,
+        .open = open_file_generic,
+};
+
+static struct file_operations gsctl_fops = {
+        .read = gsctl_read_file,
+        .write = write_file_dummy,
+        .open = open_file_generic,
+};
+
+
+static void __devinit mbxfb_debugfs_init(struct fb_info *fbi)
+{
+        struct mbxfb_info *mfbi = fbi->par;
+        struct mbxfb_debugfs_data *dbg;
+
+        dbg = kzalloc(sizeof(struct mbxfb_debugfs_data), GFP_KERNEL);
+        mfbi->debugfs_data = dbg;
+
+        dbg->dir = debugfs_create_dir("mbxfb", NULL);
+        dbg->sysconf = debugfs_create_file("sysconf", 0444, dbg->dir,
+                                      fbi, &sysconf_fops);
+        dbg->clock = debugfs_create_file("clock", 0444, dbg->dir,
+                                    fbi, &clock_fops);
+        dbg->display = debugfs_create_file("display", 0444, dbg->dir,
+                                      fbi, &display_fops);
+        dbg->gsctl = debugfs_create_file("gsctl", 0444, dbg->dir,
+                                    fbi, &gsctl_fops);
+}
+
+static void __devexit mbxfb_debugfs_remove(struct fb_info *fbi)
+{
+        struct mbxfb_info *mfbi = fbi->par;
+        struct mbxfb_debugfs_data *dbg = mfbi->debugfs_data;
+
+        debugfs_remove(dbg->gsctl);
+        debugfs_remove(dbg->display);
+        debugfs_remove(dbg->clock);
+        debugfs_remove(dbg->sysconf);
+        debugfs_remove(dbg->dir);
+}
diff --git a/drivers/video/mbx/mbxfb.c b/drivers/video/mbx/mbxfb.c
new file mode 100644
index 000000000000..6849ab75d403
--- /dev/null
+++ b/drivers/video/mbx/mbxfb.c
@@ -0,0 +1,683 @@
+/*
+ *  linux/drivers/video/mbx/mbxfb.c
+ *
+ *  Copyright (C) 2006 Compulab, Ltd.
+ *  Mike Rapoport <mike@compulab.co.il>
+ *
+ *   Based on pxafb.c
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file COPYING in the main directory of this archive for
+ * more details.
+ *
+ *   Intel 2700G (Marathon) Graphics Accelerator Frame Buffer Driver
+ *
+ */
+
+#include <linux/delay.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+#include <asm/io.h>
+
+#include <video/mbxfb.h>
+
+#include "regs.h"
+#include "reg_bits.h"
+
+static unsigned long virt_base_2700;
+
+#define MIN_XRES        16
+#define MIN_YRES        16
+#define MAX_XRES        2048
+#define MAX_YRES        2048
+
+#define MAX_PALETTES    16
+
+/* FIXME: take care of different chip revisions with different sizes
+   of ODFB */
+#define MEMORY_OFFSET   0x60000
+
+struct mbxfb_info {
+        struct device *dev;
+
+        struct resource *fb_res;
+        struct resource *fb_req;
+
+        struct resource *reg_res;
+        struct resource *reg_req;
+
+        void __iomem *fb_virt_addr;
+        unsigned long fb_phys_addr;
+
+        void __iomem *reg_virt_addr;
+        unsigned long reg_phys_addr;
+
+        int (*platform_probe) (struct fb_info * fb);
+        int (*platform_remove) (struct fb_info * fb);
+
+        u32 pseudo_palette[MAX_PALETTES];
+#ifdef CONFIG_FB_MBX_DEBUG
+        void *debugfs_data;
+#endif
+
+};
+
+static struct fb_var_screeninfo mbxfb_default __devinitdata = {
+        .xres = 640,
+        .yres = 480,
+        .xres_virtual = 640,
+        .yres_virtual = 480,
+        .bits_per_pixel = 16,
+        .red = {11, 5, 0},
+        .green = {5, 6, 0},
+        .blue = {0, 5, 0},
+        .activate = FB_ACTIVATE_TEST,
+        .height = -1,
+        .width = -1,
+        .pixclock = 40000,
+        .left_margin = 48,
+        .right_margin = 16,
+        .upper_margin = 33,
+        .lower_margin = 10,
+        .hsync_len = 96,
+        .vsync_len = 2,
+        .vmode = FB_VMODE_NONINTERLACED,
+        .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+};
+
+static struct fb_fix_screeninfo mbxfb_fix  __devinitdata = {
+        .id = "MBX",
+        .type = FB_TYPE_PACKED_PIXELS,
+        .visual = FB_VISUAL_TRUECOLOR,
+        .xpanstep = 0,
+        .ypanstep = 0,
+        .ywrapstep = 0,
+        .accel = FB_ACCEL_NONE,
+};
+
+struct pixclock_div {
+        u8 m;
+        u8 n;
+        u8 p;
+};
+
+static unsigned int mbxfb_get_pixclock(unsigned int pixclock_ps,
+                                       struct pixclock_div *div)
+{
+        u8 m, n, p;
+        unsigned int err = 0;
+        unsigned int min_err = ~0x0;
+        unsigned int clk;
+        unsigned int best_clk = 0;
+        unsigned int ref_clk = 13000;   /* FIXME: take from platform data */
+        unsigned int pixclock;
+
+        /* convert pixclock to KHz */
+        pixclock = PICOS2KHZ(pixclock_ps);
+
+        for (m = 1; m < 64; m++) {
+                for (n = 1; n < 8; n++) {
+                        for (p = 0; p < 8; p++) {
+                                clk = (ref_clk * m) / (n * (1 << p));
+                                err = (clk > pixclock) ? (clk - pixclock) :
+                                        (pixclock - clk);
+                                if (err < min_err) {
+                                        min_err = err;
+                                        best_clk = clk;
+                                        div->m = m;
+                                        div->n = n;
+                                        div->p = p;
+                                }
+                        }
+                }
+        }
+        return KHZ2PICOS(best_clk);
+}
+
+static int mbxfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
+                           u_int trans, struct fb_info *info)
+{
+        u32 val, ret = 1;
+
+        if (regno < MAX_PALETTES) {
+                u32 *pal = info->pseudo_palette;
+
+                val = (red & 0xf800) | ((green & 0xfc00) >> 5) |
+                        ((blue & 0xf800) >> 11);
+                pal[regno] = val;
+                ret = 0;
+        }
+
+        return ret;
+}
+
+static int mbxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
+{
+        struct pixclock_div div;
+
+        var->pixclock = mbxfb_get_pixclock(var->pixclock, &div);
+
+        if (var->xres < MIN_XRES)
+                var->xres = MIN_XRES;
+        if (var->yres < MIN_YRES)
+                var->yres = MIN_YRES;
+        if (var->xres > MAX_XRES)
+                return -EINVAL;
+        if (var->yres > MAX_YRES)
+                return -EINVAL;
+        var->xres_virtual = max(var->xres_virtual, var->xres);
+        var->yres_virtual = max(var->yres_virtual, var->yres);
+
+        switch (var->bits_per_pixel) {
+                /* 8 bits-per-pixel is not supported yet */
+        case 8:
+                return -EINVAL;
+        case 16:
+                var->green.length = (var->green.length == 5) ? 5 : 6;
+                var->red.length = 5;
+                var->blue.length = 5;
+                var->transp.length = 6 - var->green.length;
+                var->blue.offset = 0;
+                var->green.offset = 5;
+                var->red.offset = 5 + var->green.length;
+                var->transp.offset = (5 + var->red.offset) & 15;
+                break;
+        case 24:                /* RGB 888   */
+        case 32:                /* RGBA 8888 */
+                var->red.offset = 16;
+                var->red.length = 8;
+                var->green.offset = 8;
+                var->green.length = 8;
+                var->blue.offset = 0;
+                var->blue.length = 8;
+                var->transp.length = var->bits_per_pixel - 24;
+                var->transp.offset = (var->transp.length) ? 24 : 0;
+                break;
+        }
+        var->red.msb_right = 0;
+        var->green.msb_right = 0;
+        var->blue.msb_right = 0;
+        var->transp.msb_right = 0;
+
+        return 0;
+}
+
+static int mbxfb_set_par(struct fb_info *info)
+{
+        struct fb_var_screeninfo *var = &info->var;
+        struct pixclock_div div;
+        ushort hbps, ht, hfps, has;
+        ushort vbps, vt, vfps, vas;
+        u32 gsctrl = readl(GSCTRL);
+        u32 gsadr = readl(GSADR);
+
+        info->fix.line_length = var->xres_virtual * var->bits_per_pixel / 8;
+
+        /* setup color mode */
+        gsctrl &= ~(FMsk(GSCTRL_GPIXFMT));
+        /* FIXME: add *WORKING* support for 8-bits per color */
+        if (info->var.bits_per_pixel == 8) {
+                return -EINVAL;
+        } else {
+                fb_dealloc_cmap(&info->cmap);
+                gsctrl &= ~GSCTRL_LUT_EN;
+
+                info->fix.visual = FB_VISUAL_TRUECOLOR;
+                switch (info->var.bits_per_pixel) {
+                case 16:
+                        if (info->var.green.length == 5)
+                                gsctrl |= GSCTRL_GPIXFMT_ARGB1555;
+                        else
+                                gsctrl |= GSCTRL_GPIXFMT_RGB565;
+                        break;
+                case 24:
+                        gsctrl |= GSCTRL_GPIXFMT_RGB888;
+                        break;
+                case 32:
+                        gsctrl |= GSCTRL_GPIXFMT_ARGB8888;
+                        break;
+                }
+        }
+
+        /* setup resolution */
+        gsctrl &= ~(FMsk(GSCTRL_GSWIDTH) | FMsk(GSCTRL_GSHEIGHT));
+        gsctrl |= Gsctrl_Width(info->var.xres - 1) |
+                Gsctrl_Height(info->var.yres - 1);
+        writel(gsctrl, GSCTRL);
+        udelay(1000);
+
+        gsadr &= ~(FMsk(GSADR_SRCSTRIDE));
+        gsadr |= Gsadr_Srcstride(info->var.xres * info->var.bits_per_pixel /
+                                 (8 * 16) - 1);
+        writel(gsadr, GSADR);
+        udelay(1000);
+
+        /* setup timings */
+        var->pixclock = mbxfb_get_pixclock(info->var.pixclock, &div);
+
+        writel((Disp_Pll_M(div.m) | Disp_Pll_N(div.n) |
+                Disp_Pll_P(div.p) | DISP_PLL_EN), DISPPLL);
+
+        hbps = var->hsync_len;
+        has = hbps + var->left_margin;
+        hfps = has + var->xres;
+        ht = hfps + var->right_margin;
+
+        vbps = var->vsync_len;
+        vas = vbps + var->upper_margin;
+        vfps = vas + var->yres;
+        vt = vfps + var->lower_margin;
+
+        writel((Dht01_Hbps(hbps) | Dht01_Ht(ht)), DHT01);
+        writel((Dht02_Hlbs(has) | Dht02_Has(has)), DHT02);
+        writel((Dht03_Hfps(hfps) | Dht03_Hrbs(hfps)), DHT03);
+        writel((Dhdet_Hdes(has) | Dhdet_Hdef(hfps)), DHDET);
+
+        writel((Dvt01_Vbps(vbps) | Dvt01_Vt(vt)), DVT01);
+        writel((Dvt02_Vtbs(vas) | Dvt02_Vas(vas)), DVT02);
+        writel((Dvt03_Vfps(vfps) | Dvt03_Vbbs(vfps)), DVT03);
+        writel((Dvdet_Vdes(vas) | Dvdet_Vdef(vfps)), DVDET);
+        writel((Dvectrl_Vevent(vfps) | Dvectrl_Vfetch(vbps)), DVECTRL);
+
+        writel((readl(DSCTRL) | DSCTRL_SYNCGEN_EN), DSCTRL);
+
+        return 0;
+}
+
+static int mbxfb_blank(int blank, struct fb_info *info)
+{
+        switch (blank) {
+        case FB_BLANK_POWERDOWN:
+        case FB_BLANK_VSYNC_SUSPEND:
+        case FB_BLANK_HSYNC_SUSPEND:
+        case FB_BLANK_NORMAL:
+                writel((readl(DSCTRL) & ~DSCTRL_SYNCGEN_EN), DSCTRL);
+                udelay(1000);
+                writel((readl(PIXCLK) & ~PIXCLK_EN), PIXCLK);
+                udelay(1000);
+                writel((readl(VOVRCLK) & ~VOVRCLK_EN), VOVRCLK);
+                udelay(1000);
+                break;
+        case FB_BLANK_UNBLANK:
+                writel((readl(DSCTRL) | DSCTRL_SYNCGEN_EN), DSCTRL);
+                udelay(1000);
+                writel((readl(PIXCLK) | PIXCLK_EN), PIXCLK);
+                udelay(1000);
+                break;
+        }
+        return 0;
+}
+
+static struct fb_ops mbxfb_ops = {
+        .owner = THIS_MODULE,
+        .fb_check_var = mbxfb_check_var,
+        .fb_set_par = mbxfb_set_par,
+        .fb_setcolreg = mbxfb_setcolreg,
+        .fb_fillrect = cfb_fillrect,
+        .fb_copyarea = cfb_copyarea,
+        .fb_imageblit = cfb_imageblit,
+        .fb_blank = mbxfb_blank,
+};
+
+/*
+  Enable external SDRAM controller. Assume that all clocks are active
+  by now.
+*/
+static void __devinit setup_memc(struct fb_info *fbi)
+{
+        struct mbxfb_info *mfbi = fbi->par;
+        unsigned long tmp;
+        int i;
+
+        /* FIXME: use platfrom specific parameters */
+        /* setup SDRAM controller */
+        writel((LMCFG_LMC_DS | LMCFG_LMC_TS | LMCFG_LMD_TS |
+                LMCFG_LMA_TS),
+               LMCFG);
+        udelay(1000);
+
+        writel(LMPWR_MC_PWR_ACT, LMPWR);
+        udelay(1000);
+
+        /* setup SDRAM timings */
+        writel((Lmtim_Tras(7) | Lmtim_Trp(3) | Lmtim_Trcd(3) |
+                Lmtim_Trc(9) | Lmtim_Tdpl(2)),
+               LMTIM);
+        udelay(1000);
+        /* setup SDRAM refresh rate */
+        writel(0xc2b, LMREFRESH);
+        udelay(1000);
+        /* setup SDRAM type parameters */
+        writel((LMTYPE_CASLAT_3 | LMTYPE_BKSZ_2 | LMTYPE_ROWSZ_11 |
+                LMTYPE_COLSZ_8),
+               LMTYPE);
+        udelay(1000);
+        /* enable memory controller */
+        writel(LMPWR_MC_PWR_ACT, LMPWR);
+        udelay(1000);
+
+        /* perform dummy reads */
+        for ( i = 0; i < 16; i++ ) {
+                tmp = readl(fbi->screen_base);
+        }
+}
+
+static void enable_clocks(struct fb_info *fbi)
+{
+        /* enable clocks */
+        writel(SYSCLKSRC_PLL_2, SYSCLKSRC);
+        udelay(1000);
+        writel(PIXCLKSRC_PLL_1, PIXCLKSRC);
+        udelay(1000);
+        writel(0x00000000, CLKSLEEP);
+        udelay(1000);
+        writel((Core_Pll_M(0x17) | Core_Pll_N(0x3) | Core_Pll_P(0x0) |
+                CORE_PLL_EN),
+               COREPLL);
+        udelay(1000);
+        writel((Disp_Pll_M(0x1b) | Disp_Pll_N(0x7) | Disp_Pll_P(0x1) |
+                DISP_PLL_EN),
+               DISPPLL);
+
+        writel(0x00000000, VOVRCLK);
+        udelay(1000);
+        writel(PIXCLK_EN, PIXCLK);
+        udelay(1000);
+        writel(MEMCLK_EN, MEMCLK);
+        udelay(1000);
+        writel(0x00000006, M24CLK);
+        udelay(1000);
+        writel(0x00000006, MBXCLK);
+        udelay(1000);
+        writel(SDCLK_EN, SDCLK);
+        udelay(1000);
+        writel(0x00000001, PIXCLKDIV);
+        udelay(1000);
+}
+
+static void __devinit setup_graphics(struct fb_info *fbi)
+{
+        unsigned long gsctrl;
+
+        gsctrl = GSCTRL_GAMMA_EN | Gsctrl_Width(fbi->var.xres - 1) |
+                Gsctrl_Height(fbi->var.yres - 1);
+        switch (fbi->var.bits_per_pixel) {
+        case 16:
+                if (fbi->var.green.length == 5)
+                        gsctrl |= GSCTRL_GPIXFMT_ARGB1555;
+                else
+                        gsctrl |= GSCTRL_GPIXFMT_RGB565;
+                break;
+        case 24:
+                gsctrl |= GSCTRL_GPIXFMT_RGB888;
+                break;
+        case 32:
+                gsctrl |= GSCTRL_GPIXFMT_ARGB8888;
+                break;
+        }
+
+        writel(gsctrl, GSCTRL);
+        udelay(1000);
+        writel(0x00000000, GBBASE);
+        udelay(1000);
+        writel(0x00ffffff, GDRCTRL);
+        udelay(1000);
+        writel((GSCADR_STR_EN | Gscadr_Gbase_Adr(0x6000)), GSCADR);
+        udelay(1000);
+        writel(0x00000000, GPLUT);
+        udelay(1000);
+}
+
+static void __devinit setup_display(struct fb_info *fbi)
+{
+        unsigned long dsctrl = 0;
+
+        dsctrl = DSCTRL_BLNK_POL;
+        if (fbi->var.sync & FB_SYNC_HOR_HIGH_ACT)
+                dsctrl |= DSCTRL_HS_POL;
+        if (fbi->var.sync & FB_SYNC_VERT_HIGH_ACT)
+                dsctrl |= DSCTRL_VS_POL;
+        writel(dsctrl, DSCTRL);
+        udelay(1000);
+        writel(0xd0303010, DMCTRL);
+        udelay(1000);
+        writel((readl(DSCTRL) | DSCTRL_SYNCGEN_EN), DSCTRL);
+}
+
+static void __devinit enable_controller(struct fb_info *fbi)
+{
+        writel(SYSRST_RST, SYSRST);
+        udelay(1000);
+
+
+        enable_clocks(fbi);
+        setup_memc(fbi);
+        setup_graphics(fbi);
+        setup_display(fbi);
+}
+
+#ifdef CONFIG_PM
+/*
+ * Power management hooks.  Note that we won't be called from IRQ context,
+ * unlike the blank functions above, so we may sleep.
+ */
+static int mbxfb_suspend(struct platform_device *dev, pm_message_t state)
+{
+        /* make frame buffer memory enter self-refresh mode */
+        writel(LMPWR_MC_PWR_SRM, LMPWR);
+        while (LMPWRSTAT != LMPWRSTAT_MC_PWR_SRM)
+                ; /* empty statement */
+
+        /* reset the device, since it's initial state is 'mostly sleeping' */
+        writel(SYSRST_RST, SYSRST);
+        return 0;
+}
+
+static int mbxfb_resume(struct platform_device *dev)
+{
+        struct fb_info *fbi = platform_get_drvdata(dev);
+
+        enable_clocks(fbi);
+/*      setup_graphics(fbi); */
+/*      setup_display(fbi); */
+
+        writel((readl(DSCTRL) | DSCTRL_SYNCGEN_EN), DSCTRL);
+        return 0;
+}
+#else
+#define mbxfb_suspend   NULL
+#define mbxfb_resume    NULL
+#endif
+
+/* debugfs entries */
+#ifndef CONFIG_FB_MBX_DEBUG
+#define mbxfb_debugfs_init(x)   do {} while(0)
+#define mbxfb_debugfs_remove(x) do {} while(0)
+#endif
+
+#define res_size(_r) (((_r)->end - (_r)->start) + 1)
+
+static int __devinit mbxfb_probe(struct platform_device *dev)
+{
+        int ret;
+        struct fb_info *fbi;
+        struct mbxfb_info *mfbi;
+        struct mbxfb_platform_data *pdata;
+
+        dev_dbg(dev, "mbxfb_probe\n");
+
+        fbi = framebuffer_alloc(sizeof(struct mbxfb_info), &dev->dev);
+        if (fbi == NULL) {
+                dev_err(&dev->dev, "framebuffer_alloc failed\n");
+                return -ENOMEM;
+        }
+
+        mfbi = fbi->par;
+        fbi->pseudo_palette = mfbi->pseudo_palette;
+        pdata = dev->dev.platform_data;
+        if (pdata->probe)
+                mfbi->platform_probe = pdata->probe;
+        if (pdata->remove)
+                mfbi->platform_remove = pdata->remove;
+
+        mfbi->fb_res = platform_get_resource(dev, IORESOURCE_MEM, 0);
+        mfbi->reg_res = platform_get_resource(dev, IORESOURCE_MEM, 1);
+
+        if (!mfbi->fb_res || !mfbi->reg_res) {
+                dev_err(&dev->dev, "no resources found\n");
+                ret = -ENODEV;
+                goto err1;
+        }
+
+        mfbi->fb_req = request_mem_region(mfbi->fb_res->start,
+                                          res_size(mfbi->fb_res), dev->name);
+        if (mfbi->fb_req == NULL) {
+                dev_err(&dev->dev, "failed to claim framebuffer memory\n");
+                ret = -EINVAL;
+                goto err1;
+        }
+        mfbi->fb_phys_addr = mfbi->fb_res->start;
+
+        mfbi->reg_req = request_mem_region(mfbi->reg_res->start,
+                                           res_size(mfbi->reg_res), dev->name);
+        if (mfbi->reg_req == NULL) {
+                dev_err(&dev->dev, "failed to claim Marathon registers\n");
+                ret = -EINVAL;
+                goto err2;
+        }
+        mfbi->reg_phys_addr = mfbi->reg_res->start;
+
+        mfbi->reg_virt_addr = ioremap_nocache(mfbi->reg_phys_addr,
+                                              res_size(mfbi->reg_req));
+        if (!mfbi->reg_virt_addr) {
+                dev_err(&dev->dev, "failed to ioremap Marathon registers\n");
+                ret = -EINVAL;
+                goto err3;
+        }
+        virt_base_2700 = (unsigned long)mfbi->reg_virt_addr;
+
+        mfbi->fb_virt_addr = ioremap_nocache(mfbi->fb_phys_addr,
+                                             res_size(mfbi->fb_req));
+        if (!mfbi->reg_virt_addr) {
+                dev_err(&dev->dev, "failed to ioremap frame buffer\n");
+                ret = -EINVAL;
+                goto err4;
+        }
+
+        /* FIXME: get from platform */
+        fbi->screen_base = (char __iomem *)(mfbi->fb_virt_addr + 0x60000);
+        fbi->screen_size = 8 * 1024 * 1024;     /* 8 Megs */
+        fbi->fbops = &mbxfb_ops;
+
+        fbi->var = mbxfb_default;
+        fbi->fix = mbxfb_fix;
+        fbi->fix.smem_start = mfbi->fb_phys_addr + 0x60000;
+        fbi->fix.smem_len = 8 * 1024 * 1024;
+        fbi->fix.line_length = 640 * 2;
+
+        ret = fb_alloc_cmap(&fbi->cmap, 256, 0);
+        if (ret < 0) {
+                dev_err(&dev->dev, "fb_alloc_cmap failed\n");
+                ret = -EINVAL;
+                goto err5;
+        }
+
+        platform_set_drvdata(dev, fbi);
+
+        printk(KERN_INFO "fb%d: mbx frame buffer device\n", fbi->node);
+
+        if (mfbi->platform_probe)
+                mfbi->platform_probe(fbi);
+
+        enable_controller(fbi);
+
+        mbxfb_debugfs_init(fbi);
+
+        ret = register_framebuffer(fbi);
+        if (ret < 0) {
+                dev_err(&dev->dev, "register_framebuffer failed\n");
+                ret = -EINVAL;
+                goto err6;
+        }
+
+        return 0;
+
+err6:
+        fb_dealloc_cmap(&fbi->cmap);
+err5:
+        iounmap(mfbi->fb_virt_addr);
+err4:
+        iounmap(mfbi->reg_virt_addr);
+err3:
+        release_mem_region(mfbi->reg_res->start, res_size(mfbi->reg_res));
+err2:
+        release_mem_region(mfbi->fb_res->start, res_size(mfbi->fb_res));
+err1:
+        framebuffer_release(fbi);
+
+        return ret;
+}
+
+static int __devexit mbxfb_remove(struct platform_device *dev)
+{
+        struct fb_info *fbi = platform_get_drvdata(dev);
+
+        writel(SYSRST_RST, SYSRST);
+        udelay(1000);
+
+        mbxfb_debugfs_remove(fbi);
+
+        if (fbi) {
+                struct mbxfb_info *mfbi = fbi->par;
+
+                unregister_framebuffer(fbi);
+                if (mfbi) {
+                        if (mfbi->platform_remove)
+                                mfbi->platform_remove(fbi);
+
+                        if (mfbi->fb_virt_addr)
+                                iounmap(mfbi->fb_virt_addr);
+                        if (mfbi->reg_virt_addr)
+                                iounmap(mfbi->reg_virt_addr);
+                        if (mfbi->reg_req)
+                                release_mem_region(mfbi->reg_req->start,
+                                                   res_size(mfbi->reg_req));
+                        if (mfbi->fb_req)
+                                release_mem_region(mfbi->fb_req->start,
+                                                   res_size(mfbi->fb_req));
+                }
+                framebuffer_release(fbi);
+        }
+
+        return 0;
+}
+
+static struct platform_driver mbxfb_driver = {
+        .probe = mbxfb_probe,
+        .remove = mbxfb_remove,
+        .suspend = mbxfb_suspend,
+        .resume = mbxfb_resume,
+        .driver = {
+                .name = "mbx-fb",
+        },
+};
+
+int __devinit mbxfb_init(void)
+{
+        return platform_driver_register(&mbxfb_driver);
+}
+
+static void __devexit mbxfb_exit(void)
+{
+        platform_driver_unregister(&mbxfb_driver);
+}
+
+module_init(mbxfb_init);
+module_exit(mbxfb_exit);
+
+MODULE_DESCRIPTION("loadable framebuffer driver for Marathon device");
+MODULE_AUTHOR("Mike Rapoport, Compulab");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/mbx/reg_bits.h b/drivers/video/mbx/reg_bits.h
new file mode 100644
index 000000000000..c226a8e45312
--- /dev/null
+++ b/drivers/video/mbx/reg_bits.h
@@ -0,0 +1,418 @@
+#ifndef __REG_BITS_2700G_
+#define __REG_BITS_2700G_
+
+/* use defines from asm-arm/arch-pxa/bitfields.h for bit fields access */
+#define UData(Data)     ((unsigned long) (Data))
+#define Fld(Size, Shft) (((Size) << 16) + (Shft))
+#define FSize(Field)    ((Field) >> 16)
+#define FShft(Field)    ((Field) & 0x0000FFFF)
+#define FMsk(Field)     (((UData (1) << FSize (Field)) - 1) << FShft (Field))
+#define FAlnMsk(Field)  ((UData (1) << FSize (Field)) - 1)
+#define F1stBit(Field)  (UData (1) << FShft (Field))
+
+#define SYSRST_RST      (1 << 0)
+
+/* SYSCLKSRC - SYSCLK Source Control Register */
+#define SYSCLKSRC_SEL   Fld(2,0)
+#define SYSCLKSRC_REF   ((0x0) << FShft(SYSCLKSRC_SEL))
+#define SYSCLKSRC_PLL_1 ((0x1) << FShft(SYSCLKSRC_SEL))
+#define SYSCLKSRC_PLL_2 ((0x2) << FShft(SYSCLKSRC_SEL))
+
+/* PIXCLKSRC - PIXCLK Source Control Register */
+#define PIXCLKSRC_SEL   Fld(2,0)
+#define PIXCLKSRC_REF   ((0x0) << FShft(PIXCLKSRC_SEL))
+#define PIXCLKSRC_PLL_1 ((0x1) << FShft(PIXCLKSRC_SEL))
+#define PIXCLKSRC_PLL_2 ((0x2) << FShft(PIXCLKSRC_SEL))
+
+/* Clock Disable Register */
+#define CLKSLEEP_SLP    (1 << 0)
+
+/* Core PLL Control Register */
+#define CORE_PLL_M      Fld(6,7)
+#define Core_Pll_M(x)   ((x) << FShft(CORE_PLL_M))
+#define CORE_PLL_N      Fld(3,4)
+#define Core_Pll_N(x)   ((x) << FShft(CORE_PLL_N))
+#define CORE_PLL_P      Fld(3,1)
+#define Core_Pll_P(x)   ((x) << FShft(CORE_PLL_P))
+#define CORE_PLL_EN     (1 << 0)
+
+/* Display PLL Control Register */
+#define DISP_PLL_M      Fld(6,7)
+#define Disp_Pll_M(x)   ((x) << FShft(DISP_PLL_M))
+#define DISP_PLL_N      Fld(3,4)
+#define Disp_Pll_N(x)   ((x) << FShft(DISP_PLL_N))
+#define DISP_PLL_P      Fld(3,1)
+#define Disp_Pll_P(x)   ((x) << FShft(DISP_PLL_P))
+#define DISP_PLL_EN     (1 << 0)
+
+/* PLL status register */
+#define PLLSTAT_CORE_PLL_LOST_L (1 << 3)
+#define PLLSTAT_CORE_PLL_LSTS   (1 << 2)
+#define PLLSTAT_DISP_PLL_LOST_L (1 << 1)
+#define PLLSTAT_DISP_PLL_LSTS   (1 << 0)
+
+/* Video and scale clock control register */
+#define VOVRCLK_EN      (1 << 0)
+
+/* Pixel clock control register */
+#define PIXCLK_EN       (1 << 0)
+
+/* Memory clock control register */
+#define MEMCLK_EN       (1 << 0)
+
+/* MBX clock control register */
+#define MBXCLK_DIV      Fld(2,2)
+#define MBXCLK_DIV_1    ((0x0) << FShft(MBXCLK_DIV))
+#define MBXCLK_DIV_2    ((0x1) << FShft(MBXCLK_DIV))
+#define MBXCLK_DIV_3    ((0x2) << FShft(MBXCLK_DIV))
+#define MBXCLK_DIV_4    ((0x3) << FShft(MBXCLK_DIV))
+#define MBXCLK_EN       Fld(2,0)
+#define MBXCLK_EN_NONE  ((0x0) << FShft(MBXCLK_EN))
+#define MBXCLK_EN_2D    ((0x1) << FShft(MBXCLK_EN))
+#define MBXCLK_EN_BOTH  ((0x2) << FShft(MBXCLK_EN))
+
+/* M24 clock control register */
+#define M24CLK_DIV      Fld(2,1)
+#define M24CLK_DIV_1    ((0x0) << FShft(M24CLK_DIV))
+#define M24CLK_DIV_2    ((0x1) << FShft(M24CLK_DIV))
+#define M24CLK_DIV_3    ((0x2) << FShft(M24CLK_DIV))
+#define M24CLK_DIV_4    ((0x3) << FShft(M24CLK_DIV))
+#define M24CLK_EN       (1 << 0)
+
+/* SDRAM clock control register */
+#define SDCLK_EN        (1 << 0)
+
+/* PixClk Divisor Register */
+#define PIXCLKDIV_PD    Fld(9,0)
+#define Pixclkdiv_Pd(x) ((x) << FShft(PIXCLKDIV_PD))
+
+/* LCD Config control register */
+#define LCDCFG_IN_FMT   Fld(3,28)
+#define Lcdcfg_In_Fmt(x)        ((x) << FShft(LCDCFG_IN_FMT))
+#define LCDCFG_LCD1DEN_POL      (1 << 27)
+#define LCDCFG_LCD1FCLK_POL     (1 << 26)
+#define LCDCFG_LCD1LCLK_POL     (1 << 25)
+#define LCDCFG_LCD1D_POL        (1 << 24)
+#define LCDCFG_LCD2DEN_POL      (1 << 23)
+#define LCDCFG_LCD2FCLK_POL     (1 << 22)
+#define LCDCFG_LCD2LCLK_POL     (1 << 21)
+#define LCDCFG_LCD2D_POL        (1 << 20)
+#define LCDCFG_LCD1_TS          (1 << 19)
+#define LCDCFG_LCD1D_DS         (1 << 18)
+#define LCDCFG_LCD1C_DS         (1 << 17)
+#define LCDCFG_LCD1_IS_IN       (1 << 16)
+#define LCDCFG_LCD2_TS          (1 << 3)
+#define LCDCFG_LCD2D_DS         (1 << 2)
+#define LCDCFG_LCD2C_DS         (1 << 1)
+#define LCDCFG_LCD2_IS_IN       (1 << 0)
+
+/* On-Die Frame Buffer Power Control Register */
+#define ODFBPWR_SLOW    (1 << 2)
+#define ODFBPWR_MODE    Fld(2,0)
+#define ODFBPWR_MODE_ACT        ((0x0) << FShft(ODFBPWR_MODE))
+#define ODFBPWR_MODE_ACT_LP     ((0x1) << FShft(ODFBPWR_MODE))
+#define ODFBPWR_MODE_SLEEP      ((0x2) << FShft(ODFBPWR_MODE))
+#define ODFBPWR_MODE_SHUTD      ((0x3) << FShft(ODFBPWR_MODE))
+
+/* On-Die Frame Buffer Power State Status Register */
+#define ODFBSTAT_ACT    (1 << 2)
+#define ODFBSTAT_SLP    (1 << 1)
+#define ODFBSTAT_SDN    (1 << 0)
+
+/* LMRST - Local Memory (SDRAM) Reset */
+#define LMRST_MC_RST    (1 << 0)
+
+/* LMCFG - Local Memory (SDRAM) Configuration Register */
+#define LMCFG_LMC_DS    (1 << 5)
+#define LMCFG_LMD_DS    (1 << 4)
+#define LMCFG_LMA_DS    (1 << 3)
+#define LMCFG_LMC_TS    (1 << 2)
+#define LMCFG_LMD_TS    (1 << 1)
+#define LMCFG_LMA_TS    (1 << 0)
+
+/* LMPWR - Local Memory (SDRAM) Power Control Register */
+#define LMPWR_MC_PWR_CNT        Fld(2,0)
+#define LMPWR_MC_PWR_ACT        ((0x0) << FShft(LMPWR_MC_PWR_CNT)) /* Active */
+#define LMPWR_MC_PWR_SRM        ((0x1) << FShft(LMPWR_MC_PWR_CNT)) /* Self-refresh */
+#define LMPWR_MC_PWR_DPD        ((0x3) << FShft(LMPWR_MC_PWR_CNT)) /* deep power down */
+
+/* LMPWRSTAT - Local Memory (SDRAM) Power Status Register */
+#define LMPWRSTAT_MC_PWR_CNT    Fld(2,0)
+#define LMPWRSTAT_MC_PWR_ACT    ((0x0) << FShft(LMPWRSTAT_MC_PWR_CNT)) /* Active */
+#define LMPWRSTAT_MC_PWR_SRM    ((0x1) << FShft(LMPWRSTAT_MC_PWR_CNT)) /* Self-refresh */
+#define LMPWRSTAT_MC_PWR_DPD    ((0x3) << FShft(LMPWRSTAT_MC_PWR_CNT)) /* deep power down */
+
+/* LMTYPE - Local Memory (SDRAM) Type Register */
+#define LMTYPE_CASLAT   Fld(3,10)
+#define LMTYPE_CASLAT_1 ((0x1) << FShft(LMTYPE_CASLAT))
+#define LMTYPE_CASLAT_2 ((0x2) << FShft(LMTYPE_CASLAT))
+#define LMTYPE_CASLAT_3 ((0x3) << FShft(LMTYPE_CASLAT))
+#define LMTYPE_BKSZ     Fld(2,8)
+#define LMTYPE_BKSZ_1   ((0x1) << FShft(LMTYPE_BKSZ))
+#define LMTYPE_BKSZ_2   ((0x2) << FShft(LMTYPE_BKSZ))
+#define LMTYPE_ROWSZ    Fld(4,4)
+#define LMTYPE_ROWSZ_11 ((0xb) << FShft(LMTYPE_ROWSZ))
+#define LMTYPE_ROWSZ_12 ((0xc) << FShft(LMTYPE_ROWSZ))
+#define LMTYPE_ROWSZ_13 ((0xd) << FShft(LMTYPE_ROWSZ))
+#define LMTYPE_COLSZ    Fld(4,0)
+#define LMTYPE_COLSZ_7  ((0x7) << FShft(LMTYPE_COLSZ))
+#define LMTYPE_COLSZ_8  ((0x8) << FShft(LMTYPE_COLSZ))
+#define LMTYPE_COLSZ_9  ((0x9) << FShft(LMTYPE_COLSZ))
+#define LMTYPE_COLSZ_10 ((0xa) << FShft(LMTYPE_COLSZ))
+#define LMTYPE_COLSZ_11 ((0xb) << FShft(LMTYPE_COLSZ))
+#define LMTYPE_COLSZ_12 ((0xc) << FShft(LMTYPE_COLSZ))
+
+/* LMTIM - Local Memory (SDRAM) Timing Register */
+#define LMTIM_TRAS      Fld(4,16)
+#define Lmtim_Tras(x)   ((x) << FShft(LMTIM_TRAS))
+#define LMTIM_TRP       Fld(4,12)
+#define Lmtim_Trp(x)    ((x) << FShft(LMTIM_TRP))
+#define LMTIM_TRCD      Fld(4,8)
+#define Lmtim_Trcd(x)   ((x) << FShft(LMTIM_TRCD))
+#define LMTIM_TRC       Fld(4,4)
+#define Lmtim_Trc(x)    ((x) << FShft(LMTIM_TRC))
+#define LMTIM_TDPL      Fld(4,0)
+#define Lmtim_Tdpl(x)   ((x) << FShft(LMTIM_TDPL))
+
+/* LMREFRESH - Local Memory (SDRAM) tREF Control Register */
+#define LMREFRESH_TREF  Fld(2,0)
+#define Lmrefresh_Tref(x)       ((x) << FShft(LMREFRESH_TREF))
+
+/* GSCTRL - Graphics surface control register */
+#define GSCTRL_LUT_EN   (1 << 31)
+#define GSCTRL_GPIXFMT  Fld(4,27)
+#define GSCTRL_GPIXFMT_INDEXED  ((0x0) << FShft(GSCTRL_GPIXFMT))
+#define GSCTRL_GPIXFMT_ARGB4444 ((0x4) << FShft(GSCTRL_GPIXFMT))
+#define GSCTRL_GPIXFMT_ARGB1555 ((0x5) << FShft(GSCTRL_GPIXFMT))
+#define GSCTRL_GPIXFMT_RGB888   ((0x6) << FShft(GSCTRL_GPIXFMT))
+#define GSCTRL_GPIXFMT_RGB565   ((0x7) << FShft(GSCTRL_GPIXFMT))
+#define GSCTRL_GPIXFMT_ARGB8888 ((0x8) << FShft(GSCTRL_GPIXFMT))
+#define GSCTRL_GAMMA_EN (1 << 26)
+
+#define GSCTRL_GSWIDTH Fld(11,11)
+#define Gsctrl_Width(Pixel)     /* Display Width [1..2048 pix.]  */ \
+                        (((Pixel) - 1) << FShft(GSCTRL_GSWIDTH))
+
+#define GSCTRL_GSHEIGHT Fld(11,0)
+#define Gsctrl_Height(Pixel)    /* Display Height [1..2048 pix.]  */ \
+                        (((Pixel) - 1) << FShft(GSCTRL_GSHEIGHT))
+
+/* GBBASE fileds */
+#define GBBASE_GLALPHA Fld(8,24)
+#define Gbbase_Glalpha(x)       ((x) << FShft(GBBASE_GLALPHA))
+
+#define GBBASE_COLKEY Fld(24,0)
+#define Gbbase_Colkey(x)        ((x) << FShft(GBBASE_COLKEY))
+
+/* GDRCTRL fields */
+#define GDRCTRL_PIXDBL  (1 << 31)
+#define GDRCTRL_PIXHLV  (1 << 30)
+#define GDRCTRL_LNDBL   (1 << 29)
+#define GDRCTRL_LNHLV   (1 << 28)
+#define GDRCTRL_COLKEYM Fld(24,0)
+#define Gdrctrl_Colkeym(x)      ((x) << FShft(GDRCTRL_COLKEYM))
+
+/* GSCADR graphics stream control address register fields */
+#define GSCADR_STR_EN   (1 << 31)
+#define GSCADR_COLKEY_EN        (1 << 30)
+#define GSCADR_COLKEYSCR        (1 << 29)
+#define GSCADR_BLEND_M  Fld(2,27)
+#define GSCADR_BLEND_NONE       ((0x0) << FShft(GSCADR_BLEND_M))
+#define GSCADR_BLEND_INV        ((0x1) << FShft(GSCADR_BLEND_M))
+#define GSCADR_BLEND_GLOB       ((0x2) << FShft(GSCADR_BLEND_M))
+#define GSCADR_BLEND_PIX        ((0x3) << FShft(GSCADR_BLEND_M))
+#define GSCADR_BLEND_POS        Fld(2,24)
+#define GSCADR_BLEND_GFX        ((0x0) << FShft(GSCADR_BLEND_POS))
+#define GSCADR_BLEND_VID        ((0x1) << FShft(GSCADR_BLEND_POS))
+#define GSCADR_BLEND_CUR        ((0x2) << FShft(GSCADR_BLEND_POS))
+#define GSCADR_GBASE_ADR        Fld(23,0)
+#define Gscadr_Gbase_Adr(x)     ((x) << FShft(GSCADR_GBASE_ADR))
+
+/* GSADR graphics stride address register fields */
+#define GSADR_SRCSTRIDE Fld(10,22)
+#define Gsadr_Srcstride(x)      ((x) << FShft(GSADR_SRCSTRIDE))
+#define GSADR_XSTART    Fld(11,11)
+#define Gsadr_Xstart(x)         ((x) << FShft(GSADR_XSTART))
+#define GSADR_YSTART    Fld(11,0)
+#define Gsadr_Ystart(y)         ((y) << FShft(GSADR_YSTART))
+
+/* GPLUT graphics palette register fields */
+#define GPLUT_LUTADR    Fld(8,24)
+#define Gplut_Lutadr(x) ((x) << FShft(GPLUT_LUTADR))
+#define GPLUT_LUTDATA   Fld(24,0)
+#define Gplut_Lutdata(x)        ((x) << FShft(GPLUT_LUTDATA))
+
+/* HCCTRL - Hardware Cursor Register fields */
+#define HCCTRL_CUR_EN   (1 << 31)
+#define HCCTRL_COLKEY_EN        (1 << 29)
+#define HCCTRL_COLKEYSRC        (1 << 28)
+#define HCCTRL_BLEND_M  Fld(2,26)
+#define HCCTRL_BLEND_NONE       ((0x0) << FShft(HCCTRL_BLEND_M))
+#define HCCTRL_BLEND_INV        ((0x1) << FShft(HCCTRL_BLEND_M))
+#define HCCTRL_BLEND_GLOB       ((0x2) << FShft(HCCTRL_BLEND_M))
+#define HCCTRL_BLEND_PIX        ((0x3) << FShft(HCCTRL_BLEND_M))
+#define HCCTRL_CPIXFMT  Fld(3,23)
+#define HCCTRL_CPIXFMT_RGB332   ((0x3) << FShft(HCCTRL_CPIXFMT))
+#define HCCTRL_CPIXFMT_ARGB4444 ((0x4) << FShft(HCCTRL_CPIXFMT))
+#define HCCTRL_CPIXFMT_ARGB1555 ((0x5) << FShft(HCCTRL_CPIXFMT))
+#define HCCTRL_CBASE_ADR        Fld(23,0)
+#define Hcctrl_Cbase_Adr(x)     ((x) << FShft(HCCTRL_CBASE_ADR))
+
+/* HCSIZE Hardware Cursor Size Register fields */
+#define HCSIZE_BLEND_POS        Fld(2,29)
+#define HCSIZE_BLEND_GFX        ((0x0) << FShft(HCSIZE_BLEND_POS))
+#define HCSIZE_BLEND_VID        ((0x1) << FShft(HCSIZE_BLEND_POS))
+#define HCSIZE_BLEND_CUR        ((0x2) << FShft(HCSIZE_BLEND_POS))
+#define HCSIZE_CWIDTH   Fld(3,16)
+#define Hcsize_Cwidth(x)        ((x) << FShft(HCSIZE_CWIDTH))
+#define HCSIZE_CHEIGHT  Fld(3,0)
+#define Hcsize_Cheight(x)       ((x) << FShft(HCSIZE_CHEIGHT))
+
+/* HCPOS Hardware Cursor Position Register fields */
+#define HCPOS_SWITCHSRC (1 << 30)
+#define HCPOS_CURBLINK  Fld(6,24)
+#define Hcpos_Curblink(x)       ((x) << FShft(HCPOS_CURBLINK))
+#define HCPOS_XSTART    Fld(12,12)
+#define Hcpos_Xstart(x) ((x) << FShft(HCPOS_XSTART))
+#define HCPOS_YSTART    Fld(12,0)
+#define Hcpos_Ystart(y) ((y) << FShft(HCPOS_YSTART))
+
+/* HCBADR Hardware Cursor Blend Address Register */
+#define HCBADR_GLALPHA  Fld(8,24)
+#define Hcbadr_Glalpha(x)       ((x) << FShft(HCBADR_GLALPHA))
+#define HCBADR_COLKEY   Fld(24,0)
+#define Hcbadr_Colkey(x)        ((x) << FShft(HCBADR_COLKEY))
+
+/* HCCKMSK - Hardware Cursor Color Key Mask Register */
+#define HCCKMSK_COLKEY_M        Fld(24,0)
+#define Hcckmsk_Colkey_M(x)     ((x) << FShft(HCCKMSK_COLKEY_M))
+
+/* DSCTRL - Display sync control register */
+#define DSCTRL_SYNCGEN_EN       (1 << 31)
+#define DSCTRL_DPL_RST          (1 << 29)
+#define DSCTRL_PWRDN_M          (1 << 28)
+#define DSCTRL_UPDSYNCCNT       (1 << 26)
+#define DSCTRL_UPDINTCNT        (1 << 25)
+#define DSCTRL_UPDCNT           (1 << 24)
+#define DSCTRL_UPDWAIT  Fld(4,16)
+#define Dsctrl_Updwait(x)       ((x) << FShft(DSCTRL_UPDWAIT))
+#define DSCTRL_CLKPOL           (1 << 11)
+#define DSCTRL_CSYNC_EN         (1 << 10)
+#define DSCTRL_VS_SLAVE         (1 << 7)
+#define DSCTRL_HS_SLAVE         (1 << 6)
+#define DSCTRL_BLNK_POL         (1 << 5)
+#define DSCTRL_BLNK_DIS         (1 << 4)
+#define DSCTRL_VS_POL           (1 << 3)
+#define DSCTRL_VS_DIS           (1 << 2)
+#define DSCTRL_HS_POL           (1 << 1)
+#define DSCTRL_HS_DIS           (1 << 0)
+
+/* DHT01 - Display horizontal timing register 01 */
+#define DHT01_HBPS      Fld(12,16)
+#define Dht01_Hbps(x)   ((x) << FShft(DHT01_HBPS))
+#define DHT01_HT        Fld(12,0)
+#define Dht01_Ht(x)     ((x) << FShft(DHT01_HT))
+
+/* DHT02 - Display horizontal timing register 02 */
+#define DHT02_HAS       Fld(12,16)
+#define Dht02_Has(x)    ((x) << FShft(DHT02_HAS))
+#define DHT02_HLBS      Fld(12,0)
+#define Dht02_Hlbs(x)   ((x) << FShft(DHT02_HLBS))
+
+/* DHT03 - Display horizontal timing register 03 */
+#define DHT03_HFPS      Fld(12,16)
+#define Dht03_Hfps(x)   ((x) << FShft(DHT03_HFPS))
+#define DHT03_HRBS      Fld(12,0)
+#define Dht03_Hrbs(x)   ((x) << FShft(DHT03_HRBS))
+
+/* DVT01 - Display vertical timing register 01 */
+#define DVT01_VBPS      Fld(12,16)
+#define Dvt01_Vbps(x)   ((x) << FShft(DVT01_VBPS))
+#define DVT01_VT        Fld(12,0)
+#define Dvt01_Vt(x)     ((x) << FShft(DVT01_VT))
+
+/* DVT02 - Display vertical timing register 02 */
+#define DVT02_VAS       Fld(12,16)
+#define Dvt02_Vas(x)    ((x) << FShft(DVT02_VAS))
+#define DVT02_VTBS      Fld(12,0)
+#define Dvt02_Vtbs(x)   ((x) << FShft(DVT02_VTBS))
+
+/* DVT03 - Display vertical timing register 03 */
+#define DVT03_VFPS      Fld(12,16)
+#define Dvt03_Vfps(x)   ((x) << FShft(DVT03_VFPS))
+#define DVT03_VBBS      Fld(12,0)
+#define Dvt03_Vbbs(x)   ((x) << FShft(DVT03_VBBS))
+
+/* DVECTRL - display vertical event control register */
+#define DVECTRL_VEVENT  Fld(12,16)
+#define Dvectrl_Vevent(x)       ((x) << FShft(DVECTRL_VEVENT))
+#define DVECTRL_VFETCH  Fld(12,0)
+#define Dvectrl_Vfetch(x)       ((x) << FShft(DVECTRL_VFETCH))
+
+/* DHDET - display horizontal DE timing register */
+#define DHDET_HDES      Fld(12,16)
+#define Dhdet_Hdes(x)   ((x) << FShft(DHDET_HDES))
+#define DHDET_HDEF      Fld(12,0)
+#define Dhdet_Hdef(x)   ((x) << FShft(DHDET_HDEF))
+
+/* DVDET - display vertical DE timing register */
+#define DVDET_VDES      Fld(12,16)
+#define Dvdet_Vdes(x)   ((x) << FShft(DVDET_VDES))
+#define DVDET_VDEF      Fld(12,0)
+#define Dvdet_Vdef(x)   ((x) << FShft(DVDET_VDEF))
+
+/* DODMSK - display output data mask register */
+#define DODMSK_MASK_LVL (1 << 31)
+#define DODMSK_BLNK_LVL (1 << 30)
+#define DODMSK_MASK_B   Fld(8,16)
+#define Dodmsk_Mask_B(x)        ((x) << FShft(DODMSK_MASK_B))
+#define DODMSK_MASK_G   Fld(8,8)
+#define Dodmsk_Mask_G(x)        ((x) << FShft(DODMSK_MASK_G))
+#define DODMSK_MASK_R   Fld(8,0)
+#define Dodmsk_Mask_R(x)        ((x) << FShft(DODMSK_MASK_R))
+
+/* DBCOL - display border color control register */
+#define DBCOL_BORDCOL   Fld(24,0)
+#define Dbcol_Bordcol(x)        ((x) << FShft(DBCOL_BORDCOL))
+
+/* DVLNUM - display vertical line number register */
+#define DVLNUM_VLINE    Fld(12,0)
+#define Dvlnum_Vline(x) ((x) << FShft(DVLNUM_VLINE))
+
+/* DMCTRL - Display Memory Control Register */
+#define DMCTRL_MEM_REF  Fld(2,30)
+#define DMCTRL_MEM_REF_ACT      ((0x0) << FShft(DMCTRL_MEM_REF))
+#define DMCTRL_MEM_REF_HB       ((0x1) << FShft(DMCTRL_MEM_REF))
+#define DMCTRL_MEM_REF_VB       ((0x2) << FShft(DMCTRL_MEM_REF))
+#define DMCTRL_MEM_REF_BOTH     ((0x3) << FShft(DMCTRL_MEM_REF))
+#define DMCTRL_UV_THRHLD        Fld(6,24)
+#define Dmctrl_Uv_Thrhld(x)     ((x) << FShft(DMCTRL_UV_THRHLD))
+#define DMCTRL_V_THRHLD         Fld(7,16)
+#define Dmctrl_V_Thrhld(x)      ((x) << FShft(DMCTRL_V_THRHLD))
+#define DMCTRL_D_THRHLD         Fld(7,8)
+#define Dmctrl_D_Thrhld(x)      ((x) << FShft(DMCTRL_D_THRHLD))
+#define DMCTRL_BURSTLEN Fld(6,0)
+#define Dmctrl_Burstlen(x)      ((x) << FShft(DMCTRL_BURSTLEN))
+
+
+/* DLSTS - display load status register */
+#define DLSTS_RLD_ADONE (1 << 23)
+/* #define DLSTS_RLD_ADOUT      Fld(23,0) */
+
+/* DLLCTRL - display list load control register */
+#define DLLCTRL_RLD_ADRLN       Fld(8,24)
+#define Dllctrl_Rld_Adrln(x)    ((x) << FShft(DLLCTRL_RLD_ADRLN))
+
+/* SPOCTRL - Scale Pitch/Order Control Register */
+#define SPOCTRL_H_SC_BP         (1 << 31)
+#define SPOCTRL_V_SC_BP         (1 << 30)
+#define SPOCTRL_HV_SC_OR        (1 << 29)
+#define SPOCTRL_VS_UR_C         (1 << 27)
+#define SPOCTRL_VORDER  Fld(2,16)
+#define SPOCTRL_VORDER_1TAP     ((0x0) << FShft(SPOCTRL_VORDER))
+#define SPOCTRL_VORDER_2TAP     ((0x1) << FShft(SPOCTRL_VORDER))
+#define SPOCTRL_VORDER_4TAP     ((0x3) << FShft(SPOCTRL_VORDER))
+#define SPOCTRL_VPITCH  Fld(16,0)
+#define Spoctrl_Vpitch(x)       ((x) << FShft(SPOCTRL_VPITCH))
+
+#endif /* __REG_BITS_2700G_ */
diff --git a/drivers/video/mbx/regs.h b/drivers/video/mbx/regs.h
new file mode 100644
index 000000000000..ad20be07666b
--- /dev/null
+++ b/drivers/video/mbx/regs.h
@@ -0,0 +1,195 @@
+#ifndef __REGS_2700G_
+#define __REGS_2700G_
+
+/* extern unsigned long virt_base_2700; */
+/* #define __REG_2700G(x)       (*(volatile unsigned long*)((x)+virt_base_2700)) */
+#define __REG_2700G(x)  ((x)+virt_base_2700)
+
+/* System Configuration Registers (0x0000_0000  0x0000_0010) */
+#define SYSCFG          __REG_2700G(0x00000000)
+#define PFBASE          __REG_2700G(0x00000004)
+#define PFCEIL          __REG_2700G(0x00000008)
+#define POLLFLAG        __REG_2700G(0x0000000c)
+#define SYSRST          __REG_2700G(0x00000010)
+
+/* Interrupt Control Registers (0x0000_0014  0x0000_002F) */
+#define NINTPW          __REG_2700G(0x00000014)
+#define MINTENABLE      __REG_2700G(0x00000018)
+#define MINTSTAT        __REG_2700G(0x0000001c)
+#define SINTENABLE      __REG_2700G(0x00000020)
+#define SINTSTAT        __REG_2700G(0x00000024)
+#define SINTCLR         __REG_2700G(0x00000028)
+
+/* Clock Control Registers (0x0000_002C  0x0000_005F) */
+#define SYSCLKSRC       __REG_2700G(0x0000002c)
+#define PIXCLKSRC       __REG_2700G(0x00000030)
+#define CLKSLEEP        __REG_2700G(0x00000034)
+#define COREPLL         __REG_2700G(0x00000038)
+#define DISPPLL         __REG_2700G(0x0000003c)
+#define PLLSTAT         __REG_2700G(0x00000040)
+#define VOVRCLK         __REG_2700G(0x00000044)
+#define PIXCLK          __REG_2700G(0x00000048)
+#define MEMCLK          __REG_2700G(0x0000004c)
+#define M24CLK          __REG_2700G(0x00000054)
+#define MBXCLK          __REG_2700G(0x00000054)
+#define SDCLK           __REG_2700G(0x00000058)
+#define PIXCLKDIV       __REG_2700G(0x0000005c)
+
+/* LCD Port Control Register (0x0000_0060  0x0000_006F) */
+#define LCD_CONFIG      __REG_2700G(0x00000060)
+
+/* On-Die Frame Buffer Registers (0x0000_0064  0x0000_006B) */
+#define ODFBPWR         __REG_2700G(0x00000064)
+#define ODFBSTAT        __REG_2700G(0x00000068)
+
+/* GPIO Registers (0x0000_006C  0x0000_007F) */
+#define GPIOCGF         __REG_2700G(0x0000006c)
+#define GPIOHI          __REG_2700G(0x00000070)
+#define GPIOLO          __REG_2700G(0x00000074)
+#define GPIOSTAT        __REG_2700G(0x00000078)
+
+/* Pulse Width Modulator (PWM) Registers (0x0000_0200  0x0000_02FF) */
+#define PWMRST          __REG_2700G(0x00000200)
+#define PWMCFG          __REG_2700G(0x00000204)
+#define PWM0DIV         __REG_2700G(0x00000210)
+#define PWM0DUTY        __REG_2700G(0x00000214)
+#define PWM0PER         __REG_2700G(0x00000218)
+#define PWM1DIV         __REG_2700G(0x00000220)
+#define PWM1DUTY        __REG_2700G(0x00000224)
+#define PWM1PER         __REG_2700G(0x00000228)
+
+/* Identification (ID) Registers (0x0000_0300  0x0000_0FFF) */
+#define ID              __REG_2700G(0x00000FF0)
+
+/* Local Memory (SDRAM) Interface Registers (0x0000_1000  0x0000_1FFF) */
+#define LMRST           __REG_2700G(0x00001000)
+#define LMCFG           __REG_2700G(0x00001004)
+#define LMPWR           __REG_2700G(0x00001008)
+#define LMPWRSTAT       __REG_2700G(0x0000100c)
+#define LMCEMR          __REG_2700G(0x00001010)
+#define LMTYPE          __REG_2700G(0x00001014)
+#define LMTIM           __REG_2700G(0x00001018)
+#define LMREFRESH       __REG_2700G(0x0000101c)
+#define LMPROTMIN       __REG_2700G(0x00001020)
+#define LMPROTMAX       __REG_2700G(0x00001024)
+#define LMPROTCFG       __REG_2700G(0x00001028)
+#define LMPROTERR       __REG_2700G(0x0000102c)
+
+/* Plane Controller Registers (0x0000_2000  0x0000_2FFF) */
+#define GSCTRL          __REG_2700G(0x00002000)
+#define VSCTRL          __REG_2700G(0x00002004)
+#define GBBASE          __REG_2700G(0x00002020)
+#define VBBASE          __REG_2700G(0x00002024)
+#define GDRCTRL         __REG_2700G(0x00002040)
+#define VCMSK           __REG_2700G(0x00002044)
+#define GSCADR          __REG_2700G(0x00002060)
+#define VSCADR          __REG_2700G(0x00002064)
+#define VUBASE          __REG_2700G(0x00002084)
+#define VVBASE          __REG_2700G(0x000020a4)
+#define GSADR           __REG_2700G(0x000020c0)
+#define VSADR           __REG_2700G(0x000020c4)
+#define HCCTRL          __REG_2700G(0x00002100)
+#define HCSIZE          __REG_2700G(0x00002110)
+#define HCPOS           __REG_2700G(0x00002120)
+#define HCBADR          __REG_2700G(0x00002130)
+#define HCCKMSK         __REG_2700G(0x00002140)
+#define GPLUT           __REG_2700G(0x00002150)
+#define DSCTRL          __REG_2700G(0x00002154)
+#define DHT01           __REG_2700G(0x00002158)
+#define DHT02           __REG_2700G(0x0000215c)
+#define DHT03           __REG_2700G(0x00002160)
+#define DVT01           __REG_2700G(0x00002164)
+#define DVT02           __REG_2700G(0x00002168)
+#define DVT03           __REG_2700G(0x0000216c)
+#define DBCOL           __REG_2700G(0x00002170)
+#define BGCOLOR         __REG_2700G(0x00002174)
+#define DINTRS          __REG_2700G(0x00002178)
+#define DINTRE          __REG_2700G(0x0000217c)
+#define DINTRCNT        __REG_2700G(0x00002180)
+#define DSIG            __REG_2700G(0x00002184)
+#define DMCTRL          __REG_2700G(0x00002188)
+#define CLIPCTRL        __REG_2700G(0x0000218c)
+#define SPOCTRL         __REG_2700G(0x00002190)
+#define SVCTRL          __REG_2700G(0x00002194)
+
+/* 0x0000_2198 */
+/* 0x0000_21A8 VSCOEFF[0:4] Video Scalar Vertical Coefficient [0:4] 4.14.5 */
+#define VSCOEFF0        __REG_2700G(0x00002198)
+#define VSCOEFF1        __REG_2700G(0x0000219c)
+#define VSCOEFF2        __REG_2700G(0x000021a0)
+#define VSCOEFF3        __REG_2700G(0x000021a4)
+#define VSCOEFF4        __REG_2700G(0x000021a8)
+
+#define SHCTRL          __REG_2700G(0x000021b0)
+
+/* 0x0000_21B4 */
+/* 0x0000_21D4 HSCOEFF[0:8] Video Scalar Horizontal Coefficient [0:8] 4.14.7 */
+#define HSCOEFF0        __REG_2700G(0x000021b4)
+#define HSCOEFF1        __REG_2700G(0x000021b8)
+#define HSCOEFF2        __REG_2700G(0x000021bc)
+#define HSCOEFF3        __REG_2700G(0x000021b0)
+#define HSCOEFF4        __REG_2700G(0x000021c4)
+#define HSCOEFF5        __REG_2700G(0x000021c8)
+#define HSCOEFF6        __REG_2700G(0x000021cc)
+#define HSCOEFF7        __REG_2700G(0x000021d0)
+#define HSCOEFF8        __REG_2700G(0x000021d4)
+
+#define SSSIZE          __REG_2700G(0x000021D8)
+
+/* 0x0000_2200 */
+/* 0x0000_2240 VIDGAM[0:16] Video Gamma LUT Index [0:16] 4.15.2 */
+#define VIDGAM0         __REG_2700G(0x00002200)
+#define VIDGAM1         __REG_2700G(0x00002204)
+#define VIDGAM2         __REG_2700G(0x00002208)
+#define VIDGAM3         __REG_2700G(0x0000220c)
+#define VIDGAM4         __REG_2700G(0x00002210)
+#define VIDGAM5         __REG_2700G(0x00002214)
+#define VIDGAM6         __REG_2700G(0x00002218)
+#define VIDGAM7         __REG_2700G(0x0000221c)
+#define VIDGAM8         __REG_2700G(0x00002220)
+#define VIDGAM9         __REG_2700G(0x00002224)
+#define VIDGAM10        __REG_2700G(0x00002228)
+#define VIDGAM11        __REG_2700G(0x0000222c)
+#define VIDGAM12        __REG_2700G(0x00002230)
+#define VIDGAM13        __REG_2700G(0x00002234)
+#define VIDGAM14        __REG_2700G(0x00002238)
+#define VIDGAM15        __REG_2700G(0x0000223c)
+#define VIDGAM16        __REG_2700G(0x00002240)
+
+/* 0x0000_2250 */
+/* 0x0000_2290 GFXGAM[0:16] Graphics Gamma LUT Index [0:16] 4.15.3 */
+#define GFXGAM0         __REG_2700G(0x00002250)
+#define GFXGAM1         __REG_2700G(0x00002254)
+#define GFXGAM2         __REG_2700G(0x00002258)
+#define GFXGAM3         __REG_2700G(0x0000225c)
+#define GFXGAM4         __REG_2700G(0x00002260)
+#define GFXGAM5         __REG_2700G(0x00002264)
+#define GFXGAM6         __REG_2700G(0x00002268)
+#define GFXGAM7         __REG_2700G(0x0000226c)
+#define GFXGAM8         __REG_2700G(0x00002270)
+#define GFXGAM9         __REG_2700G(0x00002274)
+#define GFXGAM10        __REG_2700G(0x00002278)
+#define GFXGAM11        __REG_2700G(0x0000227c)
+#define GFXGAM12        __REG_2700G(0x00002280)
+#define GFXGAM13        __REG_2700G(0x00002284)
+#define GFXGAM14        __REG_2700G(0x00002288)
+#define GFXGAM15        __REG_2700G(0x0000228c)
+#define GFXGAM16        __REG_2700G(0x00002290)
+
+#define DLSTS           __REG_2700G(0x00002300)
+#define DLLCTRL         __REG_2700G(0x00002304)
+#define DVLNUM          __REG_2700G(0x00002308)
+#define DUCTRL          __REG_2700G(0x0000230c)
+#define DVECTRL         __REG_2700G(0x00002310)
+#define DHDET           __REG_2700G(0x00002314)
+#define DVDET           __REG_2700G(0x00002318)
+#define DODMSK          __REG_2700G(0x0000231c)
+#define CSC01           __REG_2700G(0x00002330)
+#define CSC02           __REG_2700G(0x00002334)
+#define CSC03           __REG_2700G(0x00002338)
+#define CSC04           __REG_2700G(0x0000233c)
+#define CSC05           __REG_2700G(0x00002340)
+
+#define FB_MEMORY_START __REG_2700G(0x00060000)
+
+#endif /* __REGS_2700G_ */
diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index 26a1c618a205..d1267904c280 100644
--- a/drivers/video/modedb.c
+++ b/drivers/video/modedb.c
@@ -12,7 +12,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/tty.h>
 #include <linux/fb.h>
 #include <linux/sched.h>
 
@@ -259,6 +258,10 @@ static const struct fb_videomode modedb[] = {
         /* 1152x768, 60 Hz, PowerBook G4 Titanium I and II */
         NULL, 60, 1152, 768, 15386, 158, 26, 29, 3, 136, 6,
         FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
+    }, {
+        /* 1366x768, 60 Hz, 47.403 kHz hsync, WXGA 16:9 aspect ratio */
+        NULL, 60, 1366, 768, 13806, 120, 10, 14, 3, 32, 5,
+        0, FB_VMODE_NONINTERLACED
     },
 };
 
@@ -787,8 +790,9 @@ struct fb_videomode *fb_find_best_mode(struct fb_var_screeninfo *var,
                         if (diff > d) {
                                 diff = d;
                                 best = mode;
-                        } else if (diff == d && mode->refresh > best->refresh)
-                            best = mode;
+                        } else if (diff == d && best &&
+                                   mode->refresh > best->refresh)
+                                best = mode;
                 }
         }
         return best;
@@ -1016,8 +1020,6 @@ EXPORT_SYMBOL(fb_videomode_to_var);
 EXPORT_SYMBOL(fb_var_to_videomode);
 EXPORT_SYMBOL(fb_mode_is_equal);
 EXPORT_SYMBOL(fb_add_videomode);
-EXPORT_SYMBOL(fb_delete_videomode);
-EXPORT_SYMBOL(fb_destroy_modelist);
 EXPORT_SYMBOL(fb_match_mode);
 EXPORT_SYMBOL(fb_find_best_mode);
 EXPORT_SYMBOL(fb_find_nearest_mode);
diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c
index 24b12f71d5a8..59a6f5fa5ae6 100644
--- a/drivers/video/neofb.c
+++ b/drivers/video/neofb.c
@@ -54,13 +54,11 @@
  *
  */
 
-#include <linux/config.h>
 #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>
@@ -1333,17 +1331,22 @@ static int neofb_blank(int blank_mode, struct fb_info *info)
          *  run "setterm -powersave powerdown" to take advantage
          */
         struct neofb_par *par = info->par;
-        int seqflags, lcdflags, dpmsflags, reg;
-
+        int seqflags, lcdflags, dpmsflags, reg, tmpdisp;
 
         /*
-         * Reload the value stored in the register, if sensible. It might have
-         * been changed via FN keystroke.
+         * Read back the register bits related to display configuration. They might
+         * have been changed underneath the driver via Fn key stroke.
+         */
+        neoUnlock();
+        tmpdisp = vga_rgfx(NULL, 0x20) & 0x03;
+        neoLock(&par->state);
+
+        /* In case we blank the screen, we want to store the possibly new
+         * configuration in the driver. During un-blank, we re-apply this setting,
+         * since the LCD bit will be cleared in order to switch off the backlight.
          */
         if (par->PanelDispCntlRegRead) {
-                neoUnlock();
-                par->PanelDispCntlReg1 = vga_rgfx(NULL, 0x20) & 0x03;
-                neoLock(&par->state);
+                par->PanelDispCntlReg1 = tmpdisp;
         }
         par->PanelDispCntlRegRead = !blank_mode;
 
@@ -1378,12 +1381,21 @@ static int neofb_blank(int blank_mode, struct fb_info *info)
                 break;
         case FB_BLANK_NORMAL:           /* just blank screen (backlight stays on) */
                 seqflags = VGA_SR01_SCREEN_OFF; /* Disable sequencer */
-                lcdflags = par->PanelDispCntlReg1 & 0x02; /* LCD normal */
+                /*
+                 * During a blank operation with the LID shut, we might store "LCD off"
+                 * by mistake. Due to timing issues, the BIOS may switch the lights
+                 * back on, and we turn it back off once we "unblank".
+                 *
+                 * So here is an attempt to implement ">=" - if we are in the process
+                 * of unblanking, and the LCD bit is unset in the driver but set in the
+                 * register, we must keep it.
+                 */
+                lcdflags = ((par->PanelDispCntlReg1 | tmpdisp) & 0x02); /* LCD normal */
                 dpmsflags = 0x00;       /* no hsync/vsync suppression */
                 break;
         case FB_BLANK_UNBLANK:          /* unblank */
                 seqflags = 0;                   /* Enable sequencer */
-                lcdflags = par->PanelDispCntlReg1 & 0x02; /* LCD normal */
+                lcdflags = ((par->PanelDispCntlReg1 | tmpdisp) & 0x02); /* LCD normal */
                 dpmsflags = 0x00;       /* no hsync/vsync suppression */
 #ifdef CONFIG_TOSHIBA
                 /* Do we still need this ? */
diff --git a/drivers/video/nvidia/Makefile b/drivers/video/nvidia/Makefile
index 690d37e8de5b..ca47432113e0 100644
--- a/drivers/video/nvidia/Makefile
+++ b/drivers/video/nvidia/Makefile
@@ -7,6 +7,7 @@ obj-$(CONFIG_FB_NVIDIA)          += nvidiafb.o
 nvidiafb-y                       := nvidia.o nv_hw.o nv_setup.o \
                                     nv_accel.o
 nvidiafb-$(CONFIG_FB_NVIDIA_I2C) += nv_i2c.o
+nvidiafb-$(CONFIG_FB_NVIDIA_BACKLIGHT)  += nv_backlight.o
 nvidiafb-$(CONFIG_PPC_OF)        += nv_of.o
 
-nvidiafb-objs                    := $(nvidiafb-y)
\ No newline at end of file
+nvidiafb-objs                    := $(nvidiafb-y)
diff --git a/drivers/video/nvidia/nv_backlight.c b/drivers/video/nvidia/nv_backlight.c
new file mode 100644
index 000000000000..5b75ae4e9457
--- /dev/null
+++ b/drivers/video/nvidia/nv_backlight.c
@@ -0,0 +1,203 @@
+/*
+ * Backlight code for nVidia based graphic cards
+ *
+ * Copyright 2004 Antonino Daplas <adaplas@pol.net>
+ * Copyright (c) 2006 Michael Hanselmann <linux-kernel@hansmi.ch>
+ *
+ * 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/backlight.h>
+#include <linux/fb.h>
+#include <linux/pci.h>
+#include "nv_local.h"
+#include "nv_type.h"
+#include "nv_proto.h"
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+#include <asm/backlight.h>
+#include <asm/machdep.h>
+#endif
+
+/* We do not have any information about which values are allowed, thus
+ * we used safe values.
+ */
+#define MIN_LEVEL 0x158
+#define MAX_LEVEL 0x534
+#define LEVEL_STEP ((MAX_LEVEL - MIN_LEVEL) / FB_BACKLIGHT_MAX)
+
+static struct backlight_properties nvidia_bl_data;
+
+/* Call with fb_info->bl_mutex held */
+static int nvidia_bl_get_level_brightness(struct nvidia_par *par,
+                int level)
+{
+        struct fb_info *info = pci_get_drvdata(par->pci_dev);
+        int nlevel;
+
+        /* Get and convert the value */
+        nlevel = MIN_LEVEL + info->bl_curve[level] * LEVEL_STEP;
+
+        if (nlevel < 0)
+                nlevel = 0;
+        else if (nlevel < MIN_LEVEL)
+                nlevel = MIN_LEVEL;
+        else if (nlevel > MAX_LEVEL)
+                nlevel = MAX_LEVEL;
+
+        return nlevel;
+}
+
+/* Call with fb_info->bl_mutex held */
+static int __nvidia_bl_update_status(struct backlight_device *bd)
+{
+        struct nvidia_par *par = class_get_devdata(&bd->class_dev);
+        u32 tmp_pcrt, tmp_pmc, fpcontrol;
+        int level;
+
+        if (!par->FlatPanel)
+                return 0;
+
+        if (bd->props->power != FB_BLANK_UNBLANK ||
+            bd->props->fb_blank != FB_BLANK_UNBLANK)
+                level = 0;
+        else
+                level = bd->props->brightness;
+
+        tmp_pmc = NV_RD32(par->PMC, 0x10F0) & 0x0000FFFF;
+        tmp_pcrt = NV_RD32(par->PCRTC0, 0x081C) & 0xFFFFFFFC;
+        fpcontrol = NV_RD32(par->PRAMDAC, 0x0848) & 0xCFFFFFCC;
+
+        if (level > 0) {
+                tmp_pcrt |= 0x1;
+                tmp_pmc |= (1 << 31); /* backlight bit */
+                tmp_pmc |= nvidia_bl_get_level_brightness(par, level) << 16;
+                fpcontrol |= par->fpSyncs;
+        } else
+                fpcontrol |= 0x20000022;
+
+        NV_WR32(par->PCRTC0, 0x081C, tmp_pcrt);
+        NV_WR32(par->PMC, 0x10F0, tmp_pmc);
+        NV_WR32(par->PRAMDAC, 0x848, fpcontrol);
+
+        return 0;
+}
+
+static int nvidia_bl_update_status(struct backlight_device *bd)
+{
+        struct nvidia_par *par = class_get_devdata(&bd->class_dev);
+        struct fb_info *info = pci_get_drvdata(par->pci_dev);
+        int ret;
+
+        mutex_lock(&info->bl_mutex);
+        ret = __nvidia_bl_update_status(bd);
+        mutex_unlock(&info->bl_mutex);
+
+        return ret;
+}
+
+static int nvidia_bl_get_brightness(struct backlight_device *bd)
+{
+        return bd->props->brightness;
+}
+
+static struct backlight_properties nvidia_bl_data = {
+        .owner          = THIS_MODULE,
+        .get_brightness = nvidia_bl_get_brightness,
+        .update_status  = nvidia_bl_update_status,
+        .max_brightness = (FB_BACKLIGHT_LEVELS - 1),
+};
+
+void nvidia_bl_set_power(struct fb_info *info, int power)
+{
+        mutex_lock(&info->bl_mutex);
+
+        if (info->bl_dev) {
+                down(&info->bl_dev->sem);
+                info->bl_dev->props->power = power;
+                __nvidia_bl_update_status(info->bl_dev);
+                up(&info->bl_dev->sem);
+        }
+
+        mutex_unlock(&info->bl_mutex);
+}
+
+void nvidia_bl_init(struct nvidia_par *par)
+{
+        struct fb_info *info = pci_get_drvdata(par->pci_dev);
+        struct backlight_device *bd;
+        char name[12];
+
+        if (!par->FlatPanel)
+                return;
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        if (!machine_is(powermac) ||
+            !pmac_has_backlight_type("mnca"))
+                return;
+#endif
+
+        snprintf(name, sizeof(name), "nvidiabl%d", info->node);
+
+        bd = backlight_device_register(name, par, &nvidia_bl_data);
+        if (IS_ERR(bd)) {
+                info->bl_dev = NULL;
+                printk(KERN_WARNING "nvidia: Backlight registration failed\n");
+                goto error;
+        }
+
+        mutex_lock(&info->bl_mutex);
+        info->bl_dev = bd;
+        fb_bl_default_curve(info, 0,
+                0x158 * FB_BACKLIGHT_MAX / MAX_LEVEL,
+                0x534 * FB_BACKLIGHT_MAX / MAX_LEVEL);
+        mutex_unlock(&info->bl_mutex);
+
+        down(&bd->sem);
+        bd->props->brightness = nvidia_bl_data.max_brightness;
+        bd->props->power = FB_BLANK_UNBLANK;
+        bd->props->update_status(bd);
+        up(&bd->sem);
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        mutex_lock(&pmac_backlight_mutex);
+        if (!pmac_backlight)
+                pmac_backlight = bd;
+        mutex_unlock(&pmac_backlight_mutex);
+#endif
+
+        printk("nvidia: Backlight initialized (%s)\n", name);
+
+        return;
+
+error:
+        return;
+}
+
+void nvidia_bl_exit(struct nvidia_par *par)
+{
+        struct fb_info *info = pci_get_drvdata(par->pci_dev);
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        mutex_lock(&pmac_backlight_mutex);
+#endif
+
+        mutex_lock(&info->bl_mutex);
+        if (info->bl_dev) {
+#ifdef CONFIG_PMAC_BACKLIGHT
+                if (pmac_backlight == info->bl_dev)
+                        pmac_backlight = NULL;
+#endif
+
+                backlight_device_unregister(info->bl_dev);
+
+                printk("nvidia: Backlight unloaded\n");
+        }
+        mutex_unlock(&info->bl_mutex);
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        mutex_unlock(&pmac_backlight_mutex);
+#endif
+}
diff --git a/drivers/video/nvidia/nv_hw.c b/drivers/video/nvidia/nv_hw.c
index 99c3a8e6a237..9ed640d35728 100644
--- a/drivers/video/nvidia/nv_hw.c
+++ b/drivers/video/nvidia/nv_hw.c
@@ -886,7 +886,10 @@ void NVCalcStateExt(struct nvidia_par *par,
         case NV_ARCH_20:
         case NV_ARCH_30:
         default:
-                if (((par->Chipset & 0xffff) == 0x01A0) ||
+                if ((par->Chipset & 0xfff0) == 0x0240) {
+                        state->arbitration0 = 256;
+                        state->arbitration1 = 0x0480;
+                } else if (((par->Chipset & 0xffff) == 0x01A0) ||
                     ((par->Chipset & 0xffff) == 0x01f0)) {
                         nForceUpdateArbitrationSettings(VClk,
                                                         pixelDepth * 8,
@@ -1235,6 +1238,7 @@ void NVLoadStateExt(struct nvidia_par *par, RIVA_HW_STATE * state)
                                         break;
                                 case 0x0160:
                                 case 0x01D0:
+                                case 0x0240:
                                         NV_WR32(par->PMC, 0x1700,
                                                 NV_RD32(par->PFB, 0x020C));
                                         NV_WR32(par->PMC, 0x1704, 0);
@@ -1359,7 +1363,9 @@ void NVLoadStateExt(struct nvidia_par *par, RIVA_HW_STATE * state)
                                                 if(((par->Chipset & 0xfff0)
                                                     != 0x0160) &&
                                                    ((par->Chipset & 0xfff0)
-                                                    != 0x0220))
+                                                    != 0x0220) &&
+                                                   ((par->Chipset & 0xfff0)
+                                                    != 0x240))
                                                         NV_WR32(par->PGRAPH,
                                                                 0x6900 + i*4,
                                                                 NV_RD32(par->PFB,
diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c
index 1edb1c432b75..19eef3a09023 100644
--- a/drivers/video/nvidia/nv_i2c.c
+++ b/drivers/video/nvidia/nv_i2c.c
@@ -10,7 +10,6 @@
  * for more details.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
diff --git a/drivers/video/nvidia/nv_of.c b/drivers/video/nvidia/nv_of.c
index 7a03d040b1a3..d9af88c2b580 100644
--- a/drivers/video/nvidia/nv_of.c
+++ b/drivers/video/nvidia/nv_of.c
@@ -10,7 +10,6 @@
  * for more details.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -33,7 +32,7 @@ int nvidia_probe_of_connector(struct fb_info *info, int conn, u8 **out_edid)
 {
         struct nvidia_par *par = info->par;
         struct device_node *parent, *dp;
-        unsigned char *pedid = NULL;
+        const unsigned char *pedid = NULL;
         static char *propnames[] = {
                 "DFP,EDID", "LCD,EDID", "EDID", "EDID1",
                 "EDID,B", "EDID,A", NULL };
@@ -43,20 +42,19 @@ int nvidia_probe_of_connector(struct fb_info *info, int conn, u8 **out_edid)
         if (parent == NULL)
                 return -1;
         if (par->twoHeads) {
-                char *pname;
+                const char *pname;
                 int len;
 
                 for (dp = NULL;
                      (dp = of_get_next_child(parent, dp)) != NULL;) {
-                        pname = (char *)get_property(dp, "name", NULL);
+                        pname = get_property(dp, "name", NULL);
                         if (!pname)
                                 continue;
                         len = strlen(pname);
                         if ((pname[len-1] == 'A' && conn == 1) ||
                             (pname[len-1] == 'B' && conn == 2)) {
                                 for (i = 0; propnames[i] != NULL; ++i) {
-                                        pedid = (unsigned char *)
-                                                get_property(dp, propnames[i],
+                                        pedid = get_property(dp, propnames[i],
                                                              NULL);
                                         if (pedid != NULL)
                                                 break;
@@ -68,8 +66,7 @@ int nvidia_probe_of_connector(struct fb_info *info, int conn, u8 **out_edid)
         }
         if (pedid == NULL) {
                 for (i = 0; propnames[i] != NULL; ++i) {
-                        pedid = (unsigned char *)
-                                get_property(parent, propnames[i], NULL);
+                        pedid = get_property(parent, propnames[i], NULL);
                         if (pedid != NULL)
                                 break;
                 }
diff --git a/drivers/video/nvidia/nv_proto.h b/drivers/video/nvidia/nv_proto.h
index b149a690ee0f..861271017655 100644
--- a/drivers/video/nvidia/nv_proto.h
+++ b/drivers/video/nvidia/nv_proto.h
@@ -63,4 +63,16 @@ extern void nvidiafb_imageblit(struct fb_info *info,
                                const struct fb_image *image);
 extern int nvidiafb_sync(struct fb_info *info);
 extern u8 byte_rev[256];
+
+/* in nv_backlight.h */
+#ifdef CONFIG_FB_NVIDIA_BACKLIGHT
+extern void nvidia_bl_init(struct nvidia_par *par);
+extern void nvidia_bl_exit(struct nvidia_par *par);
+extern void nvidia_bl_set_power(struct fb_info *info, int power);
+#else
+static inline void nvidia_bl_init(struct nvidia_par *par) {}
+static inline void nvidia_bl_exit(struct nvidia_par *par) {}
+static inline void nvidia_bl_set_power(struct fb_info *info, int power) {}
+#endif
+
 #endif                          /* __NV_PROTO_H__ */
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index 093ab9977c7c..f8cd4c519aeb 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -9,19 +9,18 @@
  *
  */
 
-#include <linux/config.h>
 #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/pci.h>
 #include <linux/console.h>
+#include <linux/backlight.h>
 #ifdef CONFIG_MTRR
 #include <asm/mtrr.h>
 #endif
@@ -29,20 +28,12 @@
 #include <asm/prom.h>
 #include <asm/pci-bridge.h>
 #endif
-#ifdef CONFIG_PMAC_BACKLIGHT
-#include <asm/machdep.h>
-#include <asm/backlight.h>
-#endif
 
 #include "nv_local.h"
 #include "nv_type.h"
 #include "nv_proto.h"
 #include "nv_dma.h"
 
-#ifndef CONFIG_PCI              /* sanity check */
-#error This driver requires PCI support.
-#endif
-
 #undef CONFIG_FB_NVIDIA_DEBUG
 #ifdef CONFIG_FB_NVIDIA_DEBUG
 #define NVTRACE          printk
@@ -70,359 +61,10 @@
 #define MAX_CURS                32
 
 static struct pci_device_id nvidiafb_pci_tbl[] = {
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_TNT,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_TNT2,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_UTNT2,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_TNT_UNKNOWN,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_VTNT2,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_UVTNT2,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_ITNT2,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_SDR,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_DDR,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX2,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE2_GO,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO2_MXR,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS2,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE2_ULTRA,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO2_PRO,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_460,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440_SE,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_440_GO,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_420_GO,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_460_GO,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_420_GO_M32,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_500XGL,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_440_GO_M64,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_200,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_550XGL,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_500_GOGL,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_410_GO_M16,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440_8X,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440SE_8X,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420_8X,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_4000,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_448_GO,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_488_GO,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_580_XGL,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_MAC,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_280_NVS,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_380_XGL,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_IGEFORCE2,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE3,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE3_1,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE3_2,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_DDC,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4600,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4400,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4200,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_900XGL,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_750XGL,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_700XGL,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800_8X,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800SE,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_4200_GO,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_980_XGL,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_780_XGL,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_700_GOGL,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5800_ULTRA,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5800,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_FX_2000,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_FX_1000,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5600_ULTRA,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5600,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5600SE,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5600,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5650,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_FX_GO700,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200_ULTRA,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200_1,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200SE,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5200,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5250,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5250_32,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO_5200,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_NVS_280_PCI,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_FX_500,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5300,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5100,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5900_ULTRA,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5900,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5900XT,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5950_ULTRA,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_FX_3000,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5700_ULTRA,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5700,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5700LE,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5700VE,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5700_1,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5700_2,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_FX_GO1000,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_FX_1100,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5500,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5100,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_FX_700,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5900ZT,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_6800_ULTRA,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_6800,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_6800_LE,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_6800_GT,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_FX_4000,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_6600_GT,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_6600,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_6610_XL,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_FX_540,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_6200,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCIE_DEVICE_ID_NVIDIA_GEFORCE_6800_ALT1,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCIE_DEVICE_ID_NVIDIA_GEFORCE_6600_ALT1,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCIE_DEVICE_ID_NVIDIA_GEFORCE_6600_ALT2,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCIE_DEVICE_ID_NVIDIA_GEFORCE_6200_ALT1,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCIE_DEVICE_ID_NVIDIA_GEFORCE_6800_GT,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCIE_DEVICE_ID_NVIDIA_QUADRO_NVS280,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x0252,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x0313,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x0316,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x0317,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x031D,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x031E,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x031F,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x0329,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x032F,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x0345,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x0349,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x034B,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x034F,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x00c0,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_GEFORCE_6800A,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_GEFORCE_6800A_LE,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_GEFORCE_GO_6800,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_GEFORCE_GO_6800_ULTRA,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_QUADRO_FX_GO1400,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x00cd,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_QUADRO_FX_1400,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x0142,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x0143,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x0144,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x0145,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x0146,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x0147,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x0148,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x0149,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x014b,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x14c,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x014d,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x0160,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_6200_TURBOCACHE,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x0162,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x0163,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_6200,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x0165,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_6250,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_6200_1,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_6250_1,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x0169,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x016b,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x016c,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x016d,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x016e,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x0210,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_6800B,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_6800B_LE,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_6800B_GT,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_7800_GT,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_7800_GTX,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_7800,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_GO_7800_GTX,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x021d,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x021e,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x0220,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x0221,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x0222,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {PCI_VENDOR_ID_NVIDIA, 0x0228,
-         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0,}                    /* terminate list */
+        {PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
+         PCI_BASE_CLASS_DISPLAY << 16, 0xff0000, 0},
+        { 0, }
 };
-
 MODULE_DEVICE_TABLE(pci, nvidiafb_pci_tbl);
 
 /* command line data, set in nvidiafb_setup() */
@@ -470,75 +112,6 @@ static struct fb_var_screeninfo __devinitdata nvidiafb_default_var = {
         .vmode = FB_VMODE_NONINTERLACED
 };
 
-/*
- * Backlight control
- */
-#ifdef CONFIG_PMAC_BACKLIGHT
-
-static int nvidia_backlight_levels[] = {
-        0x158,
-        0x192,
-        0x1c6,
-        0x200,
-        0x234,
-        0x268,
-        0x2a2,
-        0x2d6,
-        0x310,
-        0x344,
-        0x378,
-        0x3b2,
-        0x3e6,
-        0x41a,
-        0x454,
-        0x534,
-};
-
-/* ------------------------------------------------------------------------- *
- *
- * Backlight operations
- *
- * ------------------------------------------------------------------------- */
-
-static int nvidia_set_backlight_enable(int on, int level, void *data)
-{
-        struct nvidia_par *par = data;
-        u32 tmp_pcrt, tmp_pmc, fpcontrol;
-
-        tmp_pmc = NV_RD32(par->PMC, 0x10F0) & 0x0000FFFF;
-        tmp_pcrt = NV_RD32(par->PCRTC0, 0x081C) & 0xFFFFFFFC;
-        fpcontrol = NV_RD32(par->PRAMDAC, 0x0848) & 0xCFFFFFCC;
-
-        if (on && (level > BACKLIGHT_OFF)) {
-                tmp_pcrt |= 0x1;
-                tmp_pmc |= (1 << 31);   // backlight bit
-                tmp_pmc |= nvidia_backlight_levels[level - 1] << 16;
-        }
-
-        if (on)
-                fpcontrol |= par->fpSyncs;
-        else
-                fpcontrol |= 0x20000022;
-
-        NV_WR32(par->PCRTC0, 0x081C, tmp_pcrt);
-        NV_WR32(par->PMC, 0x10F0, tmp_pmc);
-        NV_WR32(par->PRAMDAC, 0x848, fpcontrol);
-
-        return 0;
-}
-
-static int nvidia_set_backlight_level(int level, void *data)
-{
-        return nvidia_set_backlight_enable(1, level, data);
-}
-
-static struct backlight_controller nvidia_backlight_controller = {
-        nvidia_set_backlight_enable,
-        nvidia_set_backlight_level
-};
-
-#endif                          /* CONFIG_PMAC_BACKLIGHT */
-
 static void nvidiafb_load_cursor_image(struct nvidia_par *par, u8 * data8,
                                        u16 bg, u16 fg, u32 w, u32 h)
 {
@@ -1355,11 +928,7 @@ static int nvidiafb_blank(int blank, struct fb_info *info)
         NVWriteSeq(par, 0x01, tmp);
         NVWriteCrtc(par, 0x1a, vesa);
 
-#ifdef CONFIG_PMAC_BACKLIGHT
-        if (par->FlatPanel && machine_is(powermac)) {
-                set_backlight_enable(!blank);
-        }
-#endif
+        nvidia_bl_set_power(info, blank);
 
         NVTRACE_LEAVE();
 
@@ -1381,24 +950,25 @@ static struct fb_ops nvidia_fb_ops = {
 };
 
 #ifdef CONFIG_PM
-static int nvidiafb_suspend(struct pci_dev *dev, pm_message_t state)
+static int nvidiafb_suspend(struct pci_dev *dev, pm_message_t mesg)
 {
         struct fb_info *info = pci_get_drvdata(dev);
         struct nvidia_par *par = info->par;
 
+        if (mesg.event == PM_EVENT_PRETHAW)
+                mesg.event = PM_EVENT_FREEZE;
         acquire_console_sem();
-        par->pm_state = state.event;
+        par->pm_state = mesg.event;
 
-        if (state.event == PM_EVENT_FREEZE) {
-                dev->dev.power.power_state = state;
-        } else {
+        if (mesg.event == PM_EVENT_SUSPEND) {
                 fb_set_suspend(info, 1);
                 nvidiafb_blank(FB_BLANK_POWERDOWN, info);
                 nvidia_write_regs(par, &par->SavedReg);
                 pci_save_state(dev);
                 pci_disable_device(dev);
-                pci_set_power_state(dev, pci_choose_state(dev, state));
+                pci_set_power_state(dev, pci_choose_state(dev, mesg));
         }
+        dev->dev.power.power_state = mesg;
 
         release_console_sem();
         return 0;
@@ -1532,10 +1102,10 @@ static u32 __devinit nvidia_get_chipset(struct fb_info *info)
         struct nvidia_par *par = info->par;
         u32 id = (par->pci_dev->vendor << 16) | par->pci_dev->device;
 
-        printk("nvidiafb: PCI id - %x\n", id);
+        printk(KERN_INFO PFX "Device ID: %x \n", id);
+
         if ((id & 0xfff0) == 0x00f0) {
                 /* pci-e */
-                printk("nvidiafb: PCI-E card\n");
                 id = NV_RD32(par->REGS, 0x1800);
 
                 if ((id & 0x0000ffff) == 0x000010DE)
@@ -1543,9 +1113,9 @@ static u32 __devinit nvidia_get_chipset(struct fb_info *info)
                 else if ((id & 0xffff0000) == 0xDE100000) /* wrong endian */
                         id = 0x10DE0000 | ((id << 8) & 0x0000ff00) |
                             ((id >> 8) & 0x000000ff);
+                printk(KERN_INFO PFX "Subsystem ID: %x \n", id);
         }
 
-        printk("nvidiafb: Actual id - %x\n", id);
         return id;
 }
 
@@ -1587,6 +1157,7 @@ static u32 __devinit nvidia_get_arch(struct fb_info *info)
         case 0x0210:
         case 0x0220:
         case 0x0230:
+        case 0x0240:
         case 0x0290:
         case 0x0390:
                 arch = NV_ARCH_40;
@@ -1634,7 +1205,7 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd,
 
         if (pci_request_regions(pd, "nvidiafb")) {
                 printk(KERN_ERR PFX "cannot request PCI regions\n");
-                goto err_out_request;
+                goto err_out_enable;
         }
 
         par->FlatPanel = flatpanel;
@@ -1663,7 +1234,6 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd,
         }
 
         par->Chipset = nvidia_get_chipset(info);
-        printk(KERN_INFO PFX "nVidia device/chipset %X\n", par->Chipset);
         par->Architecture = nvidia_get_arch(info);
 
         if (par->Architecture == 0) {
@@ -1730,22 +1300,19 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd,
 
         nvidia_save_vga(par, &par->SavedReg);
 
+        pci_set_drvdata(pd, info);
+        nvidia_bl_init(par);
         if (register_framebuffer(info) < 0) {
                 printk(KERN_ERR PFX "error registering nVidia framebuffer\n");
                 goto err_out_iounmap_fb;
         }
 
-        pci_set_drvdata(pd, info);
 
         printk(KERN_INFO PFX
                "PCI nVidia %s framebuffer (%dMB @ 0x%lX)\n",
                info->fix.id,
                par->FbMapSize / (1024 * 1024), info->fix.smem_start);
-#ifdef CONFIG_PMAC_BACKLIGHT
-        if (par->FlatPanel && machine_is(powermac))
-                register_backlight_controller(&nvidia_backlight_controller,
-                                              par, "mnca");
-#endif
+
         NVTRACE_LEAVE();
         return 0;
 
@@ -1756,10 +1323,8 @@ err_out_free_base1:
         nvidia_delete_i2c_busses(par);
 err_out_arch:
         iounmap(par->REGS);
-err_out_free_base0:
+ err_out_free_base0:
         pci_release_regions(pd);
-err_out_request:
-        pci_disable_device(pd);
 err_out_enable:
         kfree(info->pixmap.addr);
 err_out_kfree:
@@ -1775,6 +1340,8 @@ static void __exit nvidiafb_remove(struct pci_dev *pd)
 
         NVTRACE_ENTER();
 
+        nvidia_bl_exit(par);
+
         unregister_framebuffer(info);
 #ifdef CONFIG_MTRR
         if (par->mtrr.vram_valid)
@@ -1787,7 +1354,6 @@ static void __exit nvidiafb_remove(struct pci_dev *pd)
         nvidia_delete_i2c_busses(par);
         iounmap(par->REGS);
         pci_release_regions(pd);
-        pci_disable_device(pd);
         kfree(info->pixmap.addr);
         framebuffer_release(info);
         pci_set_drvdata(pd, NULL);
diff --git a/drivers/video/offb.c b/drivers/video/offb.c
index ad1434e3f227..bad0e98fb3b6 100644
--- a/drivers/video/offb.c
+++ b/drivers/video/offb.c
@@ -12,13 +12,11 @@
  *  more details.
  */
 
-#include <linux/config.h>
 #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/vmalloc.h>
 #include <linux/delay.h>
@@ -64,8 +62,6 @@ struct offb_par default_par;
      *  Interface used by the world
      */
 
-int offb_init(void);
-
 static int offb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
                           u_int transp, struct fb_info *info);
 static int offb_blank(int blank, struct fb_info *info);
@@ -74,11 +70,6 @@ static int offb_blank(int blank, struct fb_info *info);
 extern boot_infos_t *boot_infos;
 #endif
 
-static void offb_init_nodriver(struct device_node *);
-static void offb_init_fb(const char *name, const char *full_name,
-                         int width, int height, int depth, int pitch,
-                         unsigned long address, struct device_node *dp);
-
 static struct fb_ops offb_ops = {
         .owner          = THIS_MODULE,
         .fb_setcolreg   = offb_setcolreg,
@@ -98,14 +89,43 @@ static int offb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
                           u_int transp, struct fb_info *info)
 {
         struct offb_par *par = (struct offb_par *) info->par;
+        int i, depth;
+        u32 *pal = info->pseudo_palette;
 
-        if (!par->cmap_adr || regno > 255)
+        depth = info->var.bits_per_pixel;
+        if (depth == 16)
+                depth = (info->var.green.length == 5) ? 15 : 16;
+
+        if (regno > 255 ||
+            (depth == 16 && regno > 63) ||
+            (depth == 15 && regno > 31))
                 return 1;
 
+        if (regno < 16) {
+                switch (depth) {
+                case 15:
+                        pal[regno] = (regno << 10) | (regno << 5) | regno;
+                        break;
+                case 16:
+                        pal[regno] = (regno << 11) | (regno << 5) | regno;
+                        break;
+                case 24:
+                        pal[regno] = (regno << 16) | (regno << 8) | regno;
+                        break;
+                case 32:
+                        i = (regno << 8) | regno;
+                        pal[regno] = (i << 16) | i;
+                        break;
+                }
+        }
+
         red >>= 8;
         green >>= 8;
         blue >>= 8;
 
+        if (!par->cmap_adr)
+                return 0;
+
         switch (par->cmap_type) {
         case cmap_m64:
                 writeb(regno, par->cmap_adr);
@@ -142,20 +162,6 @@ static int offb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
                 break;
         }
 
-        if (regno < 16)
-                switch (info->var.bits_per_pixel) {
-                case 16:
-                        ((u16 *) (info->pseudo_palette))[regno] =
-                            (regno << 10) | (regno << 5) | regno;
-                        break;
-                case 32:
-                        {
-                                int i = (regno << 8) | regno;
-                                ((u32 *) (info->pseudo_palette))[regno] =
-                                    (i << 16) | i;
-                                break;
-                        }
-                }
         return 0;
 }
 
@@ -216,196 +222,17 @@ static int offb_blank(int blank, struct fb_info *info)
         return 0;
 }
 
-    /*
-     *  Initialisation
-     */
 
-int __init offb_init(void)
+static void __iomem *offb_map_reg(struct device_node *np, int index,
+                                  unsigned long offset, unsigned long size)
 {
-        struct device_node *dp = NULL, *boot_disp = NULL;
-
-#if defined(CONFIG_BOOTX_TEXT) && defined(CONFIG_PPC32)
-        struct device_node *macos_display = NULL;
-#endif
-        if (fb_get_options("offb", NULL))
-                return -ENODEV;
-
-#if defined(CONFIG_BOOTX_TEXT) && defined(CONFIG_PPC32)
-        /* If we're booted from BootX... */
-        if (boot_infos != 0) {
-                unsigned long addr =
-                    (unsigned long) boot_infos->dispDeviceBase;
-                u32 *addrp;
-                u64 daddr, dsize;
-                unsigned int flags;
-
-                /* find the device node corresponding to the macos display */
-                while ((dp = of_find_node_by_type(dp, "display"))) {
-                        int i;
-
-                        /*
-                         * Look for an AAPL,address property first.
-                         */
-                        unsigned int na;
-                        unsigned int *ap =
-                                (unsigned int *)get_property(dp, "AAPL,address",
-                                                             &na);
-                        if (ap != 0) {
-                                for (na /= sizeof(unsigned int); na > 0;
-                                     --na, ++ap)
-                                        if (*ap <= addr &&
-                                            addr < *ap + 0x1000000) {
-                                                macos_display = dp;
-                                                goto foundit;
-                                        }
-                        }
-
-                        /*
-                         * See if the display address is in one of the address
-                         * ranges for this display.
-                         */
-                        i = 0;
-                        for (;;) {
-                                addrp = of_get_address(dp, i++, &dsize, &flags);
-                                if (addrp == NULL)
-                                        break;
-                                if (!(flags & IORESOURCE_MEM))
-                                        continue;
-                                daddr = of_translate_address(dp, addrp);
-                                if (daddr == OF_BAD_ADDR)
-                                        continue;
-                                if (daddr <= addr && addr < (daddr + dsize)) {
-                                        macos_display = dp;
-                                        goto foundit;
-                                }
-                        }
-                foundit:
-                        if (macos_display) {
-                                printk(KERN_INFO "MacOS display is %s\n",
-                                       dp->full_name);
-                                break;
-                        }
-                }
-
-                /* initialize it */
-                offb_init_fb(macos_display ? macos_display->
-                             name : "MacOS display",
-                             macos_display ? macos_display->
-                             full_name : "MacOS display",
-                             boot_infos->dispDeviceRect[2],
-                             boot_infos->dispDeviceRect[3],
-                             boot_infos->dispDeviceDepth,
-                             boot_infos->dispDeviceRowBytes, addr, NULL);
-        }
-#endif /* defined(CONFIG_BOOTX_TEXT) && defined(CONFIG_PPC32) */
-
-        for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) {
-                if (get_property(dp, "linux,opened", NULL) &&
-                    get_property(dp, "linux,boot-display", NULL)) {
-                        boot_disp = dp;
-                        offb_init_nodriver(dp);
-                }
-        }
-        for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) {
-                if (get_property(dp, "linux,opened", NULL) &&
-                    dp != boot_disp)
-                        offb_init_nodriver(dp);
-        }
-
-        return 0;
-}
-
-
-static void __init offb_init_nodriver(struct device_node *dp)
-{
-        int *pp, i;
-        unsigned int len;
-        int width = 640, height = 480, depth = 8, pitch;
-        unsigned int flags, rsize, *up;
-        u64 address = OF_BAD_ADDR;
-        u32 *addrp;
-        u64 asize;
-
-        if ((pp = (int *) get_property(dp, "depth", &len)) != NULL
-            && len == sizeof(int))
-                depth = *pp;
-        if ((pp = (int *) get_property(dp, "width", &len)) != NULL
-            && len == sizeof(int))
-                width = *pp;
-        if ((pp = (int *) get_property(dp, "height", &len)) != NULL
-            && len == sizeof(int))
-                height = *pp;
-        if ((pp = (int *) get_property(dp, "linebytes", &len)) != NULL
-            && len == sizeof(int)) {
-                pitch = *pp;
-                if (pitch == 1)
-                        pitch = 0x1000;
-        } else
-                pitch = width;
-
-       rsize = (unsigned long)pitch * (unsigned long)height *
-               (unsigned long)(depth / 8);
-
-       /* Try to match device to a PCI device in order to get a properly
-        * translated address rather then trying to decode the open firmware
-        * stuff in various incorrect ways
-        */
-#ifdef CONFIG_PCI
-       /* First try to locate the PCI device if any */
-       {
-               struct pci_dev *pdev = NULL;
-
-               for_each_pci_dev(pdev) {
-                       if (dp == pci_device_to_OF_node(pdev))
-                               break;
-               }
-               if (pdev) {
-                       for (i = 0; i < 6 && address == OF_BAD_ADDR; i++) {
-                               if ((pci_resource_flags(pdev, i) &
-                                    IORESOURCE_MEM) &&
-                                   (pci_resource_len(pdev, i) >= rsize))
-                                       address = pci_resource_start(pdev, i);
-                       }
-                       pci_dev_put(pdev);
-               }
-        }
-#endif /* CONFIG_PCI */
-
-       /* This one is dodgy, we may drop it ... */
-       if (address == OF_BAD_ADDR &&
-           (up = (unsigned *) get_property(dp, "address", &len)) != NULL &&
-           len == sizeof(unsigned int))
-               address = (u64) * up;
-
-       if (address == OF_BAD_ADDR) {
-               for (i = 0; (addrp = of_get_address(dp, i, &asize, &flags))
-                            != NULL; i++) {
-                       if (!(flags & IORESOURCE_MEM))
-                               continue;
-                       if (asize >= pitch * height * depth / 8)
-                               break;
-               }
-                if (addrp == NULL) {
-                        printk(KERN_ERR
-                               "no framebuffer address found for %s\n",
-                               dp->full_name);
-                        return;
-                }
-                address = of_translate_address(dp, addrp);
-                if (address == OF_BAD_ADDR) {
-                        printk(KERN_ERR
-                               "can't translate framebuffer address for %s\n",
-                               dp->full_name);
-                        return;
-                }
-
-                /* kludge for valkyrie */
-                if (strcmp(dp->name, "valkyrie") == 0)
-                        address += 0x1000;
-        }
-        offb_init_fb(dp->name, dp->full_name, width, height, depth,
-                     pitch, address, dp);
+        struct resource r;
 
+        if (of_address_to_resource(np, index, &r))
+                return 0;
+        if ((r.start + offset + size) > r.end)
+                return 0;
+        return ioremap(r.start + offset, size);
 }
 
 static void __init offb_init_fb(const char *name, const char *full_name,
@@ -413,7 +240,7 @@ static void __init offb_init_fb(const char *name, const char *full_name,
                                 int pitch, unsigned long address,
                                 struct device_node *dp)
 {
-        unsigned long res_size = pitch * height * depth / 8;
+        unsigned long res_size = pitch * height * (depth + 7) / 8;
         struct offb_par *par = &default_par;
         unsigned long res_start = address;
         struct fb_fix_screeninfo *fix;
@@ -427,7 +254,7 @@ static void __init offb_init_fb(const char *name, const char *full_name,
         printk(KERN_INFO
                "Using unsupported %dx%d %s at %lx, depth=%d, pitch=%d\n",
                width, height, name, address, depth, pitch);
-        if (depth != 8 && depth != 16 && depth != 32) {
+        if (depth != 8 && depth != 15 && depth != 16 && depth != 32) {
                 printk(KERN_ERR "%s: can't use depth = %d\n", full_name,
                        depth);
                 release_mem_region(res_start, res_size);
@@ -462,48 +289,41 @@ static void __init offb_init_fb(const char *name, const char *full_name,
 
         par->cmap_type = cmap_unknown;
         if (depth == 8) {
-
                 /* Palette hacks disabled for now */
-#if 0
                 if (dp && !strncmp(name, "ATY,Rage128", 11)) {
-                        unsigned long regbase = dp->addrs[2].address;
-                        par->cmap_adr = ioremap(regbase, 0x1FFF);
-                        par->cmap_type = cmap_r128;
+                        par->cmap_adr = offb_map_reg(dp, 2, 0, 0x1fff);
+                        if (par->cmap_adr)
+                                par->cmap_type = cmap_r128;
                 } else if (dp && (!strncmp(name, "ATY,RageM3pA", 12)
                                   || !strncmp(name, "ATY,RageM3p12A", 14))) {
-                        unsigned long regbase =
-                            dp->parent->addrs[2].address;
-                        par->cmap_adr = ioremap(regbase, 0x1FFF);
-                        par->cmap_type = cmap_M3A;
+                        par->cmap_adr = offb_map_reg(dp, 2, 0, 0x1fff);
+                        if (par->cmap_adr)
+                                par->cmap_type = cmap_M3A;
                 } else if (dp && !strncmp(name, "ATY,RageM3pB", 12)) {
-                        unsigned long regbase =
-                            dp->parent->addrs[2].address;
-                        par->cmap_adr = ioremap(regbase, 0x1FFF);
-                        par->cmap_type = cmap_M3B;
+                        par->cmap_adr = offb_map_reg(dp, 2, 0, 0x1fff);
+                        if (par->cmap_adr)
+                                par->cmap_type = cmap_M3B;
                 } else if (dp && !strncmp(name, "ATY,Rage6", 9)) {
-                        unsigned long regbase = dp->addrs[1].address;
-                        par->cmap_adr = ioremap(regbase, 0x1FFF);
-                        par->cmap_type = cmap_radeon;
+                        par->cmap_adr = offb_map_reg(dp, 1, 0, 0x1fff);
+                        if (par->cmap_adr)
+                                par->cmap_type = cmap_radeon;
                 } else if (!strncmp(name, "ATY,", 4)) {
                         unsigned long base = address & 0xff000000UL;
                         par->cmap_adr =
                             ioremap(base + 0x7ff000, 0x1000) + 0xcc0;
                         par->cmap_data = par->cmap_adr + 1;
                         par->cmap_type = cmap_m64;
-                } else if (device_is_compatible(dp, "pci1014,b7")) {
-                        unsigned long regbase = dp->addrs[0].address;
-                        par->cmap_adr = ioremap(regbase + 0x6000, 0x1000);
-                        par->cmap_type = cmap_gxt2000;
+                } else if (dp && device_is_compatible(dp, "pci1014,b7")) {
+                        par->cmap_adr = offb_map_reg(dp, 0, 0x6000, 0x1000);
+                        if (par->cmap_adr)
+                                par->cmap_type = cmap_gxt2000;
                 }
-#endif
-                fix->visual = par->cmap_adr ? FB_VISUAL_PSEUDOCOLOR
-                    : FB_VISUAL_STATIC_PSEUDOCOLOR;
+                fix->visual = (par->cmap_type != cmap_unknown) ?
+                        FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_STATIC_PSEUDOCOLOR;
         } else
-                fix->visual =   /* par->cmap_adr ? FB_VISUAL_DIRECTCOLOR
-                                   : */ FB_VISUAL_TRUECOLOR;
+                fix->visual = FB_VISUAL_TRUECOLOR;
 
         var->xoffset = var->yoffset = 0;
-        var->bits_per_pixel = depth;
         switch (depth) {
         case 8:
                 var->bits_per_pixel = 8;
@@ -516,7 +336,7 @@ static void __init offb_init_fb(const char *name, const char *full_name,
                 var->transp.offset = 0;
                 var->transp.length = 0;
                 break;
-        case 16:                /* RGB 555 */
+        case 15:                /* RGB 555 */
                 var->bits_per_pixel = 16;
                 var->red.offset = 10;
                 var->red.length = 5;
@@ -527,6 +347,17 @@ static void __init offb_init_fb(const char *name, const char *full_name,
                 var->transp.offset = 0;
                 var->transp.length = 0;
                 break;
+        case 16:                /* RGB 565 */
+                var->bits_per_pixel = 16;
+                var->red.offset = 11;
+                var->red.length = 5;
+                var->green.offset = 5;
+                var->green.length = 6;
+                var->blue.offset = 0;
+                var->blue.length = 5;
+                var->transp.offset = 0;
+                var->transp.length = 0;
+                break;
         case 32:                /* RGB 888 */
                 var->bits_per_pixel = 32;
                 var->red.offset = 16;
@@ -570,5 +401,139 @@ static void __init offb_init_fb(const char *name, const char *full_name,
                info->node, full_name);
 }
 
+
+static void __init offb_init_nodriver(struct device_node *dp, int no_real_node)
+{
+        unsigned int len;
+        int i, width = 640, height = 480, depth = 8, pitch = 640;
+        unsigned int flags, rsize, addr_prop = 0;
+        unsigned long max_size = 0;
+        u64 rstart, address = OF_BAD_ADDR;
+        const u32 *pp, *addrp, *up;
+        u64 asize;
+
+        pp = get_property(dp, "linux,bootx-depth", &len);
+        if (pp == NULL)
+                pp = get_property(dp, "depth", &len);
+        if (pp && len == sizeof(u32))
+                depth = *pp;
+
+        pp = get_property(dp, "linux,bootx-width", &len);
+        if (pp == NULL)
+                pp = get_property(dp, "width", &len);
+        if (pp && len == sizeof(u32))
+                width = *pp;
+
+        pp = get_property(dp, "linux,bootx-height", &len);
+        if (pp == NULL)
+                pp = get_property(dp, "height", &len);
+        if (pp && len == sizeof(u32))
+                height = *pp;
+
+        pp = get_property(dp, "linux,bootx-linebytes", &len);
+        if (pp == NULL)
+                pp = get_property(dp, "linebytes", &len);
+        if (pp && len == sizeof(u32))
+                pitch = *pp;
+        else
+                pitch = width * ((depth + 7) / 8);
+
+        rsize = (unsigned long)pitch * (unsigned long)height;
+
+        /* Ok, now we try to figure out the address of the framebuffer.
+         *
+         * Unfortunately, Open Firmware doesn't provide a standard way to do
+         * so. All we can do is a dodgy heuristic that happens to work in
+         * practice. On most machines, the "address" property contains what
+         * we need, though not on Matrox cards found in IBM machines. What I've
+         * found that appears to give good results is to go through the PCI
+         * ranges and pick one that is both big enough and if possible encloses
+         * the "address" property. If none match, we pick the biggest
+         */
+        up = get_property(dp, "linux,bootx-addr", &len);
+        if (up == NULL)
+                up = get_property(dp, "address", &len);
+        if (up && len == sizeof(u32))
+                addr_prop = *up;
+
+        /* Hack for when BootX is passing us */
+        if (no_real_node)
+                goto skip_addr;
+
+        for (i = 0; (addrp = of_get_address(dp, i, &asize, &flags))
+                     != NULL; i++) {
+                int match_addrp = 0;
+
+                if (!(flags & IORESOURCE_MEM))
+                        continue;
+                if (asize < rsize)
+                        continue;
+                rstart = of_translate_address(dp, addrp);
+                if (rstart == OF_BAD_ADDR)
+                        continue;
+                if (addr_prop && (rstart <= addr_prop) &&
+                    ((rstart + asize) >= (addr_prop + rsize)))
+                        match_addrp = 1;
+                if (match_addrp) {
+                        address = addr_prop;
+                        break;
+                }
+                if (rsize > max_size) {
+                        max_size = rsize;
+                        address = OF_BAD_ADDR;
+                }
+
+                if (address == OF_BAD_ADDR)
+                        address = rstart;
+        }
+ skip_addr:
+        if (address == OF_BAD_ADDR && addr_prop)
+                address = (u64)addr_prop;
+        if (address != OF_BAD_ADDR) {
+                /* kludge for valkyrie */
+                if (strcmp(dp->name, "valkyrie") == 0)
+                        address += 0x1000;
+                offb_init_fb(no_real_node ? "bootx" : dp->name,
+                             no_real_node ? "display" : dp->full_name,
+                             width, height, depth, pitch, address,
+                             no_real_node ? dp : NULL);
+        }
+}
+
+static int __init offb_init(void)
+{
+        struct device_node *dp = NULL, *boot_disp = NULL;
+
+        if (fb_get_options("offb", NULL))
+                return -ENODEV;
+
+        /* Check if we have a MacOS display without a node spec */
+        if (get_property(of_chosen, "linux,bootx-noscreen", NULL) != NULL) {
+                /* The old code tried to work out which node was the MacOS
+                 * display based on the address. I'm dropping that since the
+                 * lack of a node spec only happens with old BootX versions
+                 * (users can update) and with this code, they'll still get
+                 * a display (just not the palette hacks).
+                 */
+                offb_init_nodriver(of_chosen, 1);
+        }
+
+        for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) {
+                if (get_property(dp, "linux,opened", NULL) &&
+                    get_property(dp, "linux,boot-display", NULL)) {
+                        boot_disp = dp;
+                        offb_init_nodriver(dp, 0);
+                }
+        }
+        for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) {
+                if (get_property(dp, "linux,opened", NULL) &&
+                    dp != boot_disp)
+                        offb_init_nodriver(dp, 0);
+        }
+
+        return 0;
+}
+
+
 module_init(offb_init);
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c
index 0d1957505359..56ac51d6a7f3 100644
--- a/drivers/video/p9100.c
+++ b/drivers/video/p9100.c
@@ -1,6 +1,6 @@
 /* p9100.c: P9100 frame buffer driver
  *
- * Copyright (C) 2003 David S. Miller (davem@redhat.com)
+ * Copyright (C) 2003, 2006 David S. Miller (davem@davemloft.net)
  * Copyright 1999 Derrick J Brashear (shadow@dementia.org)
  *
  * Driver layout based loosely on tgafb.c, see that file for credits.
@@ -17,8 +17,8 @@
 #include <linux/mm.h>
 
 #include <asm/io.h>
-#include <asm/sbus.h>
-#include <asm/oplib.h>
+#include <asm/prom.h>
+#include <asm/of_device.h>
 #include <asm/fbio.h>
 
 #include "sbuslib.h"
@@ -72,60 +72,60 @@ static struct fb_ops p9100_ops = {
 
 struct p9100_regs {
         /* Registers for the system control */
-        volatile u32 sys_base;
-        volatile u32 sys_config;
-        volatile u32 sys_intr;
-        volatile u32 sys_int_ena;
-        volatile u32 sys_alt_rd;
-        volatile u32 sys_alt_wr;
-        volatile u32 sys_xxx[58];
+        u32 sys_base;
+        u32 sys_config;
+        u32 sys_intr;
+        u32 sys_int_ena;
+        u32 sys_alt_rd;
+        u32 sys_alt_wr;
+        u32 sys_xxx[58];
 
         /* Registers for the video control */
-        volatile u32 vid_base;
-        volatile u32 vid_hcnt;
-        volatile u32 vid_htotal;
-        volatile u32 vid_hsync_rise;
-        volatile u32 vid_hblank_rise;
-        volatile u32 vid_hblank_fall;
-        volatile u32 vid_hcnt_preload;
-        volatile u32 vid_vcnt;
-        volatile u32 vid_vlen;
-        volatile u32 vid_vsync_rise;
-        volatile u32 vid_vblank_rise;
-        volatile u32 vid_vblank_fall;
-        volatile u32 vid_vcnt_preload;
-        volatile u32 vid_screenpaint_addr;
-        volatile u32 vid_screenpaint_timectl1;
-        volatile u32 vid_screenpaint_qsfcnt;
-        volatile u32 vid_screenpaint_timectl2;
-        volatile u32 vid_xxx[15];
+        u32 vid_base;
+        u32 vid_hcnt;
+        u32 vid_htotal;
+        u32 vid_hsync_rise;
+        u32 vid_hblank_rise;
+        u32 vid_hblank_fall;
+        u32 vid_hcnt_preload;
+        u32 vid_vcnt;
+        u32 vid_vlen;
+        u32 vid_vsync_rise;
+        u32 vid_vblank_rise;
+        u32 vid_vblank_fall;
+        u32 vid_vcnt_preload;
+        u32 vid_screenpaint_addr;
+        u32 vid_screenpaint_timectl1;
+        u32 vid_screenpaint_qsfcnt;
+        u32 vid_screenpaint_timectl2;
+        u32 vid_xxx[15];
 
         /* Registers for the video control */
-        volatile u32 vram_base;
-        volatile u32 vram_memcfg;
-        volatile u32 vram_refresh_pd;
-        volatile u32 vram_refresh_cnt;
-        volatile u32 vram_raslo_max;
-        volatile u32 vram_raslo_cur;
-        volatile u32 pwrup_cfg;
-        volatile u32 vram_xxx[25];
+        u32 vram_base;
+        u32 vram_memcfg;
+        u32 vram_refresh_pd;
+        u32 vram_refresh_cnt;
+        u32 vram_raslo_max;
+        u32 vram_raslo_cur;
+        u32 pwrup_cfg;
+        u32 vram_xxx[25];
 
         /* Registers for IBM RGB528 Palette */
-        volatile u32 ramdac_cmap_wridx; 
-        volatile u32 ramdac_palette_data;
-        volatile u32 ramdac_pixel_mask;
-        volatile u32 ramdac_palette_rdaddr;
-        volatile u32 ramdac_idx_lo;
-        volatile u32 ramdac_idx_hi;
-        volatile u32 ramdac_idx_data;
-        volatile u32 ramdac_idx_ctl;
-        volatile u32 ramdac_xxx[1784];
+        u32 ramdac_cmap_wridx; 
+        u32 ramdac_palette_data;
+        u32 ramdac_pixel_mask;
+        u32 ramdac_palette_rdaddr;
+        u32 ramdac_idx_lo;
+        u32 ramdac_idx_hi;
+        u32 ramdac_idx_data;
+        u32 ramdac_idx_ctl;
+        u32 ramdac_xxx[1784];
 };
 
 struct p9100_cmd_parameng {
-        volatile u32 parameng_status;
-        volatile u32 parameng_bltcmd;
-        volatile u32 parameng_quadcmd;
+        u32 parameng_status;
+        u32 parameng_bltcmd;
+        u32 parameng_quadcmd;
 };
 
 struct p9100_par {
@@ -136,9 +136,8 @@ struct p9100_par {
 #define P9100_FLAG_BLANKED      0x00000001
 
         unsigned long           physbase;
+        unsigned long           which_io;
         unsigned long           fbsize;
-
-        struct sbus_dev         *sdev;
 };
 
 /**
@@ -227,8 +226,7 @@ static int p9100_mmap(struct fb_info *info, struct vm_area_struct *vma)
 
         return sbusfb_mmap_helper(p9100_mmap_map,
                                   par->physbase, par->fbsize,
-                                  par->sdev->reg_addrs[0].which_io,
-                                  vma);
+                                  par->which_io, vma);
 }
 
 static int p9100_ioctl(struct fb_info *info, unsigned int cmd,
@@ -245,12 +243,9 @@ static int p9100_ioctl(struct fb_info *info, unsigned int cmd,
  *  Initialisation
  */
 
-static void
-p9100_init_fix(struct fb_info *info, int linebytes)
+static void p9100_init_fix(struct fb_info *info, int linebytes, struct device_node *dp)
 {
-        struct p9100_par *par = (struct p9100_par *)info->par;
-
-        strlcpy(info->fix.id, par->sdev->prom_name, sizeof(info->fix.id));
+        strlcpy(info->fix.id, dp->name, sizeof(info->fix.id));
 
         info->fix.type = FB_TYPE_PACKED_PIXELS;
         info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
@@ -263,121 +258,137 @@ p9100_init_fix(struct fb_info *info, int linebytes)
 struct all_info {
         struct fb_info info;
         struct p9100_par par;
-        struct list_head list;
 };
-static LIST_HEAD(p9100_list);
 
-static void p9100_init_one(struct sbus_dev *sdev)
+static int __devinit p9100_init_one(struct of_device *op)
 {
+        struct device_node *dp = op->node;
         struct all_info *all;
-        int linebytes;
-
-        all = kmalloc(sizeof(*all), GFP_KERNEL);
-        if (!all) {
-                printk(KERN_ERR "p9100: Cannot allocate memory.\n");
-                return;
-        }
-        memset(all, 0, sizeof(*all));
+        int linebytes, err;
 
-        INIT_LIST_HEAD(&all->list);
+        all = kzalloc(sizeof(*all), GFP_KERNEL);
+        if (!all)
+                return -ENOMEM;
 
         spin_lock_init(&all->par.lock);
-        all->par.sdev = sdev;
 
         /* This is the framebuffer and the only resource apps can mmap.  */
-        all->par.physbase = sdev->reg_addrs[2].phys_addr;
+        all->par.physbase = op->resource[2].start;
+        all->par.which_io = op->resource[2].flags & IORESOURCE_BITS;
 
-        sbusfb_fill_var(&all->info.var, sdev->prom_node, 8);
+        sbusfb_fill_var(&all->info.var, dp->node, 8);
         all->info.var.red.length = 8;
         all->info.var.green.length = 8;
         all->info.var.blue.length = 8;
 
-        linebytes = prom_getintdefault(sdev->prom_node, "linebytes",
-                                       all->info.var.xres);
+        linebytes = of_getintprop_default(dp, "linebytes",
+                                          all->info.var.xres);
         all->par.fbsize = PAGE_ALIGN(linebytes * all->info.var.yres);
 
-        all->par.regs = sbus_ioremap(&sdev->resource[0], 0,
-                             sizeof(struct p9100_regs), "p9100 regs");
+        all->par.regs = of_ioremap(&op->resource[0], 0,
+                                   sizeof(struct p9100_regs), "p9100 regs");
+        if (!all->par.regs) {
+                kfree(all);
+                return -ENOMEM;
+        }
 
         all->info.flags = FBINFO_DEFAULT;
         all->info.fbops = &p9100_ops;
-#ifdef CONFIG_SPARC32
-        all->info.screen_base = (char __iomem *)
-                prom_getintdefault(sdev->prom_node, "address", 0);
-#endif
-        if (!all->info.screen_base)
-                all->info.screen_base = sbus_ioremap(&sdev->resource[2], 0,
-                                     all->par.fbsize, "p9100 ram");
+        all->info.screen_base = of_ioremap(&op->resource[2], 0,
+                                           all->par.fbsize, "p9100 ram");
+        if (!all->info.screen_base) {
+                of_iounmap(all->par.regs, sizeof(struct p9100_regs));
+                kfree(all);
+                return -ENOMEM;
+        }
         all->info.par = &all->par;
 
         p9100_blank(0, &all->info);
 
         if (fb_alloc_cmap(&all->info.cmap, 256, 0)) {
-                printk(KERN_ERR "p9100: Could not allocate color map.\n");
+                of_iounmap(all->par.regs, sizeof(struct p9100_regs));
+                of_iounmap(all->info.screen_base, all->par.fbsize);
                 kfree(all);
-                return;
+                return -ENOMEM;
         }
 
-        p9100_init_fix(&all->info, linebytes);
+        p9100_init_fix(&all->info, linebytes, dp);
 
-        if (register_framebuffer(&all->info) < 0) {
-                printk(KERN_ERR "p9100: Could not register framebuffer.\n");
+        err = register_framebuffer(&all->info);
+        if (err < 0) {
                 fb_dealloc_cmap(&all->info.cmap);
+                of_iounmap(all->par.regs, sizeof(struct p9100_regs));
+                of_iounmap(all->info.screen_base, all->par.fbsize);
                 kfree(all);
-                return;
+                return err;
         }
         fb_set_cmap(&all->info.cmap, &all->info);
 
-        list_add(&all->list, &p9100_list);
+        dev_set_drvdata(&op->dev, all);
+
+        printk("%s: p9100 at %lx:%lx\n",
+               dp->full_name,
+               all->par.which_io, all->par.physbase);
 
-        printk("p9100: %s at %lx:%lx\n",
-               sdev->prom_name,
-               (long) sdev->reg_addrs[0].which_io,
-               (long) sdev->reg_addrs[0].phys_addr);
+        return 0;
 }
 
-int __init p9100_init(void)
+static int __devinit p9100_probe(struct of_device *dev, const struct of_device_id *match)
 {
-        struct sbus_bus *sbus;
-        struct sbus_dev *sdev;
+        struct of_device *op = to_of_device(&dev->dev);
 
-        if (fb_get_options("p9100fb", NULL))
-                return -ENODEV;
+        return p9100_init_one(op);
+}
 
-        for_all_sbusdev(sdev, sbus) {
-                if (!strcmp(sdev->prom_name, "p9100"))
-                        p9100_init_one(sdev);
-        }
+static int __devexit p9100_remove(struct of_device *dev)
+{
+        struct all_info *all = dev_get_drvdata(&dev->dev);
+
+        unregister_framebuffer(&all->info);
+        fb_dealloc_cmap(&all->info.cmap);
+
+        of_iounmap(all->par.regs, sizeof(struct p9100_regs));
+        of_iounmap(all->info.screen_base, all->par.fbsize);
+
+        kfree(all);
+
+        dev_set_drvdata(&dev->dev, NULL);
 
         return 0;
 }
 
-void __exit p9100_exit(void)
-{
-        struct list_head *pos, *tmp;
+static struct of_device_id p9100_match[] = {
+        {
+                .name = "p9100",
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(of, p9100_match);
 
-        list_for_each_safe(pos, tmp, &p9100_list) {
-                struct all_info *all = list_entry(pos, typeof(*all), list);
+static struct of_platform_driver p9100_driver = {
+        .name           = "p9100",
+        .match_table    = p9100_match,
+        .probe          = p9100_probe,
+        .remove         = __devexit_p(p9100_remove),
+};
 
-                unregister_framebuffer(&all->info);
-                fb_dealloc_cmap(&all->info.cmap);
-                kfree(all);
-        }
+static int __init p9100_init(void)
+{
+        if (fb_get_options("p9100fb", NULL))
+                return -ENODEV;
+
+        return of_register_driver(&p9100_driver, &of_bus_type);
 }
 
-int __init
-p9100_setup(char *arg)
+static void __exit p9100_exit(void)
 {
-        /* No cmdline options yet... */
-        return 0;
+        of_unregister_driver(&p9100_driver);
 }
 
 module_init(p9100_init);
-
-#ifdef MODULE
 module_exit(p9100_exit);
-#endif
 
 MODULE_DESCRIPTION("framebuffer driver for P9100 chipsets");
-MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
+MODULE_AUTHOR("David S. Miller <davem@davemloft.net>");
+MODULE_VERSION("2.0");
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c
index 335e37465559..983be3ec2345 100644
--- a/drivers/video/platinumfb.c
+++ b/drivers/video/platinumfb.c
@@ -17,13 +17,11 @@
  *  more details.
  */
 
-#include <linux/config.h>
 #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/vmalloc.h>
 #include <linux/delay.h>
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c
index 4e963930b50a..a560a2223825 100644
--- a/drivers/video/pm2fb.c
+++ b/drivers/video/pm2fb.c
@@ -27,14 +27,12 @@
  * 
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.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>
diff --git a/drivers/video/pm3fb.c b/drivers/video/pm3fb.c
index 52c18a35fb41..1d81ef47efd3 100644
--- a/drivers/video/pm3fb.c
+++ b/drivers/video/pm3fb.c
@@ -52,13 +52,11 @@
  *  Wed Feb 21 14:47:06 CET 2001, v 1.0.0: First working version
  */
 
-#include <linux/config.h>
 #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/vmalloc.h>
 #include <linux/delay.h>
diff --git a/drivers/video/pmag-aa-fb.c b/drivers/video/pmag-aa-fb.c
index d92f352211ef..68ca3cc40770 100644
--- a/drivers/video/pmag-aa-fb.c
+++ b/drivers/video/pmag-aa-fb.c
@@ -29,7 +29,6 @@
 #include <linux/string.h>
 #include <linux/timer.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
diff --git a/drivers/video/pnx4008/Makefile b/drivers/video/pnx4008/Makefile
new file mode 100644
index 000000000000..636aaccf01fd
--- /dev/null
+++ b/drivers/video/pnx4008/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the new PNX4008 framebuffer device driver
+#
+
+obj-$(CONFIG_FB_PNX4008_DUM) += sdum.o
+obj-$(CONFIG_FB_PNX4008_DUM_RGB) += pnxrgbfb.o
+
diff --git a/drivers/video/pnx4008/dum.h b/drivers/video/pnx4008/dum.h
new file mode 100644
index 000000000000..d80a614d89ed
--- /dev/null
+++ b/drivers/video/pnx4008/dum.h
@@ -0,0 +1,211 @@
+/*
+ * linux/drivers/video/pnx4008/dum.h
+ *
+ * Internal header for SDUM
+ *
+ * 2005 (c) Koninklijke Philips N.V. This file is licensed under
+ * the terms of the GNU General Public License version 2. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+
+#ifndef __PNX008_DUM_H__
+#define __PNX008_DUM_H__
+
+#include <asm/arch/platform.h>
+
+#define PNX4008_DUMCONF_VA_BASE         IO_ADDRESS(PNX4008_DUMCONF_BASE)
+#define PNX4008_DUM_MAIN_VA_BASE        IO_ADDRESS(PNX4008_DUM_MAINCFG_BASE)
+
+/* DUM CFG ADDRESSES */
+#define DUM_CH_BASE_ADR         (PNX4008_DUMCONF_VA_BASE + 0x00)
+#define DUM_CH_MIN_ADR          (PNX4008_DUMCONF_VA_BASE + 0x00)
+#define DUM_CH_MAX_ADR          (PNX4008_DUMCONF_VA_BASE + 0x04)
+#define DUM_CH_CONF_ADR         (PNX4008_DUMCONF_VA_BASE + 0x08)
+#define DUM_CH_STAT_ADR         (PNX4008_DUMCONF_VA_BASE + 0x0C)
+#define DUM_CH_CTRL_ADR         (PNX4008_DUMCONF_VA_BASE + 0x10)
+
+#define CH_MARG         (0x100 / sizeof(u32))
+#define DUM_CH_MIN(i)   (*((volatile u32 *)DUM_CH_MIN_ADR + (i) * CH_MARG))
+#define DUM_CH_MAX(i)   (*((volatile u32 *)DUM_CH_MAX_ADR + (i) * CH_MARG))
+#define DUM_CH_CONF(i)  (*((volatile u32 *)DUM_CH_CONF_ADR + (i) * CH_MARG))
+#define DUM_CH_STAT(i)  (*((volatile u32 *)DUM_CH_STAT_ADR + (i) * CH_MARG))
+#define DUM_CH_CTRL(i)  (*((volatile u32 *)DUM_CH_CTRL_ADR + (i) * CH_MARG))
+
+#define DUM_CONF_ADR          (PNX4008_DUM_MAIN_VA_BASE + 0x00)
+#define DUM_CTRL_ADR          (PNX4008_DUM_MAIN_VA_BASE + 0x04)
+#define DUM_STAT_ADR          (PNX4008_DUM_MAIN_VA_BASE + 0x08)
+#define DUM_DECODE_ADR        (PNX4008_DUM_MAIN_VA_BASE + 0x0C)
+#define DUM_COM_BASE_ADR      (PNX4008_DUM_MAIN_VA_BASE + 0x10)
+#define DUM_SYNC_C_ADR        (PNX4008_DUM_MAIN_VA_BASE + 0x14)
+#define DUM_CLK_DIV_ADR       (PNX4008_DUM_MAIN_VA_BASE + 0x18)
+#define DUM_DIRTY_LOW_ADR     (PNX4008_DUM_MAIN_VA_BASE + 0x20)
+#define DUM_DIRTY_HIGH_ADR    (PNX4008_DUM_MAIN_VA_BASE + 0x24)
+#define DUM_FORMAT_ADR        (PNX4008_DUM_MAIN_VA_BASE + 0x28)
+#define DUM_WTCFG1_ADR        (PNX4008_DUM_MAIN_VA_BASE + 0x30)
+#define DUM_RTCFG1_ADR        (PNX4008_DUM_MAIN_VA_BASE + 0x34)
+#define DUM_WTCFG2_ADR        (PNX4008_DUM_MAIN_VA_BASE + 0x38)
+#define DUM_RTCFG2_ADR        (PNX4008_DUM_MAIN_VA_BASE + 0x3C)
+#define DUM_TCFG_ADR          (PNX4008_DUM_MAIN_VA_BASE + 0x40)
+#define DUM_OUTP_FORMAT1_ADR  (PNX4008_DUM_MAIN_VA_BASE + 0x44)
+#define DUM_OUTP_FORMAT2_ADR  (PNX4008_DUM_MAIN_VA_BASE + 0x48)
+#define DUM_SYNC_MODE_ADR     (PNX4008_DUM_MAIN_VA_BASE + 0x4C)
+#define DUM_SYNC_OUT_C_ADR    (PNX4008_DUM_MAIN_VA_BASE + 0x50)
+
+#define DUM_CONF              (*(volatile u32 *)(DUM_CONF_ADR))
+#define DUM_CTRL              (*(volatile u32 *)(DUM_CTRL_ADR))
+#define DUM_STAT              (*(volatile u32 *)(DUM_STAT_ADR))
+#define DUM_DECODE            (*(volatile u32 *)(DUM_DECODE_ADR))
+#define DUM_COM_BASE          (*(volatile u32 *)(DUM_COM_BASE_ADR))
+#define DUM_SYNC_C            (*(volatile u32 *)(DUM_SYNC_C_ADR))
+#define DUM_CLK_DIV           (*(volatile u32 *)(DUM_CLK_DIV_ADR))
+#define DUM_DIRTY_LOW         (*(volatile u32 *)(DUM_DIRTY_LOW_ADR))
+#define DUM_DIRTY_HIGH        (*(volatile u32 *)(DUM_DIRTY_HIGH_ADR))
+#define DUM_FORMAT            (*(volatile u32 *)(DUM_FORMAT_ADR))
+#define DUM_WTCFG1            (*(volatile u32 *)(DUM_WTCFG1_ADR))
+#define DUM_RTCFG1            (*(volatile u32 *)(DUM_RTCFG1_ADR))
+#define DUM_WTCFG2            (*(volatile u32 *)(DUM_WTCFG2_ADR))
+#define DUM_RTCFG2            (*(volatile u32 *)(DUM_RTCFG2_ADR))
+#define DUM_TCFG              (*(volatile u32 *)(DUM_TCFG_ADR))
+#define DUM_OUTP_FORMAT1      (*(volatile u32 *)(DUM_OUTP_FORMAT1_ADR))
+#define DUM_OUTP_FORMAT2      (*(volatile u32 *)(DUM_OUTP_FORMAT2_ADR))
+#define DUM_SYNC_MODE         (*(volatile u32 *)(DUM_SYNC_MODE_ADR))
+#define DUM_SYNC_OUT_C        (*(volatile u32 *)(DUM_SYNC_OUT_C_ADR))
+
+/* DUM SLAVE ADDRESSES */
+#define DUM_SLAVE_WRITE_ADR      (PNX4008_DUM_MAINCFG_BASE + 0x0000000)
+#define DUM_SLAVE_READ1_I_ADR    (PNX4008_DUM_MAINCFG_BASE + 0x1000000)
+#define DUM_SLAVE_READ1_R_ADR    (PNX4008_DUM_MAINCFG_BASE + 0x1000004)
+#define DUM_SLAVE_READ2_I_ADR    (PNX4008_DUM_MAINCFG_BASE + 0x1000008)
+#define DUM_SLAVE_READ2_R_ADR    (PNX4008_DUM_MAINCFG_BASE + 0x100000C)
+
+#define DUM_SLAVE_WRITE_W  ((volatile u32 *)(DUM_SLAVE_WRITE_ADR))
+#define DUM_SLAVE_WRITE_HW ((volatile u16 *)(DUM_SLAVE_WRITE_ADR))
+#define DUM_SLAVE_READ1_I  ((volatile u8 *)(DUM_SLAVE_READ1_I_ADR))
+#define DUM_SLAVE_READ1_R  ((volatile u16 *)(DUM_SLAVE_READ1_R_ADR))
+#define DUM_SLAVE_READ2_I  ((volatile u8 *)(DUM_SLAVE_READ2_I_ADR))
+#define DUM_SLAVE_READ2_R  ((volatile u16 *)(DUM_SLAVE_READ2_R_ADR))
+
+/* Sony display register addresses */
+#define DISP_0_REG            (0x00)
+#define DISP_1_REG            (0x01)
+#define DISP_CAL_REG          (0x20)
+#define DISP_ID_REG           (0x2A)
+#define DISP_XMIN_L_REG       (0x30)
+#define DISP_XMIN_H_REG       (0x31)
+#define DISP_YMIN_REG         (0x32)
+#define DISP_XMAX_L_REG       (0x34)
+#define DISP_XMAX_H_REG       (0x35)
+#define DISP_YMAX_REG         (0x36)
+#define DISP_SYNC_EN_REG      (0x38)
+#define DISP_SYNC_RISE_L_REG  (0x3C)
+#define DISP_SYNC_RISE_H_REG  (0x3D)
+#define DISP_SYNC_FALL_L_REG  (0x3E)
+#define DISP_SYNC_FALL_H_REG  (0x3F)
+#define DISP_PIXEL_REG        (0x0B)
+#define DISP_DUMMY1_REG       (0x28)
+#define DISP_DUMMY2_REG       (0x29)
+#define DISP_TIMING_REG       (0x98)
+#define DISP_DUMP_REG         (0x99)
+
+/* Sony display constants */
+#define SONY_ID1              (0x22)
+#define SONY_ID2              (0x23)
+
+/* Philips display register addresses */
+#define PH_DISP_ORIENT_REG    (0x003)
+#define PH_DISP_YPOINT_REG    (0x200)
+#define PH_DISP_XPOINT_REG    (0x201)
+#define PH_DISP_PIXEL_REG     (0x202)
+#define PH_DISP_YMIN_REG      (0x406)
+#define PH_DISP_YMAX_REG      (0x407)
+#define PH_DISP_XMIN_REG      (0x408)
+#define PH_DISP_XMAX_REG      (0x409)
+
+/* Misc constants */
+#define NO_VALID_DISPLAY_FOUND      (0)
+#define DISPLAY2_IS_NOT_CONNECTED   (0)
+
+/* register values */
+#define V_BAC_ENABLE            (BIT(0))
+#define V_BAC_DISABLE_IDLE      (BIT(1))
+#define V_BAC_DISABLE_TRIG      (BIT(2))
+#define V_DUM_RESET             (BIT(3))
+#define V_MUX_RESET             (BIT(4))
+#define BAC_ENABLED             (BIT(0))
+#define BAC_DISABLED            0
+
+/* Sony LCD commands */
+#define V_LCD_STANDBY_OFF       ((BIT(25)) | (0 << 16) | DISP_0_REG)
+#define V_LCD_USE_9BIT_BUS      ((BIT(25)) | (2 << 16) | DISP_1_REG)
+#define V_LCD_SYNC_RISE_L       ((BIT(25)) | (0 << 16) | DISP_SYNC_RISE_L_REG)
+#define V_LCD_SYNC_RISE_H       ((BIT(25)) | (0 << 16) | DISP_SYNC_RISE_H_REG)
+#define V_LCD_SYNC_FALL_L       ((BIT(25)) | (160 << 16) | DISP_SYNC_FALL_L_REG)
+#define V_LCD_SYNC_FALL_H       ((BIT(25)) | (0 << 16) | DISP_SYNC_FALL_H_REG)
+#define V_LCD_SYNC_ENABLE       ((BIT(25)) | (128 << 16) | DISP_SYNC_EN_REG)
+#define V_LCD_DISPLAY_ON        ((BIT(25)) | (64 << 16) | DISP_0_REG)
+
+enum {
+        PAD_NONE,
+        PAD_512,
+        PAD_1024
+};
+
+enum {
+        RGB888,
+        RGB666,
+        RGB565,
+        BGR565,
+        ARGB1555,
+        ABGR1555,
+        ARGB4444,
+        ABGR4444
+};
+
+struct dum_setup {
+        int sync_neg_edge;
+        int round_robin;
+        int mux_int;
+        int synced_dirty_flag_int;
+        int dirty_flag_int;
+        int error_int;
+        int pf_empty_int;
+        int sf_empty_int;
+        int bac_dis_int;
+        u32 dirty_base_adr;
+        u32 command_base_adr;
+        u32 sync_clk_div;
+        int sync_output;
+        u32 sync_restart_val;
+        u32 set_sync_high;
+        u32 set_sync_low;
+};
+
+struct dum_ch_setup {
+        int disp_no;
+        u32 xmin;
+        u32 ymin;
+        u32 xmax;
+        u32 ymax;
+        int xmirror;
+        int ymirror;
+        int rotate;
+        u32 minadr;
+        u32 maxadr;
+        u32 dirtybuffer;
+        int pad;
+        int format;
+        int hwdirty;
+        int slave_trans;
+};
+
+struct disp_window {
+        u32 xmin_l;
+        u32 xmin_h;
+        u32 ymin;
+        u32 xmax_l;
+        u32 xmax_h;
+        u32 ymax;
+};
+
+#endif                          /* #ifndef __PNX008_DUM_H__ */
diff --git a/drivers/video/pnx4008/fbcommon.h b/drivers/video/pnx4008/fbcommon.h
new file mode 100644
index 000000000000..4ebc87dafafb
--- /dev/null
+++ b/drivers/video/pnx4008/fbcommon.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2005 Philips Semiconductors
+ *
+ * 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 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; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA, or http://www.gnu.org/licenses/gpl.html
+*/
+
+#define QCIF_W  (176)
+#define QCIF_H  (144)
+
+#define CIF_W   (352)
+#define CIF_H   (288)
+
+#define LCD_X_RES       208
+#define LCD_Y_RES       320
+#define LCD_X_PAD       256
+#define LCD_BBP         4       /* Bytes Per Pixel */
+
+#define DISP_MAX_X_SIZE     (320)
+#define DISP_MAX_Y_SIZE     (208)
+
+#define RETURNVAL_BASE (0x400)
+
+enum fb_ioctl_returntype {
+        ENORESOURCESLEFT = RETURNVAL_BASE,
+        ERESOURCESNOTFREED,
+        EPROCNOTOWNER,
+        EFBNOTOWNER,
+        ECOPYFAILED,
+        EIOREMAPFAILED,
+};
diff --git a/drivers/video/pnx4008/pnxrgbfb.c b/drivers/video/pnx4008/pnxrgbfb.c
new file mode 100644
index 000000000000..7d9453c91a42
--- /dev/null
+++ b/drivers/video/pnx4008/pnxrgbfb.c
@@ -0,0 +1,213 @@
+/*
+ * drivers/video/pnx4008/pnxrgbfb.c
+ *
+ * PNX4008's framebuffer support
+ *
+ * Author: Grigory Tolstolytkin <gtolstolytkin@ru.mvista.com>
+ * Based on Philips Semiconductors's code
+ *
+ * Copyrght (c) 2005 MontaVista Software, Inc.
+ * Copyright (c) 2005 Philips Semiconductors
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#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/vmalloc.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+
+#include <asm/uaccess.h>
+#include "sdum.h"
+#include "fbcommon.h"
+
+static u32 colreg[16];
+
+static struct fb_var_screeninfo rgbfb_var __initdata = {
+        .xres = LCD_X_RES,
+        .yres = LCD_Y_RES,
+        .xres_virtual = LCD_X_RES,
+        .yres_virtual = LCD_Y_RES,
+        .bits_per_pixel = 32,
+        .red.offset = 16,
+        .red.length = 8,
+        .green.offset = 8,
+        .green.length = 8,
+        .blue.offset = 0,
+        .blue.length = 8,
+        .left_margin = 0,
+        .right_margin = 0,
+        .upper_margin = 0,
+        .lower_margin = 0,
+        .vmode = FB_VMODE_NONINTERLACED,
+};
+static struct fb_fix_screeninfo rgbfb_fix __initdata = {
+        .id = "RGBFB",
+        .line_length = LCD_X_RES * LCD_BBP,
+        .type = FB_TYPE_PACKED_PIXELS,
+        .visual = FB_VISUAL_TRUECOLOR,
+        .xpanstep = 0,
+        .ypanstep = 0,
+        .ywrapstep = 0,
+        .accel = FB_ACCEL_NONE,
+};
+
+static int channel_owned;
+
+static int no_cursor(struct fb_info *info, struct fb_cursor *cursor)
+{
+        return 0;
+}
+
+static int rgbfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
+                           u_int transp, struct fb_info *info)
+{
+        if (regno > 15)
+                return 1;
+
+        colreg[regno] = ((red & 0xff00) << 8) | (green & 0xff00) |
+            ((blue & 0xff00) >> 8);
+        return 0;
+}
+
+static int rgbfb_mmap(struct fb_info *info, struct vm_area_struct *vma)
+{
+        return pnx4008_sdum_mmap(info, vma, NULL);
+}
+
+static struct fb_ops rgbfb_ops = {
+        .fb_mmap = rgbfb_mmap,
+        .fb_setcolreg = rgbfb_setcolreg,
+        .fb_fillrect = cfb_fillrect,
+        .fb_copyarea = cfb_copyarea,
+        .fb_imageblit = cfb_imageblit,
+};
+
+static int rgbfb_remove(struct platform_device *pdev)
+{
+        struct fb_info *info = platform_get_drvdata(pdev);
+
+        if (info) {
+                unregister_framebuffer(info);
+                fb_dealloc_cmap(&info->cmap);
+                framebuffer_release(info);
+                platform_set_drvdata(pdev, NULL);
+                kfree(info);
+        }
+
+        pnx4008_free_dum_channel(channel_owned, pdev->id);
+        pnx4008_set_dum_exit_notification(pdev->id);
+
+        return 0;
+}
+
+static int __devinit rgbfb_probe(struct platform_device *pdev)
+{
+        struct fb_info *info;
+        struct dumchannel_uf chan_uf;
+        int ret;
+        char *option;
+
+        info = framebuffer_alloc(sizeof(u32) * 16, &pdev->dev);
+        if (!info) {
+                ret = -ENOMEM;
+                goto err;
+        }
+
+        pnx4008_get_fb_addresses(FB_TYPE_RGB, (void **)&info->screen_base,
+                                 (dma_addr_t *) &rgbfb_fix.smem_start,
+                                 &rgbfb_fix.smem_len);
+
+        if ((ret = pnx4008_alloc_dum_channel(pdev->id)) < 0)
+                goto err0;
+        else {
+                channel_owned = ret;
+                chan_uf.channelnr = channel_owned;
+                chan_uf.dirty = (u32 *) NULL;
+                chan_uf.source = (u32 *) rgbfb_fix.smem_start;
+                chan_uf.x_offset = 0;
+                chan_uf.y_offset = 0;
+                chan_uf.width = LCD_X_RES;
+                chan_uf.height = LCD_Y_RES;
+
+                if ((ret = pnx4008_put_dum_channel_uf(chan_uf, pdev->id))< 0)
+                        goto err1;
+
+                if ((ret =
+                     pnx4008_set_dum_channel_sync(channel_owned, CONF_SYNC_ON,
+                                                  pdev->id)) < 0)
+                        goto err1;
+
+                if ((ret =
+                     pnx4008_set_dum_channel_dirty_detect(channel_owned,
+                                                         CONF_DIRTYDETECTION_ON,
+                                                         pdev->id)) < 0)
+                        goto err1;
+        }
+
+        if (!fb_get_options("pnxrgbfb", &option) && !strcmp(option, "nocursor"))
+                rgbfb_ops.fb_cursor = no_cursor;
+
+        info->node = -1;
+        info->flags = FBINFO_FLAG_DEFAULT;
+        info->fbops = &rgbfb_ops;
+        info->fix = rgbfb_fix;
+        info->var = rgbfb_var;
+        info->screen_size = rgbfb_fix.smem_len;
+        info->pseudo_palette = info->par;
+        info->par = NULL;
+
+        ret = fb_alloc_cmap(&info->cmap, 256, 0);
+        if (ret < 0)
+                goto err2;
+
+        ret = register_framebuffer(info);
+        if (ret < 0)
+                goto err3;
+        platform_set_drvdata(pdev, info);
+
+        return 0;
+
+err3:
+        fb_dealloc_cmap(&info->cmap);
+err2:
+        framebuffer_release(info);
+err1:
+        pnx4008_free_dum_channel(channel_owned, pdev->id);
+err0:
+        kfree(info);
+err:
+        return ret;
+}
+
+static struct platform_driver rgbfb_driver = {
+        .driver = {
+                .name = "rgbfb",
+        },
+        .probe = rgbfb_probe,
+        .remove = rgbfb_remove,
+};
+
+static int __init rgbfb_init(void)
+{
+        return platform_driver_register(&rgbfb_driver);
+}
+
+static void __exit rgbfb_exit(void)
+{
+        platform_driver_unregister(&rgbfb_driver);
+}
+
+module_init(rgbfb_init);
+module_exit(rgbfb_exit);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/pnx4008/sdum.c b/drivers/video/pnx4008/sdum.c
new file mode 100644
index 000000000000..51f0ecc2a511
--- /dev/null
+++ b/drivers/video/pnx4008/sdum.c
@@ -0,0 +1,872 @@
+/*
+ * drivers/video/pnx4008/sdum.c
+ *
+ * Display Update Master support
+ *
+ * Authors: Grigory Tolstolytkin <gtolstolytkin@ru.mvista.com>
+ *          Vitaly Wool <vitalywool@gmail.com>
+ * Based on Philips Semiconductors's code
+ *
+ * Copyrght (c) 2005-2006 MontaVista Software, Inc.
+ * Copyright (c) 2005 Philips Semiconductors
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#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/vmalloc.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/dma-mapping.h>
+#include <linux/clk.h>
+#include <asm/uaccess.h>
+#include <asm/arch/gpio.h>
+
+#include "sdum.h"
+#include "fbcommon.h"
+#include "dum.h"
+
+/* Framebuffers we have */
+
+static struct pnx4008_fb_addr {
+        int fb_type;
+        long addr_offset;
+        long fb_length;
+} fb_addr[] = {
+        [0] = {
+                FB_TYPE_YUV, 0, 0xB0000
+        },
+        [1] = {
+                FB_TYPE_RGB, 0xB0000, 0x50000
+        },
+};
+
+static struct dum_data {
+        u32 lcd_phys_start;
+        u32 lcd_virt_start;
+        u32 slave_phys_base;
+        u32 *slave_virt_base;
+        int fb_owning_channel[MAX_DUM_CHANNELS];
+        struct dumchannel_uf chan_uf_store[MAX_DUM_CHANNELS];
+} dum_data;
+
+/* Different local helper functions */
+
+static u32 nof_pixels_dx(struct dum_ch_setup *ch_setup)
+{
+        return (ch_setup->xmax - ch_setup->xmin + 1);
+}
+
+static u32 nof_pixels_dy(struct dum_ch_setup *ch_setup)
+{
+        return (ch_setup->ymax - ch_setup->ymin + 1);
+}
+
+static u32 nof_pixels_dxy(struct dum_ch_setup *ch_setup)
+{
+        return (nof_pixels_dx(ch_setup) * nof_pixels_dy(ch_setup));
+}
+
+static u32 nof_bytes(struct dum_ch_setup *ch_setup)
+{
+        u32 r = nof_pixels_dxy(ch_setup);
+        switch (ch_setup->format) {
+        case RGB888:
+        case RGB666:
+                r *= 4;
+                break;
+
+        default:
+                r *= 2;
+                break;
+        }
+        return r;
+}
+
+static u32 build_command(int disp_no, u32 reg, u32 val)
+{
+        return ((disp_no << 26) | BIT(25) | (val << 16) | (disp_no << 10) |
+                (reg << 0));
+}
+
+static u32 build_double_index(int disp_no, u32 val)
+{
+        return ((disp_no << 26) | (val << 16) | (disp_no << 10) | (val << 0));
+}
+
+static void build_disp_window(struct dum_ch_setup * ch_setup, struct disp_window * dw)
+{
+        dw->ymin = ch_setup->ymin;
+        dw->ymax = ch_setup->ymax;
+        dw->xmin_l = ch_setup->xmin & 0xFF;
+        dw->xmin_h = (ch_setup->xmin & BIT(8)) >> 8;
+        dw->xmax_l = ch_setup->xmax & 0xFF;
+        dw->xmax_h = (ch_setup->xmax & BIT(8)) >> 8;
+}
+
+static int put_channel(struct dumchannel chan)
+{
+        int i = chan.channelnr;
+
+        if (i < 0 || i > MAX_DUM_CHANNELS)
+                return -EINVAL;
+        else {
+                DUM_CH_MIN(i) = chan.dum_ch_min;
+                DUM_CH_MAX(i) = chan.dum_ch_max;
+                DUM_CH_CONF(i) = chan.dum_ch_conf;
+                DUM_CH_CTRL(i) = chan.dum_ch_ctrl;
+        }
+
+        return 0;
+}
+
+static void clear_channel(int channr)
+{
+        struct dumchannel chan;
+
+        chan.channelnr = channr;
+        chan.dum_ch_min = 0;
+        chan.dum_ch_max = 0;
+        chan.dum_ch_conf = 0;
+        chan.dum_ch_ctrl = 0;
+
+        put_channel(chan);
+}
+
+static int put_cmd_string(struct cmdstring cmds)
+{
+        u16 *cmd_str_virtaddr;
+        u32 *cmd_ptr0_virtaddr;
+        u32 cmd_str_physaddr;
+
+        int i = cmds.channelnr;
+
+        if (i < 0 || i > MAX_DUM_CHANNELS)
+                return -EINVAL;
+        else if ((cmd_ptr0_virtaddr =
+                  (int *)ioremap_nocache(DUM_COM_BASE,
+                                         sizeof(int) * MAX_DUM_CHANNELS)) ==
+                 NULL)
+                return -EIOREMAPFAILED;
+        else {
+                cmd_str_physaddr = ioread32(&cmd_ptr0_virtaddr[cmds.channelnr]);
+                if ((cmd_str_virtaddr =
+                     (u16 *) ioremap_nocache(cmd_str_physaddr,
+                                             sizeof(cmds))) == NULL) {
+                        iounmap(cmd_ptr0_virtaddr);
+                        return -EIOREMAPFAILED;
+                } else {
+                        int t;
+                        for (t = 0; t < 8; t++)
+                                iowrite16(*((u16 *)&cmds.prestringlen + t),
+                                          cmd_str_virtaddr + t);
+
+                        for (t = 0; t < cmds.prestringlen / 2; t++)
+                                 iowrite16(*((u16 *)&cmds.precmd + t),
+                                           cmd_str_virtaddr + t + 8);
+
+                        for (t = 0; t < cmds.poststringlen / 2; t++)
+                                iowrite16(*((u16 *)&cmds.postcmd + t),
+                                          cmd_str_virtaddr + t + 8 +
+                                                cmds.prestringlen / 2);
+
+                        iounmap(cmd_ptr0_virtaddr);
+                        iounmap(cmd_str_virtaddr);
+                }
+        }
+
+        return 0;
+}
+
+static u32 dum_ch_setup(int ch_no, struct dum_ch_setup * ch_setup)
+{
+        struct cmdstring cmds_c;
+        struct cmdstring *cmds = &cmds_c;
+        struct disp_window dw;
+        int standard;
+        u32 orientation = 0;
+        struct dumchannel chan = { 0 };
+        int ret;
+
+        if ((ch_setup->xmirror) || (ch_setup->ymirror) || (ch_setup->rotate)) {
+                standard = 0;
+
+                orientation = BIT(1);   /* always set 9-bit-bus */
+                if (ch_setup->xmirror)
+                        orientation |= BIT(4);
+                if (ch_setup->ymirror)
+                        orientation |= BIT(3);
+                if (ch_setup->rotate)
+                        orientation |= BIT(0);
+        } else
+                standard = 1;
+
+        cmds->channelnr = ch_no;
+
+        /* build command string header */
+        if (standard) {
+                cmds->prestringlen = 32;
+                cmds->poststringlen = 0;
+        } else {
+                cmds->prestringlen = 48;
+                cmds->poststringlen = 16;
+        }
+
+        cmds->format =
+            (u16) ((ch_setup->disp_no << 4) | (BIT(3)) | (ch_setup->format));
+        cmds->reserved = 0x0;
+        cmds->startaddr_low = (ch_setup->minadr & 0xFFFF);
+        cmds->startaddr_high = (ch_setup->minadr >> 16);
+
+        if ((ch_setup->minadr == 0) && (ch_setup->maxadr == 0)
+            && (ch_setup->xmin == 0)
+            && (ch_setup->ymin == 0) && (ch_setup->xmax == 0)
+            && (ch_setup->ymax == 0)) {
+                cmds->pixdatlen_low = 0;
+                cmds->pixdatlen_high = 0;
+        } else {
+                u32 nbytes = nof_bytes(ch_setup);
+                cmds->pixdatlen_low = (nbytes & 0xFFFF);
+                cmds->pixdatlen_high = (nbytes >> 16);
+        }
+
+        if (ch_setup->slave_trans)
+                cmds->pixdatlen_high |= BIT(15);
+
+        /* build pre-string */
+        build_disp_window(ch_setup, &dw);
+
+        if (standard) {
+                cmds->precmd[0] =
+                    build_command(ch_setup->disp_no, DISP_XMIN_L_REG, 0x99);
+                cmds->precmd[1] =
+                    build_command(ch_setup->disp_no, DISP_XMIN_L_REG,
+                                  dw.xmin_l);
+                cmds->precmd[2] =
+                    build_command(ch_setup->disp_no, DISP_XMIN_H_REG,
+                                  dw.xmin_h);
+                cmds->precmd[3] =
+                    build_command(ch_setup->disp_no, DISP_YMIN_REG, dw.ymin);
+                cmds->precmd[4] =
+                    build_command(ch_setup->disp_no, DISP_XMAX_L_REG,
+                                  dw.xmax_l);
+                cmds->precmd[5] =
+                    build_command(ch_setup->disp_no, DISP_XMAX_H_REG,
+                                  dw.xmax_h);
+                cmds->precmd[6] =
+                    build_command(ch_setup->disp_no, DISP_YMAX_REG, dw.ymax);
+                cmds->precmd[7] =
+                    build_double_index(ch_setup->disp_no, DISP_PIXEL_REG);
+        } else {
+                if (dw.xmin_l == ch_no)
+                        cmds->precmd[0] =
+                            build_command(ch_setup->disp_no, DISP_XMIN_L_REG,
+                                          0x99);
+                else
+                        cmds->precmd[0] =
+                            build_command(ch_setup->disp_no, DISP_XMIN_L_REG,
+                                          ch_no);
+
+                cmds->precmd[1] =
+                    build_command(ch_setup->disp_no, DISP_XMIN_L_REG,
+                                  dw.xmin_l);
+                cmds->precmd[2] =
+                    build_command(ch_setup->disp_no, DISP_XMIN_H_REG,
+                                  dw.xmin_h);
+                cmds->precmd[3] =
+                    build_command(ch_setup->disp_no, DISP_YMIN_REG, dw.ymin);
+                cmds->precmd[4] =
+                    build_command(ch_setup->disp_no, DISP_XMAX_L_REG,
+                                  dw.xmax_l);
+                cmds->precmd[5] =
+                    build_command(ch_setup->disp_no, DISP_XMAX_H_REG,
+                                  dw.xmax_h);
+                cmds->precmd[6] =
+                    build_command(ch_setup->disp_no, DISP_YMAX_REG, dw.ymax);
+                cmds->precmd[7] =
+                    build_command(ch_setup->disp_no, DISP_1_REG, orientation);
+                cmds->precmd[8] =
+                    build_double_index(ch_setup->disp_no, DISP_PIXEL_REG);
+                cmds->precmd[9] =
+                    build_double_index(ch_setup->disp_no, DISP_PIXEL_REG);
+                cmds->precmd[0xA] =
+                    build_double_index(ch_setup->disp_no, DISP_PIXEL_REG);
+                cmds->precmd[0xB] =
+                    build_double_index(ch_setup->disp_no, DISP_PIXEL_REG);
+                cmds->postcmd[0] =
+                    build_command(ch_setup->disp_no, DISP_1_REG, BIT(1));
+                cmds->postcmd[1] =
+                    build_command(ch_setup->disp_no, DISP_DUMMY1_REG, 1);
+                cmds->postcmd[2] =
+                    build_command(ch_setup->disp_no, DISP_DUMMY1_REG, 2);
+                cmds->postcmd[3] =
+                    build_command(ch_setup->disp_no, DISP_DUMMY1_REG, 3);
+        }
+
+        if ((ret = put_cmd_string(cmds_c)) != 0) {
+                return ret;
+        }
+
+        chan.channelnr = cmds->channelnr;
+        chan.dum_ch_min = ch_setup->dirtybuffer + ch_setup->minadr;
+        chan.dum_ch_max = ch_setup->dirtybuffer + ch_setup->maxadr;
+        chan.dum_ch_conf = 0x002;
+        chan.dum_ch_ctrl = 0x04;
+
+        put_channel(chan);
+
+        return 0;
+}
+
+static u32 display_open(int ch_no, int auto_update, u32 * dirty_buffer,
+                        u32 * frame_buffer, u32 xpos, u32 ypos, u32 w, u32 h)
+{
+
+        struct dum_ch_setup k;
+        int ret;
+
+        /* keep width & height within display area */
+        if ((xpos + w) > DISP_MAX_X_SIZE)
+                w = DISP_MAX_X_SIZE - xpos;
+
+        if ((ypos + h) > DISP_MAX_Y_SIZE)
+                h = DISP_MAX_Y_SIZE - ypos;
+
+        /* assume 1 display only */
+        k.disp_no = 0;
+        k.xmin = xpos;
+        k.ymin = ypos;
+        k.xmax = xpos + (w - 1);
+        k.ymax = ypos + (h - 1);
+
+        /* adjust min and max values if necessary */
+        if (k.xmin > DISP_MAX_X_SIZE - 1)
+                k.xmin = DISP_MAX_X_SIZE - 1;
+        if (k.ymin > DISP_MAX_Y_SIZE - 1)
+                k.ymin = DISP_MAX_Y_SIZE - 1;
+
+        if (k.xmax > DISP_MAX_X_SIZE - 1)
+                k.xmax = DISP_MAX_X_SIZE - 1;
+        if (k.ymax > DISP_MAX_Y_SIZE - 1)
+                k.ymax = DISP_MAX_Y_SIZE - 1;
+
+        k.xmirror = 0;
+        k.ymirror = 0;
+        k.rotate = 0;
+        k.minadr = (u32) frame_buffer;
+        k.maxadr = (u32) frame_buffer + (((w - 1) << 10) | ((h << 2) - 2));
+        k.pad = PAD_1024;
+        k.dirtybuffer = (u32) dirty_buffer;
+        k.format = RGB888;
+        k.hwdirty = 0;
+        k.slave_trans = 0;
+
+        ret = dum_ch_setup(ch_no, &k);
+
+        return ret;
+}
+
+static void lcd_reset(void)
+{
+        u32 *dum_pio_base = (u32 *)IO_ADDRESS(PNX4008_PIO_BASE);
+
+        udelay(1);
+        iowrite32(BIT(19), &dum_pio_base[2]);
+        udelay(1);
+        iowrite32(BIT(19), &dum_pio_base[1]);
+        udelay(1);
+}
+
+static int dum_init(struct platform_device *pdev)
+{
+        struct clk *clk;
+
+        /* enable DUM clock */
+        clk = clk_get(&pdev->dev, "dum_ck");
+        if (IS_ERR(clk)) {
+                printk(KERN_ERR "pnx4008_dum: Unable to access DUM clock\n");
+                return PTR_ERR(clk);
+        }
+
+        clk_set_rate(clk, 1);
+        clk_put(clk);
+
+        DUM_CTRL = V_DUM_RESET;
+
+        /* set priority to "round-robin". All other params to "false" */
+        DUM_CONF = BIT(9);
+
+        /* Display 1 */
+        DUM_WTCFG1 = PNX4008_DUM_WT_CFG;
+        DUM_RTCFG1 = PNX4008_DUM_RT_CFG;
+        DUM_TCFG = PNX4008_DUM_T_CFG;
+
+        return 0;
+}
+
+static void dum_chan_init(void)
+{
+        int i = 0, ch = 0;
+        u32 *cmdptrs;
+        u32 *cmdstrings;
+
+        DUM_COM_BASE =
+                CMDSTRING_BASEADDR + BYTES_PER_CMDSTRING * NR_OF_CMDSTRINGS;
+
+        if ((cmdptrs =
+             (u32 *) ioremap_nocache(DUM_COM_BASE,
+                                     sizeof(u32) * NR_OF_CMDSTRINGS)) == NULL)
+                return;
+
+        for (ch = 0; ch < NR_OF_CMDSTRINGS; ch++)
+                iowrite32(CMDSTRING_BASEADDR + BYTES_PER_CMDSTRING * ch,
+                          cmdptrs + ch);
+
+        for (ch = 0; ch < MAX_DUM_CHANNELS; ch++)
+                clear_channel(ch);
+
+        /* Clear the cmdstrings */
+        cmdstrings =
+            (u32 *)ioremap_nocache(*cmdptrs,
+                                   BYTES_PER_CMDSTRING * NR_OF_CMDSTRINGS);
+
+        if (!cmdstrings)
+                goto out;
+
+        for (i = 0; i < NR_OF_CMDSTRINGS * BYTES_PER_CMDSTRING / sizeof(u32);
+             i++)
+                iowrite32(0, cmdstrings + i);
+
+        iounmap((u32 *)cmdstrings);
+
+out:
+        iounmap((u32 *)cmdptrs);
+}
+
+static void lcd_init(void)
+{
+        lcd_reset();
+
+        DUM_OUTP_FORMAT1 = 0; /* RGB666 */
+
+        udelay(1);
+        iowrite32(V_LCD_STANDBY_OFF, dum_data.slave_virt_base);
+        udelay(1);
+        iowrite32(V_LCD_USE_9BIT_BUS, dum_data.slave_virt_base);
+        udelay(1);
+        iowrite32(V_LCD_SYNC_RISE_L, dum_data.slave_virt_base);
+        udelay(1);
+        iowrite32(V_LCD_SYNC_RISE_H, dum_data.slave_virt_base);
+        udelay(1);
+        iowrite32(V_LCD_SYNC_FALL_L, dum_data.slave_virt_base);
+        udelay(1);
+        iowrite32(V_LCD_SYNC_FALL_H, dum_data.slave_virt_base);
+        udelay(1);
+        iowrite32(V_LCD_SYNC_ENABLE, dum_data.slave_virt_base);
+        udelay(1);
+        iowrite32(V_LCD_DISPLAY_ON, dum_data.slave_virt_base);
+        udelay(1);
+}
+
+/* Interface exported to framebuffer drivers */
+
+int pnx4008_get_fb_addresses(int fb_type, void **virt_addr,
+                             dma_addr_t *phys_addr, int *fb_length)
+{
+        int i;
+        int ret = -1;
+        for (i = 0; i < ARRAY_SIZE(fb_addr); i++)
+                if (fb_addr[i].fb_type == fb_type) {
+                        *virt_addr = (void *)(dum_data.lcd_virt_start +
+                                        fb_addr[i].addr_offset);
+                        *phys_addr =
+                            dum_data.lcd_phys_start + fb_addr[i].addr_offset;
+                        *fb_length = fb_addr[i].fb_length;
+                        ret = 0;
+                        break;
+                }
+
+        return ret;
+}
+
+EXPORT_SYMBOL(pnx4008_get_fb_addresses);
+
+int pnx4008_alloc_dum_channel(int dev_id)
+{
+        int i = 0;
+
+        while ((i < MAX_DUM_CHANNELS) && (dum_data.fb_owning_channel[i] != -1))
+                i++;
+
+        if (i == MAX_DUM_CHANNELS)
+                return -ENORESOURCESLEFT;
+        else {
+                dum_data.fb_owning_channel[i] = dev_id;
+                return i;
+        }
+}
+
+EXPORT_SYMBOL(pnx4008_alloc_dum_channel);
+
+int pnx4008_free_dum_channel(int channr, int dev_id)
+{
+        if (channr < 0 || channr > MAX_DUM_CHANNELS)
+                return -EINVAL;
+        else if (dum_data.fb_owning_channel[channr] != dev_id)
+                return -EFBNOTOWNER;
+        else {
+                clear_channel(channr);
+                dum_data.fb_owning_channel[channr] = -1;
+        }
+
+        return 0;
+}
+
+EXPORT_SYMBOL(pnx4008_free_dum_channel);
+
+int pnx4008_put_dum_channel_uf(struct dumchannel_uf chan_uf, int dev_id)
+{
+        int i = chan_uf.channelnr;
+        int ret;
+
+        if (i < 0 || i > MAX_DUM_CHANNELS)
+                return -EINVAL;
+        else if (dum_data.fb_owning_channel[i] != dev_id)
+                return -EFBNOTOWNER;
+        else if ((ret =
+                  display_open(chan_uf.channelnr, 0, chan_uf.dirty,
+                               chan_uf.source, chan_uf.y_offset,
+                               chan_uf.x_offset, chan_uf.height,
+                               chan_uf.width)) != 0)
+                return ret;
+        else {
+                dum_data.chan_uf_store[i].dirty = chan_uf.dirty;
+                dum_data.chan_uf_store[i].source = chan_uf.source;
+                dum_data.chan_uf_store[i].x_offset = chan_uf.x_offset;
+                dum_data.chan_uf_store[i].y_offset = chan_uf.y_offset;
+                dum_data.chan_uf_store[i].width = chan_uf.width;
+                dum_data.chan_uf_store[i].height = chan_uf.height;
+        }
+
+        return 0;
+}
+
+EXPORT_SYMBOL(pnx4008_put_dum_channel_uf);
+
+int pnx4008_set_dum_channel_sync(int channr, int val, int dev_id)
+{
+        if (channr < 0 || channr > MAX_DUM_CHANNELS)
+                return -EINVAL;
+        else if (dum_data.fb_owning_channel[channr] != dev_id)
+                return -EFBNOTOWNER;
+        else {
+                if (val == CONF_SYNC_ON) {
+                        DUM_CH_CONF(channr) |= CONF_SYNCENABLE;
+                        DUM_CH_CONF(channr) |= DUM_CHANNEL_CFG_SYNC_MASK |
+                                DUM_CHANNEL_CFG_SYNC_MASK_SET;
+                } else if (val == CONF_SYNC_OFF)
+                        DUM_CH_CONF(channr) &= ~CONF_SYNCENABLE;
+                else
+                        return -EINVAL;
+        }
+
+        return 0;
+}
+
+EXPORT_SYMBOL(pnx4008_set_dum_channel_sync);
+
+int pnx4008_set_dum_channel_dirty_detect(int channr, int val, int dev_id)
+{
+        if (channr < 0 || channr > MAX_DUM_CHANNELS)
+                return -EINVAL;
+        else if (dum_data.fb_owning_channel[channr] != dev_id)
+                return -EFBNOTOWNER;
+        else {
+                if (val == CONF_DIRTYDETECTION_ON)
+                        DUM_CH_CONF(channr) |= CONF_DIRTYENABLE;
+                else if (val == CONF_DIRTYDETECTION_OFF)
+                        DUM_CH_CONF(channr) &= ~CONF_DIRTYENABLE;
+                else
+                        return -EINVAL;
+        }
+
+        return 0;
+}
+
+EXPORT_SYMBOL(pnx4008_set_dum_channel_dirty_detect);
+
+#if 0 /* Functions not used currently, but likely to be used in future */
+
+static int get_channel(struct dumchannel *p_chan)
+{
+        int i = p_chan->channelnr;
+
+        if (i < 0 || i > MAX_DUM_CHANNELS)
+                return -EINVAL;
+        else {
+                p_chan->dum_ch_min = DUM_CH_MIN(i);
+                p_chan->dum_ch_max = DUM_CH_MAX(i);
+                p_chan->dum_ch_conf = DUM_CH_CONF(i);
+                p_chan->dum_ch_stat = DUM_CH_STAT(i);
+                p_chan->dum_ch_ctrl = 0;        /* WriteOnly control register */
+        }
+
+        return 0;
+}
+
+int pnx4008_get_dum_channel_uf(struct dumchannel_uf *p_chan_uf, int dev_id)
+{
+        int i = p_chan_uf->channelnr;
+
+        if (i < 0 || i > MAX_DUM_CHANNELS)
+                return -EINVAL;
+        else if (dum_data.fb_owning_channel[i] != dev_id)
+                return -EFBNOTOWNER;
+        else {
+                p_chan_uf->dirty = dum_data.chan_uf_store[i].dirty;
+                p_chan_uf->source = dum_data.chan_uf_store[i].source;
+                p_chan_uf->x_offset = dum_data.chan_uf_store[i].x_offset;
+                p_chan_uf->y_offset = dum_data.chan_uf_store[i].y_offset;
+                p_chan_uf->width = dum_data.chan_uf_store[i].width;
+                p_chan_uf->height = dum_data.chan_uf_store[i].height;
+        }
+
+        return 0;
+}
+
+EXPORT_SYMBOL(pnx4008_get_dum_channel_uf);
+
+int pnx4008_get_dum_channel_config(int channr, int dev_id)
+{
+        int ret;
+        struct dumchannel chan;
+
+        if (channr < 0 || channr > MAX_DUM_CHANNELS)
+                return -EINVAL;
+        else if (dum_data.fb_owning_channel[channr] != dev_id)
+                return -EFBNOTOWNER;
+        else {
+                chan.channelnr = channr;
+                if ((ret = get_channel(&chan)) != 0)
+                        return ret;
+        }
+
+        return (chan.dum_ch_conf & DUM_CHANNEL_CFG_MASK);
+}
+
+EXPORT_SYMBOL(pnx4008_get_dum_channel_config);
+
+int pnx4008_force_update_dum_channel(int channr, int dev_id)
+{
+        if (channr < 0 || channr > MAX_DUM_CHANNELS)
+                return -EINVAL;
+
+        else if (dum_data.fb_owning_channel[channr] != dev_id)
+                return -EFBNOTOWNER;
+        else
+                DUM_CH_CTRL(channr) = CTRL_SETDIRTY;
+
+        return 0;
+}
+
+EXPORT_SYMBOL(pnx4008_force_update_dum_channel);
+
+#endif
+
+int pnx4008_sdum_mmap(struct fb_info *info, struct vm_area_struct *vma,
+                      struct device *dev)
+{
+        unsigned long off = vma->vm_pgoff << PAGE_SHIFT;
+
+        if (off < info->fix.smem_len) {
+                vma->vm_pgoff += 1;
+                return dma_mmap_writecombine(dev, vma,
+                                (void *)dum_data.lcd_virt_start,
+                                dum_data.lcd_phys_start,
+                                FB_DMA_SIZE);
+        }
+        return -EINVAL;
+}
+
+EXPORT_SYMBOL(pnx4008_sdum_mmap);
+
+int pnx4008_set_dum_exit_notification(int dev_id)
+{
+        int i;
+
+        for (i = 0; i < MAX_DUM_CHANNELS; i++)
+                if (dum_data.fb_owning_channel[i] == dev_id)
+                        return -ERESOURCESNOTFREED;
+
+        return 0;
+}
+
+EXPORT_SYMBOL(pnx4008_set_dum_exit_notification);
+
+/* Platform device driver for DUM */
+
+static int sdum_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        int retval = 0;
+        struct clk *clk;
+
+        clk = clk_get(0, "dum_ck");
+        if (!IS_ERR(clk)) {
+                clk_set_rate(clk, 0);
+                clk_put(clk);
+        } else
+                retval = PTR_ERR(clk);
+
+        /* disable BAC */
+        DUM_CTRL = V_BAC_DISABLE_IDLE;
+
+        /* LCD standby & turn off display */
+        lcd_reset();
+
+        return retval;
+}
+
+static int sdum_resume(struct platform_device *pdev)
+{
+        int retval = 0;
+        struct clk *clk;
+
+        clk = clk_get(0, "dum_ck");
+        if (!IS_ERR(clk)) {
+                clk_set_rate(clk, 1);
+                clk_put(clk);
+        } else
+                retval = PTR_ERR(clk);
+
+        /* wait for BAC disable */
+        DUM_CTRL = V_BAC_DISABLE_TRIG;
+
+        while (DUM_CTRL & BAC_ENABLED)
+                udelay(10);
+
+        /* re-init LCD */
+        lcd_init();
+
+        /* enable BAC and reset MUX */
+        DUM_CTRL = V_BAC_ENABLE;
+        udelay(1);
+        DUM_CTRL = V_MUX_RESET;
+        return 0;
+}
+
+static int __devinit sdum_probe(struct platform_device *pdev)
+{
+        int ret = 0, i = 0;
+
+        /* map frame buffer */
+        dum_data.lcd_virt_start = (u32) dma_alloc_writecombine(&pdev->dev,
+                                                       FB_DMA_SIZE,
+                                                       &dum_data.lcd_phys_start,
+                                                       GFP_KERNEL);
+
+        if (!dum_data.lcd_virt_start) {
+                ret = -ENOMEM;
+                goto out_3;
+        }
+
+        /* map slave registers */
+        dum_data.slave_phys_base = PNX4008_DUM_SLAVE_BASE;
+        dum_data.slave_virt_base =
+            (u32 *) ioremap_nocache(dum_data.slave_phys_base, sizeof(u32));
+
+        if (dum_data.slave_virt_base == NULL) {
+                ret = -ENOMEM;
+                goto out_2;
+        }
+
+        /* initialize DUM and LCD display */
+        ret = dum_init(pdev);
+        if (ret)
+                goto out_1;
+
+        dum_chan_init();
+        lcd_init();
+
+        DUM_CTRL = V_BAC_ENABLE;
+        udelay(1);
+        DUM_CTRL = V_MUX_RESET;
+
+        /* set decode address and sync clock divider */
+        DUM_DECODE = dum_data.lcd_phys_start & DUM_DECODE_MASK;
+        DUM_CLK_DIV = PNX4008_DUM_CLK_DIV;
+
+        for (i = 0; i < MAX_DUM_CHANNELS; i++)
+                dum_data.fb_owning_channel[i] = -1;
+
+        /*setup wakeup interrupt */
+        start_int_set_rising_edge(SE_DISP_SYNC_INT);
+        start_int_ack(SE_DISP_SYNC_INT);
+        start_int_umask(SE_DISP_SYNC_INT);
+
+        return 0;
+
+out_1:
+        iounmap((void *)dum_data.slave_virt_base);
+out_2:
+        dma_free_writecombine(&pdev->dev, FB_DMA_SIZE,
+                        (void *)dum_data.lcd_virt_start,
+                        dum_data.lcd_phys_start);
+out_3:
+        return ret;
+}
+
+static int sdum_remove(struct platform_device *pdev)
+{
+        struct clk *clk;
+
+        start_int_mask(SE_DISP_SYNC_INT);
+
+        clk = clk_get(0, "dum_ck");
+        if (!IS_ERR(clk)) {
+                clk_set_rate(clk, 0);
+                clk_put(clk);
+        }
+
+        iounmap((void *)dum_data.slave_virt_base);
+
+        dma_free_writecombine(&pdev->dev, FB_DMA_SIZE,
+                        (void *)dum_data.lcd_virt_start,
+                        dum_data.lcd_phys_start);
+
+        return 0;
+}
+
+static struct platform_driver sdum_driver = {
+        .driver = {
+                .name = "sdum",
+        },
+        .probe = sdum_probe,
+        .remove = sdum_remove,
+        .suspend = sdum_suspend,
+        .resume = sdum_resume,
+};
+
+int __init sdum_init(void)
+{
+        return platform_driver_register(&sdum_driver);
+}
+
+static void __exit sdum_exit(void)
+{
+        platform_driver_unregister(&sdum_driver);
+};
+
+module_init(sdum_init);
+module_exit(sdum_exit);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/pnx4008/sdum.h b/drivers/video/pnx4008/sdum.h
new file mode 100644
index 000000000000..e8c5dcdd8813
--- /dev/null
+++ b/drivers/video/pnx4008/sdum.h
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2005 Philips Semiconductors
+ *
+ * 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 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; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA, or http://www.gnu.org/licenses/gpl.html
+*/
+
+#define MAX_DUM_CHANNELS        64
+
+#define RGB_MEM_WINDOW(x) (0x10000000 + (x)*0x00100000)
+
+#define QCIF_OFFSET(x) (((x) == 0) ? 0x00000: ((x) == 1) ? 0x30000: -1)
+#define CIF_OFFSET(x)  (((x) == 0) ? 0x00000: ((x) == 1) ? 0x60000: -1)
+
+#define CTRL_SETDIRTY           (0x00000001)
+#define CONF_DIRTYENABLE        (0x00000020)
+#define CONF_SYNCENABLE         (0x00000004)
+
+#define DIRTY_ENABLED(conf)     ((conf) & 0x0020)
+#define SYNC_ENABLED(conf)      ((conf) & 0x0004)
+
+/* Display 1 & 2 Write Timing Configuration */
+#define PNX4008_DUM_WT_CFG              0x00372000
+
+/* Display 1 & 2 Read Timing Configuration */
+#define PNX4008_DUM_RT_CFG              0x00003A47
+
+/* DUM Transit State Timing Configuration */
+#define PNX4008_DUM_T_CFG               0x1D    /* 29 HCLK cycles */
+
+/* DUM Sync count clock divider */
+#define PNX4008_DUM_CLK_DIV             0x02DD
+
+/* Memory size for framebuffer, allocated through dma_alloc_writecombine().
+ * Must be PAGE aligned
+ */
+#define FB_DMA_SIZE (PAGE_ALIGN(SZ_1M + PAGE_SIZE))
+
+#define OFFSET_RGBBUFFER (0xB0000)
+#define OFFSET_YUVBUFFER (0x00000)
+
+#define YUVBUFFER (lcd_video_start + OFFSET_YUVBUFFER)
+#define RGBBUFFER (lcd_video_start + OFFSET_RGBBUFFER)
+
+#define CMDSTRING_BASEADDR      (0x00C000)      /* iram */
+#define BYTES_PER_CMDSTRING     (0x80)
+#define NR_OF_CMDSTRINGS        (64)
+
+#define MAX_NR_PRESTRINGS (0x40)
+#define MAX_NR_POSTSTRINGS (0x40)
+
+/* various mask definitions */
+#define DUM_CLK_ENABLE 0x01
+#define DUM_CLK_DISABLE 0
+#define DUM_DECODE_MASK 0x1FFFFFFF
+#define DUM_CHANNEL_CFG_MASK 0x01FF
+#define DUM_CHANNEL_CFG_SYNC_MASK 0xFFFE00FF
+#define DUM_CHANNEL_CFG_SYNC_MASK_SET 0x0CA00
+
+#define SDUM_RETURNVAL_BASE (0x500)
+
+#define CONF_SYNC_OFF           (0x602)
+#define CONF_SYNC_ON            (0x603)
+
+#define CONF_DIRTYDETECTION_OFF (0x600)
+#define CONF_DIRTYDETECTION_ON  (0x601)
+
+/* Set the corresponding bit. */
+#define BIT(n) (0x1U << (n))
+
+struct dumchannel_uf {
+        int channelnr;
+        u32 *dirty;
+        u32 *source;
+        u32 x_offset;
+        u32 y_offset;
+        u32 width;
+        u32 height;
+};
+
+enum {
+        FB_TYPE_YUV,
+        FB_TYPE_RGB
+};
+
+struct cmdstring {
+        int channelnr;
+        uint16_t prestringlen;
+        uint16_t poststringlen;
+        uint16_t format;
+        uint16_t reserved;
+        uint16_t startaddr_low;
+        uint16_t startaddr_high;
+        uint16_t pixdatlen_low;
+        uint16_t pixdatlen_high;
+        u32 precmd[MAX_NR_PRESTRINGS];
+        u32 postcmd[MAX_NR_POSTSTRINGS];
+
+};
+
+struct dumchannel {
+        int channelnr;
+        int dum_ch_min;
+        int dum_ch_max;
+        int dum_ch_conf;
+        int dum_ch_stat;
+        int dum_ch_ctrl;
+};
+
+int pnx4008_alloc_dum_channel(int dev_id);
+int pnx4008_free_dum_channel(int channr, int dev_id);
+
+int pnx4008_get_dum_channel_uf(struct dumchannel_uf *pChan_uf, int dev_id);
+int pnx4008_put_dum_channel_uf(struct dumchannel_uf chan_uf, int dev_id);
+
+int pnx4008_set_dum_channel_sync(int channr, int val, int dev_id);
+int pnx4008_set_dum_channel_dirty_detect(int channr, int val, int dev_id);
+
+int pnx4008_force_dum_update_channel(int channr, int dev_id);
+
+int pnx4008_get_dum_channel_config(int channr, int dev_id);
+
+int pnx4008_sdum_mmap(struct fb_info *info, struct vm_area_struct *vma, struct device *dev);
+int pnx4008_set_dum_exit_notification(int dev_id);
+
+int pnx4008_get_fb_addresses(int fb_type, void **virt_addr,
+                             dma_addr_t * phys_addr, int *fb_length);
diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c
index ec4bacf9dd2e..78dc59a1751b 100644
--- a/drivers/video/pvr2fb.c
+++ b/drivers/video/pvr2fb.c
@@ -53,10 +53,8 @@
 #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/config.h>
 #include <linux/interrupt.h>
 #include <linux/fb.h>
 #include <linux/init.h>
@@ -189,7 +187,7 @@ static short do_blank = 0;		/* (Un)Blank the screen */
 static unsigned int is_blanked = 0;             /* Is the screen blanked? */
 
 #ifdef CONFIG_SH_STORE_QUEUES
-static struct sq_mapping *pvr2fb_map;
+static unsigned long pvr2fb_map;
 #endif
 
 #ifdef CONFIG_SH_DMA
@@ -215,15 +213,17 @@ static irqreturn_t pvr2fb_interrupt(int irq, void *dev_id, struct pt_regs *fp);
 static int pvr2_init_cable(void);
 static int pvr2_get_param(const struct pvr2_params *p, const char *s,
                             int val, int size);
+#ifdef CONFIG_SH_DMA
 static ssize_t pvr2fb_write(struct file *file, const char *buf,
                             size_t count, loff_t *ppos);
+#endif
 
 static struct fb_ops pvr2fb_ops = {
-        .owner          = THIS_MODULE,
-        .fb_setcolreg   = pvr2fb_setcolreg,
-        .fb_blank       = pvr2fb_blank,
-        .fb_check_var   = pvr2fb_check_var,
-        .fb_set_par     = pvr2fb_set_par,
+        .owner          = THIS_MODULE,
+        .fb_setcolreg   = pvr2fb_setcolreg,
+        .fb_blank       = pvr2fb_blank,
+        .fb_check_var   = pvr2fb_check_var,
+        .fb_set_par     = pvr2fb_set_par,
 #ifdef CONFIG_SH_DMA
         .fb_write       = pvr2fb_write,
 #endif
@@ -785,7 +785,7 @@ static int __init pvr2fb_common_init(void)
                 goto out_err;
         }
 
-        fb_memset((unsigned long)fb_info->screen_base, 0, pvr2_fix.smem_len);
+        fb_memset(fb_info->screen_base, 0, pvr2_fix.smem_len);
 
         pvr2_fix.ypanstep       = nopan  ? 0 : 1;
         pvr2_fix.ywrapstep      = nowrap ? 0 : 1;
@@ -822,7 +822,7 @@ static int __init pvr2fb_common_init(void)
                modememused >> 10, (unsigned long)(fb_info->fix.smem_len >> 10));
         printk("fb%d: Mode %dx%d-%d pitch = %ld cable: %s video output: %s\n", 
                fb_info->node, fb_info->var.xres, fb_info->var.yres,
-               fb_info->var.bits_per_pixel, 
+               fb_info->var.bits_per_pixel,
                get_line_length(fb_info->var.xres, fb_info->var.bits_per_pixel),
                (char *)pvr2_get_param(cables, NULL, cable_type, 3),
                (char *)pvr2_get_param(outputs, NULL, video_output, 3));
@@ -831,10 +831,10 @@ static int __init 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);
+                              fb_info->fix.id, pgprot_val(PAGE_SHARED));
 
         printk(KERN_NOTICE "fb%d: Mapped video memory to SQ addr 0x%lx\n",
-               fb_info->node, pvr2fb_map->sq_addr);
+               fb_info->node, pvr2fb_map);
 #endif
 
         return 0;
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 809fc5eefc15..bbb07106cd54 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -22,7 +22,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
@@ -1335,7 +1334,7 @@ int __init pxafb_probe(struct platform_device *dev)
                 goto failed;
         }
 
-        ret = request_irq(IRQ_LCD, pxafb_handle_irq, SA_INTERRUPT, "LCD", fbi);
+        ret = request_irq(IRQ_LCD, pxafb_handle_irq, IRQF_DISABLED, "LCD", fbi);
         if (ret) {
                 dev_err(&dev->dev, "request_irq failed: %d\n", ret);
                 ret = -EBUSY;
diff --git a/drivers/video/q40fb.c b/drivers/video/q40fb.c
index fc91dbf896d2..48536c3e58a4 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/tty.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
diff --git a/drivers/video/retz3fb.c b/drivers/video/retz3fb.c
index 5e2c64f622cb..cf41ff177644 100644
--- a/drivers/video/retz3fb.c
+++ b/drivers/video/retz3fb.c
@@ -25,7 +25,6 @@
 #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>
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index 3e9308f0f165..4acde4f7dbf8 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -29,18 +29,17 @@
  *      doublescan modes are broken
  */
 
-#include <linux/config.h>
 #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/pci.h>
+#include <linux/backlight.h>
 #ifdef CONFIG_MTRR
 #include <asm/mtrr.h>
 #endif
@@ -272,34 +271,183 @@ static const struct riva_regs reg_template = {
 /*
  * Backlight control
  */
-#ifdef CONFIG_PMAC_BACKLIGHT
+#ifdef CONFIG_FB_RIVA_BACKLIGHT
+/* We do not have any information about which values are allowed, thus
+ * we used safe values.
+ */
+#define MIN_LEVEL 0x158
+#define MAX_LEVEL 0x534
+#define LEVEL_STEP ((MAX_LEVEL - MIN_LEVEL) / FB_BACKLIGHT_MAX)
 
-static int riva_backlight_levels[] = {
-    0x158,
-    0x192,
-    0x1c6,
-    0x200,
-    0x234,
-    0x268,
-    0x2a2,
-    0x2d6,
-    0x310,
-    0x344,
-    0x378,
-    0x3b2,
-    0x3e6,
-    0x41a,
-    0x454,
-    0x534,
-};
+static struct backlight_properties riva_bl_data;
+
+/* Call with fb_info->bl_mutex held */
+static int riva_bl_get_level_brightness(struct riva_par *par,
+                int level)
+{
+        struct fb_info *info = pci_get_drvdata(par->pdev);
+        int nlevel;
+
+        /* Get and convert the value */
+        nlevel = MIN_LEVEL + info->bl_curve[level] * LEVEL_STEP;
+
+        if (nlevel < 0)
+                nlevel = 0;
+        else if (nlevel < MIN_LEVEL)
+                nlevel = MIN_LEVEL;
+        else if (nlevel > MAX_LEVEL)
+                nlevel = MAX_LEVEL;
+
+        return nlevel;
+}
+
+/* Call with fb_info->bl_mutex held */
+static int __riva_bl_update_status(struct backlight_device *bd)
+{
+        struct riva_par *par = class_get_devdata(&bd->class_dev);
+        U032 tmp_pcrt, tmp_pmc;
+        int level;
+
+        if (bd->props->power != FB_BLANK_UNBLANK ||
+            bd->props->fb_blank != FB_BLANK_UNBLANK)
+                level = 0;
+        else
+                level = bd->props->brightness;
+
+        tmp_pmc = par->riva.PMC[0x10F0/4] & 0x0000FFFF;
+        tmp_pcrt = par->riva.PCRTC0[0x081C/4] & 0xFFFFFFFC;
+        if(level > 0) {
+                tmp_pcrt |= 0x1;
+                tmp_pmc |= (1 << 31); /* backlight bit */
+                tmp_pmc |= riva_bl_get_level_brightness(par, level) << 16; /* level */
+        }
+        par->riva.PCRTC0[0x081C/4] = tmp_pcrt;
+        par->riva.PMC[0x10F0/4] = tmp_pmc;
+
+        return 0;
+}
+
+static int riva_bl_update_status(struct backlight_device *bd)
+{
+        struct riva_par *par = class_get_devdata(&bd->class_dev);
+        struct fb_info *info = pci_get_drvdata(par->pdev);
+        int ret;
 
-static int riva_set_backlight_enable(int on, int level, void *data);
-static int riva_set_backlight_level(int level, void *data);
-static struct backlight_controller riva_backlight_controller = {
-        riva_set_backlight_enable,
-        riva_set_backlight_level
+        mutex_lock(&info->bl_mutex);
+        ret = __riva_bl_update_status(bd);
+        mutex_unlock(&info->bl_mutex);
+
+        return ret;
+}
+
+static int riva_bl_get_brightness(struct backlight_device *bd)
+{
+        return bd->props->brightness;
+}
+
+static struct backlight_properties riva_bl_data = {
+        .owner    = THIS_MODULE,
+        .get_brightness = riva_bl_get_brightness,
+        .update_status  = riva_bl_update_status,
+        .max_brightness = (FB_BACKLIGHT_LEVELS - 1),
 };
-#endif /* CONFIG_PMAC_BACKLIGHT */
+
+static void riva_bl_set_power(struct fb_info *info, int power)
+{
+        mutex_lock(&info->bl_mutex);
+
+        if (info->bl_dev) {
+                down(&info->bl_dev->sem);
+                info->bl_dev->props->power = power;
+                __riva_bl_update_status(info->bl_dev);
+                up(&info->bl_dev->sem);
+        }
+
+        mutex_unlock(&info->bl_mutex);
+}
+
+static void riva_bl_init(struct riva_par *par)
+{
+        struct fb_info *info = pci_get_drvdata(par->pdev);
+        struct backlight_device *bd;
+        char name[12];
+
+        if (!par->FlatPanel)
+                return;
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        if (!machine_is(powermac) ||
+            !pmac_has_backlight_type("mnca"))
+                return;
+#endif
+
+        snprintf(name, sizeof(name), "rivabl%d", info->node);
+
+        bd = backlight_device_register(name, par, &riva_bl_data);
+        if (IS_ERR(bd)) {
+                info->bl_dev = NULL;
+                printk(KERN_WARNING "riva: Backlight registration failed\n");
+                goto error;
+        }
+
+        mutex_lock(&info->bl_mutex);
+        info->bl_dev = bd;
+        fb_bl_default_curve(info, 0,
+                0x158 * FB_BACKLIGHT_MAX / MAX_LEVEL,
+                0x534 * FB_BACKLIGHT_MAX / MAX_LEVEL);
+        mutex_unlock(&info->bl_mutex);
+
+        down(&bd->sem);
+        bd->props->brightness = riva_bl_data.max_brightness;
+        bd->props->power = FB_BLANK_UNBLANK;
+        bd->props->update_status(bd);
+        up(&bd->sem);
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        mutex_lock(&pmac_backlight_mutex);
+        if (!pmac_backlight)
+                pmac_backlight = bd;
+        mutex_unlock(&pmac_backlight_mutex);
+#endif
+
+        printk("riva: Backlight initialized (%s)\n", name);
+
+        return;
+
+error:
+        return;
+}
+
+static void riva_bl_exit(struct riva_par *par)
+{
+        struct fb_info *info = pci_get_drvdata(par->pdev);
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        mutex_lock(&pmac_backlight_mutex);
+#endif
+
+        mutex_lock(&info->bl_mutex);
+        if (info->bl_dev) {
+#ifdef CONFIG_PMAC_BACKLIGHT
+                if (pmac_backlight == info->bl_dev)
+                        pmac_backlight = NULL;
+#endif
+
+                backlight_device_unregister(info->bl_dev);
+
+                printk("riva: Backlight unloaded\n");
+        }
+        mutex_unlock(&info->bl_mutex);
+
+#ifdef CONFIG_PMAC_BACKLIGHT
+        mutex_unlock(&pmac_backlight_mutex);
+#endif
+}
+#else
+static inline void riva_bl_init(struct riva_par *par) {}
+static inline void riva_bl_exit(struct riva_par *par) {}
+static inline void riva_bl_set_power(struct fb_info *info, int power) {}
+#endif /* CONFIG_FB_RIVA_BACKLIGHT */
 
 /* ------------------------------------------------------------------------- *
  *
@@ -973,36 +1121,6 @@ static int riva_get_cmap_len(const struct fb_var_screeninfo *var)
 
 /* ------------------------------------------------------------------------- *
  *
- * Backlight operations
- *
- * ------------------------------------------------------------------------- */
-
-#ifdef CONFIG_PMAC_BACKLIGHT
-static int riva_set_backlight_enable(int on, int level, void *data)
-{
-        struct riva_par *par = data;
-        U032 tmp_pcrt, tmp_pmc;
-
-        tmp_pmc = par->riva.PMC[0x10F0/4] & 0x0000FFFF;
-        tmp_pcrt = par->riva.PCRTC0[0x081C/4] & 0xFFFFFFFC;
-        if(on && (level > BACKLIGHT_OFF)) {
-                tmp_pcrt |= 0x1;
-                tmp_pmc |= (1 << 31); // backlight bit
-                tmp_pmc |= riva_backlight_levels[level-1] << 16; // level
-        }
-        par->riva.PCRTC0[0x081C/4] = tmp_pcrt;
-        par->riva.PMC[0x10F0/4] = tmp_pmc;
-        return 0;
-}
-
-static int riva_set_backlight_level(int level, void *data)
-{
-        return riva_set_backlight_enable(1, level, data);
-}
-#endif /* CONFIG_PMAC_BACKLIGHT */
-
-/* ------------------------------------------------------------------------- *
- *
  * framebuffer operations
  *
  * ------------------------------------------------------------------------- */
@@ -1247,11 +1365,7 @@ static int rivafb_blank(int blank, struct fb_info *info)
         SEQout(par, 0x01, tmp);
         CRTCout(par, 0x1a, vesa);
 
-#ifdef CONFIG_PMAC_BACKLIGHT
-        if ( par->FlatPanel && machine_is(powermac)) {
-                set_backlight_enable(!blank);
-        }
-#endif
+        riva_bl_set_power(info, blank);
 
         NVTRACE_LEAVE();
 
@@ -1712,8 +1826,8 @@ static int __devinit riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd)
 {
         struct riva_par *par = info->par;
         struct device_node *dp;
-        unsigned char *pedid = NULL;
-        unsigned char *disptype = NULL;
+        const unsigned char *pedid = NULL;
+        const unsigned char *disptype = NULL;
         static char *propnames[] = {
                 "DFP,EDID", "LCD,EDID", "EDID", "EDID1", "EDID,B", "EDID,A", NULL };
         int i;
@@ -1721,14 +1835,13 @@ static int __devinit riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd)
         NVTRACE_ENTER();
         dp = pci_device_to_OF_node(pd);
         for (; dp != NULL; dp = dp->child) {
-                disptype = (unsigned char *)get_property(dp, "display-type", NULL);
+                disptype = get_property(dp, "display-type", NULL);
                 if (disptype == NULL)
                         continue;
                 if (strncmp(disptype, "LCD", 3) != 0)
                         continue;
                 for (i = 0; propnames[i] != NULL; ++i) {
-                        pedid = (unsigned char *)
-                                get_property(dp, propnames[i], NULL);
+                        pedid = get_property(dp, propnames[i], NULL);
                         if (pedid != NULL) {
                                 par->EDID = pedid;
                                 NVTRACE("LCD found.\n");
@@ -2022,6 +2135,9 @@ static int __devinit rivafb_probe(struct pci_dev *pd,
 
         fb_destroy_modedb(info->monspecs.modedb);
         info->monspecs.modedb = NULL;
+
+        pci_set_drvdata(pd, info);
+        riva_bl_init(info->par);
         ret = register_framebuffer(info);
         if (ret < 0) {
                 printk(KERN_ERR PFX
@@ -2029,19 +2145,13 @@ static int __devinit rivafb_probe(struct pci_dev *pd,
                 goto err_iounmap_screen_base;
         }
 
-        pci_set_drvdata(pd, info);
-
         printk(KERN_INFO PFX
                 "PCI nVidia %s framebuffer ver %s (%dMB @ 0x%lX)\n",
                 info->fix.id,
                 RIVAFB_VERSION,
                 info->fix.smem_len / (1024 * 1024),
                 info->fix.smem_start);
-#ifdef CONFIG_PMAC_BACKLIGHT
-        if (default_par->FlatPanel && machine_is(powermac))
-                register_backlight_controller(&riva_backlight_controller,
-                                              default_par, "mnca");
-#endif
+
         NVTRACE_LEAVE();
         return 0;
 
@@ -2058,7 +2168,6 @@ err_iounmap_ctrl_base:
 err_release_region:
         pci_release_regions(pd);
 err_disable_device:
-        pci_disable_device(pd);
 err_free_pixmap:
         kfree(info->pixmap.addr);
 err_framebuffer_release:
@@ -2074,6 +2183,8 @@ static void __exit rivafb_remove(struct pci_dev *pd)
         
         NVTRACE_ENTER();
 
+        riva_bl_exit(par);
+
 #ifdef CONFIG_FB_RIVA_I2C
         riva_delete_i2c_busses(par);
         kfree(par->EDID);
@@ -2091,7 +2202,6 @@ static void __exit rivafb_remove(struct pci_dev *pd)
         if (par->riva.Architecture == NV_ARCH_03)
                 iounmap(par->riva.PRAMIN);
         pci_release_regions(pd);
-        pci_disable_device(pd);
         kfree(info->pixmap.addr);
         framebuffer_release(info);
         pci_set_drvdata(pd, NULL);
diff --git a/drivers/video/riva/rivafb-i2c.c b/drivers/video/riva/rivafb-i2c.c
index 8b1967fc116a..9751c37c0bfd 100644
--- a/drivers/video/riva/rivafb-i2c.c
+++ b/drivers/video/riva/rivafb-i2c.c
@@ -12,7 +12,6 @@
  * for more details.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
diff --git a/drivers/video/riva/rivafb.h b/drivers/video/riva/rivafb.h
index 440ff445689b..7fa13fc9c413 100644
--- a/drivers/video/riva/rivafb.h
+++ b/drivers/video/riva/rivafb.h
@@ -1,7 +1,6 @@
 #ifndef __RIVAFB_H
 #define __RIVAFB_H
 
-#include <linux/config.h>
 #include <linux/fb.h>
 #include <video/vga.h>
 #include <linux/i2c.h>
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
index feec47bdd479..a5333c190789 100644
--- a/drivers/video/s1d13xxxfb.c
+++ b/drivers/video/s1d13xxxfb.c
@@ -28,7 +28,6 @@
  * more details.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index 9451932fbaf2..ad3bdd6f1ac1 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -76,7 +76,6 @@
 #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>
@@ -641,6 +640,7 @@ static int __init s3c2410fb_probe(struct platform_device *pdev)
         int ret;
         int irq;
         int i;
+        u32 lcdcon1;
 
         mach_info = pdev->dev.platform_data;
         if (mach_info == NULL) {
@@ -672,6 +672,11 @@ static int __init s3c2410fb_probe(struct platform_device *pdev)
 
         memcpy(&info->regs, &mach_info->regs, sizeof(info->regs));
 
+        /* Stop the video and unset ENVID if set */
+        info->regs.lcdcon1 &= ~S3C2410_LCDCON1_ENVID;
+        lcdcon1 = readl(S3C2410_LCDCON1);
+        writel(lcdcon1 & ~S3C2410_LCDCON1_ENVID, S3C2410_LCDCON1);
+
         info->mach_info             = pdev->dev.platform_data;
 
         fbinfo->fix.type            = FB_TYPE_PACKED_PIXELS;
@@ -729,7 +734,7 @@ static int __init s3c2410fb_probe(struct platform_device *pdev)
 
         dprintk("got LCD region\n");
 
-        ret = request_irq(irq, s3c2410fb_irq, SA_INTERRUPT, pdev->name, info);
+        ret = request_irq(irq, s3c2410fb_irq, IRQF_DISABLED, pdev->name, info);
         if (ret) {
                 dev_err(&pdev->dev, "cannot get irq %d - err %d\n", irq, ret);
                 ret = -EBUSY;
@@ -794,15 +799,14 @@ dealloc_fb:
  * shutdown the lcd controller
 */
 
-static void s3c2410fb_stop_lcd(void)
+static void s3c2410fb_stop_lcd(struct s3c2410fb_info *fbi)
 {
         unsigned long flags;
-        unsigned long tmp;
 
         local_irq_save(flags);
 
-        tmp = readl(S3C2410_LCDCON1);
-        writel(tmp & ~S3C2410_LCDCON1_ENVID, S3C2410_LCDCON1);
+        fbi->regs.lcdcon1 &= ~S3C2410_LCDCON1_ENVID;
+        writel(fbi->regs.lcdcon1, S3C2410_LCDCON1);
 
         local_irq_restore(flags);
 }
@@ -816,7 +820,7 @@ static int s3c2410fb_remove(struct platform_device *pdev)
         struct s3c2410fb_info *info = fbinfo->par;
         int irq;
 
-        s3c2410fb_stop_lcd();
+        s3c2410fb_stop_lcd(info);
         msleep(1);
 
         s3c2410fb_unmap_video_memory(info);
@@ -844,7 +848,7 @@ static int s3c2410fb_suspend(struct platform_device *dev, pm_message_t state)
         struct fb_info     *fbinfo = platform_get_drvdata(dev);
         struct s3c2410fb_info *info = fbinfo->par;
 
-        s3c2410fb_stop_lcd();
+        s3c2410fb_stop_lcd(info);
 
         /* sleep before disabling the clock, we need to ensure
          * the LCD DMA engine is not going to get back on the bus
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index d9831fd42341..a2e6e7205d7e 100644
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -160,7 +160,6 @@
  *      - Add patch 681/1 and clean up stork definitions.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -1473,7 +1472,7 @@ static int __init sa1100fb_probe(struct platform_device *pdev)
         if (ret)
                 goto failed;
 
-        ret = request_irq(irq, sa1100fb_handle_irq, SA_INTERRUPT,
+        ret = request_irq(irq, sa1100fb_handle_irq, IRQF_DISABLED,
                           "LCD", fbi);
         if (ret) {
                 printk(KERN_ERR "sa1100fb: request_irq failed: %d\n", ret);
diff --git a/drivers/video/savage/savagefb-i2c.c b/drivers/video/savage/savagefb-i2c.c
index 21debed863ac..d7d810dbf0bd 100644
--- a/drivers/video/savage/savagefb-i2c.c
+++ b/drivers/video/savage/savagefb-i2c.c
@@ -10,7 +10,6 @@
  * for more details.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -149,7 +148,6 @@ static int savage_setup_i2c_bus(struct savagefb_i2c_chan *chan,
                 chan->adapter.algo_data         = &chan->algo;
                 chan->adapter.dev.parent        = &chan->par->pcidev->dev;
                 chan->algo.udelay               = 40;
-                chan->algo.mdelay               = 5;
                 chan->algo.timeout              = 20;
                 chan->algo.data                 = chan;
 
diff --git a/drivers/video/savage/savagefb.h b/drivers/video/savage/savagefb.h
index 58cfdfb41833..e648a6c0f6d9 100644
--- a/drivers/video/savage/savagefb.h
+++ b/drivers/video/savage/savagefb.h
@@ -147,7 +147,27 @@ struct xtimings {
         int            interlaced;
 };
 
+struct savage_reg {
+        unsigned char MiscOutReg;     /* Misc */
+        unsigned char CRTC[25];       /* Crtc Controller */
+        unsigned char Sequencer[5];   /* Video Sequencer */
+        unsigned char Graphics[9];    /* Video Graphics */
+        unsigned char Attribute[21];  /* Video Atribute */
 
+        unsigned int mode, refresh;
+        unsigned char SR08, SR0E, SR0F;
+        unsigned char SR10, SR11, SR12, SR13, SR15, SR18, SR29, SR30;
+        unsigned char SR54[8];
+        unsigned char Clock;
+        unsigned char CR31, CR32, CR33, CR34, CR36, CR3A, CR3B, CR3C;
+        unsigned char CR40, CR41, CR42, CR43, CR45;
+        unsigned char CR50, CR51, CR53, CR55, CR58, CR5B, CR5D, CR5E;
+        unsigned char CR60, CR63, CR65, CR66, CR67, CR68, CR69, CR6D, CR6F;
+        unsigned char CR86, CR88;
+        unsigned char CR90, CR91, CRB0;
+        unsigned int  STREAMS[22];      /* yuck, streams regs */
+        unsigned int  MMPR0, MMPR1, MMPR2, MMPR3;
+};
 /* --------------------------------------------------------------------- */
 
 #define NR_PALETTE      256
@@ -167,6 +187,8 @@ struct savagefb_par {
         struct pci_dev *pcidev;
         savage_chipset  chip;
         struct savagefb_i2c_chan chan;
+        struct savage_reg state;
+        struct savage_reg save;
         unsigned char   *edid;
         u32 pseudo_palette[16];
         int paletteEnabled;
@@ -179,6 +201,7 @@ struct savagefb_par {
         int minClock;
         int numClocks;
         int clock[4];
+        int MCLK, REFCLK, LCDclk;
         struct {
                 u8   __iomem *vbase;
                 u32    pbase;
@@ -196,7 +219,6 @@ struct savagefb_par {
 
         volatile u32  __iomem *bci_base;
         unsigned int  bci_ptr;
-
         u32           cob_offset;
         u32           cob_size;
         int           cob_index;
@@ -204,7 +226,6 @@ struct savagefb_par {
         void (*SavageWaitIdle) (struct savagefb_par *par);
         void (*SavageWaitFifo) (struct savagefb_par *par, int space);
 
-        int MCLK, REFCLK, LCDclk;
         int HorizScaleFactor;
 
         /* Panels size */
@@ -217,26 +238,6 @@ struct savagefb_par {
 
         int depth;
         int vwidth;
-
-        unsigned char MiscOutReg;     /* Misc */
-        unsigned char CRTC[25];       /* Crtc Controller */
-        unsigned char Sequencer[5];   /* Video Sequencer */
-        unsigned char Graphics[9];    /* Video Graphics */
-        unsigned char Attribute[21];  /* Video Atribute */
-
-        unsigned int mode, refresh;
-        unsigned char SR08, SR0E, SR0F;
-        unsigned char SR10, SR11, SR12, SR13, SR15, SR18, SR29, SR30;
-        unsigned char SR54[8];
-        unsigned char Clock;
-        unsigned char CR31, CR32, CR33, CR34, CR36, CR3A, CR3B, CR3C;
-        unsigned char CR40, CR41, CR42, CR43, CR45;
-        unsigned char CR50, CR51, CR53, CR55, CR58, CR5B, CR5D, CR5E;
-        unsigned char CR60, CR63, CR65, CR66, CR67, CR68, CR69, CR6D, CR6F;
-        unsigned char CR86, CR88;
-        unsigned char CR90, CR91, CRB0;
-        unsigned int  STREAMS[22];      /* yuck, streams regs */
-        unsigned int  MMPR0, MMPR1, MMPR2, MMPR3;
 };
 
 #define BCI_BD_BW_DISABLE            0x10000000
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c
index 0da624e6524f..82b3deaae02d 100644
--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@@ -41,13 +41,11 @@
  *
  */
 
-#include <linux/config.h>
 #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>
@@ -86,15 +84,15 @@ MODULE_DESCRIPTION("FBDev driver for S3 Savage PCI/AGP Chips");
 
 /* --------------------------------------------------------------------- */
 
-static void vgaHWSeqReset (struct savagefb_par *par, int start)
+static void vgaHWSeqReset(struct savagefb_par *par, int start)
 {
         if (start)
-                VGAwSEQ (0x00, 0x01, par);      /* Synchronous Reset */
+                VGAwSEQ(0x00, 0x01, par);       /* Synchronous Reset */
         else
-                VGAwSEQ (0x00, 0x03, par);      /* End Reset */
+                VGAwSEQ(0x00, 0x03, par);       /* End Reset */
 }
 
-static void vgaHWProtect (struct savagefb_par *par, int on)
+static void vgaHWProtect(struct savagefb_par *par, int on)
 {
         unsigned char tmp;
 
@@ -102,10 +100,10 @@ static void vgaHWProtect (struct savagefb_par *par, int on)
                 /*
                  * Turn off screen and disable sequencer.
                  */
-                tmp = VGArSEQ (0x01, par);
+                tmp = VGArSEQ(0x01, par);
 
-                vgaHWSeqReset (par, 1);         /* start synchronous reset */
-                VGAwSEQ (0x01, tmp | 0x20, par);/* disable the display */
+                vgaHWSeqReset(par, 1);          /* start synchronous reset */
+                VGAwSEQ(0x01, tmp | 0x20, par);/* disable the display */
 
                 VGAenablePalette(par);
         } else {
@@ -113,75 +111,76 @@ static void vgaHWProtect (struct savagefb_par *par, int on)
                  * Reenable sequencer, then turn on screen.
                  */
 
-                tmp = VGArSEQ (0x01, par);
+                tmp = VGArSEQ(0x01, par);
 
-                VGAwSEQ (0x01, tmp & ~0x20, par);/* reenable display */
-                vgaHWSeqReset (par, 0);         /* clear synchronous reset */
+                VGAwSEQ(0x01, tmp & ~0x20, par);/* reenable display */
+                vgaHWSeqReset(par, 0);          /* clear synchronous reset */
 
                 VGAdisablePalette(par);
         }
 }
 
-static void vgaHWRestore (struct savagefb_par  *par)
+static void vgaHWRestore(struct savagefb_par  *par, struct savage_reg *reg)
 {
         int i;
 
-        VGAwMISC (par->MiscOutReg, par);
+        VGAwMISC(reg->MiscOutReg, par);
 
         for (i = 1; i < 5; i++)
-                VGAwSEQ (i, par->Sequencer[i], par);
+                VGAwSEQ(i, reg->Sequencer[i], par);
 
         /* Ensure CRTC registers 0-7 are unlocked by clearing bit 7 or
            CRTC[17] */
-        VGAwCR (17, par->CRTC[17] & ~0x80, par);
+        VGAwCR(17, reg->CRTC[17] & ~0x80, par);
 
         for (i = 0; i < 25; i++)
-                VGAwCR (i, par->CRTC[i], par);
+                VGAwCR(i, reg->CRTC[i], par);
 
         for (i = 0; i < 9; i++)
-                VGAwGR (i, par->Graphics[i], par);
+                VGAwGR(i, reg->Graphics[i], par);
 
         VGAenablePalette(par);
 
         for (i = 0; i < 21; i++)
-                VGAwATTR (i, par->Attribute[i], par);
+                VGAwATTR(i, reg->Attribute[i], par);
 
         VGAdisablePalette(par);
 }
 
-static void vgaHWInit (struct fb_var_screeninfo *var,
-                       struct savagefb_par            *par,
-                       struct xtimings                *timings)
+static void vgaHWInit(struct fb_var_screeninfo *var,
+                      struct savagefb_par            *par,
+                      struct xtimings                *timings,
+                      struct savage_reg              *reg)
 {
-        par->MiscOutReg = 0x23;
+        reg->MiscOutReg = 0x23;
 
         if (!(timings->sync & FB_SYNC_HOR_HIGH_ACT))
-                par->MiscOutReg |= 0x40;
+                reg->MiscOutReg |= 0x40;
 
         if (!(timings->sync & FB_SYNC_VERT_HIGH_ACT))
-                par->MiscOutReg |= 0x80;
+                reg->MiscOutReg |= 0x80;
 
         /*
          * Time Sequencer
          */
-        par->Sequencer[0x00] = 0x00;
-        par->Sequencer[0x01] = 0x01;
-        par->Sequencer[0x02] = 0x0F;
-        par->Sequencer[0x03] = 0x00;          /* Font select */
-        par->Sequencer[0x04] = 0x0E;          /* Misc */
+        reg->Sequencer[0x00] = 0x00;
+        reg->Sequencer[0x01] = 0x01;
+        reg->Sequencer[0x02] = 0x0F;
+        reg->Sequencer[0x03] = 0x00;          /* Font select */
+        reg->Sequencer[0x04] = 0x0E;          /* Misc */
 
         /*
          * CRTC Controller
          */
-        par->CRTC[0x00] = (timings->HTotal >> 3) - 5;
-        par->CRTC[0x01] = (timings->HDisplay >> 3) - 1;
-        par->CRTC[0x02] = (timings->HSyncStart >> 3) - 1;
-        par->CRTC[0x03] = (((timings->HSyncEnd >> 3)  - 1) & 0x1f) | 0x80;
-        par->CRTC[0x04] = (timings->HSyncStart >> 3);
-        par->CRTC[0x05] = ((((timings->HSyncEnd >> 3) - 1) & 0x20) << 2) |
+        reg->CRTC[0x00] = (timings->HTotal >> 3) - 5;
+        reg->CRTC[0x01] = (timings->HDisplay >> 3) - 1;
+        reg->CRTC[0x02] = (timings->HSyncStart >> 3) - 1;
+        reg->CRTC[0x03] = (((timings->HSyncEnd >> 3)  - 1) & 0x1f) | 0x80;
+        reg->CRTC[0x04] = (timings->HSyncStart >> 3);
+        reg->CRTC[0x05] = ((((timings->HSyncEnd >> 3) - 1) & 0x20) << 2) |
                 (((timings->HSyncEnd >> 3)) & 0x1f);
-        par->CRTC[0x06] = (timings->VTotal - 2) & 0xFF;
-        par->CRTC[0x07] = (((timings->VTotal - 2) & 0x100) >> 8) |
+        reg->CRTC[0x06] = (timings->VTotal - 2) & 0xFF;
+        reg->CRTC[0x07] = (((timings->VTotal - 2) & 0x100) >> 8) |
                 (((timings->VDisplay - 1) & 0x100) >> 7) |
                 ((timings->VSyncStart & 0x100) >> 6) |
                 (((timings->VSyncStart - 1) & 0x100) >> 5) |
@@ -189,27 +188,27 @@ static void vgaHWInit (struct fb_var_screeninfo *var,
                 (((timings->VTotal - 2) & 0x200) >> 4) |
                 (((timings->VDisplay - 1) & 0x200) >> 3) |
                 ((timings->VSyncStart & 0x200) >> 2);
-        par->CRTC[0x08] = 0x00;
-        par->CRTC[0x09] = (((timings->VSyncStart - 1) & 0x200) >> 4) | 0x40;
+        reg->CRTC[0x08] = 0x00;
+        reg->CRTC[0x09] = (((timings->VSyncStart - 1) & 0x200) >> 4) | 0x40;
 
         if (timings->dblscan)
-                par->CRTC[0x09] |= 0x80;
-
-        par->CRTC[0x0a] = 0x00;
-        par->CRTC[0x0b] = 0x00;
-        par->CRTC[0x0c] = 0x00;
-        par->CRTC[0x0d] = 0x00;
-        par->CRTC[0x0e] = 0x00;
-        par->CRTC[0x0f] = 0x00;
-        par->CRTC[0x10] = timings->VSyncStart & 0xff;
-        par->CRTC[0x11] = (timings->VSyncEnd & 0x0f) | 0x20;
-        par->CRTC[0x12] = (timings->VDisplay - 1) & 0xff;
-        par->CRTC[0x13] = var->xres_virtual >> 4;
-        par->CRTC[0x14] = 0x00;
-        par->CRTC[0x15] = (timings->VSyncStart - 1) & 0xff;
-        par->CRTC[0x16] = (timings->VSyncEnd - 1) & 0xff;
-        par->CRTC[0x17] = 0xc3;
-        par->CRTC[0x18] = 0xff;
+                reg->CRTC[0x09] |= 0x80;
+
+        reg->CRTC[0x0a] = 0x00;
+        reg->CRTC[0x0b] = 0x00;
+        reg->CRTC[0x0c] = 0x00;
+        reg->CRTC[0x0d] = 0x00;
+        reg->CRTC[0x0e] = 0x00;
+        reg->CRTC[0x0f] = 0x00;
+        reg->CRTC[0x10] = timings->VSyncStart & 0xff;
+        reg->CRTC[0x11] = (timings->VSyncEnd & 0x0f) | 0x20;
+        reg->CRTC[0x12] = (timings->VDisplay - 1) & 0xff;
+        reg->CRTC[0x13] = var->xres_virtual >> 4;
+        reg->CRTC[0x14] = 0x00;
+        reg->CRTC[0x15] = (timings->VSyncStart - 1) & 0xff;
+        reg->CRTC[0x16] = (timings->VSyncEnd - 1) & 0xff;
+        reg->CRTC[0x17] = 0xc3;
+        reg->CRTC[0x18] = 0xff;
 
         /*
          * are these unnecessary?
@@ -220,38 +219,38 @@ static void vgaHWInit (struct fb_var_screeninfo *var,
         /*
          * Graphics Display Controller
          */
-        par->Graphics[0x00] = 0x00;
-        par->Graphics[0x01] = 0x00;
-        par->Graphics[0x02] = 0x00;
-        par->Graphics[0x03] = 0x00;
-        par->Graphics[0x04] = 0x00;
-        par->Graphics[0x05] = 0x40;
-        par->Graphics[0x06] = 0x05;   /* only map 64k VGA memory !!!! */
-        par->Graphics[0x07] = 0x0F;
-        par->Graphics[0x08] = 0xFF;
-
-
-        par->Attribute[0x00]  = 0x00; /* standard colormap translation */
-        par->Attribute[0x01]  = 0x01;
-        par->Attribute[0x02]  = 0x02;
-        par->Attribute[0x03]  = 0x03;
-        par->Attribute[0x04]  = 0x04;
-        par->Attribute[0x05]  = 0x05;
-        par->Attribute[0x06]  = 0x06;
-        par->Attribute[0x07]  = 0x07;
-        par->Attribute[0x08]  = 0x08;
-        par->Attribute[0x09]  = 0x09;
-        par->Attribute[0x0a] = 0x0A;
-        par->Attribute[0x0b] = 0x0B;
-        par->Attribute[0x0c] = 0x0C;
-        par->Attribute[0x0d] = 0x0D;
-        par->Attribute[0x0e] = 0x0E;
-        par->Attribute[0x0f] = 0x0F;
-        par->Attribute[0x10] = 0x41;
-        par->Attribute[0x11] = 0xFF;
-        par->Attribute[0x12] = 0x0F;
-        par->Attribute[0x13] = 0x00;
-        par->Attribute[0x14] = 0x00;
+        reg->Graphics[0x00] = 0x00;
+        reg->Graphics[0x01] = 0x00;
+        reg->Graphics[0x02] = 0x00;
+        reg->Graphics[0x03] = 0x00;
+        reg->Graphics[0x04] = 0x00;
+        reg->Graphics[0x05] = 0x40;
+        reg->Graphics[0x06] = 0x05;   /* only map 64k VGA memory !!!! */
+        reg->Graphics[0x07] = 0x0F;
+        reg->Graphics[0x08] = 0xFF;
+
+
+        reg->Attribute[0x00]  = 0x00; /* standard colormap translation */
+        reg->Attribute[0x01]  = 0x01;
+        reg->Attribute[0x02]  = 0x02;
+        reg->Attribute[0x03]  = 0x03;
+        reg->Attribute[0x04]  = 0x04;
+        reg->Attribute[0x05]  = 0x05;
+        reg->Attribute[0x06]  = 0x06;
+        reg->Attribute[0x07]  = 0x07;
+        reg->Attribute[0x08]  = 0x08;
+        reg->Attribute[0x09]  = 0x09;
+        reg->Attribute[0x0a] = 0x0A;
+        reg->Attribute[0x0b] = 0x0B;
+        reg->Attribute[0x0c] = 0x0C;
+        reg->Attribute[0x0d] = 0x0D;
+        reg->Attribute[0x0e] = 0x0E;
+        reg->Attribute[0x0f] = 0x0F;
+        reg->Attribute[0x10] = 0x41;
+        reg->Attribute[0x11] = 0xFF;
+        reg->Attribute[0x12] = 0x0F;
+        reg->Attribute[0x13] = 0x00;
+        reg->Attribute[0x14] = 0x00;
 }
 
 /* -------------------- Hardware specific routines ------------------------- */
@@ -304,15 +303,15 @@ savage2000_waitidle(struct savagefb_par *par)
         while ((savage_in32(0x48C60, par) & 0x009fffff));
 }
 
-
+#ifdef CONFIG_FB_SAVAGE_ACCEL
 static void
-SavageSetup2DEngine (struct savagefb_par  *par)
+SavageSetup2DEngine(struct savagefb_par  *par)
 {
         unsigned long GlobalBitmapDescriptor;
 
         GlobalBitmapDescriptor = 1 | 8 | BCI_BD_BW_DISABLE;
-        BCI_BD_SET_BPP (GlobalBitmapDescriptor, par->depth);
-        BCI_BD_SET_STRIDE (GlobalBitmapDescriptor, par->vwidth);
+        BCI_BD_SET_BPP(GlobalBitmapDescriptor, par->depth);
+        BCI_BD_SET_STRIDE(GlobalBitmapDescriptor, par->vwidth);
 
         switch(par->chip) {
         case S3_SAVAGE3D:
@@ -361,32 +360,48 @@ SavageSetup2DEngine (struct savagefb_par  *par)
         vga_out8(0x3d5, 0x0c, par);
 
         /* Set stride to use GBD. */
-        vga_out8 (0x3d4, 0x50, par);
-        vga_out8 (0x3d5, vga_in8(0x3d5, par) | 0xC1, par);
+        vga_out8(0x3d4, 0x50, par);
+        vga_out8(0x3d5, vga_in8(0x3d5, par) | 0xC1, par);
 
         /* Enable 2D engine. */
-        vga_out8 (0x3d4, 0x40, par);
-        vga_out8 (0x3d5, 0x01, par);
+        vga_out8(0x3d4, 0x40, par);
+        vga_out8(0x3d5, 0x01, par);
 
-        savage_out32 (MONO_PAT_0, ~0, par);
-        savage_out32 (MONO_PAT_1, ~0, par);
+        savage_out32(MONO_PAT_0, ~0, par);
+        savage_out32(MONO_PAT_1, ~0, par);
 
         /* Setup plane masks */
-        savage_out32 (0x8128, ~0, par); /* enable all write planes */
-        savage_out32 (0x812C, ~0, par); /* enable all read planes */
-        savage_out16 (0x8134, 0x27, par);
-        savage_out16 (0x8136, 0x07, par);
+        savage_out32(0x8128, ~0, par); /* enable all write planes */
+        savage_out32(0x812C, ~0, par); /* enable all read planes */
+        savage_out16(0x8134, 0x27, par);
+        savage_out16(0x8136, 0x07, par);
 
         /* Now set the GBD */
         par->bci_ptr = 0;
-        par->SavageWaitFifo (par, 4);
+        par->SavageWaitFifo(par, 4);
 
-        BCI_SEND( BCI_CMD_SETREG | (1 << 16) | BCI_GBD1 );
-        BCI_SEND( 0 );
-        BCI_SEND( BCI_CMD_SETREG | (1 << 16) | BCI_GBD2 );
-        BCI_SEND( GlobalBitmapDescriptor );
+        BCI_SEND(BCI_CMD_SETREG | (1 << 16) | BCI_GBD1);
+        BCI_SEND(0);
+        BCI_SEND(BCI_CMD_SETREG | (1 << 16) | BCI_GBD2);
+        BCI_SEND(GlobalBitmapDescriptor);
 }
 
+static void savagefb_set_clip(struct fb_info *info)
+{
+        struct savagefb_par *par = info->par;
+        int cmd;
+
+        cmd = BCI_CMD_NOP | BCI_CMD_CLIP_NEW;
+        par->bci_ptr = 0;
+        par->SavageWaitFifo(par,3);
+        BCI_SEND(cmd);
+        BCI_SEND(BCI_CLIP_TL(0, 0));
+        BCI_SEND(BCI_CLIP_BR(0xfff, 0xfff));
+}
+#else
+static void SavageSetup2DEngine(struct savagefb_par  *par) {}
+
+#endif
 
 static void SavageCalcClock(long freq, int min_m, int min_n1, int max_n1,
                             int min_n2, int max_n2, long freq_min,
@@ -398,11 +413,11 @@ static void SavageCalcClock(long freq, int min_m, int min_n1, int max_n1,
         unsigned char n1, n2, best_n1=16+2, best_n2=2, best_m=125+2;
 
         if (freq < freq_min / (1 << max_n2)) {
-                printk (KERN_ERR "invalid frequency %ld Khz\n", freq);
+                printk(KERN_ERR "invalid frequency %ld Khz\n", freq);
                 freq = freq_min / (1 << max_n2);
         }
         if (freq > freq_max / (1 << min_n2)) {
-                printk (KERN_ERR "invalid frequency %ld Khz\n", freq);
+                printk(KERN_ERR "invalid frequency %ld Khz\n", freq);
                 freq = freq_max / (1 << min_n2);
         }
 
@@ -453,12 +468,12 @@ static int common_calc_clock(long freq, int min_m, int min_n1, int max_n1,
                                 BASE_FREQ;
                         if (m < min_m + 2 || m > 127+2)
                                 continue;
-                        if((m * BASE_FREQ >= freq_min * n1) &&
-                           (m * BASE_FREQ <= freq_max * n1)) {
+                        if ((m * BASE_FREQ >= freq_min * n1) &&
+                            (m * BASE_FREQ <= freq_max * n1)) {
                                 diff = freq * (1 << n2) * n1 - BASE_FREQ * m;
-                                if(diff < 0)
+                                if (diff < 0)
                                         diff = -diff;
-                                if(diff < best_diff) {
+                                if (diff < best_diff) {
                                         best_diff = diff;
                                         best_m = m;
                                         best_n1 = n1;
@@ -468,7 +483,7 @@ static int common_calc_clock(long freq, int min_m, int min_n1, int max_n1,
                 }
         }
 
-        if(max_n1 == 63)
+        if (max_n1 == 63)
                 *ndiv = (best_n1 - 2) | (best_n2 << 6);
         else
                 *ndiv = (best_n1 - 2) | (best_n2 << 5);
@@ -488,23 +503,23 @@ static void SavagePrintRegs(void)
         int vgaCRReg = 0x3d5;
 
         printk(KERN_DEBUG "SR    x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE "
-               "xF" );
+               "xF");
 
-        for( i = 0; i < 0x70; i++ ) {
-                if( !(i % 16) )
-                        printk(KERN_DEBUG "\nSR%xx ", i >> 4 );
-                vga_out8( 0x3c4, i, par);
-                printk(KERN_DEBUG " %02x", vga_in8(0x3c5, par) );
+        for (i = 0; i < 0x70; i++) {
+                if (!(i % 16))
+                        printk(KERN_DEBUG "\nSR%xx ", i >> 4);
+                vga_out8(0x3c4, i, par);
+                printk(KERN_DEBUG " %02x", vga_in8(0x3c5, par));
         }
 
         printk(KERN_DEBUG "\n\nCR    x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC "
-               "xD xE xF" );
+               "xD xE xF");
 
-        for( i = 0; i < 0xB7; i++ ) {
-                if( !(i % 16) )
-                        printk(KERN_DEBUG "\nCR%xx ", i >> 4 );
-                vga_out8( vgaCRIndex, i, par);
-                printk(KERN_DEBUG " %02x", vga_in8(vgaCRReg, par) );
+        for (i = 0; i < 0xB7; i++) {
+                if (!(i % 16))
+                        printk(KERN_DEBUG "\nCR%xx ", i >> 4);
+                vga_out8(vgaCRIndex, i, par);
+                printk(KERN_DEBUG " %02x", vga_in8(vgaCRReg, par));
         }
 
         printk(KERN_DEBUG "\n\n");
@@ -513,156 +528,309 @@ static void SavagePrintRegs(void)
 
 /* --------------------------------------------------------------------- */
 
-static void savage_get_default_par(struct savagefb_par *par)
+static void savage_get_default_par(struct savagefb_par *par, struct savage_reg *reg)
 {
         unsigned char cr3a, cr53, cr66;
 
-        vga_out16 (0x3d4, 0x4838, par);
-        vga_out16 (0x3d4, 0xa039, par);
-        vga_out16 (0x3c4, 0x0608, par);
-
-        vga_out8 (0x3d4, 0x66, par);
-        cr66 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d5, cr66 | 0x80, par);
-        vga_out8 (0x3d4, 0x3a, par);
-        cr3a = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d5, cr3a | 0x80, par);
-        vga_out8 (0x3d4, 0x53, par);
-        cr53 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d5, cr53 & 0x7f, par);
-
-        vga_out8 (0x3d4, 0x66, par);
-        vga_out8 (0x3d5, cr66, par);
-        vga_out8 (0x3d4, 0x3a, par);
-        vga_out8 (0x3d5, cr3a, par);
-
-        vga_out8 (0x3d4, 0x66, par);
-        vga_out8 (0x3d5, cr66, par);
-        vga_out8 (0x3d4, 0x3a, par);
-        vga_out8 (0x3d5, cr3a, par);
+        vga_out16(0x3d4, 0x4838, par);
+        vga_out16(0x3d4, 0xa039, par);
+        vga_out16(0x3c4, 0x0608, par);
+
+        vga_out8(0x3d4, 0x66, par);
+        cr66 = vga_in8(0x3d5, par);
+        vga_out8(0x3d5, cr66 | 0x80, par);
+        vga_out8(0x3d4, 0x3a, par);
+        cr3a = vga_in8(0x3d5, par);
+        vga_out8(0x3d5, cr3a | 0x80, par);
+        vga_out8(0x3d4, 0x53, par);
+        cr53 = vga_in8(0x3d5, par);
+        vga_out8(0x3d5, cr53 & 0x7f, par);
+
+        vga_out8(0x3d4, 0x66, par);
+        vga_out8(0x3d5, cr66, par);
+        vga_out8(0x3d4, 0x3a, par);
+        vga_out8(0x3d5, cr3a, par);
+
+        vga_out8(0x3d4, 0x66, par);
+        vga_out8(0x3d5, cr66, par);
+        vga_out8(0x3d4, 0x3a, par);
+        vga_out8(0x3d5, cr3a, par);
 
         /* unlock extended seq regs */
-        vga_out8 (0x3c4, 0x08, par);
-        par->SR08 = vga_in8 (0x3c5, par);
-        vga_out8 (0x3c5, 0x06, par);
+        vga_out8(0x3c4, 0x08, par);
+        reg->SR08 = vga_in8(0x3c5, par);
+        vga_out8(0x3c5, 0x06, par);
 
         /* now save all the extended regs we need */
-        vga_out8 (0x3d4, 0x31, par);
-        par->CR31 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x32, par);
-        par->CR32 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x34, par);
-        par->CR34 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x36, par);
-        par->CR36 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x3a, par);
-        par->CR3A = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x40, par);
-        par->CR40 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x42, par);
-        par->CR42 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x45, par);
-        par->CR45 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x50, par);
-        par->CR50 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x51, par);
-        par->CR51 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x53, par);
-        par->CR53 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x58, par);
-        par->CR58 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x60, par);
-        par->CR60 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x66, par);
-        par->CR66 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x67, par);
-        par->CR67 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x68, par);
-        par->CR68 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x69, par);
-        par->CR69 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x6f, par);
-        par->CR6F = vga_in8 (0x3d5, par);
-
-        vga_out8 (0x3d4, 0x33, par);
-        par->CR33 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x86, par);
-        par->CR86 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x88, par);
-        par->CR88 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x90, par);
-        par->CR90 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x91, par);
-        par->CR91 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0xb0, par);
-        par->CRB0 = vga_in8 (0x3d5, par) | 0x80;
+        vga_out8(0x3d4, 0x31, par);
+        reg->CR31 = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x32, par);
+        reg->CR32 = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x34, par);
+        reg->CR34 = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x36, par);
+        reg->CR36 = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x3a, par);
+        reg->CR3A = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x40, par);
+        reg->CR40 = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x42, par);
+        reg->CR42 = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x45, par);
+        reg->CR45 = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x50, par);
+        reg->CR50 = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x51, par);
+        reg->CR51 = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x53, par);
+        reg->CR53 = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x58, par);
+        reg->CR58 = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x60, par);
+        reg->CR60 = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x66, par);
+        reg->CR66 = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x67, par);
+        reg->CR67 = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x68, par);
+        reg->CR68 = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x69, par);
+        reg->CR69 = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x6f, par);
+        reg->CR6F = vga_in8(0x3d5, par);
+
+        vga_out8(0x3d4, 0x33, par);
+        reg->CR33 = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x86, par);
+        reg->CR86 = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x88, par);
+        reg->CR88 = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x90, par);
+        reg->CR90 = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x91, par);
+        reg->CR91 = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0xb0, par);
+        reg->CRB0 = vga_in8(0x3d5, par) | 0x80;
+
+        /* extended mode timing regs */
+        vga_out8(0x3d4, 0x3b, par);
+        reg->CR3B = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x3c, par);
+        reg->CR3C = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x43, par);
+        reg->CR43 = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x5d, par);
+        reg->CR5D = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x5e, par);
+        reg->CR5E = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x65, par);
+        reg->CR65 = vga_in8(0x3d5, par);
+
+        /* save seq extended regs for DCLK PLL programming */
+        vga_out8(0x3c4, 0x0e, par);
+        reg->SR0E = vga_in8(0x3c5, par);
+        vga_out8(0x3c4, 0x0f, par);
+        reg->SR0F = vga_in8(0x3c5, par);
+        vga_out8(0x3c4, 0x10, par);
+        reg->SR10 = vga_in8(0x3c5, par);
+        vga_out8(0x3c4, 0x11, par);
+        reg->SR11 = vga_in8(0x3c5, par);
+        vga_out8(0x3c4, 0x12, par);
+        reg->SR12 = vga_in8(0x3c5, par);
+        vga_out8(0x3c4, 0x13, par);
+        reg->SR13 = vga_in8(0x3c5, par);
+        vga_out8(0x3c4, 0x29, par);
+        reg->SR29 = vga_in8(0x3c5, par);
+
+        vga_out8(0x3c4, 0x15, par);
+        reg->SR15 = vga_in8(0x3c5, par);
+        vga_out8(0x3c4, 0x30, par);
+        reg->SR30 = vga_in8(0x3c5, par);
+        vga_out8(0x3c4, 0x18, par);
+        reg->SR18 = vga_in8(0x3c5, par);
+
+        /* Save flat panel expansion regsters. */
+        if (par->chip == S3_SAVAGE_MX) {
+                int i;
+
+                for (i = 0; i < 8; i++) {
+                        vga_out8(0x3c4, 0x54+i, par);
+                        reg->SR54[i] = vga_in8(0x3c5, par);
+                }
+        }
+
+        vga_out8(0x3d4, 0x66, par);
+        cr66 = vga_in8(0x3d5, par);
+        vga_out8(0x3d5, cr66 | 0x80, par);
+        vga_out8(0x3d4, 0x3a, par);
+        cr3a = vga_in8(0x3d5, par);
+        vga_out8(0x3d5, cr3a | 0x80, par);
+
+        /* now save MIU regs */
+        if (par->chip != S3_SAVAGE_MX) {
+                reg->MMPR0 = savage_in32(FIFO_CONTROL_REG, par);
+                reg->MMPR1 = savage_in32(MIU_CONTROL_REG, par);
+                reg->MMPR2 = savage_in32(STREAMS_TIMEOUT_REG, par);
+                reg->MMPR3 = savage_in32(MISC_TIMEOUT_REG, par);
+        }
+
+        vga_out8(0x3d4, 0x3a, par);
+        vga_out8(0x3d5, cr3a, par);
+        vga_out8(0x3d4, 0x66, par);
+        vga_out8(0x3d5, cr66, par);
+}
+
+static void savage_set_default_par(struct savagefb_par *par,
+                                struct savage_reg *reg)
+{
+        unsigned char cr3a, cr53, cr66;
+
+        vga_out16(0x3d4, 0x4838, par);
+        vga_out16(0x3d4, 0xa039, par);
+        vga_out16(0x3c4, 0x0608, par);
+
+        vga_out8(0x3d4, 0x66, par);
+        cr66 = vga_in8(0x3d5, par);
+        vga_out8(0x3d5, cr66 | 0x80, par);
+        vga_out8(0x3d4, 0x3a, par);
+        cr3a = vga_in8(0x3d5, par);
+        vga_out8(0x3d5, cr3a | 0x80, par);
+        vga_out8(0x3d4, 0x53, par);
+        cr53 = vga_in8(0x3d5, par);
+        vga_out8(0x3d5, cr53 & 0x7f, par);
+
+        vga_out8(0x3d4, 0x66, par);
+        vga_out8(0x3d5, cr66, par);
+        vga_out8(0x3d4, 0x3a, par);
+        vga_out8(0x3d5, cr3a, par);
+
+        vga_out8(0x3d4, 0x66, par);
+        vga_out8(0x3d5, cr66, par);
+        vga_out8(0x3d4, 0x3a, par);
+        vga_out8(0x3d5, cr3a, par);
+
+        /* unlock extended seq regs */
+        vga_out8(0x3c4, 0x08, par);
+        vga_out8(0x3c5, reg->SR08, par);
+        vga_out8(0x3c5, 0x06, par);
+
+        /* now restore all the extended regs we need */
+        vga_out8(0x3d4, 0x31, par);
+        vga_out8(0x3d5, reg->CR31, par);
+        vga_out8(0x3d4, 0x32, par);
+        vga_out8(0x3d5, reg->CR32, par);
+        vga_out8(0x3d4, 0x34, par);
+        vga_out8(0x3d5, reg->CR34, par);
+        vga_out8(0x3d4, 0x36, par);
+        vga_out8(0x3d5,reg->CR36, par);
+        vga_out8(0x3d4, 0x3a, par);
+        vga_out8(0x3d5, reg->CR3A, par);
+        vga_out8(0x3d4, 0x40, par);
+        vga_out8(0x3d5, reg->CR40, par);
+        vga_out8(0x3d4, 0x42, par);
+        vga_out8(0x3d5, reg->CR42, par);
+        vga_out8(0x3d4, 0x45, par);
+        vga_out8(0x3d5, reg->CR45, par);
+        vga_out8(0x3d4, 0x50, par);
+        vga_out8(0x3d5, reg->CR50, par);
+        vga_out8(0x3d4, 0x51, par);
+        vga_out8(0x3d5, reg->CR51, par);
+        vga_out8(0x3d4, 0x53, par);
+        vga_out8(0x3d5, reg->CR53, par);
+        vga_out8(0x3d4, 0x58, par);
+        vga_out8(0x3d5, reg->CR58, par);
+        vga_out8(0x3d4, 0x60, par);
+        vga_out8(0x3d5, reg->CR60, par);
+        vga_out8(0x3d4, 0x66, par);
+        vga_out8(0x3d5, reg->CR66, par);
+        vga_out8(0x3d4, 0x67, par);
+        vga_out8(0x3d5, reg->CR67, par);
+        vga_out8(0x3d4, 0x68, par);
+        vga_out8(0x3d5, reg->CR68, par);
+        vga_out8(0x3d4, 0x69, par);
+        vga_out8(0x3d5, reg->CR69, par);
+        vga_out8(0x3d4, 0x6f, par);
+        vga_out8(0x3d5, reg->CR6F, par);
+
+        vga_out8(0x3d4, 0x33, par);
+        vga_out8(0x3d5, reg->CR33, par);
+        vga_out8(0x3d4, 0x86, par);
+        vga_out8(0x3d5, reg->CR86, par);
+        vga_out8(0x3d4, 0x88, par);
+        vga_out8(0x3d5, reg->CR88, par);
+        vga_out8(0x3d4, 0x90, par);
+        vga_out8(0x3d5, reg->CR90, par);
+        vga_out8(0x3d4, 0x91, par);
+        vga_out8(0x3d5, reg->CR91, par);
+        vga_out8(0x3d4, 0xb0, par);
+        vga_out8(0x3d5, reg->CRB0, par);
 
         /* extended mode timing regs */
-        vga_out8 (0x3d4, 0x3b, par);
-        par->CR3B = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x3c, par);
-        par->CR3C = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x43, par);
-        par->CR43 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x5d, par);
-        par->CR5D = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x5e, par);
-        par->CR5E = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x65, par);
-        par->CR65 = vga_in8 (0x3d5, par);
+        vga_out8(0x3d4, 0x3b, par);
+        vga_out8(0x3d5, reg->CR3B, par);
+        vga_out8(0x3d4, 0x3c, par);
+        vga_out8(0x3d5, reg->CR3C, par);
+        vga_out8(0x3d4, 0x43, par);
+        vga_out8(0x3d5, reg->CR43, par);
+        vga_out8(0x3d4, 0x5d, par);
+        vga_out8(0x3d5, reg->CR5D, par);
+        vga_out8(0x3d4, 0x5e, par);
+        vga_out8(0x3d5, reg->CR5E, par);
+        vga_out8(0x3d4, 0x65, par);
+        vga_out8(0x3d5, reg->CR65, par);
 
         /* save seq extended regs for DCLK PLL programming */
-        vga_out8 (0x3c4, 0x0e, par);
-        par->SR0E = vga_in8 (0x3c5, par);
-        vga_out8 (0x3c4, 0x0f, par);
-        par->SR0F = vga_in8 (0x3c5, par);
-        vga_out8 (0x3c4, 0x10, par);
-        par->SR10 = vga_in8 (0x3c5, par);
-        vga_out8 (0x3c4, 0x11, par);
-        par->SR11 = vga_in8 (0x3c5, par);
-        vga_out8 (0x3c4, 0x12, par);
-        par->SR12 = vga_in8 (0x3c5, par);
-        vga_out8 (0x3c4, 0x13, par);
-        par->SR13 = vga_in8 (0x3c5, par);
-        vga_out8 (0x3c4, 0x29, par);
-        par->SR29 = vga_in8 (0x3c5, par);
-
-        vga_out8 (0x3c4, 0x15, par);
-        par->SR15 = vga_in8 (0x3c5, par);
-        vga_out8 (0x3c4, 0x30, par);
-        par->SR30 = vga_in8 (0x3c5, par);
-        vga_out8 (0x3c4, 0x18, par);
-        par->SR18 = vga_in8 (0x3c5, par);
+        vga_out8(0x3c4, 0x0e, par);
+        vga_out8(0x3c5, reg->SR0E, par);
+        vga_out8(0x3c4, 0x0f, par);
+        vga_out8(0x3c5, reg->SR0F, par);
+        vga_out8(0x3c4, 0x10, par);
+        vga_out8(0x3c5, reg->SR10, par);
+        vga_out8(0x3c4, 0x11, par);
+        vga_out8(0x3c5, reg->SR11, par);
+        vga_out8(0x3c4, 0x12, par);
+        vga_out8(0x3c5, reg->SR12, par);
+        vga_out8(0x3c4, 0x13, par);
+        vga_out8(0x3c5, reg->SR13, par);
+        vga_out8(0x3c4, 0x29, par);
+        vga_out8(0x3c5, reg->SR29, par);
+
+        vga_out8(0x3c4, 0x15, par);
+        vga_out8(0x3c5, reg->SR15, par);
+        vga_out8(0x3c4, 0x30, par);
+        vga_out8(0x3c5, reg->SR30, par);
+        vga_out8(0x3c4, 0x18, par);
+        vga_out8(0x3c5, reg->SR18, par);
 
         /* Save flat panel expansion regsters. */
         if (par->chip == S3_SAVAGE_MX) {
                 int i;
 
                 for (i = 0; i < 8; i++) {
-                        vga_out8 (0x3c4, 0x54+i, par);
-                        par->SR54[i] = vga_in8 (0x3c5, par);
+                        vga_out8(0x3c4, 0x54+i, par);
+                        vga_out8(0x3c5, reg->SR54[i], par);
                 }
         }
 
-        vga_out8 (0x3d4, 0x66, par);
-        cr66 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d5, cr66 | 0x80, par);
-        vga_out8 (0x3d4, 0x3a, par);
-        cr3a = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d5, cr3a | 0x80, par);
+        vga_out8(0x3d4, 0x66, par);
+        cr66 = vga_in8(0x3d5, par);
+        vga_out8(0x3d5, cr66 | 0x80, par);
+        vga_out8(0x3d4, 0x3a, par);
+        cr3a = vga_in8(0x3d5, par);
+        vga_out8(0x3d5, cr3a | 0x80, par);
 
         /* now save MIU regs */
         if (par->chip != S3_SAVAGE_MX) {
-                par->MMPR0 = savage_in32(FIFO_CONTROL_REG, par);
-                par->MMPR1 = savage_in32(MIU_CONTROL_REG, par);
-                par->MMPR2 = savage_in32(STREAMS_TIMEOUT_REG, par);
-                par->MMPR3 = savage_in32(MISC_TIMEOUT_REG, par);
+                savage_out32(FIFO_CONTROL_REG, reg->MMPR0, par);
+                savage_out32(MIU_CONTROL_REG, reg->MMPR1, par);
+                savage_out32(STREAMS_TIMEOUT_REG, reg->MMPR2, par);
+                savage_out32(MISC_TIMEOUT_REG, reg->MMPR3, par);
         }
 
-        vga_out8 (0x3d4, 0x3a, par);
-        vga_out8 (0x3d5, cr3a, par);
-        vga_out8 (0x3d4, 0x66, par);
-        vga_out8 (0x3d5, cr66, par);
+        vga_out8(0x3d4, 0x3a, par);
+        vga_out8(0x3d5, cr3a, par);
+        vga_out8(0x3d4, 0x66, par);
+        vga_out8(0x3d5, cr66, par);
 }
 
 static void savage_update_var(struct fb_var_screeninfo *var, struct fb_videomode *modedb)
@@ -683,8 +851,8 @@ static void savage_update_var(struct fb_var_screeninfo *var, struct fb_videomode
         var->vmode = modedb->vmode;
 }
 
-static int savagefb_check_var (struct fb_var_screeninfo   *var,
-                               struct fb_info *info)
+static int savagefb_check_var(struct fb_var_screeninfo   *var,
+                              struct fb_info *info)
 {
         struct savagefb_par *par = info->par;
         int memlen, vramlen, mode_valid = 0;
@@ -750,10 +918,10 @@ static int savagefb_check_var (struct fb_var_screeninfo   *var,
         if (par->SavagePanelWidth &&
             (var->xres > par->SavagePanelWidth ||
              var->yres > par->SavagePanelHeight)) {
-                printk (KERN_INFO "Mode (%dx%d) larger than the LCD panel "
-                        "(%dx%d)\n", var->xres,  var->yres,
-                        par->SavagePanelWidth,
-                        par->SavagePanelHeight);
+                printk(KERN_INFO "Mode (%dx%d) larger than the LCD panel "
+                       "(%dx%d)\n", var->xres,  var->yres,
+                       par->SavagePanelWidth,
+                       par->SavagePanelHeight);
                 return -1;
         }
 
@@ -788,8 +956,9 @@ static int savagefb_check_var (struct fb_var_screeninfo   *var,
 }
 
 
-static int savagefb_decode_var (struct fb_var_screeninfo   *var,
-                                struct savagefb_par        *par)
+static int savagefb_decode_var(struct fb_var_screeninfo   *var,
+                               struct savagefb_par        *par,
+                               struct savage_reg          *reg)
 {
         struct xtimings timings;
         int width, dclk, i, j; /*, refresh; */
@@ -799,7 +968,7 @@ static int savagefb_decode_var (struct fb_var_screeninfo   *var,
 
         DBG("savagefb_decode_var");
 
-        memset (&timings, 0, sizeof(timings));
+        memset(&timings, 0, sizeof(timings));
 
         if (!pixclock) pixclock = 10000;        /* 10ns = 100MHz */
         timings.Clock = 1000000000 / pixclock;
@@ -831,39 +1000,39 @@ static int savagefb_decode_var (struct fb_var_screeninfo   *var,
          * This will allocate the datastructure and initialize all of the
          * generic VGA registers.
          */
-        vgaHWInit (var, par, &timings);
+        vgaHWInit(var, par, &timings, reg);
 
         /* We need to set CR67 whether or not we use the BIOS. */
 
         dclk = timings.Clock;
-        par->CR67 = 0x00;
+        reg->CR67 = 0x00;
 
-        switch( var->bits_per_pixel ) {
+        switch(var->bits_per_pixel) {
         case 8:
-                if( (par->chip == S3_SAVAGE2000) && (dclk >= 230000) )
-                        par->CR67 = 0x10;       /* 8bpp, 2 pixels/clock */
+                if ((par->chip == S3_SAVAGE2000) && (dclk >= 230000))
+                        reg->CR67 = 0x10;       /* 8bpp, 2 pixels/clock */
                 else
-                        par->CR67 = 0x00;       /* 8bpp, 1 pixel/clock */
+                        reg->CR67 = 0x00;       /* 8bpp, 1 pixel/clock */
                 break;
         case 15:
-                if ( S3_SAVAGE_MOBILE_SERIES(par->chip) ||
-                     ((par->chip == S3_SAVAGE2000) && (dclk >= 230000)) )
-                        par->CR67 = 0x30;       /* 15bpp, 2 pixel/clock */
+                if (S3_SAVAGE_MOBILE_SERIES(par->chip) ||
+                    ((par->chip == S3_SAVAGE2000) && (dclk >= 230000)))
+                        reg->CR67 = 0x30;       /* 15bpp, 2 pixel/clock */
                 else
-                        par->CR67 = 0x20;       /* 15bpp, 1 pixels/clock */
+                        reg->CR67 = 0x20;       /* 15bpp, 1 pixels/clock */
                 break;
         case 16:
-                if( S3_SAVAGE_MOBILE_SERIES(par->chip) ||
-                    ((par->chip == S3_SAVAGE2000) && (dclk >= 230000)) )
-                        par->CR67 = 0x50;       /* 16bpp, 2 pixel/clock */
+                if (S3_SAVAGE_MOBILE_SERIES(par->chip) ||
+                   ((par->chip == S3_SAVAGE2000) && (dclk >= 230000)))
+                        reg->CR67 = 0x50;       /* 16bpp, 2 pixel/clock */
                 else
-                        par->CR67 = 0x40;       /* 16bpp, 1 pixels/clock */
+                        reg->CR67 = 0x40;       /* 16bpp, 1 pixels/clock */
                 break;
         case 24:
-                par->CR67 = 0x70;
+                reg->CR67 = 0x70;
                 break;
         case 32:
-                par->CR67 = 0xd0;
+                reg->CR67 = 0xd0;
                 break;
         }
 
@@ -872,61 +1041,61 @@ static int savagefb_decode_var (struct fb_var_screeninfo   *var,
          * match.  Fall back to traditional register-crunching.
          */
 
-        vga_out8 (0x3d4, 0x3a, par);
-        tmp = vga_in8 (0x3d5, par);
+        vga_out8(0x3d4, 0x3a, par);
+        tmp = vga_in8(0x3d5, par);
         if (1 /*FIXME:psav->pci_burst*/)
-                par->CR3A = (tmp & 0x7f) | 0x15;
+                reg->CR3A = (tmp & 0x7f) | 0x15;
         else
-                par->CR3A = tmp | 0x95;
+                reg->CR3A = tmp | 0x95;
 
-        par->CR53 = 0x00;
-        par->CR31 = 0x8c;
-        par->CR66 = 0x89;
+        reg->CR53 = 0x00;
+        reg->CR31 = 0x8c;
+        reg->CR66 = 0x89;
 
-        vga_out8 (0x3d4, 0x58, par);
-        par->CR58 = vga_in8 (0x3d5, par) & 0x80;
-        par->CR58 |= 0x13;
+        vga_out8(0x3d4, 0x58, par);
+        reg->CR58 = vga_in8(0x3d5, par) & 0x80;
+        reg->CR58 |= 0x13;
 
-        par->SR15 = 0x03 | 0x80;
-        par->SR18 = 0x00;
-        par->CR43 = par->CR45 = par->CR65 = 0x00;
+        reg->SR15 = 0x03 | 0x80;
+        reg->SR18 = 0x00;
+        reg->CR43 = reg->CR45 = reg->CR65 = 0x00;
 
-        vga_out8 (0x3d4, 0x40, par);
-        par->CR40 = vga_in8 (0x3d5, par) & ~0x01;
+        vga_out8(0x3d4, 0x40, par);
+        reg->CR40 = vga_in8(0x3d5, par) & ~0x01;
 
-        par->MMPR0 = 0x010400;
-        par->MMPR1 = 0x00;
-        par->MMPR2 = 0x0808;
-        par->MMPR3 = 0x08080810;
+        reg->MMPR0 = 0x010400;
+        reg->MMPR1 = 0x00;
+        reg->MMPR2 = 0x0808;
+        reg->MMPR3 = 0x08080810;
 
-        SavageCalcClock (dclk, 1, 1, 127, 0, 4, 180000, 360000, &m, &n, &r);
+        SavageCalcClock(dclk, 1, 1, 127, 0, 4, 180000, 360000, &m, &n, &r);
         /* m = 107; n = 4; r = 2; */
 
         if (par->MCLK <= 0) {
-                par->SR10 = 255;
-                par->SR11 = 255;
+                reg->SR10 = 255;
+                reg->SR11 = 255;
         } else {
-                common_calc_clock (par->MCLK, 1, 1, 31, 0, 3, 135000, 270000,
-                                   &par->SR11, &par->SR10);
-                /*      par->SR10 = 80; // MCLK == 286000 */
-                /*      par->SR11 = 125; */
+                common_calc_clock(par->MCLK, 1, 1, 31, 0, 3, 135000, 270000,
+                                   &reg->SR11, &reg->SR10);
+                /*      reg->SR10 = 80; // MCLK == 286000 */
+                /*      reg->SR11 = 125; */
         }
 
-        par->SR12 = (r << 6) | (n & 0x3f);
-        par->SR13 = m & 0xff;
-        par->SR29 = (r & 4) | (m & 0x100) >> 5 | (n & 0x40) >> 2;
+        reg->SR12 = (r << 6) | (n & 0x3f);
+        reg->SR13 = m & 0xff;
+        reg->SR29 = (r & 4) | (m & 0x100) >> 5 | (n & 0x40) >> 2;
 
         if (var->bits_per_pixel < 24)
-                par->MMPR0 -= 0x8000;
+                reg->MMPR0 -= 0x8000;
         else
-                par->MMPR0 -= 0x4000;
+                reg->MMPR0 -= 0x4000;
 
         if (timings.interlaced)
-                par->CR42 = 0x20;
+                reg->CR42 = 0x20;
         else
-                par->CR42 = 0x00;
+                reg->CR42 = 0x00;
 
-        par->CR34 = 0x10; /* display fifo */
+        reg->CR34 = 0x10; /* display fifo */
 
         i = ((((timings.HTotal >> 3) - 5) & 0x100) >> 8) |
                 ((((timings.HDisplay >> 3) - 1) & 0x100) >> 7) |
@@ -938,77 +1107,77 @@ static int savagefb_decode_var (struct fb_var_screeninfo   *var,
         if ((timings.HSyncEnd >> 3) - (timings.HSyncStart >> 3) > 32)
                 i |= 0x20;
 
-        j = (par->CRTC[0] + ((i & 0x01) << 8) +
-             par->CRTC[4] + ((i & 0x10) << 4) + 1) / 2;
+        j = (reg->CRTC[0] + ((i & 0x01) << 8) +
+             reg->CRTC[4] + ((i & 0x10) << 4) + 1) / 2;
 
-        if (j - (par->CRTC[4] + ((i & 0x10) << 4)) < 4) {
-                if (par->CRTC[4] + ((i & 0x10) << 4) + 4 <=
-                    par->CRTC[0] + ((i & 0x01) << 8))
-                        j = par->CRTC[4] + ((i & 0x10) << 4) + 4;
+        if (j - (reg->CRTC[4] + ((i & 0x10) << 4)) < 4) {
+                if (reg->CRTC[4] + ((i & 0x10) << 4) + 4 <=
+                    reg->CRTC[0] + ((i & 0x01) << 8))
+                        j = reg->CRTC[4] + ((i & 0x10) << 4) + 4;
                 else
-                        j = par->CRTC[0] + ((i & 0x01) << 8) + 1;
+                        j = reg->CRTC[0] + ((i & 0x01) << 8) + 1;
         }
 
-        par->CR3B = j & 0xff;
+        reg->CR3B = j & 0xff;
         i |= (j & 0x100) >> 2;
-        par->CR3C = (par->CRTC[0] + ((i & 0x01) << 8)) / 2;
-        par->CR5D = i;
-        par->CR5E = (((timings.VTotal - 2) & 0x400) >> 10) |
+        reg->CR3C = (reg->CRTC[0] + ((i & 0x01) << 8)) / 2;
+        reg->CR5D = i;
+        reg->CR5E = (((timings.VTotal - 2) & 0x400) >> 10) |
                 (((timings.VDisplay - 1) & 0x400) >> 9) |
                 (((timings.VSyncStart) & 0x400) >> 8) |
                 (((timings.VSyncStart) & 0x400) >> 6) | 0x40;
         width = (var->xres_virtual * ((var->bits_per_pixel+7) / 8)) >> 3;
-        par->CR91 = par->CRTC[19] = 0xff & width;
-        par->CR51 = (0x300 & width) >> 4;
-        par->CR90 = 0x80 | (width >> 8);
-        par->MiscOutReg |= 0x0c;
+        reg->CR91 = reg->CRTC[19] = 0xff & width;
+        reg->CR51 = (0x300 & width) >> 4;
+        reg->CR90 = 0x80 | (width >> 8);
+        reg->MiscOutReg |= 0x0c;
 
         /* Set frame buffer description. */
 
         if (var->bits_per_pixel <= 8)
-                par->CR50 = 0;
+                reg->CR50 = 0;
         else if (var->bits_per_pixel <= 16)
-                par->CR50 = 0x10;
+                reg->CR50 = 0x10;
         else
-                par->CR50 = 0x30;
+                reg->CR50 = 0x30;
 
         if (var->xres_virtual <= 640)
-                par->CR50 |= 0x40;
+                reg->CR50 |= 0x40;
         else if (var->xres_virtual == 800)
-                par->CR50 |= 0x80;
+                reg->CR50 |= 0x80;
         else if (var->xres_virtual == 1024)
-                par->CR50 |= 0x00;
+                reg->CR50 |= 0x00;
         else if (var->xres_virtual == 1152)
-                par->CR50 |= 0x01;
+                reg->CR50 |= 0x01;
         else if (var->xres_virtual == 1280)
-                par->CR50 |= 0xc0;
+                reg->CR50 |= 0xc0;
         else if (var->xres_virtual == 1600)
-                par->CR50 |= 0x81;
+                reg->CR50 |= 0x81;
         else
-                par->CR50 |= 0xc1;      /* Use GBD */
+                reg->CR50 |= 0xc1;      /* Use GBD */
 
-        if( par->chip == S3_SAVAGE2000 )
-                par->CR33 = 0x08;
+        if (par->chip == S3_SAVAGE2000)
+                reg->CR33 = 0x08;
         else
-                par->CR33 = 0x20;
+                reg->CR33 = 0x20;
 
-        par->CRTC[0x17] = 0xeb;
+        reg->CRTC[0x17] = 0xeb;
 
-        par->CR67 |= 1;
+        reg->CR67 |= 1;
 
         vga_out8(0x3d4, 0x36, par);
-        par->CR36 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x68, par);
-        par->CR68 = vga_in8 (0x3d5, par);
-        par->CR69 = 0;
-        vga_out8 (0x3d4, 0x6f, par);
-        par->CR6F = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x86, par);
-        par->CR86 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d4, 0x88, par);
-        par->CR88 = vga_in8 (0x3d5, par) | 0x08;
-        vga_out8 (0x3d4, 0xb0, par);
-        par->CRB0 = vga_in8 (0x3d5, par) | 0x80;
+        reg->CR36 = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x68, par);
+        reg->CR68 = vga_in8(0x3d5, par);
+        reg->CR69 = 0;
+        vga_out8(0x3d4, 0x6f, par);
+        reg->CR6F = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x86, par);
+        reg->CR86 = vga_in8(0x3d5, par);
+        vga_out8(0x3d4, 0x88, par);
+        reg->CR88 = vga_in8(0x3d5, par) | 0x08;
+        vga_out8(0x3d4, 0xb0, par);
+        reg->CRB0 = vga_in8(0x3d5, par) | 0x80;
 
         return 0;
 }
@@ -1037,11 +1206,11 @@ static int savagefb_setcolreg(unsigned        regno,
 
         switch (info->var.bits_per_pixel) {
         case 8:
-                vga_out8 (0x3c8, regno, par);
+                vga_out8(0x3c8, regno, par);
 
-                vga_out8 (0x3c9, red   >> 10, par);
-                vga_out8 (0x3c9, green >> 10, par);
-                vga_out8 (0x3c9, blue  >> 10, par);
+                vga_out8(0x3c9, red   >> 10, par);
+                vga_out8(0x3c9, green >> 10, par);
+                vga_out8(0x3c9, blue  >> 10, par);
                 break;
 
         case 16:
@@ -1075,21 +1244,21 @@ static int savagefb_setcolreg(unsigned        regno,
         return 0;
 }
 
-static void savagefb_set_par_int (struct savagefb_par  *par)
+static void savagefb_set_par_int(struct savagefb_par  *par, struct savage_reg *reg)
 {
         unsigned char tmp, cr3a, cr66, cr67;
 
-        DBG ("savagefb_set_par_int");
+        DBG("savagefb_set_par_int");
 
-        par->SavageWaitIdle (par);
+        par->SavageWaitIdle(par);
 
-        vga_out8 (0x3c2, 0x23, par);
+        vga_out8(0x3c2, 0x23, par);
 
-        vga_out16 (0x3d4, 0x4838, par);
-        vga_out16 (0x3d4, 0xa539, par);
-        vga_out16 (0x3c4, 0x0608, par);
+        vga_out16(0x3d4, 0x4838, par);
+        vga_out16(0x3d4, 0xa539, par);
+        vga_out16(0x3c4, 0x0608, par);
 
-        vgaHWProtect (par, 1);
+        vgaHWProtect(par, 1);
 
         /*
          * Some Savage/MX and /IX systems go nuts when trying to exit the
@@ -1099,203 +1268,202 @@ static void savagefb_set_par_int (struct savagefb_par  *par)
          */
 
         VerticalRetraceWait(par);
-        vga_out8 (0x3d4, 0x67, par);
-        cr67 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d5, cr67/*par->CR67*/ & ~0x0c, par); /* no STREAMS yet */
+        vga_out8(0x3d4, 0x67, par);
+        cr67 = vga_in8(0x3d5, par);
+        vga_out8(0x3d5, cr67/*par->CR67*/ & ~0x0c, par); /* no STREAMS yet */
 
-        vga_out8 (0x3d4, 0x23, par);
-        vga_out8 (0x3d5, 0x00, par);
-        vga_out8 (0x3d4, 0x26, par);
-        vga_out8 (0x3d5, 0x00, par);
+        vga_out8(0x3d4, 0x23, par);
+        vga_out8(0x3d5, 0x00, par);
+        vga_out8(0x3d4, 0x26, par);
+        vga_out8(0x3d5, 0x00, par);
 
         /* restore extended regs */
-        vga_out8 (0x3d4, 0x66, par);
-        vga_out8 (0x3d5, par->CR66, par);
-        vga_out8 (0x3d4, 0x3a, par);
-        vga_out8 (0x3d5, par->CR3A, par);
-        vga_out8 (0x3d4, 0x31, par);
-        vga_out8 (0x3d5, par->CR31, par);
-        vga_out8 (0x3d4, 0x32, par);
-        vga_out8 (0x3d5, par->CR32, par);
-        vga_out8 (0x3d4, 0x58, par);
-        vga_out8 (0x3d5, par->CR58, par);
-        vga_out8 (0x3d4, 0x53, par);
-        vga_out8 (0x3d5, par->CR53 & 0x7f, par);
-
-        vga_out16 (0x3c4, 0x0608, par);
+        vga_out8(0x3d4, 0x66, par);
+        vga_out8(0x3d5, reg->CR66, par);
+        vga_out8(0x3d4, 0x3a, par);
+        vga_out8(0x3d5, reg->CR3A, par);
+        vga_out8(0x3d4, 0x31, par);
+        vga_out8(0x3d5, reg->CR31, par);
+        vga_out8(0x3d4, 0x32, par);
+        vga_out8(0x3d5, reg->CR32, par);
+        vga_out8(0x3d4, 0x58, par);
+        vga_out8(0x3d5, reg->CR58, par);
+        vga_out8(0x3d4, 0x53, par);
+        vga_out8(0x3d5, reg->CR53 & 0x7f, par);
+
+        vga_out16(0x3c4, 0x0608, par);
 
         /* Restore DCLK registers. */
 
-        vga_out8 (0x3c4, 0x0e, par);
-        vga_out8 (0x3c5, par->SR0E, par);
-        vga_out8 (0x3c4, 0x0f, par);
-        vga_out8 (0x3c5, par->SR0F, par);
-        vga_out8 (0x3c4, 0x29, par);
-        vga_out8 (0x3c5, par->SR29, par);
-        vga_out8 (0x3c4, 0x15, par);
-        vga_out8 (0x3c5, par->SR15, par);
+        vga_out8(0x3c4, 0x0e, par);
+        vga_out8(0x3c5, reg->SR0E, par);
+        vga_out8(0x3c4, 0x0f, par);
+        vga_out8(0x3c5, reg->SR0F, par);
+        vga_out8(0x3c4, 0x29, par);
+        vga_out8(0x3c5, reg->SR29, par);
+        vga_out8(0x3c4, 0x15, par);
+        vga_out8(0x3c5, reg->SR15, par);
 
         /* Restore flat panel expansion regsters. */
-        if( par->chip == S3_SAVAGE_MX ) {
+        if (par->chip == S3_SAVAGE_MX) {
                 int i;
 
-                for( i = 0; i < 8; i++ ) {
-                        vga_out8 (0x3c4, 0x54+i, par);
-                        vga_out8 (0x3c5, par->SR54[i], par);
+                for (i = 0; i < 8; i++) {
+                        vga_out8(0x3c4, 0x54+i, par);
+                        vga_out8(0x3c5, reg->SR54[i], par);
                 }
         }
 
-        vgaHWRestore (par);
+        vgaHWRestore (par, reg);
 
         /* extended mode timing registers */
-        vga_out8 (0x3d4, 0x53, par);
-        vga_out8 (0x3d5, par->CR53, par);
-        vga_out8 (0x3d4, 0x5d, par);
-        vga_out8 (0x3d5, par->CR5D, par);
-        vga_out8 (0x3d4, 0x5e, par);
-        vga_out8 (0x3d5, par->CR5E, par);
-        vga_out8 (0x3d4, 0x3b, par);
-        vga_out8 (0x3d5, par->CR3B, par);
-        vga_out8 (0x3d4, 0x3c, par);
-        vga_out8 (0x3d5, par->CR3C, par);
-        vga_out8 (0x3d4, 0x43, par);
-        vga_out8 (0x3d5, par->CR43, par);
-        vga_out8 (0x3d4, 0x65, par);
-        vga_out8 (0x3d5, par->CR65, par);
+        vga_out8(0x3d4, 0x53, par);
+        vga_out8(0x3d5, reg->CR53, par);
+        vga_out8(0x3d4, 0x5d, par);
+        vga_out8(0x3d5, reg->CR5D, par);
+        vga_out8(0x3d4, 0x5e, par);
+        vga_out8(0x3d5, reg->CR5E, par);
+        vga_out8(0x3d4, 0x3b, par);
+        vga_out8(0x3d5, reg->CR3B, par);
+        vga_out8(0x3d4, 0x3c, par);
+        vga_out8(0x3d5, reg->CR3C, par);
+        vga_out8(0x3d4, 0x43, par);
+        vga_out8(0x3d5, reg->CR43, par);
+        vga_out8(0x3d4, 0x65, par);
+        vga_out8(0x3d5, reg->CR65, par);
 
         /* restore the desired video mode with cr67 */
-        vga_out8 (0x3d4, 0x67, par);
+        vga_out8(0x3d4, 0x67, par);
         /* following part not present in X11 driver */
-        cr67 = vga_in8 (0x3d5, par) & 0xf;
-        vga_out8 (0x3d5, 0x50 | cr67, par);
-        udelay (10000);
-        vga_out8 (0x3d4, 0x67, par);
+        cr67 = vga_in8(0x3d5, par) & 0xf;
+        vga_out8(0x3d5, 0x50 | cr67, par);
+        udelay(10000);
+        vga_out8(0x3d4, 0x67, par);
         /* end of part */
-        vga_out8 (0x3d5, par->CR67 & ~0x0c, par);
+        vga_out8(0x3d5, reg->CR67 & ~0x0c, par);
 
         /* other mode timing and extended regs */
-        vga_out8 (0x3d4, 0x34, par);
-        vga_out8 (0x3d5, par->CR34, par);
-        vga_out8 (0x3d4, 0x40, par);
-        vga_out8 (0x3d5, par->CR40, par);
-        vga_out8 (0x3d4, 0x42, par);
-        vga_out8 (0x3d5, par->CR42, par);
-        vga_out8 (0x3d4, 0x45, par);
-        vga_out8 (0x3d5, par->CR45, par);
-        vga_out8 (0x3d4, 0x50, par);
-        vga_out8 (0x3d5, par->CR50, par);
-        vga_out8 (0x3d4, 0x51, par);
-        vga_out8 (0x3d5, par->CR51, par);
+        vga_out8(0x3d4, 0x34, par);
+        vga_out8(0x3d5, reg->CR34, par);
+        vga_out8(0x3d4, 0x40, par);
+        vga_out8(0x3d5, reg->CR40, par);
+        vga_out8(0x3d4, 0x42, par);
+        vga_out8(0x3d5, reg->CR42, par);
+        vga_out8(0x3d4, 0x45, par);
+        vga_out8(0x3d5, reg->CR45, par);
+        vga_out8(0x3d4, 0x50, par);
+        vga_out8(0x3d5, reg->CR50, par);
+        vga_out8(0x3d4, 0x51, par);
+        vga_out8(0x3d5, reg->CR51, par);
 
         /* memory timings */
-        vga_out8 (0x3d4, 0x36, par);
-        vga_out8 (0x3d5, par->CR36, par);
-        vga_out8 (0x3d4, 0x60, par);
-        vga_out8 (0x3d5, par->CR60, par);
-        vga_out8 (0x3d4, 0x68, par);
-        vga_out8 (0x3d5, par->CR68, par);
-        vga_out8 (0x3d4, 0x69, par);
-        vga_out8 (0x3d5, par->CR69, par);
-        vga_out8 (0x3d4, 0x6f, par);
-        vga_out8 (0x3d5, par->CR6F, par);
-
-        vga_out8 (0x3d4, 0x33, par);
-        vga_out8 (0x3d5, par->CR33, par);
-        vga_out8 (0x3d4, 0x86, par);
-        vga_out8 (0x3d5, par->CR86, par);
-        vga_out8 (0x3d4, 0x88, par);
-        vga_out8 (0x3d5, par->CR88, par);
-        vga_out8 (0x3d4, 0x90, par);
-        vga_out8 (0x3d5, par->CR90, par);
-        vga_out8 (0x3d4, 0x91, par);
-        vga_out8 (0x3d5, par->CR91, par);
+        vga_out8(0x3d4, 0x36, par);
+        vga_out8(0x3d5, reg->CR36, par);
+        vga_out8(0x3d4, 0x60, par);
+        vga_out8(0x3d5, reg->CR60, par);
+        vga_out8(0x3d4, 0x68, par);
+        vga_out8(0x3d5, reg->CR68, par);
+        vga_out8(0x3d4, 0x69, par);
+        vga_out8(0x3d5, reg->CR69, par);
+        vga_out8(0x3d4, 0x6f, par);
+        vga_out8(0x3d5, reg->CR6F, par);
+
+        vga_out8(0x3d4, 0x33, par);
+        vga_out8(0x3d5, reg->CR33, par);
+        vga_out8(0x3d4, 0x86, par);
+        vga_out8(0x3d5, reg->CR86, par);
+        vga_out8(0x3d4, 0x88, par);
+        vga_out8(0x3d5, reg->CR88, par);
+        vga_out8(0x3d4, 0x90, par);
+        vga_out8(0x3d5, reg->CR90, par);
+        vga_out8(0x3d4, 0x91, par);
+        vga_out8(0x3d5, reg->CR91, par);
 
         if (par->chip == S3_SAVAGE4) {
-                vga_out8 (0x3d4, 0xb0, par);
-                vga_out8 (0x3d5, par->CRB0, par);
+                vga_out8(0x3d4, 0xb0, par);
+                vga_out8(0x3d5, reg->CRB0, par);
         }
 
-        vga_out8 (0x3d4, 0x32, par);
-        vga_out8 (0x3d5, par->CR32, par);
+        vga_out8(0x3d4, 0x32, par);
+        vga_out8(0x3d5, reg->CR32, par);
 
         /* unlock extended seq regs */
-        vga_out8 (0x3c4, 0x08, par);
-        vga_out8 (0x3c5, 0x06, par);
+        vga_out8(0x3c4, 0x08, par);
+        vga_out8(0x3c5, 0x06, par);
 
         /* Restore extended sequencer regs for MCLK. SR10 == 255 indicates
          * that we should leave the default SR10 and SR11 values there.
          */
-        if (par->SR10 != 255) {
-                vga_out8 (0x3c4, 0x10, par);
-                vga_out8 (0x3c5, par->SR10, par);
-                vga_out8 (0x3c4, 0x11, par);
-                vga_out8 (0x3c5, par->SR11, par);
+        if (reg->SR10 != 255) {
+                vga_out8(0x3c4, 0x10, par);
+                vga_out8(0x3c5, reg->SR10, par);
+                vga_out8(0x3c4, 0x11, par);
+                vga_out8(0x3c5, reg->SR11, par);
         }
 
         /* restore extended seq regs for dclk */
-        vga_out8 (0x3c4, 0x0e, par);
-        vga_out8 (0x3c5, par->SR0E, par);
-        vga_out8 (0x3c4, 0x0f, par);
-        vga_out8 (0x3c5, par->SR0F, par);
-        vga_out8 (0x3c4, 0x12, par);
-        vga_out8 (0x3c5, par->SR12, par);
-        vga_out8 (0x3c4, 0x13, par);
-        vga_out8 (0x3c5, par->SR13, par);
-        vga_out8 (0x3c4, 0x29, par);
-        vga_out8 (0x3c5, par->SR29, par);
-
-        vga_out8 (0x3c4, 0x18, par);
-        vga_out8 (0x3c5, par->SR18, par);
+        vga_out8(0x3c4, 0x0e, par);
+        vga_out8(0x3c5, reg->SR0E, par);
+        vga_out8(0x3c4, 0x0f, par);
+        vga_out8(0x3c5, reg->SR0F, par);
+        vga_out8(0x3c4, 0x12, par);
+        vga_out8(0x3c5, reg->SR12, par);
+        vga_out8(0x3c4, 0x13, par);
+        vga_out8(0x3c5, reg->SR13, par);
+        vga_out8(0x3c4, 0x29, par);
+        vga_out8(0x3c5, reg->SR29, par);
+        vga_out8(0x3c4, 0x18, par);
+        vga_out8(0x3c5, reg->SR18, par);
 
         /* load new m, n pll values for dclk & mclk */
-        vga_out8 (0x3c4, 0x15, par);
-        tmp = vga_in8 (0x3c5, par) & ~0x21;
+        vga_out8(0x3c4, 0x15, par);
+        tmp = vga_in8(0x3c5, par) & ~0x21;
 
-        vga_out8 (0x3c5, tmp | 0x03, par);
-        vga_out8 (0x3c5, tmp | 0x23, par);
-        vga_out8 (0x3c5, tmp | 0x03, par);
-        vga_out8 (0x3c5, par->SR15, par);
-        udelay (100);
+        vga_out8(0x3c5, tmp | 0x03, par);
+        vga_out8(0x3c5, tmp | 0x23, par);
+        vga_out8(0x3c5, tmp | 0x03, par);
+        vga_out8(0x3c5, reg->SR15, par);
+        udelay(100);
 
-        vga_out8 (0x3c4, 0x30, par);
-        vga_out8 (0x3c5, par->SR30, par);
-        vga_out8 (0x3c4, 0x08, par);
-        vga_out8 (0x3c5, par->SR08, par);
+        vga_out8(0x3c4, 0x30, par);
+        vga_out8(0x3c5, reg->SR30, par);
+        vga_out8(0x3c4, 0x08, par);
+        vga_out8(0x3c5, reg->SR08, par);
 
         /* now write out cr67 in full, possibly starting STREAMS */
         VerticalRetraceWait(par);
-        vga_out8 (0x3d4, 0x67, par);
-        vga_out8 (0x3d5, par->CR67, par);
+        vga_out8(0x3d4, 0x67, par);
+        vga_out8(0x3d5, reg->CR67, par);
 
-        vga_out8 (0x3d4, 0x66, par);
-        cr66 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d5, cr66 | 0x80, par);
-        vga_out8 (0x3d4, 0x3a, par);
-        cr3a = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d5, cr3a | 0x80, par);
+        vga_out8(0x3d4, 0x66, par);
+        cr66 = vga_in8(0x3d5, par);
+        vga_out8(0x3d5, cr66 | 0x80, par);
+        vga_out8(0x3d4, 0x3a, par);
+        cr3a = vga_in8(0x3d5, par);
+        vga_out8(0x3d5, cr3a | 0x80, par);
 
         if (par->chip != S3_SAVAGE_MX) {
                 VerticalRetraceWait(par);
-                savage_out32 (FIFO_CONTROL_REG, par->MMPR0, par);
-                par->SavageWaitIdle (par);
-                savage_out32 (MIU_CONTROL_REG, par->MMPR1, par);
-                par->SavageWaitIdle (par);
-                savage_out32 (STREAMS_TIMEOUT_REG, par->MMPR2, par);
-                par->SavageWaitIdle (par);
-                savage_out32 (MISC_TIMEOUT_REG, par->MMPR3, par);
+                savage_out32(FIFO_CONTROL_REG, reg->MMPR0, par);
+                par->SavageWaitIdle(par);
+                savage_out32(MIU_CONTROL_REG, reg->MMPR1, par);
+                par->SavageWaitIdle(par);
+                savage_out32(STREAMS_TIMEOUT_REG, reg->MMPR2, par);
+                par->SavageWaitIdle(par);
+                savage_out32(MISC_TIMEOUT_REG, reg->MMPR3, par);
         }
 
-        vga_out8 (0x3d4, 0x66, par);
-        vga_out8 (0x3d5, cr66, par);
-        vga_out8 (0x3d4, 0x3a, par);
-        vga_out8 (0x3d5, cr3a, par);
+        vga_out8(0x3d4, 0x66, par);
+        vga_out8(0x3d5, cr66, par);
+        vga_out8(0x3d4, 0x3a, par);
+        vga_out8(0x3d5, cr3a, par);
 
-        SavageSetup2DEngine (par);
-        vgaHWProtect (par, 0);
+        SavageSetup2DEngine(par);
+        vgaHWProtect(par, 0);
 }
 
-static void savagefb_update_start (struct savagefb_par      *par,
-                                   struct fb_var_screeninfo *var)
+static void savagefb_update_start(struct savagefb_par      *par,
+                                  struct fb_var_screeninfo *var)
 {
         int base;
 
@@ -1305,8 +1473,8 @@ static void savagefb_update_start (struct savagefb_par      *par,
         /* now program the start address registers */
         vga_out16(0x3d4, (base & 0x00ff00) | 0x0c, par);
         vga_out16(0x3d4, ((base & 0x00ff) << 8) | 0x0d, par);
-        vga_out8 (0x3d4, 0x69, par);
-        vga_out8 (0x3d5, (base & 0x7f0000) >> 16, par);
+        vga_out8(0x3d4, 0x69, par);
+        vga_out8(0x3d5, (base & 0x7f0000) >> 16, par);
 }
 
 
@@ -1325,29 +1493,14 @@ static void savagefb_set_fix(struct fb_info *info)
 
 }
 
-#if defined(CONFIG_FB_SAVAGE_ACCEL)
-static void savagefb_set_clip(struct fb_info *info)
-{
-    struct savagefb_par *par = info->par;
-    int cmd;
-
-    cmd = BCI_CMD_NOP | BCI_CMD_CLIP_NEW;
-    par->bci_ptr = 0;
-    par->SavageWaitFifo(par,3);
-    BCI_SEND(cmd);
-    BCI_SEND(BCI_CLIP_TL(0, 0));
-    BCI_SEND(BCI_CLIP_BR(0xfff, 0xfff));
-}
-#endif
-
-static int savagefb_set_par (struct fb_info *info)
+static int savagefb_set_par(struct fb_info *info)
 {
         struct savagefb_par *par = info->par;
         struct fb_var_screeninfo *var = &info->var;
         int err;
 
         DBG("savagefb_set_par");
-        err = savagefb_decode_var (var, par);
+        err = savagefb_decode_var(var, par, &par->state);
         if (err)
                 return err;
 
@@ -1366,8 +1519,8 @@ static int savagefb_set_par (struct fb_info *info)
         par->maxClock = par->dacSpeedBpp;
         par->minClock = 10000;
 
-        savagefb_set_par_int (par);
-        fb_set_cmap (&info->cmap, info);
+        savagefb_set_par_int(par, &par->state);
+        fb_set_cmap(&info->cmap, info);
         savagefb_set_fix(info);
         savagefb_set_clip(info);
 
@@ -1378,12 +1531,12 @@ static int savagefb_set_par (struct fb_info *info)
 /*
  *    Pan or Wrap the Display
  */
-static int savagefb_pan_display (struct fb_var_screeninfo *var,
-                                 struct fb_info           *info)
+static int savagefb_pan_display(struct fb_var_screeninfo *var,
+                                struct fb_info           *info)
 {
         struct savagefb_par *par = info->par;
 
-        savagefb_update_start (par, var);
+        savagefb_update_start(par, var);
         return 0;
 }
 
@@ -1440,6 +1593,22 @@ static int savagefb_blank(int blank, struct fb_info *info)
         return (blank == FB_BLANK_NORMAL) ? 1 : 0;
 }
 
+static void savagefb_save_state(struct fb_info *info)
+{
+        struct savagefb_par *par = info->par;
+
+        savage_get_default_par(par, &par->save);
+}
+
+static void savagefb_restore_state(struct fb_info *info)
+{
+        struct savagefb_par *par = info->par;
+
+        savagefb_blank(FB_BLANK_POWERDOWN, info);
+        savage_set_default_par(par, &par->save);
+        savagefb_blank(FB_BLANK_UNBLANK, info);
+}
+
 static struct fb_ops savagefb_ops = {
         .owner          = THIS_MODULE,
         .fb_check_var   = savagefb_check_var,
@@ -1447,6 +1616,8 @@ static struct fb_ops savagefb_ops = {
         .fb_setcolreg   = savagefb_setcolreg,
         .fb_pan_display = savagefb_pan_display,
         .fb_blank       = savagefb_blank,
+        .fb_save_state  = savagefb_save_state,
+        .fb_restore_state = savagefb_restore_state,
 #if defined(CONFIG_FB_SAVAGE_ACCEL)
         .fb_fillrect    = savagefb_fillrect,
         .fb_copyarea    = savagefb_copyarea,
@@ -1479,59 +1650,59 @@ static struct fb_var_screeninfo __devinitdata savagefb_var800x600x8 = {
         .vmode =        FB_VMODE_NONINTERLACED
 };
 
-static void savage_enable_mmio (struct savagefb_par *par)
+static void savage_enable_mmio(struct savagefb_par *par)
 {
         unsigned char val;
 
-        DBG ("savage_enable_mmio\n");
+        DBG("savage_enable_mmio\n");
 
-        val = vga_in8 (0x3c3, par);
-        vga_out8 (0x3c3, val | 0x01, par);
-        val = vga_in8 (0x3cc, par);
-        vga_out8 (0x3c2, val | 0x01, par);
+        val = vga_in8(0x3c3, par);
+        vga_out8(0x3c3, val | 0x01, par);
+        val = vga_in8(0x3cc, par);
+        vga_out8(0x3c2, val | 0x01, par);
 
         if (par->chip >= S3_SAVAGE4) {
-                vga_out8 (0x3d4, 0x40, par);
-                val = vga_in8 (0x3d5, par);
-                vga_out8 (0x3d5, val | 1, par);
+                vga_out8(0x3d4, 0x40, par);
+                val = vga_in8(0x3d5, par);
+                vga_out8(0x3d5, val | 1, par);
         }
 }
 
 
-static void savage_disable_mmio (struct savagefb_par *par)
+static void savage_disable_mmio(struct savagefb_par *par)
 {
         unsigned char val;
 
-        DBG ("savage_disable_mmio\n");
+        DBG("savage_disable_mmio\n");
 
-        if(par->chip >= S3_SAVAGE4 ) {
-                vga_out8 (0x3d4, 0x40, par);
-                val = vga_in8 (0x3d5, par);
-                vga_out8 (0x3d5, val | 1, par);
+        if (par->chip >= S3_SAVAGE4) {
+                vga_out8(0x3d4, 0x40, par);
+                val = vga_in8(0x3d5, par);
+                vga_out8(0x3d5, val | 1, par);
         }
 }
 
 
-static int __devinit savage_map_mmio (struct fb_info *info)
+static int __devinit savage_map_mmio(struct fb_info *info)
 {
         struct savagefb_par *par = info->par;
-        DBG ("savage_map_mmio");
+        DBG("savage_map_mmio");
 
-        if (S3_SAVAGE3D_SERIES (par->chip))
-                par->mmio.pbase = pci_resource_start (par->pcidev, 0) +
+        if (S3_SAVAGE3D_SERIES(par->chip))
+                par->mmio.pbase = pci_resource_start(par->pcidev, 0) +
                         SAVAGE_NEWMMIO_REGBASE_S3;
         else
-                par->mmio.pbase = pci_resource_start (par->pcidev, 0) +
+                par->mmio.pbase = pci_resource_start(par->pcidev, 0) +
                         SAVAGE_NEWMMIO_REGBASE_S4;
 
         par->mmio.len = SAVAGE_NEWMMIO_REGSIZE;
 
-        par->mmio.vbase = ioremap (par->mmio.pbase, par->mmio.len);
+        par->mmio.vbase = ioremap(par->mmio.pbase, par->mmio.len);
         if (!par->mmio.vbase) {
-                printk ("savagefb: unable to map memory mapped IO\n");
+                printk("savagefb: unable to map memory mapped IO\n");
                 return -ENOMEM;
         } else
-                printk (KERN_INFO "savagefb: mapped io at %p\n",
+                printk(KERN_INFO "savagefb: mapped io at %p\n",
                         par->mmio.vbase);
 
         info->fix.mmio_start = par->mmio.pbase;
@@ -1540,15 +1711,15 @@ static int __devinit savage_map_mmio (struct fb_info *info)
         par->bci_base = (u32 __iomem *)(par->mmio.vbase + BCI_BUFFER_OFFSET);
         par->bci_ptr  = 0;
 
-        savage_enable_mmio (par);
+        savage_enable_mmio(par);
 
         return 0;
 }
 
-static void savage_unmap_mmio (struct fb_info *info)
+static void savage_unmap_mmio(struct fb_info *info)
 {
         struct savagefb_par *par = info->par;
-        DBG ("savage_unmap_mmio");
+        DBG("savage_unmap_mmio");
 
         savage_disable_mmio(par);
 
@@ -1558,46 +1729,46 @@ static void savage_unmap_mmio (struct fb_info *info)
         }
 }
 
-static int __devinit savage_map_video (struct fb_info *info,
-                                       int video_len)
+static int __devinit savage_map_video(struct fb_info *info,
+                                      int video_len)
 {
         struct savagefb_par *par = info->par;
         int resource;
 
         DBG("savage_map_video");
 
-        if (S3_SAVAGE3D_SERIES (par->chip))
+        if (S3_SAVAGE3D_SERIES(par->chip))
                 resource = 0;
         else
                 resource = 1;
 
-        par->video.pbase = pci_resource_start (par->pcidev, resource);
+        par->video.pbase = pci_resource_start(par->pcidev, resource);
         par->video.len   = video_len;
-        par->video.vbase = ioremap (par->video.pbase, par->video.len);
+        par->video.vbase = ioremap(par->video.pbase, par->video.len);
 
         if (!par->video.vbase) {
-                printk ("savagefb: unable to map screen memory\n");
+                printk("savagefb: unable to map screen memory\n");
                 return -ENOMEM;
         } else
-                printk (KERN_INFO "savagefb: mapped framebuffer at %p, "
-                        "pbase == %x\n", par->video.vbase, par->video.pbase);
+                printk(KERN_INFO "savagefb: mapped framebuffer at %p, "
+                       "pbase == %x\n", par->video.vbase, par->video.pbase);
 
         info->fix.smem_start = par->video.pbase;
         info->fix.smem_len   = par->video.len - par->cob_size;
         info->screen_base    = par->video.vbase;
 
 #ifdef CONFIG_MTRR
-        par->video.mtrr = mtrr_add (par->video.pbase, video_len,
-                                     MTRR_TYPE_WRCOMB, 1);
+        par->video.mtrr = mtrr_add(par->video.pbase, video_len,
+                                   MTRR_TYPE_WRCOMB, 1);
 #endif
 
         /* Clear framebuffer, it's all white in memory after boot */
-        memset_io (par->video.vbase, 0, par->video.len);
+        memset_io(par->video.vbase, 0, par->video.len);
 
         return 0;
 }
 
-static void savage_unmap_video (struct fb_info *info)
+static void savage_unmap_video(struct fb_info *info)
 {
         struct savagefb_par *par = info->par;
 
@@ -1605,16 +1776,16 @@ static void savage_unmap_video (struct fb_info *info)
 
         if (par->video.vbase) {
 #ifdef CONFIG_MTRR
-                mtrr_del (par->video.mtrr, par->video.pbase, par->video.len);
+                mtrr_del(par->video.mtrr, par->video.pbase, par->video.len);
 #endif
 
-                iounmap (par->video.vbase);
+                iounmap(par->video.vbase);
                 par->video.vbase = NULL;
                 info->screen_base = NULL;
         }
 }
 
-static int savage_init_hw (struct savagefb_par *par)
+static int savage_init_hw(struct savagefb_par *par)
 {
         unsigned char config1, m, n, n1, n2, sr8, cr3f, cr66 = 0, tmp;
 
@@ -1656,7 +1827,7 @@ static int savage_init_hw (struct savagefb_par *par)
 
         switch  (par->chip) {
         case S3_SAVAGE3D:
-                videoRam = RamSavage3D[ (config1 & 0xC0) >> 6 ] * 1024;
+                videoRam = RamSavage3D[(config1 & 0xC0) >> 6 ] * 1024;
                 break;
 
         case S3_SAVAGE4:
@@ -1667,22 +1838,22 @@ static int savage_init_hw (struct savagefb_par *par)
                  * can do it different...
                  */
                 vga_out8(0x3d4, 0x68, par);     /* memory control 1 */
-                if( (vga_in8(0x3d5, par) & 0xC0) == (0x01 << 6) )
+                if ((vga_in8(0x3d5, par) & 0xC0) == (0x01 << 6))
                         RamSavage4[1] = 8;
 
                 /*FALLTHROUGH*/
 
         case S3_SAVAGE2000:
-                videoRam = RamSavage4[ (config1 & 0xE0) >> 5 ] * 1024;
+                videoRam = RamSavage4[(config1 & 0xE0) >> 5] * 1024;
                 break;
 
         case S3_SAVAGE_MX:
         case S3_SUPERSAVAGE:
-                videoRam = RamSavageMX[ (config1 & 0x0E) >> 1 ] * 1024;
+                videoRam = RamSavageMX[(config1 & 0x0E) >> 1] * 1024;
                 break;
 
         case S3_PROSAVAGE:
-                videoRam = RamSavageNB[ (config1 & 0xE0) >> 5 ] * 1024;
+                videoRam = RamSavageNB[(config1 & 0xE0) >> 5] * 1024;
                 break;
 
         default:
@@ -1693,31 +1864,31 @@ static int savage_init_hw (struct savagefb_par *par)
 
         videoRambytes = videoRam * 1024;
 
-        printk (KERN_INFO "savagefb: probed videoram:  %dk\n", videoRam);
+        printk(KERN_INFO "savagefb: probed videoram:  %dk\n", videoRam);
 
         /* reset graphics engine to avoid memory corruption */
-        vga_out8 (0x3d4, 0x66, par);
-        cr66 = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d5, cr66 | 0x02, par);
-        udelay (10000);
+        vga_out8(0x3d4, 0x66, par);
+        cr66 = vga_in8(0x3d5, par);
+        vga_out8(0x3d5, cr66 | 0x02, par);
+        udelay(10000);
 
-        vga_out8 (0x3d4, 0x66, par);
-        vga_out8 (0x3d5, cr66 & ~0x02, par);    /* clear reset flag */
-        udelay (10000);
+        vga_out8(0x3d4, 0x66, par);
+        vga_out8(0x3d5, cr66 & ~0x02, par);     /* clear reset flag */
+        udelay(10000);
 
 
         /*
          * reset memory interface, 3D engine, AGP master, PCI master,
          * master engine unit, motion compensation/LPB
          */
-        vga_out8 (0x3d4, 0x3f, par);
-        cr3f = vga_in8 (0x3d5, par);
-        vga_out8 (0x3d5, cr3f | 0x08, par);
-        udelay (10000);
+        vga_out8(0x3d4, 0x3f, par);
+        cr3f = vga_in8(0x3d5, par);
+        vga_out8(0x3d5, cr3f | 0x08, par);
+        udelay(10000);
 
-        vga_out8 (0x3d4, 0x3f, par);
-        vga_out8 (0x3d5, cr3f & ~0x08, par);    /* clear reset flags */
-        udelay (10000);
+        vga_out8(0x3d4, 0x3f, par);
+        vga_out8(0x3d5, cr3f & ~0x08, par);     /* clear reset flags */
+        udelay(10000);
 
         /* Savage ramdac speeds */
         par->numClocks = 4;
@@ -1740,7 +1911,7 @@ static int savage_init_hw (struct savagefb_par *par)
         n1 = n & 0x1f;
         n2 = (n >> 5) & 0x03;
         par->MCLK = ((1431818 * (m+2)) / (n1+2) / (1 << n2) + 50) / 100;
-        printk (KERN_INFO "savagefb: Detected current MCLK value of %d kHz\n",
+        printk(KERN_INFO "savagefb: Detected current MCLK value of %d kHz\n",
                 par->MCLK);
 
         /* check for DVI/flat panel */
@@ -1769,12 +1940,12 @@ static int savage_init_hw (struct savagefb_par *par)
         /* Check LCD panel parrmation */
 
         if (par->display_type == DISP_LCD) {
-                unsigned char cr6b = VGArCR( 0x6b, par);
+                unsigned char cr6b = VGArCR(0x6b, par);
 
-                int panelX = (VGArSEQ (0x61, par) +
-                              ((VGArSEQ (0x66, par) & 0x02) << 7) + 1) * 8;
-                int panelY = (VGArSEQ (0x69, par) +
-                              ((VGArSEQ (0x6e, par) & 0x70) << 4) + 1);
+                int panelX = (VGArSEQ(0x61, par) +
+                              ((VGArSEQ(0x66, par) & 0x02) << 7) + 1) * 8;
+                int panelY = (VGArSEQ(0x69, par) +
+                              ((VGArSEQ(0x6e, par) & 0x70) << 4) + 1);
 
                 char * sTechnology = "Unknown";
 
@@ -1796,26 +1967,26 @@ static int savage_init_hw (struct savagefb_par *par)
                         ActiveDUO = 0x80
                 };
 
-                if ((VGArSEQ (0x39, par) & 0x03) == 0) {
+                if ((VGArSEQ(0x39, par) & 0x03) == 0) {
                         sTechnology = "TFT";
-                } else if ((VGArSEQ (0x30, par) & 0x01) == 0) {
+                } else if ((VGArSEQ(0x30, par) & 0x01) == 0) {
                         sTechnology = "DSTN";
                 } else  {
                         sTechnology = "STN";
                 }
 
-                printk (KERN_INFO "savagefb: %dx%d %s LCD panel detected %s\n",
-                        panelX, panelY, sTechnology,
-                        cr6b & ActiveLCD ? "and active" : "but not active");
+                printk(KERN_INFO "savagefb: %dx%d %s LCD panel detected %s\n",
+                       panelX, panelY, sTechnology,
+                       cr6b & ActiveLCD ? "and active" : "but not active");
 
-                if( cr6b & ActiveLCD )  {
+                if (cr6b & ActiveLCD)   {
                         /*
                          * If the LCD is active and panel expansion is enabled,
                          * we probably want to kill the HW cursor.
                          */
 
-                        printk (KERN_INFO "savagefb: Limiting video mode to "
-                                "%dx%d\n", panelX, panelY );
+                        printk(KERN_INFO "savagefb: Limiting video mode to "
+                                "%dx%d\n", panelX, panelY);
 
                         par->SavagePanelWidth = panelX;
                         par->SavagePanelHeight = panelY;
@@ -1824,9 +1995,10 @@ static int savage_init_hw (struct savagefb_par *par)
                         par->display_type = DISP_CRT;
         }
 
-        savage_get_default_par (par);
+        savage_get_default_par(par, &par->state);
+        par->save = par->state;
 
-        if( S3_SAVAGE4_SERIES(par->chip) ) {
+        if (S3_SAVAGE4_SERIES(par->chip)) {
                 /*
                  * The Savage4 and ProSavage have COB coherency bugs which
                  * render the buffer useless.  We disable it.
@@ -1845,9 +2017,9 @@ static int savage_init_hw (struct savagefb_par *par)
         return videoRambytes;
 }
 
-static int __devinit savage_init_fb_info (struct fb_info *info,
-                                          struct pci_dev *dev,
-                                          const struct pci_device_id *id)
+static int __devinit savage_init_fb_info(struct fb_info *info,
+                                         struct pci_dev *dev,
+                                         const struct pci_device_id *id)
 {
         struct savagefb_par *par = info->par;
         int err = 0;
@@ -1863,63 +2035,63 @@ static int __devinit savage_init_fb_info (struct fb_info *info,
         switch (info->fix.accel) {
         case FB_ACCEL_SUPERSAVAGE:
                 par->chip = S3_SUPERSAVAGE;
-                snprintf (info->fix.id, 16, "SuperSavage");
+                snprintf(info->fix.id, 16, "SuperSavage");
                 break;
         case FB_ACCEL_SAVAGE4:
                 par->chip = S3_SAVAGE4;
-                snprintf (info->fix.id, 16, "Savage4");
+                snprintf(info->fix.id, 16, "Savage4");
                 break;
         case FB_ACCEL_SAVAGE3D:
                 par->chip = S3_SAVAGE3D;
-                snprintf (info->fix.id, 16, "Savage3D");
+                snprintf(info->fix.id, 16, "Savage3D");
                 break;
         case FB_ACCEL_SAVAGE3D_MV:
                 par->chip = S3_SAVAGE3D;
-                snprintf (info->fix.id, 16, "Savage3D-MV");
+                snprintf(info->fix.id, 16, "Savage3D-MV");
                 break;
         case FB_ACCEL_SAVAGE2000:
                 par->chip = S3_SAVAGE2000;
-                snprintf (info->fix.id, 16, "Savage2000");
+                snprintf(info->fix.id, 16, "Savage2000");
                 break;
         case FB_ACCEL_SAVAGE_MX_MV:
                 par->chip = S3_SAVAGE_MX;
-                snprintf (info->fix.id, 16, "Savage/MX-MV");
+                snprintf(info->fix.id, 16, "Savage/MX-MV");
                 break;
         case FB_ACCEL_SAVAGE_MX:
                 par->chip = S3_SAVAGE_MX;
-                snprintf (info->fix.id, 16, "Savage/MX");
+                snprintf(info->fix.id, 16, "Savage/MX");
                 break;
         case FB_ACCEL_SAVAGE_IX_MV:
                 par->chip = S3_SAVAGE_MX;
-                snprintf (info->fix.id, 16, "Savage/IX-MV");
+                snprintf(info->fix.id, 16, "Savage/IX-MV");
                 break;
         case FB_ACCEL_SAVAGE_IX:
                 par->chip = S3_SAVAGE_MX;
-                snprintf (info->fix.id, 16, "Savage/IX");
+                snprintf(info->fix.id, 16, "Savage/IX");
                 break;
         case FB_ACCEL_PROSAVAGE_PM:
                 par->chip = S3_PROSAVAGE;
-                snprintf (info->fix.id, 16, "ProSavagePM");
+                snprintf(info->fix.id, 16, "ProSavagePM");
                 break;
         case FB_ACCEL_PROSAVAGE_KM:
                 par->chip = S3_PROSAVAGE;
-                snprintf (info->fix.id, 16, "ProSavageKM");
+                snprintf(info->fix.id, 16, "ProSavageKM");
                 break;
         case FB_ACCEL_S3TWISTER_P:
                 par->chip = S3_PROSAVAGE;
-                snprintf (info->fix.id, 16, "TwisterP");
+                snprintf(info->fix.id, 16, "TwisterP");
                 break;
         case FB_ACCEL_S3TWISTER_K:
                 par->chip = S3_PROSAVAGE;
-                snprintf (info->fix.id, 16, "TwisterK");
+                snprintf(info->fix.id, 16, "TwisterK");
                 break;
         case FB_ACCEL_PROSAVAGE_DDR:
                 par->chip = S3_PROSAVAGE;
-                snprintf (info->fix.id, 16, "ProSavageDDR");
+                snprintf(info->fix.id, 16, "ProSavageDDR");
                 break;
         case FB_ACCEL_PROSAVAGE_DDRK:
                 par->chip = S3_PROSAVAGE;
-                snprintf (info->fix.id, 16, "ProSavage8");
+                snprintf(info->fix.id, 16, "ProSavage8");
                 break;
         }
 
@@ -1960,7 +2132,7 @@ static int __devinit savage_init_fb_info (struct fb_info *info,
                 info->pixmap.buf_align = 4;
                 info->pixmap.access_align = 32;
 
-                err = fb_alloc_cmap (&info->cmap, NR_PALETTE, 0);
+                err = fb_alloc_cmap(&info->cmap, NR_PALETTE, 0);
                 if (!err)
                 info->flags |= FBINFO_HWACCEL_COPYAREA |
                                FBINFO_HWACCEL_FILLRECT |
@@ -1972,8 +2144,8 @@ static int __devinit savage_init_fb_info (struct fb_info *info,
 
 /* --------------------------------------------------------------------- */
 
-static int __devinit savagefb_probe (struct pci_dev* dev,
-                                     const struct pci_device_id* id)
+static int __devinit savagefb_probe(struct pci_dev* dev,
+                                    const struct pci_device_id* id)
 {
         struct fb_info *info;
         struct savagefb_par *par;
@@ -2085,12 +2257,12 @@ static int __devinit savagefb_probe (struct pci_dev* dev,
         fb_destroy_modedb(info->monspecs.modedb);
         info->monspecs.modedb = NULL;
 
-        err = register_framebuffer (info);
+        err = register_framebuffer(info);
         if (err < 0)
                 goto failed;
 
-        printk (KERN_INFO "fb: S3 %s frame buffer device\n",
-                info->fix.id);
+        printk(KERN_INFO "fb: S3 %s frame buffer device\n",
+               info->fix.id);
 
         /*
          * Our driver data
@@ -2103,10 +2275,10 @@ static int __devinit savagefb_probe (struct pci_dev* dev,
 #ifdef CONFIG_FB_SAVAGE_I2C
         savagefb_delete_i2c_busses(info);
 #endif
-        fb_alloc_cmap (&info->cmap, 0, 0);
+        fb_alloc_cmap(&info->cmap, 0, 0);
         savage_unmap_video(info);
  failed_video:
-        savage_unmap_mmio (info);
+        savage_unmap_mmio(info);
  failed_mmio:
         kfree(info->pixmap.addr);
  failed_init:
@@ -2117,7 +2289,7 @@ static int __devinit savagefb_probe (struct pci_dev* dev,
         return err;
 }
 
-static void __devexit savagefb_remove (struct pci_dev *dev)
+static void __devexit savagefb_remove(struct pci_dev *dev)
 {
         struct fb_info *info = pci_get_drvdata(dev);
 
@@ -2129,16 +2301,16 @@ static void __devexit savagefb_remove (struct pci_dev *dev)
                  * we will be leaving hooks that could cause
                  * oopsen laying around.
                  */
-                if (unregister_framebuffer (info))
-                        printk (KERN_WARNING "savagefb: danger danger! "
-                                "Oopsen imminent!\n");
+                if (unregister_framebuffer(info))
+                        printk(KERN_WARNING "savagefb: danger danger! "
+                               "Oopsen imminent!\n");
 
 #ifdef CONFIG_FB_SAVAGE_I2C
                 savagefb_delete_i2c_busses(info);
 #endif
-                fb_alloc_cmap (&info->cmap, 0, 0);
-                savage_unmap_video (info);
-                savage_unmap_mmio (info);
+                fb_alloc_cmap(&info->cmap, 0, 0);
+                savage_unmap_video(info);
+                savage_unmap_mmio(info);
                 kfree(info->pixmap.addr);
                 pci_release_regions(dev);
                 framebuffer_release(info);
@@ -2151,24 +2323,24 @@ static void __devexit savagefb_remove (struct pci_dev *dev)
         }
 }
 
-static int savagefb_suspend (struct pci_dev* dev, pm_message_t state)
+static int savagefb_suspend(struct pci_dev *dev, pm_message_t mesg)
 {
         struct fb_info *info = pci_get_drvdata(dev);
         struct savagefb_par *par = info->par;
 
         DBG("savagefb_suspend");
 
-
-        par->pm_state = state.event;
+        if (mesg.event == PM_EVENT_PRETHAW)
+                mesg.event = PM_EVENT_FREEZE;
+        par->pm_state = mesg.event;
+        dev->dev.power.power_state = mesg;
 
         /*
          * For PM_EVENT_FREEZE, do not power down so the console
          * can remain active.
          */
-        if (state.event == PM_EVENT_FREEZE) {
-                dev->dev.power.power_state = state;
+        if (mesg.event == PM_EVENT_FREEZE)
                 return 0;
-        }
 
         acquire_console_sem();
         fb_set_suspend(info, 1);
@@ -2177,16 +2349,17 @@ static int savagefb_suspend (struct pci_dev* dev, pm_message_t state)
                 info->fbops->fb_sync(info);
 
         savagefb_blank(FB_BLANK_POWERDOWN, info);
+        savage_set_default_par(par, &par->save);
         savage_disable_mmio(par);
         pci_save_state(dev);
         pci_disable_device(dev);
-        pci_set_power_state(dev, pci_choose_state(dev, state));
+        pci_set_power_state(dev, pci_choose_state(dev, mesg));
         release_console_sem();
 
         return 0;
 }
 
-static int savagefb_resume (struct pci_dev* dev)
+static int savagefb_resume(struct pci_dev* dev)
 {
         struct fb_info *info = pci_get_drvdata(dev);
         struct savagefb_par *par = info->par;
@@ -2210,15 +2383,15 @@ static int savagefb_resume (struct pci_dev* dev)
         pci_set_power_state(dev, PCI_D0);
         pci_restore_state(dev);
 
-        if(pci_enable_device(dev))
+        if (pci_enable_device(dev))
                 DBG("err");
 
         pci_set_master(dev);
         savage_enable_mmio(par);
         savage_init_hw(par);
-        savagefb_set_par (info);
+        savagefb_set_par(info);
+        fb_set_suspend(info, 0);
         savagefb_blank(FB_BLANK_UNBLANK, info);
-        fb_set_suspend (info, 0);
         release_console_sem();
 
         return 0;
@@ -2311,10 +2484,10 @@ static struct pci_driver savagefb_driver = {
 
 /* **************************** exit-time only **************************** */
 
-static void __exit savage_done (void)
+static void __exit savage_done(void)
 {
         DBG("savage_done");
-        pci_unregister_driver (&savagefb_driver);
+        pci_unregister_driver(&savagefb_driver);
 }
 
 
@@ -2345,7 +2518,7 @@ static int __init savagefb_init(void)
                 return -ENODEV;
 
         savagefb_setup(option);
-        return pci_register_driver (&savagefb_driver);
+        return pci_register_driver(&savagefb_driver);
 
 }
 
diff --git a/drivers/video/sgivwfb.c b/drivers/video/sgivwfb.c
index 2e6df1fcb2b9..ebb6756aea08 100644
--- a/drivers/video/sgivwfb.c
+++ b/drivers/video/sgivwfb.c
@@ -9,7 +9,6 @@
  *  more details.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
@@ -23,6 +22,8 @@
 #include <asm/io.h>
 #include <asm/mtrr.h>
 
+#include <setup_arch.h>
+
 #define INCLUDE_TIMING_TABLE_DATA
 #define DBE_REG_BASE par->regs
 #include <video/sgivw.h>
@@ -42,10 +43,6 @@ struct sgivw_par {
  *  The default can be overridden if the driver is compiled as a module
  */
 
-/* set by arch/i386/kernel/setup.c */
-extern unsigned long sgivwfb_mem_phys;
-extern unsigned long sgivwfb_mem_size;
-
 static int ypan = 0;
 static int ywrap = 0;
 
diff --git a/drivers/video/sis/init.h b/drivers/video/sis/init.h
index 634c0a9d219b..7ecab87cef02 100644
--- a/drivers/video/sis/init.h
+++ b/drivers/video/sis/init.h
@@ -73,7 +73,6 @@
 #ifdef SIS_CP
 #undef SIS_CP
 #endif
-#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/types.h>
 #include <asm/io.h>
diff --git a/drivers/video/sis/init301.c b/drivers/video/sis/init301.c
index c3e070a6effd..f13faddc6181 100644
--- a/drivers/video/sis/init301.c
+++ b/drivers/video/sis/init301.c
@@ -8043,8 +8043,8 @@ SiS_SetCHTVReg(struct SiS_Private *SiS_Pr, unsigned short ModeNo, unsigned short
       SiS_SetCH700x(SiS_Pr,0x01,0x28);
 
       /* Set video bandwidth
-            High bandwith Luma composite video filter(S0=1)
-            low bandwith Luma S-video filter (S2-1=00)
+            High bandwidth Luma composite video filter(S0=1)
+            low bandwidth Luma S-video filter (S2-1=00)
             disable peak filter in S-video channel (S3=0)
             high bandwidth Chroma Filter (S5-4=11)
             =00110001=0x31
diff --git a/drivers/video/sis/init301.h b/drivers/video/sis/init301.h
index f475b21a85cf..bc321dc57e92 100644
--- a/drivers/video/sis/init301.h
+++ b/drivers/video/sis/init301.h
@@ -67,7 +67,6 @@
 #ifdef SIS_CP
 #undef SIS_CP
 #endif
-#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/types.h>
 #include <asm/io.h>
diff --git a/drivers/video/sis/initextlfb.c b/drivers/video/sis/initextlfb.c
index cc856d90903c..09f5d758b6c0 100644
--- a/drivers/video/sis/initextlfb.c
+++ b/drivers/video/sis/initextlfb.c
@@ -30,7 +30,6 @@
 #include "vgatypes.h"
 #include "vstruct.h"
 
-#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/types.h>
 #include <linux/fb.h>
diff --git a/drivers/video/sis/osdef.h b/drivers/video/sis/osdef.h
index 841ca3190cd4..f59568020eb2 100644
--- a/drivers/video/sis/osdef.h
+++ b/drivers/video/sis/osdef.h
@@ -90,7 +90,6 @@
 /**********************************************************************/
 
 #ifdef SIS_LINUX_KERNEL
-#include <linux/config.h>
 #include <linux/version.h>
 
 #ifdef CONFIG_FB_SIS_300
diff --git a/drivers/video/sis/sis.h b/drivers/video/sis/sis.h
index 0b6e625d7331..a259446ca7fe 100644
--- a/drivers/video/sis/sis.h
+++ b/drivers/video/sis/sis.h
@@ -24,7 +24,6 @@
 #ifndef _SIS_H_
 #define _SIS_H_
 
-#include <linux/config.h>
 #include <linux/version.h>
 
 #include "osdef.h"
diff --git a/drivers/video/sis/sis_accel.c b/drivers/video/sis/sis_accel.c
index bab933e6c6a6..3b7ce032e2ed 100644
--- a/drivers/video/sis/sis_accel.c
+++ b/drivers/video/sis/sis_accel.c
@@ -28,7 +28,6 @@
  *                      for more information and updates)
  */
 
-#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c
index 8adf5bf91eee..895ebda7d9e3 100644
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
@@ -33,7 +33,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
@@ -45,7 +44,13 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17)
 #include <linux/tty.h>
+#else
+#include <linux/screen_info.h>
+#endif
+
 #include <linux/slab.h>
 #include <linux/fb.h>
 #include <linux/selection.h>
@@ -275,7 +280,7 @@ sisfb_search_mode(char *name, BOOLEAN quiet)
 static void __devinit
 sisfb_get_vga_mode_from_kernel(void)
 {
-#if (defined(__i386__) || defined(__x86_64__)) && defined(CONFIG_VIDEO_SELECT)
+#ifdef CONFIG_X86
         char mymode[32];
         int  mydepth = screen_info.lfb_depth;
 
diff --git a/drivers/video/skeletonfb.c b/drivers/video/skeletonfb.c
index 9b707771d757..bb96cb65fdaa 100644
--- a/drivers/video/skeletonfb.c
+++ b/drivers/video/skeletonfb.c
@@ -47,7 +47,6 @@
 #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>
@@ -906,11 +905,6 @@ static void __exit xxxfb_exit(void)
 }
 #endif
 
-MODULE_LICENSE("GPL");
-module_init(xxxfb_init);
-module_exit(xxxfb_exit);
-
-
     /*
      *  Setup
      */
diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c
index c44de90ca12e..dad54e73147b 100644
--- a/drivers/video/sstfb.c
+++ b/drivers/video/sstfb.c
@@ -82,7 +82,6 @@
  * Includes
  */
 
-#include <linux/config.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/drivers/video/stifb.c b/drivers/video/stifb.c
index 4a292aae6eb2..3e16e2d9d55d 100644
--- a/drivers/video/stifb.c
+++ b/drivers/video/stifb.c
@@ -54,7 +54,6 @@
 #undef DEBUG_STIFB_REGS         /* debug sti register accesses */
 
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/drivers/video/sun3fb.c b/drivers/video/sun3fb.c
index 9b36b9df535f..f80356dfa8e8 100644
--- a/drivers/video/sun3fb.c
+++ b/drivers/video/sun3fb.c
@@ -25,13 +25,11 @@
  *  more details.
  */
 
-#include <linux/config.h>
 #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/vmalloc.h>
 #include <linux/delay.h>
diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c
index 95b918229d9b..6990ab11cd06 100644
--- a/drivers/video/tcx.c
+++ b/drivers/video/tcx.c
@@ -1,6 +1,6 @@
 /* tcx.c: TCX frame buffer driver
  *
- * Copyright (C) 2003 David S. Miller (davem@redhat.com)
+ * Copyright (C) 2003, 2006 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1996,1998 Jakub Jelinek (jj@ultra.linux.cz)
  * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx)
  * Copyright (C) 1996 Eddie C. Dost (ecd@skynet.be)
@@ -19,8 +19,8 @@
 #include <linux/mm.h>
 
 #include <asm/io.h>
-#include <asm/sbus.h>
-#include <asm/oplib.h>
+#include <asm/prom.h>
+#include <asm/of_device.h>
 #include <asm/fbio.h>
 
 #include "sbuslib.h"
@@ -77,32 +77,32 @@ static struct fb_ops tcx_ops = {
 
 /* The contents are unknown */
 struct tcx_tec {
-        volatile u32 tec_matrix;
-        volatile u32 tec_clip;
-        volatile u32 tec_vdc;
+        u32 tec_matrix;
+        u32 tec_clip;
+        u32 tec_vdc;
 };
 
 struct tcx_thc {
-        volatile u32 thc_rev;
+        u32 thc_rev;
         u32 thc_pad0[511];
-        volatile u32 thc_hs;            /* hsync timing */
-        volatile u32 thc_hsdvs;
-        volatile u32 thc_hd;
-        volatile u32 thc_vs;            /* vsync timing */
-        volatile u32 thc_vd;
-        volatile u32 thc_refresh;
-        volatile u32 thc_misc;
+        u32 thc_hs;             /* hsync timing */
+        u32 thc_hsdvs;
+        u32 thc_hd;
+        u32 thc_vs;             /* vsync timing */
+        u32 thc_vd;
+        u32 thc_refresh;
+        u32 thc_misc;
         u32 thc_pad1[56];
-        volatile u32 thc_cursxy;        /* cursor x,y position (16 bits each) */
-        volatile u32 thc_cursmask[32];  /* cursor mask bits */
-        volatile u32 thc_cursbits[32];  /* what to show where mask enabled */
+        u32 thc_cursxy; /* cursor x,y position (16 bits each) */
+        u32 thc_cursmask[32];   /* cursor mask bits */
+        u32 thc_cursbits[32];   /* what to show where mask enabled */
 };
 
 struct bt_regs {
-        volatile u32 addr;
-        volatile u32 color_map;
-        volatile u32 control;
-        volatile u32 cursor;
+        u32 addr;
+        u32 color_map;
+        u32 control;
+        u32 cursor;
 };
 
 #define TCX_MMAP_ENTRIES 14
@@ -112,24 +112,23 @@ struct tcx_par {
         struct bt_regs          __iomem *bt;
         struct tcx_thc          __iomem *thc;
         struct tcx_tec          __iomem *tec;
-        volatile u32            __iomem *cplane;
+        u32                     __iomem *cplane;
 
         u32                     flags;
 #define TCX_FLAG_BLANKED        0x00000001
 
         unsigned long           physbase;
+        unsigned long           which_io;
         unsigned long           fbsize;
 
         struct sbus_mmap_map    mmap_map[TCX_MMAP_ENTRIES];
         int                     lowdepth;
-
-        struct sbus_dev         *sdev;
 };
 
 /* Reset control plane so that WID is 8-bit plane. */
 static void __tcx_set_control_plane (struct tcx_par *par)
 {
-        volatile u32 __iomem *p, *pend;
+        u32 __iomem *p, *pend;
         
         if (par->lowdepth)
                 return;
@@ -307,8 +306,7 @@ static int tcx_mmap(struct fb_info *info, struct vm_area_struct *vma)
 
         return sbusfb_mmap_helper(par->mmap_map,
                                   par->physbase, par->fbsize,
-                                  par->sdev->reg_addrs[0].which_io,
-                                  vma);
+                                  par->which_io, vma);
 }
 
 static int tcx_ioctl(struct fb_info *info, unsigned int cmd,
@@ -350,48 +348,71 @@ tcx_init_fix(struct fb_info *info, int linebytes)
 struct all_info {
         struct fb_info info;
         struct tcx_par par;
-        struct list_head list;
 };
-static LIST_HEAD(tcx_list);
 
-static void tcx_init_one(struct sbus_dev *sdev)
+static void tcx_unmap_regs(struct all_info *all)
 {
-        struct all_info *all;
-        int linebytes, i;
+        if (all->par.tec)
+                of_iounmap(all->par.tec, sizeof(struct tcx_tec));
+        if (all->par.thc)
+                of_iounmap(all->par.thc, sizeof(struct tcx_thc));
+        if (all->par.bt)
+                of_iounmap(all->par.bt, sizeof(struct bt_regs));
+        if (all->par.cplane)
+                of_iounmap(all->par.cplane, all->par.fbsize * sizeof(u32));
+        if (all->info.screen_base)
+                of_iounmap(all->info.screen_base, all->par.fbsize);
+}
 
-        all = kmalloc(sizeof(*all), GFP_KERNEL);
-        if (!all) {
-                printk(KERN_ERR "tcx: Cannot allocate memory.\n");
-                return;
-        }
-        memset(all, 0, sizeof(*all));
+static int __devinit tcx_init_one(struct of_device *op)
+{
+        struct device_node *dp = op->node;
+        struct all_info *all;
+        int linebytes, i, err;
 
-        INIT_LIST_HEAD(&all->list);
+        all = kzalloc(sizeof(*all), GFP_KERNEL);
+        if (!all)
+                return -ENOMEM;
 
         spin_lock_init(&all->par.lock);
-        all->par.sdev = sdev;
 
-        all->par.lowdepth = prom_getbool(sdev->prom_node, "tcx-8-bit");
+        all->par.lowdepth =
+                (of_find_property(dp, "tcx-8-bit", NULL) != NULL);
 
-        sbusfb_fill_var(&all->info.var, sdev->prom_node, 8);
+        sbusfb_fill_var(&all->info.var, dp->node, 8);
         all->info.var.red.length = 8;
         all->info.var.green.length = 8;
         all->info.var.blue.length = 8;
 
-        linebytes = prom_getintdefault(sdev->prom_node, "linebytes",
-                                       all->info.var.xres);
+        linebytes = of_getintprop_default(dp, "linebytes",
+                                          all->info.var.xres);
         all->par.fbsize = PAGE_ALIGN(linebytes * all->info.var.yres);
 
-        all->par.tec = sbus_ioremap(&sdev->resource[7], 0,
-                             sizeof(struct tcx_tec), "tcx tec");
-        all->par.thc = sbus_ioremap(&sdev->resource[9], 0,
-                             sizeof(struct tcx_thc), "tcx thc");
-        all->par.bt = sbus_ioremap(&sdev->resource[8], 0,
-                             sizeof(struct bt_regs), "tcx dac");
+        all->par.tec = of_ioremap(&op->resource[7], 0,
+                                  sizeof(struct tcx_tec), "tcx tec");
+        all->par.thc = of_ioremap(&op->resource[9], 0,
+                                  sizeof(struct tcx_thc), "tcx thc");
+        all->par.bt = of_ioremap(&op->resource[8], 0,
+                                 sizeof(struct bt_regs), "tcx dac");
+        all->info.screen_base = of_ioremap(&op->resource[0], 0,
+                                           all->par.fbsize, "tcx ram");
+        if (!all->par.tec || !all->par.thc ||
+            !all->par.bt || !all->info.screen_base) {
+                tcx_unmap_regs(all);
+                kfree(all);
+                return -ENOMEM;
+        }
+
         memcpy(&all->par.mmap_map, &__tcx_mmap_map, sizeof(all->par.mmap_map));
         if (!all->par.lowdepth) {
-                all->par.cplane = sbus_ioremap(&sdev->resource[4], 0,
-                                     all->par.fbsize * sizeof(u32), "tcx cplane");
+                all->par.cplane = of_ioremap(&op->resource[4], 0,
+                                             all->par.fbsize * sizeof(u32),
+                                             "tcx cplane");
+                if (!all->par.cplane) {
+                        tcx_unmap_regs(all);
+                        kfree(all);
+                        return -ENOMEM;
+                }
         } else {
                 all->par.mmap_map[1].size = SBUS_MMAP_EMPTY;
                 all->par.mmap_map[4].size = SBUS_MMAP_EMPTY;
@@ -400,6 +421,8 @@ static void tcx_init_one(struct sbus_dev *sdev)
         }
 
         all->par.physbase = 0;
+        all->par.which_io = op->resource[0].flags & IORESOURCE_BITS;
+
         for (i = 0; i < TCX_MMAP_ENTRIES; i++) {
                 int j;
 
@@ -416,18 +439,11 @@ static void tcx_init_one(struct sbus_dev *sdev)
                         j = i;
                         break;
                 };
-                all->par.mmap_map[i].poff = sdev->reg_addrs[j].phys_addr;
+                all->par.mmap_map[i].poff = op->resource[j].start;
         }
 
         all->info.flags = FBINFO_DEFAULT;
         all->info.fbops = &tcx_ops;
-#ifdef CONFIG_SPARC32
-        all->info.screen_base = (char __iomem *)
-                prom_getintdefault(sdev->prom_node, "address", 0);
-#endif
-        if (!all->info.screen_base)
-                all->info.screen_base = sbus_ioremap(&sdev->resource[0], 0,
-                                     all->par.fbsize, "tcx ram");
         all->info.par = &all->par;
 
         /* Initialize brooktree DAC. */
@@ -445,72 +461,88 @@ static void tcx_init_one(struct sbus_dev *sdev)
         tcx_blank(FB_BLANK_UNBLANK, &all->info);
 
         if (fb_alloc_cmap(&all->info.cmap, 256, 0)) {
-                printk(KERN_ERR "tcx: Could not allocate color map.\n");
+                tcx_unmap_regs(all);
                 kfree(all);
-                return;
+                return -ENOMEM;
         }
 
         fb_set_cmap(&all->info.cmap, &all->info);
         tcx_init_fix(&all->info, linebytes);
 
-        if (register_framebuffer(&all->info) < 0) {
-                printk(KERN_ERR "tcx: Could not register framebuffer.\n");
+        err = register_framebuffer(&all->info);
+        if (err < 0) {
                 fb_dealloc_cmap(&all->info.cmap);
+                tcx_unmap_regs(all);
                 kfree(all);
-                return;
+                return err;
         }
 
-        list_add(&all->list, &tcx_list);
+        dev_set_drvdata(&op->dev, all);
 
-        printk("tcx: %s at %lx:%lx, %s\n",
-               sdev->prom_name,
-               (long) sdev->reg_addrs[0].which_io,
-               (long) sdev->reg_addrs[0].phys_addr,
+        printk("%s: TCX at %lx:%lx, %s\n",
+               dp->full_name,
+               all->par.which_io,
+               op->resource[0].start,
                all->par.lowdepth ? "8-bit only" : "24-bit depth");
+
+        return 0;
 }
 
-int __init tcx_init(void)
+static int __devinit tcx_probe(struct of_device *dev, const struct of_device_id *match)
 {
-        struct sbus_bus *sbus;
-        struct sbus_dev *sdev;
+        struct of_device *op = to_of_device(&dev->dev);
 
-        if (fb_get_options("tcxfb", NULL))
-                return -ENODEV;
+        return tcx_init_one(op);
+}
 
-        for_all_sbusdev(sdev, sbus) {
-                if (!strcmp(sdev->prom_name, "SUNW,tcx"))
-                        tcx_init_one(sdev);
-        }
+static int __devexit tcx_remove(struct of_device *dev)
+{
+        struct all_info *all = dev_get_drvdata(&dev->dev);
+
+        unregister_framebuffer(&all->info);
+        fb_dealloc_cmap(&all->info.cmap);
+
+        tcx_unmap_regs(all);
+
+        kfree(all);
+
+        dev_set_drvdata(&dev->dev, NULL);
 
         return 0;
 }
 
-void __exit tcx_exit(void)
-{
-        struct list_head *pos, *tmp;
+static struct of_device_id tcx_match[] = {
+        {
+                .name = "SUNW,tcx",
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(of, tcx_match);
 
-        list_for_each_safe(pos, tmp, &tcx_list) {
-                struct all_info *all = list_entry(pos, typeof(*all), list);
+static struct of_platform_driver tcx_driver = {
+        .name           = "tcx",
+        .match_table    = tcx_match,
+        .probe          = tcx_probe,
+        .remove         = __devexit_p(tcx_remove),
+};
 
-                unregister_framebuffer(&all->info);
-                fb_dealloc_cmap(&all->info.cmap);
-                kfree(all);
-        }
+int __init tcx_init(void)
+{
+        if (fb_get_options("tcxfb", NULL))
+                return -ENODEV;
+
+        return of_register_driver(&tcx_driver, &of_bus_type);
 }
 
-int __init
-tcx_setup(char *arg)
+void __exit tcx_exit(void)
 {
-        /* No cmdline options yet... */
-        return 0;
+        of_unregister_driver(&tcx_driver);
 }
 
 module_init(tcx_init);
-
-#ifdef MODULE
 module_exit(tcx_exit);
-#endif
 
 MODULE_DESCRIPTION("framebuffer driver for TCX chipsets");
-MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
+MODULE_AUTHOR("David S. Miller <davem@davemloft.net>");
+MODULE_VERSION("2.0");
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c
index 5e5328d682db..689ce0270b81 100644
--- a/drivers/video/tdfxfb.c
+++ b/drivers/video/tdfxfb.c
@@ -58,13 +58,11 @@
  *
  */
 
-#include <linux/config.h>
 #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/interrupt.h>
diff --git a/drivers/video/tgafb.c b/drivers/video/tgafb.c
index 7398bd48ba6c..94fde625a6c0 100644
--- a/drivers/video/tgafb.c
+++ b/drivers/video/tgafb.c
@@ -17,7 +17,6 @@
 #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/init.h>
@@ -26,7 +25,6 @@
 #include <linux/selection.h>
 #include <asm/io.h>
 #include <video/tgafb.h>
-#include <linux/selection.h>
 
 /*
  * Local functions.
diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c
index 9ac2d3171187..14175cdb9c9c 100644
--- a/drivers/video/tridentfb.c
+++ b/drivers/video/tridentfb.c
@@ -15,7 +15,6 @@
  *      TGUI acceleration       
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/fb.h>
 #include <linux/init.h>
@@ -551,7 +550,7 @@ static inline void enable_mmio(void)
 #define crtc_unlock()   write3X4(CRTVSyncEnd, read3X4(CRTVSyncEnd) & 0x7F)
 
 /*  Return flat panel's maximum x resolution */
-static int __init get_nativex(void)
+static int __devinit get_nativex(void)
 {
         int x,y,tmp;
 
@@ -658,7 +657,7 @@ static void set_number_of_lines(int lines)
  * If we see that FP is active we assume we have one.
  * Otherwise we have a CRT display.User can override.
  */
-static unsigned int __init get_displaytype(void)
+static unsigned int __devinit get_displaytype(void)
 {
         if (fp)
                 return DISPLAY_FP;
@@ -668,7 +667,7 @@ static unsigned int __init get_displaytype(void)
 }
 
 /* Try detecting the video memory size */
-static unsigned int __init get_memsize(void)
+static unsigned int __devinit get_memsize(void)
 {
         unsigned char tmp, tmp2;
         unsigned int k;
diff --git a/drivers/video/tx3912fb.c b/drivers/video/tx3912fb.c
index d904da44e1aa..07389ba01eff 100644
--- a/drivers/video/tx3912fb.c
+++ b/drivers/video/tx3912fb.c
@@ -14,7 +14,6 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
-#include <linux/tty.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c
index 2bdeb4baa952..47f27924a7d7 100644
--- a/drivers/video/valkyriefb.c
+++ b/drivers/video/valkyriefb.c
@@ -39,13 +39,11 @@
  *  more details.
  */
 
-#include <linux/config.h>
 #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/vmalloc.h>
 #include <linux/delay.h>
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index b0b9acfdd430..2196448396ec 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -13,13 +13,13 @@
 #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/ioport.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/screen_info.h>
 
 #include <video/vga.h>
 #include <asm/io.h>
@@ -51,7 +51,7 @@ static int             inverse   = 0;
 static int             mtrr      = 0; /* disable mtrr */
 static int             vram_remap __initdata = 0; /* Set amount of memory to be used */
 static int             vram_total __initdata = 0; /* Set total amount of memory */
-static int             pmi_setpal = 0;  /* pmi for palette changes ??? */
+static int             pmi_setpal = 1;  /* pmi for palette changes ??? */
 static int             ypan       = 0;  /* 0..nothing, 1..ypan, 2..ywrap */
 static unsigned short  *pmi_base  = NULL;
 static void            (*pmi_start)(void);
@@ -80,15 +80,30 @@ static int vesafb_pan_display(struct fb_var_screeninfo *var,
         return 0;
 }
 
-static void vesa_setpalette(int regno, unsigned red, unsigned green,
+static int vesa_setpalette(int regno, unsigned red, unsigned green,
                             unsigned blue)
 {
         int shift = 16 - depth;
+        int err = -EINVAL;
+
+/*
+ * Try VGA registers first...
+ */
+        if (vga_compat) {
+                outb_p(regno,       dac_reg);
+                outb_p(red   >> shift, dac_val);
+                outb_p(green >> shift, dac_val);
+                outb_p(blue  >> shift, dac_val);
+                err = 0;
+        }
 
 #ifdef __i386__
-        struct { u_char blue, green, red, pad; } entry;
+/*
+ * Fallback to the PMI....
+ */
+        if (err && pmi_setpal) {
+                struct { u_char blue, green, red, pad; } entry;
 
-        if (pmi_setpal) {
                 entry.red   = red   >> shift;
                 entry.green = green >> shift;
                 entry.blue  = blue  >> shift;
@@ -102,26 +117,19 @@ static void vesa_setpalette(int regno, unsigned red, unsigned green,
                   "d" (regno),          /* EDX */
                   "D" (&entry),         /* EDI */
                   "S" (&pmi_pal));      /* ESI */
-                return;
+                err = 0;
         }
 #endif
 
-/*
- * without protected mode interface and if VGA compatible,
- * try VGA registers...
- */
-        if (vga_compat) {
-                outb_p(regno,       dac_reg);
-                outb_p(red   >> shift, dac_val);
-                outb_p(green >> shift, dac_val);
-                outb_p(blue  >> shift, dac_val);
-        }
+        return err;
 }
 
 static int vesafb_setcolreg(unsigned regno, unsigned red, unsigned green,
                             unsigned blue, unsigned transp,
                             struct fb_info *info)
 {
+        int err = 0;
+
         /*
          *  Set a single color register. The values supplied are
          *  already rounded down to the hardware's capabilities
@@ -133,7 +141,7 @@ static int vesafb_setcolreg(unsigned regno, unsigned red, unsigned green,
                 return 1;
 
         if (info->var.bits_per_pixel == 8)
-                vesa_setpalette(regno,red,green,blue);
+                err = vesa_setpalette(regno,red,green,blue);
         else if (regno < 16) {
                 switch (info->var.bits_per_pixel) {
                 case 16:
@@ -164,7 +172,7 @@ static int vesafb_setcolreg(unsigned regno, unsigned red, unsigned green,
                 }
         }
 
-        return 0;
+        return err;
 }
 
 static struct fb_ops vesafb_ops = {
@@ -460,9 +468,7 @@ static struct platform_driver vesafb_driver = {
         },
 };
 
-static struct platform_device vesafb_device = {
-        .name   = "vesafb",
-};
+static struct platform_device *vesafb_device;
 
 static int __init vesafb_init(void)
 {
@@ -475,10 +481,19 @@ static int __init vesafb_init(void)
         ret = platform_driver_register(&vesafb_driver);
 
         if (!ret) {
-                ret = platform_device_register(&vesafb_device);
-                if (ret)
+                vesafb_device = platform_device_alloc("vesafb", 0);
+
+                if (vesafb_device)
+                        ret = platform_device_add(vesafb_device);
+                else
+                        ret = -ENOMEM;
+
+                if (ret) {
+                        platform_device_put(vesafb_device);
                         platform_driver_unregister(&vesafb_driver);
+                }
         }
+
         return ret;
 }
 module_init(vesafb_init);
diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c
index 77eed1fd9943..a9b99b01bd8e 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/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
@@ -398,12 +397,6 @@ static int __init vfb_setup(char *options)
      *  Initialisation
      */
 
-static void vfb_platform_release(struct device *device)
-{
-        // This is called when the reference count goes to zero.
-        dev_err(device, "This driver is broken, please bug the authors so they will fix it.\n");
-}
-
 static int __init vfb_probe(struct platform_device *dev)
 {
         struct fb_info *info;
@@ -482,13 +475,7 @@ static struct platform_driver vfb_driver = {
         },
 };
 
-static struct platform_device vfb_device = {
-        .name   = "vfb",
-        .id     = 0,
-        .dev    = {
-                .release = vfb_platform_release,
-        }
-};
+static struct platform_device *vfb_device;
 
 static int __init vfb_init(void)
 {
@@ -508,10 +495,19 @@ static int __init vfb_init(void)
         ret = platform_driver_register(&vfb_driver);
 
         if (!ret) {
-                ret = platform_device_register(&vfb_device);
-                if (ret)
+                vfb_device = platform_device_alloc("vfb", 0);
+
+                if (vfb_device)
+                        ret = platform_device_add(vfb_device);
+                else
+                        ret = -ENOMEM;
+
+                if (ret) {
+                        platform_device_put(vfb_device);
                         platform_driver_unregister(&vfb_driver);
+                }
         }
+
         return ret;
 }
 
@@ -520,7 +516,7 @@ module_init(vfb_init);
 #ifdef MODULE
 static void __exit vfb_exit(void)
 {
-        platform_device_unregister(&vfb_device);
+        platform_device_unregister(vfb_device);
         platform_driver_unregister(&vfb_driver);
 }
 
diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c
index 4fd2a272e03d..43d5a6d9c4a6 100644
--- a/drivers/video/vga16fb.c
+++ b/drivers/video/vga16fb.c
@@ -15,13 +15,13 @@
 #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/ioport.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/screen_info.h>
 
 #include <asm/io.h>
 #include <video/vga.h>
@@ -1334,9 +1334,8 @@ static int vga16fb_setup(char *options)
 }
 #endif
 
-static int __init vga16fb_probe(struct device *device)
+static int __init vga16fb_probe(struct platform_device *dev)
 {
-        struct platform_device *dev = to_platform_device(device);
         struct fb_info *info;
         struct vga16fb_par *par;
         int i;
@@ -1403,7 +1402,7 @@ static int __init vga16fb_probe(struct device *device)
 
         printk(KERN_INFO "fb%d: %s frame buffer device\n",
                info->node, info->fix.id);
-        dev_set_drvdata(device, info);
+        platform_set_drvdata(dev, info);
 
         return 0;
 
@@ -1417,9 +1416,9 @@ static int __init vga16fb_probe(struct device *device)
         return ret;
 }
 
-static int vga16fb_remove(struct device *device)
+static int vga16fb_remove(struct platform_device *dev)
 {
-        struct fb_info *info = dev_get_drvdata(device);
+        struct fb_info *info = platform_get_drvdata(dev);
 
         if (info) {
                 unregister_framebuffer(info);
@@ -1432,16 +1431,15 @@ static int vga16fb_remove(struct device *device)
         return 0;
 }
 
-static struct device_driver vga16fb_driver = {
-        .name = "vga16fb",
-        .bus  = &platform_bus_type,
+static struct platform_driver vga16fb_driver = {
         .probe = vga16fb_probe,
         .remove = vga16fb_remove,
+        .driver = {
+                .name = "vga16fb",
+        },
 };
 
-static struct platform_device vga16fb_device = {
-        .name = "vga16fb",
-};
+static struct platform_device *vga16fb_device;
 
 static int __init vga16fb_init(void)
 {
@@ -1454,12 +1452,20 @@ static int __init vga16fb_init(void)
 
         vga16fb_setup(option);
 #endif
-        ret = driver_register(&vga16fb_driver);
+        ret = platform_driver_register(&vga16fb_driver);
 
         if (!ret) {
-                ret = platform_device_register(&vga16fb_device);
-                if (ret)
-                        driver_unregister(&vga16fb_driver);
+                vga16fb_device = platform_device_alloc("vga16fb", 0);
+
+                if (vga16fb_device)
+                        ret = platform_device_add(vga16fb_device);
+                else
+                        ret = -ENOMEM;
+
+                if (ret) {
+                        platform_device_put(vga16fb_device);
+                        platform_driver_unregister(&vga16fb_driver);
+                }
         }
 
         return ret;
@@ -1467,8 +1473,8 @@ static int __init vga16fb_init(void)
 
 static void __exit vga16fb_exit(void)
 {
-        platform_device_unregister(&vga16fb_device);
-        driver_unregister(&vga16fb_driver);
+        platform_device_unregister(vga16fb_device);
+        platform_driver_unregister(&vga16fb_driver);
 }
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/vgastate.c b/drivers/video/vgastate.c
index 15179ec62339..d94efafc77b5 100644
--- a/drivers/video/vgastate.c
+++ b/drivers/video/vgastate.c
@@ -13,7 +13,6 @@
  * archive for more details.  
  *
  */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/fb.h>
diff --git a/drivers/video/virgefb.c b/drivers/video/virgefb.c
index 5ea2345dab99..64378959dd7b 100644
--- a/drivers/video/virgefb.c
+++ b/drivers/video/virgefb.c
@@ -39,7 +39,6 @@
 #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/zorro.h>