219 files changed, 6870 insertions, 3121 deletions

diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 1bcecc7dd2ca..766bd25d3376 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -1710,7 +1710,6 @@ static int acpi_thermal_resume(struct acpi_device *device)
         return AE_OK;
 }
 
-#ifdef CONFIG_DMI
 static int thermal_act(const struct dmi_system_id *d) {
 
         if (act == 0) {
@@ -1785,7 +1784,6 @@ static struct dmi_system_id thermal_dmi_table[] __initdata = {
         },
         {}
 };
-#endif /* CONFIG_DMI */
 
 static int __init acpi_thermal_init(void)
 {
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index fddd346b1d57..853559e32315 100644
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -678,7 +678,7 @@ static unsigned int sata_fsl_dev_classify(struct ata_port *ap)
         return ata_dev_classify(&tf);
 }
 
-static int sata_fsl_prereset(struct ata_linke *link, unsigned long deadline)
+static int sata_fsl_prereset(struct ata_link *link, unsigned long deadline)
 {
         /* FIXME: Never skip softreset, sata_fsl_softreset() is
          * combination of soft and hard resets.  sata_fsl_softreset()
diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index 7bd76639544c..e8e38faeafd8 100644
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -319,7 +319,7 @@ out:
 
 #ifdef CONFIG_BLK_DEV_XIP
 static int brd_direct_access (struct block_device *bdev, sector_t sector,
-                        unsigned long *data)
+                        void **kaddr, unsigned long *pfn)
 {
         struct brd_device *brd = bdev->bd_disk->private_data;
         struct page *page;
@@ -333,7 +333,8 @@ static int brd_direct_access (struct block_device *bdev, sector_t sector,
         page = brd_insert_page(brd, sector);
         if (!page)
                 return -ENOMEM;
-        *data = (unsigned long)page_address(page);
+        *kaddr = page_address(page);
+        *pfn = page_to_pfn(page);
 
         return 0;
 }
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 2906ee7bd298..929d4fa73fd9 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -732,9 +732,16 @@ config NVRAM
           To compile this driver as a module, choose M here: the
           module will be called nvram.
 
+#
+# These legacy RTC drivers just cause too many conflicts with the generic
+# RTC framework ... let's not even try to coexist any more.
+#
+if RTC_LIB=n
+
 config RTC
         tristate "Enhanced Real Time Clock Support"
-        depends on !PPC && !PARISC && !IA64 && !M68K && !SPARC && !FRV && !ARM && !SUPERH && !S390 && !AVR32
+        depends on !PPC && !PARISC && !IA64 && !M68K && !SPARC && !FRV \
+                        && !ARM && !SUPERH && !S390 && !AVR32
         ---help---
           If you say Y here and create a character special file /dev/rtc with
           major number 10 and minor number 135 using mknod ("man mknod"), you
@@ -840,6 +847,8 @@ config DS1302
           will get access to the real time clock (or hardware clock) built
           into your computer.
 
+endif # RTC_LIB
+
 config COBALT_LCD
         bool "Support for Cobalt LCD"
         depends on MIPS_COBALT
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 4e84d233e5a2..583356426dfb 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -189,20 +189,20 @@ typedef struct _mgslpc_info {
 
         u32 pending_bh;
 
-        int bh_running;
-        int bh_requested;
+        bool bh_running;
+        bool bh_requested;
 
         int dcd_chkcount; /* check counts to prevent */
         int cts_chkcount; /* too many IRQs if a signal */
         int dsr_chkcount; /* is floating */
         int ri_chkcount;
 
-        int rx_enabled;
-        int rx_overflow;
+        bool rx_enabled;
+        bool rx_overflow;
 
-        int tx_enabled;
-        int tx_active;
-        int tx_aborting;
+        bool tx_enabled;
+        bool tx_active;
+        bool tx_aborting;
         u32 idle_mode;
 
         int if_mode; /* serial interface selection (RS-232, v.35 etc) */
@@ -216,12 +216,12 @@ typedef struct _mgslpc_info {
 
         unsigned char serial_signals;   /* current serial signal states */
 
-        char irq_occurred;              /* for diagnostics use */
+        bool irq_occurred;              /* for diagnostics use */
         char testing_irq;
         unsigned int init_error;        /* startup error (DIAGS)        */
 
         char flag_buf[MAX_ASYNC_BUFFER_SIZE];
-        BOOLEAN drop_rts_on_tx_done;
+        bool drop_rts_on_tx_done;
 
         struct  _input_signal_events    input_signal_events;
 
@@ -402,8 +402,8 @@ static void hdlcdev_exit(MGSLPC_INFO *info);
 
 static void trace_block(MGSLPC_INFO *info,const char* data, int count, int xmit);
 
-static BOOLEAN register_test(MGSLPC_INFO *info);
-static BOOLEAN irq_test(MGSLPC_INFO *info);
+static bool register_test(MGSLPC_INFO *info);
+static bool irq_test(MGSLPC_INFO *info);
 static int adapter_test(MGSLPC_INFO *info);
 
 static int claim_resources(MGSLPC_INFO *info);
@@ -411,7 +411,7 @@ static void release_resources(MGSLPC_INFO *info);
 static void mgslpc_add_device(MGSLPC_INFO *info);
 static void mgslpc_remove_device(MGSLPC_INFO *info);
 
-static int  rx_get_frame(MGSLPC_INFO *info);
+static bool rx_get_frame(MGSLPC_INFO *info);
 static void rx_reset_buffers(MGSLPC_INFO *info);
 static int  rx_alloc_buffers(MGSLPC_INFO *info);
 static void rx_free_buffers(MGSLPC_INFO *info);
@@ -719,7 +719,7 @@ static int mgslpc_resume(struct pcmcia_device *link)
 }
 
 
-static inline int mgslpc_paranoia_check(MGSLPC_INFO *info,
+static inline bool mgslpc_paranoia_check(MGSLPC_INFO *info,
                                         char *name, const char *routine)
 {
 #ifdef MGSLPC_PARANOIA_CHECK
@@ -730,17 +730,17 @@ static inline int mgslpc_paranoia_check(MGSLPC_INFO *info,
 
         if (!info) {
                 printk(badinfo, name, routine);
-                return 1;
+                return true;
         }
         if (info->magic != MGSLPC_MAGIC) {
                 printk(badmagic, name, routine);
-                return 1;
+                return true;
         }
 #else
         if (!info)
-                return 1;
+                return true;
 #endif
-        return 0;
+        return false;
 }
 
 
@@ -752,16 +752,16 @@ static inline int mgslpc_paranoia_check(MGSLPC_INFO *info,
 #define CMD_TXEOM       BIT1    // transmit end message
 #define CMD_TXRESET     BIT0    // transmit reset
 
-static BOOLEAN wait_command_complete(MGSLPC_INFO *info, unsigned char channel)
+static bool wait_command_complete(MGSLPC_INFO *info, unsigned char channel)
 {
         int i = 0;
         /* wait for command completion */
         while (read_reg(info, (unsigned char)(channel+STAR)) & BIT2) {
                 udelay(1);
                 if (i++ == 1000)
-                        return FALSE;
+                        return false;
         }
-        return TRUE;
+        return true;
 }
 
 static void issue_command(MGSLPC_INFO *info, unsigned char channel, unsigned char cmd)
@@ -825,8 +825,8 @@ static int bh_action(MGSLPC_INFO *info)
 
         if (!rc) {
                 /* Mark BH routine as complete */
-                info->bh_running   = 0;
-                info->bh_requested = 0;
+                info->bh_running = false;
+                info->bh_requested = false;
         }
 
         spin_unlock_irqrestore(&info->lock,flags);
@@ -846,7 +846,7 @@ static void bh_handler(struct work_struct *work)
                 printk( "%s(%d):bh_handler(%s) entry\n",
                         __FILE__,__LINE__,info->device_name);
 
-        info->bh_running = 1;
+        info->bh_running = true;
 
         while((action = bh_action(info)) != 0) {
 
@@ -913,7 +913,7 @@ static void rx_ready_hdlc(MGSLPC_INFO *info, int eom)
                 /* no more free buffers */
                 issue_command(info, CHA, CMD_RXRESET);
                 info->pending_bh |= BH_RECEIVE;
-                info->rx_overflow = 1;
+                info->rx_overflow = true;
                 info->icount.buf_overrun++;
                 return;
         }
@@ -1032,8 +1032,8 @@ static void tx_done(MGSLPC_INFO *info)
         if (!info->tx_active)
                 return;
 
-        info->tx_active = 0;
-        info->tx_aborting = 0;
+        info->tx_active = false;
+        info->tx_aborting = false;
 
         if (info->params.mode == MGSL_MODE_ASYNC)
                 return;
@@ -1047,7 +1047,7 @@ static void tx_done(MGSLPC_INFO *info)
                         info->serial_signals &= ~SerialSignal_RTS;
                         set_signals(info);
                 }
-                info->drop_rts_on_tx_done = 0;
+                info->drop_rts_on_tx_done = false;
         }
 
 #if SYNCLINK_GENERIC_HDLC
@@ -1081,7 +1081,7 @@ static void tx_ready(MGSLPC_INFO *info)
                         return;
                 }
                 if (!info->tx_count)
-                        info->tx_active = 0;
+                        info->tx_active = false;
         }
 
         if (!info->tx_count)
@@ -1261,7 +1261,7 @@ static irqreturn_t mgslpc_isr(int dummy, void *dev_id)
                 {
                         isr = read_reg16(info, CHA + ISR);
                         if (isr & IRQ_TIMER) {
-                                info->irq_occurred = 1;
+                                info->irq_occurred = true;
                                 irq_disable(info, CHA, IRQ_TIMER);
                         }
 
@@ -1318,7 +1318,7 @@ static irqreturn_t mgslpc_isr(int dummy, void *dev_id)
                         printk("%s(%d):%s queueing bh task.\n",
                                 __FILE__,__LINE__,info->device_name);
                 schedule_work(&info->task);
-                info->bh_requested = 1;
+                info->bh_requested = true;
         }
 
         spin_unlock(&info->lock);
@@ -1990,7 +1990,7 @@ static int tx_abort(MGSLPC_INFO * info)
                  * This results in underrun and abort transmission.
                  */
                 info->tx_count = info->tx_put = info->tx_get = 0;
-                info->tx_aborting = TRUE;
+                info->tx_aborting = true;
         }
         spin_unlock_irqrestore(&info->lock,flags);
         return 0;
@@ -2589,7 +2589,8 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
 {
         DECLARE_WAITQUEUE(wait, current);
         int             retval;
-        int             do_clocal = 0, extra_count = 0;
+        bool            do_clocal = false;
+        bool            extra_count = false;
         unsigned long   flags;
 
         if (debug_level >= DEBUG_LEVEL_INFO)
@@ -2604,7 +2605,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
         }
 
         if (tty->termios->c_cflag & CLOCAL)
-                do_clocal = 1;
+                do_clocal = true;
 
         /* Wait for carrier detect and the line to become
          * free (i.e., not in use by the callout).  While we are in
@@ -2622,7 +2623,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
 
         spin_lock_irqsave(&info->lock, flags);
         if (!tty_hung_up_p(filp)) {
-                extra_count = 1;
+                extra_count = true;
                 info->count--;
         }
         spin_unlock_irqrestore(&info->lock, flags);
@@ -3493,8 +3494,8 @@ static void rx_stop(MGSLPC_INFO *info)
         /* MODE:03 RAC Receiver Active, 0=inactive */
         clear_reg_bits(info, CHA + MODE, BIT3);
 
-        info->rx_enabled = 0;
-        info->rx_overflow = 0;
+        info->rx_enabled = false;
+        info->rx_overflow = false;
 }
 
 static void rx_start(MGSLPC_INFO *info)
@@ -3504,13 +3505,13 @@ static void rx_start(MGSLPC_INFO *info)
                          __FILE__,__LINE__, info->device_name );
 
         rx_reset_buffers(info);
-        info->rx_enabled = 0;
-        info->rx_overflow = 0;
+        info->rx_enabled = false;
+        info->rx_overflow = false;
 
         /* MODE:03 RAC Receiver Active, 1=active */
         set_reg_bits(info, CHA + MODE, BIT3);
 
-        info->rx_enabled = 1;
+        info->rx_enabled = true;
 }
 
 static void tx_start(MGSLPC_INFO *info)
@@ -3523,24 +3524,24 @@ static void tx_start(MGSLPC_INFO *info)
                 /* If auto RTS enabled and RTS is inactive, then assert */
                 /* RTS and set a flag indicating that the driver should */
                 /* negate RTS when the transmission completes. */
-                info->drop_rts_on_tx_done = 0;
+                info->drop_rts_on_tx_done = false;
 
                 if (info->params.flags & HDLC_FLAG_AUTO_RTS) {
                         get_signals(info);
                         if (!(info->serial_signals & SerialSignal_RTS)) {
                                 info->serial_signals |= SerialSignal_RTS;
                                 set_signals(info);
-                                info->drop_rts_on_tx_done = 1;
+                                info->drop_rts_on_tx_done = true;
                         }
                 }
 
                 if (info->params.mode == MGSL_MODE_ASYNC) {
                         if (!info->tx_active) {
-                                info->tx_active = 1;
+                                info->tx_active = true;
                                 tx_ready(info);
                         }
                 } else {
-                        info->tx_active = 1;
+                        info->tx_active = true;
                         tx_ready(info);
                         mod_timer(&info->tx_timer, jiffies +
                                         msecs_to_jiffies(5000));
@@ -3548,7 +3549,7 @@ static void tx_start(MGSLPC_INFO *info)
         }
 
         if (!info->tx_enabled)
-                info->tx_enabled = 1;
+                info->tx_enabled = true;
 }
 
 static void tx_stop(MGSLPC_INFO *info)
@@ -3559,8 +3560,8 @@ static void tx_stop(MGSLPC_INFO *info)
 
         del_timer(&info->tx_timer);
 
-        info->tx_enabled = 0;
-        info->tx_active  = 0;
+        info->tx_enabled = false;
+        info->tx_active = false;
 }
 
 /* Reset the adapter to a known state and prepare it for further use.
@@ -3860,19 +3861,19 @@ static void rx_reset_buffers(MGSLPC_INFO *info)
 /* Attempt to return a received HDLC frame
  * Only frames received without errors are returned.
  *
- * Returns 1 if frame returned, otherwise 0
+ * Returns true if frame returned, otherwise false
  */
-static int rx_get_frame(MGSLPC_INFO *info)
+static bool rx_get_frame(MGSLPC_INFO *info)
 {
         unsigned short status;
         RXBUF *buf;
         unsigned int framesize = 0;
         unsigned long flags;
         struct tty_struct *tty = info->tty;
-        int return_frame = 0;
+        bool return_frame = false;
 
         if (info->rx_frame_count == 0)
-                return 0;
+                return false;
 
         buf = (RXBUF*)(info->rx_buf + (info->rx_get * info->rx_buf_size));
 
@@ -3891,7 +3892,7 @@ static int rx_get_frame(MGSLPC_INFO *info)
                 else if (!(status & BIT5)) {
                         info->icount.rxcrc++;
                         if (info->params.crc_type & HDLC_CRC_RETURN_EX)
-                                return_frame = 1;
+                                return_frame = true;
                 }
                 framesize = 0;
 #if SYNCLINK_GENERIC_HDLC
@@ -3902,7 +3903,7 @@ static int rx_get_frame(MGSLPC_INFO *info)
                 }
 #endif
         } else
-                return_frame = 1;
+                return_frame = true;
 
         if (return_frame)
                 framesize = buf->count;
@@ -3945,16 +3946,16 @@ static int rx_get_frame(MGSLPC_INFO *info)
                 info->rx_get = 0;
         spin_unlock_irqrestore(&info->lock,flags);
 
-        return 1;
+        return true;
 }
 
-static BOOLEAN register_test(MGSLPC_INFO *info)
+static bool register_test(MGSLPC_INFO *info)
 {
         static unsigned char patterns[] =
             { 0x00, 0xff, 0xaa, 0x55, 0x69, 0x96, 0x0f };
         static unsigned int count = ARRAY_SIZE(patterns);
         unsigned int i;
-        BOOLEAN rc = TRUE;
+        bool rc = true;
         unsigned long flags;
 
         spin_lock_irqsave(&info->lock,flags);
@@ -3965,7 +3966,7 @@ static BOOLEAN register_test(MGSLPC_INFO *info)
                 write_reg(info, XAD2, patterns[(i + 1) % count]);
                 if ((read_reg(info, XAD1) != patterns[i]) ||
                     (read_reg(info, XAD2) != patterns[(i + 1) % count])) {
-                        rc = FALSE;
+                        rc = false;
                         break;
                 }
         }
@@ -3974,7 +3975,7 @@ static BOOLEAN register_test(MGSLPC_INFO *info)
         return rc;
 }
 
-static BOOLEAN irq_test(MGSLPC_INFO *info)
+static bool irq_test(MGSLPC_INFO *info)
 {
         unsigned long end_time;
         unsigned long flags;
@@ -3982,10 +3983,10 @@ static BOOLEAN irq_test(MGSLPC_INFO *info)
         spin_lock_irqsave(&info->lock,flags);
         reset_device(info);
 
-        info->testing_irq = TRUE;
+        info->testing_irq = true;
         hdlc_mode(info);
 
-        info->irq_occurred = FALSE;
+        info->irq_occurred = false;
 
         /* init hdlc mode */
 
@@ -4000,13 +4001,13 @@ static BOOLEAN irq_test(MGSLPC_INFO *info)
                 msleep_interruptible(10);
         }
 
-        info->testing_irq = FALSE;
+        info->testing_irq = false;
 
         spin_lock_irqsave(&info->lock,flags);
         reset_device(info);
         spin_unlock_irqrestore(&info->lock,flags);
 
-        return info->irq_occurred ? TRUE : FALSE;
+        return info->irq_occurred;
 }
 
 static int adapter_test(MGSLPC_INFO *info)
@@ -4079,7 +4080,7 @@ static void tx_timeout(unsigned long context)
                 info->icount.txtimeout++;
         }
         spin_lock_irqsave(&info->lock,flags);
-        info->tx_active = 0;
+        info->tx_active = false;
         info->tx_count = info->tx_put = info->tx_get = 0;
 
         spin_unlock_irqrestore(&info->lock,flags);
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index 5c3142b6f1fc..e2ec2ee4cf79 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -88,6 +88,7 @@
 
 #ifdef CONFIG_SPARC32
 #include <linux/pci.h>
+#include <linux/jiffies.h>
 #include <asm/ebus.h>
 
 static unsigned long rtc_port;
@@ -1316,7 +1317,8 @@ void rtc_get_rtc_time(struct rtc_time *rtc_tm)
          * Once the read clears, read the RTC time (again via ioctl). Easy.
          */
 
-        while (rtc_is_updating() != 0 && jiffies - uip_watchdog < 2*HZ/100)
+        while (rtc_is_updating() != 0 &&
+               time_before(jiffies, uip_watchdog + 2*HZ/100))
                 cpu_relax();
 
         /*
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index a3237d48a584..fadab1d9510f 100644
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -218,9 +218,9 @@ struct mgsl_struct {
 
         u32 pending_bh;
 
-        int bh_running;         /* Protection from multiple */
+        bool bh_running;                /* Protection from multiple */
         int isr_overflow;
-        int bh_requested;
+        bool bh_requested;
         
         int dcd_chkcount;               /* check counts to prevent */
         int cts_chkcount;               /* too many IRQs if a signal */
@@ -250,12 +250,12 @@ struct mgsl_struct {
         int tx_holding_count;           /* number of tx holding buffers waiting */
         struct tx_holding_buffer tx_holding_buffers[MAX_TX_HOLDING_BUFFERS];
 
-        int rx_enabled;
-        int rx_overflow;
-        int rx_rcc_underrun;
+        bool rx_enabled;
+        bool rx_overflow;
+        bool rx_rcc_underrun;
 
-        int tx_enabled;
-        int tx_active;
+        bool tx_enabled;
+        bool tx_active;
         u32 idle_mode;
 
         u16 cmr_value;
@@ -269,14 +269,14 @@ struct mgsl_struct {
 
         unsigned int io_base;           /* base I/O address of adapter */
         unsigned int io_addr_size;      /* size of the I/O address range */
-        int io_addr_requested;          /* nonzero if I/O address requested */
+        bool io_addr_requested;         /* true if I/O address requested */
         
         unsigned int irq_level;         /* interrupt level */
         unsigned long irq_flags;
-        int irq_requested;              /* nonzero if IRQ requested */
+        bool irq_requested;             /* true if IRQ requested */
         
         unsigned int dma_level;         /* DMA channel */
-        int dma_requested;              /* nonzero if dma channel requested */
+        bool dma_requested;             /* true if dma channel requested */
 
         u16 mbre_bit;
         u16 loopback_bits;
@@ -286,27 +286,27 @@ struct mgsl_struct {
 
         unsigned char serial_signals;   /* current serial signal states */
 
-        int irq_occurred;               /* for diagnostics use */
+        bool irq_occurred;              /* for diagnostics use */
         unsigned int init_error;        /* Initialization startup error                 (DIAGS) */
         int     fDiagnosticsmode;       /* Driver in Diagnostic mode?                   (DIAGS) */
 
         u32 last_mem_alloc;
         unsigned char* memory_base;     /* shared memory address (PCI only) */
         u32 phys_memory_base;
-        int shared_mem_requested;
+        bool shared_mem_requested;
 
         unsigned char* lcr_base;        /* local config registers (PCI only) */
         u32 phys_lcr_base;
         u32 lcr_offset;
-        int lcr_mem_requested;
+        bool lcr_mem_requested;
 
         u32 misc_ctrl_value;
         char flag_buf[MAX_ASYNC_BUFFER_SIZE];
         char char_buf[MAX_ASYNC_BUFFER_SIZE];   
-        BOOLEAN drop_rts_on_tx_done;
+        bool drop_rts_on_tx_done;
 
-        BOOLEAN loopmode_insert_requested;
-        BOOLEAN loopmode_send_done_requested;
+        bool loopmode_insert_requested;
+        bool loopmode_send_done_requested;
         
         struct  _input_signal_events    input_signal_events;
 
@@ -752,10 +752,10 @@ static void mgsl_trace_block(struct mgsl_struct *info,const char* data, int coun
 /*
  * Adapter diagnostic routines
  */
-static BOOLEAN mgsl_register_test( struct mgsl_struct *info );
-static BOOLEAN mgsl_irq_test( struct mgsl_struct *info );
-static BOOLEAN mgsl_dma_test( struct mgsl_struct *info );
-static BOOLEAN mgsl_memory_test( struct mgsl_struct *info );
+static bool mgsl_register_test( struct mgsl_struct *info );
+static bool mgsl_irq_test( struct mgsl_struct *info );
+static bool mgsl_dma_test( struct mgsl_struct *info );
+static bool mgsl_memory_test( struct mgsl_struct *info );
 static int mgsl_adapter_test( struct mgsl_struct *info );
 
 /*
@@ -770,8 +770,8 @@ static struct mgsl_struct* mgsl_allocate_device(void);
  * DMA buffer manupulation functions.
  */
 static void mgsl_free_rx_frame_buffers( struct mgsl_struct *info, unsigned int StartIndex, unsigned int EndIndex );
-static int  mgsl_get_rx_frame( struct mgsl_struct *info );
-static int  mgsl_get_raw_rx_frame( struct mgsl_struct *info );
+static bool mgsl_get_rx_frame( struct mgsl_struct *info );
+static bool mgsl_get_raw_rx_frame( struct mgsl_struct *info );
 static void mgsl_reset_rx_dma_buffers( struct mgsl_struct *info );
 static void mgsl_reset_tx_dma_buffers( struct mgsl_struct *info );
 static int num_free_tx_dma_buffers(struct mgsl_struct *info);
@@ -791,7 +791,7 @@ static int mgsl_alloc_intermediate_rxbuffer_memory(struct mgsl_struct *info);
 static void mgsl_free_intermediate_rxbuffer_memory(struct mgsl_struct *info);
 static int mgsl_alloc_intermediate_txbuffer_memory(struct mgsl_struct *info);
 static void mgsl_free_intermediate_txbuffer_memory(struct mgsl_struct *info);
-static int load_next_tx_holding_buffer(struct mgsl_struct *info);
+static bool load_next_tx_holding_buffer(struct mgsl_struct *info);
 static int save_tx_buffer_request(struct mgsl_struct *info,const char *Buffer, unsigned int BufferSize);
 
 /*
@@ -847,7 +847,7 @@ static int mgsl_wait_event(struct mgsl_struct * info, int __user *mask);
 static int mgsl_loopmode_send_done( struct mgsl_struct * info );
 
 /* set non-zero on successful registration with PCI subsystem */
-static int pci_registered;
+static bool pci_registered;
 
 /*
  * Global linked list of SyncLink devices
@@ -1054,8 +1054,8 @@ static int mgsl_bh_action(struct mgsl_struct *info)
 
         if (!rc) {
                 /* Mark BH routine as complete */
-                info->bh_running   = 0;
-                info->bh_requested = 0;
+                info->bh_running = false;
+                info->bh_requested = false;
         }
         
         spin_unlock_irqrestore(&info->irq_spinlock,flags);
@@ -1079,7 +1079,7 @@ static void mgsl_bh_handler(struct work_struct *work)
                 printk( "%s(%d):mgsl_bh_handler(%s) entry\n",
                         __FILE__,__LINE__,info->device_name);
         
-        info->bh_running = 1;
+        info->bh_running = true;
 
         while((action = mgsl_bh_action(info)) != 0) {
         
@@ -1113,7 +1113,7 @@ static void mgsl_bh_handler(struct work_struct *work)
 
 static void mgsl_bh_receive(struct mgsl_struct *info)
 {
-        int (*get_rx_frame)(struct mgsl_struct *info) =
+        bool (*get_rx_frame)(struct mgsl_struct *info) =
                 (info->params.mode == MGSL_MODE_HDLC ? mgsl_get_rx_frame : mgsl_get_raw_rx_frame);
 
         if ( debug_level >= DEBUG_LEVEL_BH )
@@ -1187,7 +1187,7 @@ static void mgsl_isr_receive_status( struct mgsl_struct *info )
                 usc_loopmode_active(info) )
         {
                 ++info->icount.rxabort;
-                info->loopmode_insert_requested = FALSE;
+                info->loopmode_insert_requested = false;
  
                 /* clear CMR:13 to start echoing RxD to TxD */
                 info->cmr_value &= ~BIT13;
@@ -1257,7 +1257,7 @@ static void mgsl_isr_transmit_status( struct mgsl_struct *info )
         else
                 info->icount.txunder++;
                         
-        info->tx_active = 0;
+        info->tx_active = false;
         info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
         del_timer(&info->tx_timer);     
         
@@ -1267,7 +1267,7 @@ static void mgsl_isr_transmit_status( struct mgsl_struct *info )
                         info->serial_signals &= ~SerialSignal_RTS;
                         usc_set_serial_signals( info );
                 }
-                info->drop_rts_on_tx_done = 0;
+                info->drop_rts_on_tx_done = false;
         }
 
 #if SYNCLINK_GENERIC_HDLC
@@ -1403,7 +1403,7 @@ static void mgsl_isr_io_pin( struct mgsl_struct *info )
                 usc_OutReg( info, SICR,
                         (unsigned short)(usc_InReg(info,SICR) & ~(SICR_TXC_ACTIVE+SICR_TXC_INACTIVE)) );
                 usc_UnlatchIostatusBits( info, MISCSTATUS_TXC_LATCHED );
-                info->irq_occurred = 1;
+                info->irq_occurred = true;
         }
 
 }       /* end of mgsl_isr_io_pin() */
@@ -1431,7 +1431,7 @@ static void mgsl_isr_transmit_data( struct mgsl_struct *info )
         if ( info->xmit_cnt )
                 usc_load_txfifo( info );
         else
-                info->tx_active = 0;
+                info->tx_active = false;
                 
         if (info->xmit_cnt < WAKEUP_CHARS)
                 info->pending_bh |= BH_TRANSMIT;
@@ -1568,7 +1568,7 @@ static void mgsl_isr_misc( struct mgsl_struct *info )
 
                 /* schedule BH handler to restart receiver */
                 info->pending_bh |= BH_RECEIVE;
-                info->rx_rcc_underrun = 1;
+                info->rx_rcc_underrun = true;
         }
 
         usc_ClearIrqPendingBits( info, MISC );
@@ -1626,7 +1626,7 @@ static void mgsl_isr_receive_dma( struct mgsl_struct *info )
         info->pending_bh |= BH_RECEIVE;
         
         if ( status & BIT3 ) {
-                info->rx_overflow = 1;
+                info->rx_overflow = true;
                 info->icount.buf_overrun++;
         }
 
@@ -1745,7 +1745,7 @@ static irqreturn_t mgsl_interrupt(int dummy, void *dev_id)
                         printk("%s(%d):%s queueing bh task.\n",
                                 __FILE__,__LINE__,info->device_name);
                 schedule_work(&info->task);
-                info->bh_requested = 1;
+                info->bh_requested = true;
         }
 
         spin_unlock(&info->irq_spinlock);
@@ -3303,7 +3303,8 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
 {
         DECLARE_WAITQUEUE(wait, current);
         int             retval;
-        int             do_clocal = 0, extra_count = 0;
+        bool            do_clocal = false;
+        bool            extra_count = false;
         unsigned long   flags;
         
         if (debug_level >= DEBUG_LEVEL_INFO)
@@ -3317,7 +3318,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
         }
 
         if (tty->termios->c_cflag & CLOCAL)
-                do_clocal = 1;
+                do_clocal = true;
 
         /* Wait for carrier detect and the line to become
          * free (i.e., not in use by the callout).  While we are in
@@ -3335,7 +3336,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
 
         spin_lock_irqsave(&info->irq_spinlock, flags);
         if (!tty_hung_up_p(filp)) {
-                extra_count = 1;
+                extra_count = true;
                 info->count--;
         }
         spin_unlock_irqrestore(&info->irq_spinlock, flags);
@@ -4043,13 +4044,13 @@ static void mgsl_free_intermediate_txbuffer_memory(struct mgsl_struct *info)
  *
  *      info            pointer to device instance data
  *
- * Return Value:        1 if next buffered tx request loaded
+ * Return Value:        true if next buffered tx request loaded
  *                      into adapter's tx dma buffer,
- *                      0 otherwise
+ *                      false otherwise
  */
-static int load_next_tx_holding_buffer(struct mgsl_struct *info)
+static bool load_next_tx_holding_buffer(struct mgsl_struct *info)
 {
-        int ret = 0;
+        bool ret = false;
 
         if ( info->tx_holding_count ) {
                 /* determine if we have enough tx dma buffers
@@ -4073,7 +4074,7 @@ static int load_next_tx_holding_buffer(struct mgsl_struct *info)
                         /* restart transmit timer */
                         mod_timer(&info->tx_timer, jiffies + msecs_to_jiffies(5000));
 
-                        ret = 1;
+                        ret = true;
                 }
         }
 
@@ -4119,7 +4120,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info)
                         __FILE__,__LINE__,info->device_name, info->io_base);
                 return -ENODEV;
         }
-        info->io_addr_requested = 1;
+        info->io_addr_requested = true;
         
         if ( request_irq(info->irq_level,mgsl_interrupt,info->irq_flags,
                 info->device_name, info ) < 0 ) {
@@ -4127,7 +4128,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info)
                         __FILE__,__LINE__,info->device_name, info->irq_level );
                 goto errout;
         }
-        info->irq_requested = 1;
+        info->irq_requested = true;
         
         if ( info->bus_type == MGSL_BUS_TYPE_PCI ) {
                 if (request_mem_region(info->phys_memory_base,0x40000,"synclink") == NULL) {
@@ -4135,13 +4136,13 @@ static int mgsl_claim_resources(struct mgsl_struct *info)
                                 __FILE__,__LINE__,info->device_name, info->phys_memory_base);
                         goto errout;
                 }
-                info->shared_mem_requested = 1;
+                info->shared_mem_requested = true;
                 if (request_mem_region(info->phys_lcr_base + info->lcr_offset,128,"synclink") == NULL) {
                         printk( "%s(%d):lcr mem addr conflict device %s Addr=%08X\n",
                                 __FILE__,__LINE__,info->device_name, info->phys_lcr_base + info->lcr_offset);
                         goto errout;
                 }
-                info->lcr_mem_requested = 1;
+                info->lcr_mem_requested = true;
 
                 info->memory_base = ioremap(info->phys_memory_base,0x40000);
                 if (!info->memory_base) {
@@ -4172,7 +4173,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info)
                         mgsl_release_resources( info );
                         return -ENODEV;
                 }
-                info->dma_requested = 1;
+                info->dma_requested = true;
 
                 /* ISA adapter uses bus master DMA */           
                 set_dma_mode(info->dma_level,DMA_MODE_CASCADE);
@@ -4200,12 +4201,12 @@ static void mgsl_release_resources(struct mgsl_struct *info)
                         
         if ( info->irq_requested ) {
                 free_irq(info->irq_level, info);
-                info->irq_requested = 0;
+                info->irq_requested = false;
         }
         if ( info->dma_requested ) {
                 disable_dma(info->dma_level);
                 free_dma(info->dma_level);
-                info->dma_requested = 0;
+                info->dma_requested = false;
         }
         mgsl_free_dma_buffers(info);
         mgsl_free_intermediate_rxbuffer_memory(info);
@@ -4213,15 +4214,15 @@ static void mgsl_release_resources(struct mgsl_struct *info)
         
         if ( info->io_addr_requested ) {
                 release_region(info->io_base,info->io_addr_size);
-                info->io_addr_requested = 0;
+                info->io_addr_requested = false;
         }
         if ( info->shared_mem_requested ) {
                 release_mem_region(info->phys_memory_base,0x40000);
-                info->shared_mem_requested = 0;
+                info->shared_mem_requested = false;
         }
         if ( info->lcr_mem_requested ) {
                 release_mem_region(info->phys_lcr_base + info->lcr_offset,128);
-                info->lcr_mem_requested = 0;
+                info->lcr_mem_requested = false;
         }
         if (info->memory_base){
                 iounmap(info->memory_base);
@@ -4486,7 +4487,7 @@ static int __init synclink_init(void)
         if ((rc = pci_register_driver(&synclink_pci_driver)) < 0)
                 printk("%s:failed to register PCI driver, error=%d\n",__FILE__,rc);
         else
-                pci_registered = 1;
+                pci_registered = true;
 
         if ((rc = mgsl_init_tty()) < 0)
                 goto error;
@@ -4679,7 +4680,7 @@ static u16 usc_InReg( struct mgsl_struct *info, u16 RegAddr )
 static void usc_set_sdlc_mode( struct mgsl_struct *info )
 {
         u16 RegValue;
-        int PreSL1660;
+        bool PreSL1660;
         
         /*
          * determine if the IUSC on the adapter is pre-SL1660. If
@@ -4692,11 +4693,7 @@ static void usc_set_sdlc_mode( struct mgsl_struct *info )
          */
         usc_OutReg(info,TMCR,0x1f);
         RegValue=usc_InReg(info,TMDR);
-        if ( RegValue == IUSC_PRE_SL1660 )
-                PreSL1660 = 1;
-        else
-                PreSL1660 = 0;
-        
+        PreSL1660 = (RegValue == IUSC_PRE_SL1660);
 
         if ( info->params.flags & HDLC_FLAG_HDLC_LOOPMODE )
         {
@@ -5382,9 +5379,9 @@ static void usc_process_rxoverrun_sync( struct mgsl_struct *info )
         int start_index;
         int end_index;
         int frame_start_index;
-        int start_of_frame_found = FALSE;
-        int end_of_frame_found = FALSE;
-        int reprogram_dma = FALSE;
+        bool start_of_frame_found = false;
+        bool end_of_frame_found = false;
+        bool reprogram_dma = false;
 
         DMABUFFERENTRY *buffer_list = info->rx_buffer_list;
         u32 phys_addr;
@@ -5410,9 +5407,9 @@ static void usc_process_rxoverrun_sync( struct mgsl_struct *info )
 
                 if ( !start_of_frame_found )
                 {
-                        start_of_frame_found = TRUE;
+                        start_of_frame_found = true;
                         frame_start_index = end_index;
-                        end_of_frame_found = FALSE;
+                        end_of_frame_found = false;
                 }
 
                 if ( buffer_list[end_index].status )
@@ -5423,8 +5420,8 @@ static void usc_process_rxoverrun_sync( struct mgsl_struct *info )
                         /* We want to leave the buffers for this frame intact. */
                         /* Move on to next possible frame. */
 
-                        start_of_frame_found = FALSE;
-                        end_of_frame_found = TRUE;
+                        start_of_frame_found = false;
+                        end_of_frame_found = true;
                 }
 
                 /* advance to next buffer entry in linked list */
@@ -5439,8 +5436,8 @@ static void usc_process_rxoverrun_sync( struct mgsl_struct *info )
                         /* completely screwed, reset all receive buffers! */
                         mgsl_reset_rx_dma_buffers( info );
                         frame_start_index = 0;
-                        start_of_frame_found = FALSE;
-                        reprogram_dma = TRUE;
+                        start_of_frame_found = false;
+                        reprogram_dma = true;
                         break;
                 }
         }
@@ -5466,7 +5463,7 @@ static void usc_process_rxoverrun_sync( struct mgsl_struct *info )
 
                 } while( start_index != end_index );
 
-                reprogram_dma = TRUE;
+                reprogram_dma = true;
         }
 
         if ( reprogram_dma )
@@ -5536,9 +5533,9 @@ static void usc_stop_receiver( struct mgsl_struct *info )
         usc_OutReg( info, CCSR, (u16)(usc_InReg(info,CCSR) | BIT13) );
         usc_RTCmd( info, RTCmd_PurgeRxFifo );
 
-        info->rx_enabled = 0;
-        info->rx_overflow = 0;
-        info->rx_rcc_underrun = 0;
+        info->rx_enabled = false;
+        info->rx_overflow = false;
+        info->rx_rcc_underrun = false;
         
 }       /* end of stop_receiver() */
 
@@ -5601,7 +5598,7 @@ static void usc_start_receiver( struct mgsl_struct *info )
 
         usc_OutReg( info, CCSR, 0x1020 );
 
-        info->rx_enabled = 1;
+        info->rx_enabled = true;
 
 }       /* end of usc_start_receiver() */
 
@@ -5628,14 +5625,14 @@ static void usc_start_transmitter( struct mgsl_struct *info )
                 /* RTS and set a flag indicating that the driver should */
                 /* negate RTS when the transmission completes. */
 
-                info->drop_rts_on_tx_done = 0;
+                info->drop_rts_on_tx_done = false;
 
                 if ( info->params.flags & HDLC_FLAG_AUTO_RTS ) {
                         usc_get_serial_signals( info );
                         if ( !(info->serial_signals & SerialSignal_RTS) ) {
                                 info->serial_signals |= SerialSignal_RTS;
                                 usc_set_serial_signals( info );
-                                info->drop_rts_on_tx_done = 1;
+                                info->drop_rts_on_tx_done = true;
                         }
                 }
 
@@ -5699,11 +5696,11 @@ static void usc_start_transmitter( struct mgsl_struct *info )
                         mod_timer(&info->tx_timer, jiffies +
                                         msecs_to_jiffies(5000));
                 }
-                info->tx_active = 1;
+                info->tx_active = true;
         }
 
         if ( !info->tx_enabled ) {
-                info->tx_enabled = 1;
+                info->tx_enabled = true;
                 if ( info->params.flags & HDLC_FLAG_AUTO_CTS )
                         usc_EnableTransmitter(info,ENABLE_AUTO_CTS);
                 else
@@ -5735,8 +5732,8 @@ static void usc_stop_transmitter( struct mgsl_struct *info )
         usc_DmaCmd( info, DmaCmd_ResetTxChannel );
         usc_RTCmd( info, RTCmd_PurgeTxFifo );
 
-        info->tx_enabled = 0;
-        info->tx_active  = 0;
+        info->tx_enabled = false;
+        info->tx_active = false;
 
 }       /* end of usc_stop_transmitter() */
 
@@ -6520,7 +6517,7 @@ static void mgsl_reset_rx_dma_buffers( struct mgsl_struct *info )
  */
 static void mgsl_free_rx_frame_buffers( struct mgsl_struct *info, unsigned int StartIndex, unsigned int EndIndex )
 {
-        int Done = 0;
+        bool Done = false;
         DMABUFFERENTRY *pBufEntry;
         unsigned int Index;
 
@@ -6534,7 +6531,7 @@ static void mgsl_free_rx_frame_buffers( struct mgsl_struct *info, unsigned int S
 
                 if ( Index == EndIndex ) {
                         /* This is the last buffer of the frame! */
-                        Done = 1;
+                        Done = true;
                 }
 
                 /* reset current buffer for reuse */
@@ -6559,18 +6556,18 @@ static void mgsl_free_rx_frame_buffers( struct mgsl_struct *info, unsigned int S
  *      receive DMA buffers. Only frames received without errors are returned.
  *
  * Arguments:           info    pointer to device extension
- * Return Value:        1 if frame returned, otherwise 0
+ * Return Value:        true if frame returned, otherwise false
  */
-static int mgsl_get_rx_frame(struct mgsl_struct *info)
+static bool mgsl_get_rx_frame(struct mgsl_struct *info)
 {
         unsigned int StartIndex, EndIndex;      /* index of 1st and last buffers of Rx frame */
         unsigned short status;
         DMABUFFERENTRY *pBufEntry;
         unsigned int framesize = 0;
-        int ReturnCode = 0;
+        bool ReturnCode = false;
         unsigned long flags;
         struct tty_struct *tty = info->tty;
-        int return_frame = 0;
+        bool return_frame = false;
         
         /*
          * current_rx_buffer points to the 1st buffer of the next available
@@ -6629,7 +6626,7 @@ static int mgsl_get_rx_frame(struct mgsl_struct *info)
                 else {
                         info->icount.rxcrc++;
                         if ( info->params.crc_type & HDLC_CRC_RETURN_EX )
-                                return_frame = 1;
+                                return_frame = true;
                 }
                 framesize = 0;
 #if SYNCLINK_GENERIC_HDLC
@@ -6640,7 +6637,7 @@ static int mgsl_get_rx_frame(struct mgsl_struct *info)
                 }
 #endif
         } else
-                return_frame = 1;
+                return_frame = true;
 
         if ( return_frame ) {
                 /* receive frame has no errors, get frame size.
@@ -6719,7 +6716,7 @@ static int mgsl_get_rx_frame(struct mgsl_struct *info)
         /* Free the buffers used by this frame. */
         mgsl_free_rx_frame_buffers( info, StartIndex, EndIndex );
 
-        ReturnCode = 1;
+        ReturnCode = true;
 
 Cleanup:
 
@@ -6758,15 +6755,15 @@ Cleanup:
  *      last Rx DMA buffer and return that last portion of the frame.
  *
  * Arguments:           info    pointer to device extension
- * Return Value:        1 if frame returned, otherwise 0
+ * Return Value:        true if frame returned, otherwise false
  */
-static int mgsl_get_raw_rx_frame(struct mgsl_struct *info)
+static bool mgsl_get_raw_rx_frame(struct mgsl_struct *info)
 {
         unsigned int CurrentIndex, NextIndex;
         unsigned short status;
         DMABUFFERENTRY *pBufEntry;
         unsigned int framesize = 0;
-        int ReturnCode = 0;
+        bool ReturnCode = false;
         unsigned long flags;
         struct tty_struct *tty = info->tty;
 
@@ -6891,7 +6888,7 @@ static int mgsl_get_raw_rx_frame(struct mgsl_struct *info)
                 /* Free the buffers used by this frame. */
                 mgsl_free_rx_frame_buffers( info, CurrentIndex, CurrentIndex );
 
-                ReturnCode = 1;
+                ReturnCode = true;
         }
 
 
@@ -7000,15 +6997,15 @@ static void mgsl_load_tx_dma_buffer(struct mgsl_struct *info,
  *      Performs a register test of the 16C32.
  *      
  * Arguments:           info    pointer to device instance data
- * Return Value:                TRUE if test passed, otherwise FALSE
+ * Return Value:                true if test passed, otherwise false
  */
-static BOOLEAN mgsl_register_test( struct mgsl_struct *info )
+static bool mgsl_register_test( struct mgsl_struct *info )
 {
         static unsigned short BitPatterns[] =
                 { 0x0000, 0xffff, 0xaaaa, 0x5555, 0x1234, 0x6969, 0x9696, 0x0f0f };
         static unsigned int Patterncount = ARRAY_SIZE(BitPatterns);
         unsigned int i;
-        BOOLEAN rc = TRUE;
+        bool rc = true;
         unsigned long flags;
 
         spin_lock_irqsave(&info->irq_spinlock,flags);
@@ -7019,10 +7016,10 @@ static BOOLEAN mgsl_register_test( struct mgsl_struct *info )
         if ( (usc_InReg( info, SICR ) != 0) ||
                   (usc_InReg( info, IVR  ) != 0) ||
                   (usc_InDmaReg( info, DIVR ) != 0) ){
-                rc = FALSE;
+                rc = false;
         }
 
-        if ( rc == TRUE ){
+        if ( rc ){
                 /* Write bit patterns to various registers but do it out of */
                 /* sync, then read back and verify values. */
 
@@ -7040,7 +7037,7 @@ static BOOLEAN mgsl_register_test( struct mgsl_struct *info )
                                   (usc_InReg( info, RCLR ) != BitPatterns[(i+3)%Patterncount]) ||
                                   (usc_InReg( info, RSR )  != BitPatterns[(i+4)%Patterncount]) ||
                                   (usc_InDmaReg( info, TBCR ) != BitPatterns[(i+5)%Patterncount]) ){
-                                rc = FALSE;
+                                rc = false;
                                 break;
                         }
                 }
@@ -7056,9 +7053,9 @@ static BOOLEAN mgsl_register_test( struct mgsl_struct *info )
 /* mgsl_irq_test()      Perform interrupt test of the 16C32.
  * 
  * Arguments:           info    pointer to device instance data
- * Return Value:        TRUE if test passed, otherwise FALSE
+ * Return Value:        true if test passed, otherwise false
  */
-static BOOLEAN mgsl_irq_test( struct mgsl_struct *info )
+static bool mgsl_irq_test( struct mgsl_struct *info )
 {
         unsigned long EndTime;
         unsigned long flags;
@@ -7068,10 +7065,10 @@ static BOOLEAN mgsl_irq_test( struct mgsl_struct *info )
 
         /*
          * Setup 16C32 to interrupt on TxC pin (14MHz clock) transition. 
-         * The ISR sets irq_occurred to 1. 
+         * The ISR sets irq_occurred to true.
          */
 
-        info->irq_occurred = FALSE;
+        info->irq_occurred = false;
 
         /* Enable INTEN gate for ISA adapter (Port 6, Bit12) */
         /* Enable INTEN (Port 6, Bit12) */
@@ -7097,10 +7094,7 @@ static BOOLEAN mgsl_irq_test( struct mgsl_struct *info )
         usc_reset(info);
         spin_unlock_irqrestore(&info->irq_spinlock,flags);
         
-        if ( !info->irq_occurred ) 
-                return FALSE;
-        else
-                return TRUE;
+        return info->irq_occurred;
 
 }       /* end of mgsl_irq_test() */
 
@@ -7111,16 +7105,16 @@ static BOOLEAN mgsl_irq_test( struct mgsl_struct *info )
  *      using single buffer DMA mode.
  *      
  * Arguments:           info    pointer to device instance data
- * Return Value:        TRUE if test passed, otherwise FALSE
+ * Return Value:        true if test passed, otherwise false
  */
-static BOOLEAN mgsl_dma_test( struct mgsl_struct *info )
+static bool mgsl_dma_test( struct mgsl_struct *info )
 {
         unsigned short FifoLevel;
         unsigned long phys_addr;
         unsigned int FrameSize;
         unsigned int i;
         char *TmpPtr;
-        BOOLEAN rc = TRUE;
+        bool rc = true;
         unsigned short status=0;
         unsigned long EndTime;
         unsigned long flags;
@@ -7233,7 +7227,7 @@ static BOOLEAN mgsl_dma_test( struct mgsl_struct *info )
 
         for(;;) {
                 if (time_after(jiffies, EndTime)) {
-                        rc = FALSE;
+                        rc = false;
                         break;
                 }
 
@@ -7289,7 +7283,7 @@ static BOOLEAN mgsl_dma_test( struct mgsl_struct *info )
 
         for(;;) {
                 if (time_after(jiffies, EndTime)) {
-                        rc = FALSE;
+                        rc = false;
                         break;
                 }
 
@@ -7309,7 +7303,7 @@ static BOOLEAN mgsl_dma_test( struct mgsl_struct *info )
         }
 
 
-        if ( rc == TRUE )
+        if ( rc )
         {
                 /* Enable 16C32 transmitter. */
 
@@ -7337,7 +7331,7 @@ static BOOLEAN mgsl_dma_test( struct mgsl_struct *info )
 
                 while ( !(status & (BIT6+BIT5+BIT4+BIT2+BIT1)) ) {
                         if (time_after(jiffies, EndTime)) {
-                                rc = FALSE;
+                                rc = false;
                                 break;
                         }
 
@@ -7348,13 +7342,13 @@ static BOOLEAN mgsl_dma_test( struct mgsl_struct *info )
         }
 
 
-        if ( rc == TRUE ){
+        if ( rc ){
                 /* CHECK FOR TRANSMIT ERRORS */
                 if ( status & (BIT5 + BIT1) ) 
-                        rc = FALSE;
+                        rc = false;
         }
 
-        if ( rc == TRUE ) {
+        if ( rc ) {
                 /* WAIT FOR RECEIVE COMPLETE */
 
                 /* Wait 100ms */
@@ -7364,7 +7358,7 @@ static BOOLEAN mgsl_dma_test( struct mgsl_struct *info )
                 status=info->rx_buffer_list[0].status;
                 while ( status == 0 ) {
                         if (time_after(jiffies, EndTime)) {
-                                rc = FALSE;
+                                rc = false;
                                 break;
                         }
                         status=info->rx_buffer_list[0].status;
@@ -7372,17 +7366,17 @@ static BOOLEAN mgsl_dma_test( struct mgsl_struct *info )
         }
 
 
-        if ( rc == TRUE ) {
+        if ( rc ) {
                 /* CHECK FOR RECEIVE ERRORS */
                 status = info->rx_buffer_list[0].status;
 
                 if ( status & (BIT8 + BIT3 + BIT1) ) {
                         /* receive error has occurred */
-                        rc = FALSE;
+                        rc = false;
                 } else {
                         if ( memcmp( info->tx_buffer_list[0].virt_addr ,
                                 info->rx_buffer_list[0].virt_addr, FrameSize ) ){
-                                rc = FALSE;
+                                rc = false;
                         }
                 }
         }
@@ -7445,9 +7439,9 @@ static int mgsl_adapter_test( struct mgsl_struct *info )
  *      Test the shared memory on a PCI adapter.
  * 
  * Arguments:           info    pointer to device instance data
- * Return Value:        TRUE if test passed, otherwise FALSE
+ * Return Value:        true if test passed, otherwise false
  */
-static BOOLEAN mgsl_memory_test( struct mgsl_struct *info )
+static bool mgsl_memory_test( struct mgsl_struct *info )
 {
         static unsigned long BitPatterns[] =
                 { 0x0, 0x55555555, 0xaaaaaaaa, 0x66666666, 0x99999999, 0xffffffff, 0x12345678 };
@@ -7457,7 +7451,7 @@ static BOOLEAN mgsl_memory_test( struct mgsl_struct *info )
         unsigned long * TestAddr;
 
         if ( info->bus_type != MGSL_BUS_TYPE_PCI )
-                return TRUE;
+                return true;
 
         TestAddr = (unsigned long *)info->memory_base;
 
@@ -7466,7 +7460,7 @@ static BOOLEAN mgsl_memory_test( struct mgsl_struct *info )
         for ( i = 0 ; i < Patterncount ; i++ ) {
                 *TestAddr = BitPatterns[i];
                 if ( *TestAddr != BitPatterns[i] )
-                        return FALSE;
+                        return false;
         }
 
         /* Test address lines with incrementing pattern over */
@@ -7481,13 +7475,13 @@ static BOOLEAN mgsl_memory_test( struct mgsl_struct *info )
 
         for ( i = 0 ; i < TestLimit ; i++ ) {
                 if ( *TestAddr != i * 4 )
-                        return FALSE;
+                        return false;
                 TestAddr++;
         }
 
         memset( info->memory_base, 0, SHARED_MEM_ADDRESS_SIZE );
 
-        return TRUE;
+        return true;
 
 }       /* End Of mgsl_memory_test() */
 
@@ -7604,7 +7598,7 @@ static void mgsl_tx_timeout(unsigned long context)
                 info->icount.txtimeout++;
         }
         spin_lock_irqsave(&info->irq_spinlock,flags);
-        info->tx_active = 0;
+        info->tx_active = false;
         info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
 
         if ( info->params.flags & HDLC_FLAG_HDLC_LOOPMODE )
@@ -7632,7 +7626,7 @@ static int mgsl_loopmode_send_done( struct mgsl_struct * info )
         spin_lock_irqsave(&info->irq_spinlock,flags);
         if (info->params.flags & HDLC_FLAG_HDLC_LOOPMODE) {
                 if (info->tx_active)
-                        info->loopmode_send_done_requested = TRUE;
+                        info->loopmode_send_done_requested = true;
                 else
                         usc_loopmode_send_done(info);
         }
@@ -7646,7 +7640,7 @@ static int mgsl_loopmode_send_done( struct mgsl_struct * info )
  */
 static void usc_loopmode_send_done( struct mgsl_struct * info )
 {
-        info->loopmode_send_done_requested = FALSE;
+        info->loopmode_send_done_requested = false;
         /* clear CMR:13 to 0 to start echoing RxData to TxData */
         info->cmr_value &= ~BIT13;                        
         usc_OutReg(info, CMR, info->cmr_value);
@@ -7668,7 +7662,7 @@ static void usc_loopmode_cancel_transmit( struct mgsl_struct * info )
  */
 static void usc_loopmode_insert_request( struct mgsl_struct * info )
 {
-        info->loopmode_insert_requested = TRUE;
+        info->loopmode_insert_requested = true;
  
         /* enable RxAbort irq. On next RxAbort, clear CMR:13 to
          * begin repeating TxData on RxData (complete insertion)
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
index 3c89266c8255..f3d8d72e5ea4 100644
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
@@ -117,7 +117,7 @@ static struct pci_driver pci_driver = {
         .remove         = __devexit_p(remove_one),
 };
 
-static int pci_registered;
+static bool pci_registered;
 
 /*
  * module configuration and status
@@ -289,12 +289,12 @@ struct slgt_info {
 
         struct work_struct task;
         u32 pending_bh;
-        int bh_requested;
-        int bh_running;
+        bool bh_requested;
+        bool bh_running;
 
         int isr_overflow;
-        int irq_requested;      /* nonzero if IRQ requested */
-        int irq_occurred;       /* for diagnostics use */
+        bool irq_requested;     /* true if IRQ requested */
+        bool irq_occurred;      /* for diagnostics use */
 
         /* device configuration */
 
@@ -304,7 +304,7 @@ struct slgt_info {
 
         unsigned char __iomem * reg_addr;  /* memory mapped registers address */
         u32 phys_reg_addr;
-        int reg_addr_requested;
+        bool reg_addr_requested;
 
         MGSL_PARAMS params;       /* communications parameters */
         u32 idle_mode;
@@ -315,11 +315,11 @@ struct slgt_info {
 
         /* device status */
 
-        int rx_enabled;
-        int rx_restart;
+        bool rx_enabled;
+        bool rx_restart;
 
-        int tx_enabled;
-        int tx_active;
+        bool tx_enabled;
+        bool tx_active;
 
         unsigned char signals;    /* serial signal states */
         int init_error;  /* initialization error */
@@ -329,7 +329,7 @@ struct slgt_info {
 
         char flag_buf[MAX_ASYNC_BUFFER_SIZE];
         char char_buf[MAX_ASYNC_BUFFER_SIZE];
-        BOOLEAN drop_rts_on_tx_done;
+        bool drop_rts_on_tx_done;
         struct  _input_signal_events    input_signal_events;
 
         int dcd_chkcount;       /* check counts to prevent */
@@ -467,8 +467,8 @@ static void rx_start(struct slgt_info *info);
 static void reset_rbufs(struct slgt_info *info);
 static void free_rbufs(struct slgt_info *info, unsigned int first, unsigned int last);
 static void rdma_reset(struct slgt_info *info);
-static int  rx_get_frame(struct slgt_info *info);
-static int  rx_get_buf(struct slgt_info *info);
+static bool rx_get_frame(struct slgt_info *info);
+static bool rx_get_buf(struct slgt_info *info);
 
 static void tx_start(struct slgt_info *info);
 static void tx_stop(struct slgt_info *info);
@@ -1968,8 +1968,8 @@ static int bh_action(struct slgt_info *info)
                 rc = BH_STATUS;
         } else {
                 /* Mark BH routine as complete */
-                info->bh_running   = 0;
-                info->bh_requested = 0;
+                info->bh_running = false;
+                info->bh_requested = false;
                 rc = 0;
         }
 
@@ -1988,7 +1988,7 @@ static void bh_handler(struct work_struct *work)
 
         if (!info)
                 return;
-        info->bh_running = 1;
+        info->bh_running = true;
 
         while((action = bh_action(info))) {
                 switch (action) {
@@ -2158,7 +2158,7 @@ static void isr_serial(struct slgt_info *info)
 
         wr_reg16(info, SSR, status); /* clear pending */
 
-        info->irq_occurred = 1;
+        info->irq_occurred = true;
 
         if (info->params.mode == MGSL_MODE_ASYNC) {
                 if (status & IRQ_TXIDLE) {
@@ -2225,7 +2225,7 @@ static void isr_rdma(struct slgt_info *info)
 
         if (status & (BIT5 + BIT4)) {
                 DBGISR(("%s isr_rdma rx_restart=1\n", info->device_name));
-                info->rx_restart = 1;
+                info->rx_restart = true;
         }
         info->pending_bh |= BH_RECEIVE;
 }
@@ -2276,14 +2276,14 @@ static void isr_txeom(struct slgt_info *info, unsigned short status)
                                 info->icount.txok++;
                 }
 
-                info->tx_active = 0;
+                info->tx_active = false;
                 info->tx_count = 0;
 
                 del_timer(&info->tx_timer);
 
                 if (info->params.mode != MGSL_MODE_ASYNC && info->drop_rts_on_tx_done) {
                         info->signals &= ~SerialSignal_RTS;
-                        info->drop_rts_on_tx_done = 0;
+                        info->drop_rts_on_tx_done = false;
                         set_signals(info);
                 }
 
@@ -2337,7 +2337,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
 
         while((gsr = rd_reg32(info, GSR) & 0xffffff00)) {
                 DBGISR(("%s gsr=%08x\n", info->device_name, gsr));
-                info->irq_occurred = 1;
+                info->irq_occurred = true;
                 for(i=0; i < info->port_count ; i++) {
                         if (info->port_array[i] == NULL)
                                 continue;
@@ -2374,7 +2374,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
                     !port->bh_requested) {
                         DBGISR(("%s bh queued\n", port->device_name));
                         schedule_work(&port->task);
-                        port->bh_requested = 1;
+                        port->bh_requested = true;
                 }
         }
 
@@ -3110,7 +3110,8 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
 {
         DECLARE_WAITQUEUE(wait, current);
         int             retval;
-        int             do_clocal = 0, extra_count = 0;
+        bool            do_clocal = false;
+        bool            extra_count = false;
         unsigned long   flags;
 
         DBGINFO(("%s block_til_ready\n", tty->driver->name));
@@ -3122,7 +3123,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
         }
 
         if (tty->termios->c_cflag & CLOCAL)
-                do_clocal = 1;
+                do_clocal = true;
 
         /* Wait for carrier detect and the line to become
          * free (i.e., not in use by the callout).  While we are in
@@ -3136,7 +3137,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
 
         spin_lock_irqsave(&info->lock, flags);
         if (!tty_hung_up_p(filp)) {
-                extra_count = 1;
+                extra_count = true;
                 info->count--;
         }
         spin_unlock_irqrestore(&info->lock, flags);
@@ -3321,7 +3322,7 @@ static int claim_resources(struct slgt_info *info)
                 goto errout;
         }
         else
-                info->reg_addr_requested = 1;
+                info->reg_addr_requested = true;
 
         info->reg_addr = ioremap(info->phys_reg_addr, SLGT_REG_SIZE);
         if (!info->reg_addr) {
@@ -3341,12 +3342,12 @@ static void release_resources(struct slgt_info *info)
 {
         if (info->irq_requested) {
                 free_irq(info->irq_level, info);
-                info->irq_requested = 0;
+                info->irq_requested = false;
         }
 
         if (info->reg_addr_requested) {
                 release_mem_region(info->phys_reg_addr, SLGT_REG_SIZE);
-                info->reg_addr_requested = 0;
+                info->reg_addr_requested = false;
         }
 
         if (info->reg_addr) {
@@ -3511,7 +3512,7 @@ static void device_init(int adapter_num, struct pci_dev *pdev)
                                 port_array[0]->device_name,
                                 port_array[0]->irq_level));
                 } else {
-                        port_array[0]->irq_requested = 1;
+                        port_array[0]->irq_requested = true;
                         adapter_test(port_array[0]);
                         for (i=1 ; i < port_count ; i++) {
                                 port_array[i]->init_error = port_array[0]->init_error;
@@ -3654,7 +3655,7 @@ static int __init slgt_init(void)
                 printk("%s pci_register_driver error=%d\n", driver_name, rc);
                 goto error;
         }
-        pci_registered = 1;
+        pci_registered = true;
 
         if (!slgt_device_list)
                 printk("%s no devices found\n",driver_name);
@@ -3812,8 +3813,8 @@ static void rx_stop(struct slgt_info *info)
 
         rdma_reset(info);
 
-        info->rx_enabled = 0;
-        info->rx_restart = 0;
+        info->rx_enabled = false;
+        info->rx_restart = false;
 }
 
 static void rx_start(struct slgt_info *info)
@@ -3849,8 +3850,8 @@ static void rx_start(struct slgt_info *info)
         /* enable receiver */
         wr_reg16(info, RCR, (unsigned short)(rd_reg16(info, RCR) | BIT1));
 
-        info->rx_restart = 0;
-        info->rx_enabled = 1;
+        info->rx_restart = false;
+        info->rx_enabled = true;
 }
 
 static void tx_start(struct slgt_info *info)
@@ -3858,11 +3859,11 @@ static void tx_start(struct slgt_info *info)
         if (!info->tx_enabled) {
                 wr_reg16(info, TCR,
                          (unsigned short)((rd_reg16(info, TCR) | BIT1) & ~BIT2));
-                info->tx_enabled = TRUE;
+                info->tx_enabled = true;
         }
 
         if (info->tx_count) {
-                info->drop_rts_on_tx_done = 0;
+                info->drop_rts_on_tx_done = false;
 
                 if (info->params.mode != MGSL_MODE_ASYNC) {
                         if (info->params.flags & HDLC_FLAG_AUTO_RTS) {
@@ -3870,7 +3871,7 @@ static void tx_start(struct slgt_info *info)
                                 if (!(info->signals & SerialSignal_RTS)) {
                                         info->signals |= SerialSignal_RTS;
                                         set_signals(info);
-                                        info->drop_rts_on_tx_done = 1;
+                                        info->drop_rts_on_tx_done = true;
                                 }
                         }
 
@@ -3888,7 +3889,7 @@ static void tx_start(struct slgt_info *info)
                         wr_reg16(info, SSR, IRQ_TXIDLE);
                 }
                 tdma_start(info);
-                info->tx_active = 1;
+                info->tx_active = true;
         }
 }
 
@@ -3949,8 +3950,8 @@ static void tx_stop(struct slgt_info *info)
 
         reset_tbufs(info);
 
-        info->tx_enabled = 0;
-        info->tx_active  = 0;
+        info->tx_enabled = false;
+        info->tx_active = false;
 }
 
 static void reset_port(struct slgt_info *info)
@@ -4470,14 +4471,13 @@ static void reset_rbufs(struct slgt_info *info)
 /*
  * pass receive HDLC frame to upper layer
  *
- * return 1 if frame available, otherwise 0
+ * return true if frame available, otherwise false
  */
-static int rx_get_frame(struct slgt_info *info)
+static bool rx_get_frame(struct slgt_info *info)
 {
         unsigned int start, end;
         unsigned short status;
         unsigned int framesize = 0;
-        int rc = 0;
         unsigned long flags;
         struct tty_struct *tty = info->tty;
         unsigned char addr_field = 0xff;
@@ -4601,23 +4601,23 @@ check_again:
                 }
         }
         free_rbufs(info, start, end);
-        rc = 1;
+        return true;
 
 cleanup:
-        return rc;
+        return false;
 }
 
 /*
  * pass receive buffer (RAW synchronous mode) to tty layer
- * return 1 if buffer available, otherwise 0
+ * return true if buffer available, otherwise false
  */
-static int rx_get_buf(struct slgt_info *info)
+static bool rx_get_buf(struct slgt_info *info)
 {
         unsigned int i = info->rbuf_current;
         unsigned int count;
 
         if (!desc_complete(info->rbufs[i]))
-                return 0;
+                return false;
         count = desc_count(info->rbufs[i]);
         switch(info->params.mode) {
         case MGSL_MODE_MONOSYNC:
@@ -4633,7 +4633,7 @@ static int rx_get_buf(struct slgt_info *info)
                 ldisc_receive_buf(info->tty, info->rbufs[i].buf,
                                   info->flag_buf, count);
         free_rbufs(info, i, i);
-        return 1;
+        return true;
 }
 
 static void reset_tbufs(struct slgt_info *info)
@@ -4758,7 +4758,7 @@ static int irq_test(struct slgt_info *info)
 
         /* assume failure */
         info->init_error = DiagStatus_IrqFailure;
-        info->irq_occurred = FALSE;
+        info->irq_occurred = false;
 
         spin_unlock_irqrestore(&info->lock, flags);
 
@@ -4891,7 +4891,7 @@ static void tx_timeout(unsigned long context)
                 info->icount.txtimeout++;
         }
         spin_lock_irqsave(&info->lock,flags);
-        info->tx_active = 0;
+        info->tx_active = false;
         info->tx_count = 0;
         spin_unlock_irqrestore(&info->lock,flags);
 
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c
index c96062ea72b4..e98c3e6f8216 100644
--- a/drivers/char/synclinkmp.c
+++ b/drivers/char/synclinkmp.c
@@ -188,9 +188,9 @@ typedef struct _synclinkmp_info {
 
         u32 pending_bh;
 
-        int bh_running;                         /* Protection from multiple */
+        bool bh_running;                                /* Protection from multiple */
         int isr_overflow;
-        int bh_requested;
+        bool bh_requested;
 
         int dcd_chkcount;                       /* check counts to prevent */
         int cts_chkcount;                       /* too many IRQs if a signal */
@@ -213,11 +213,11 @@ typedef struct _synclinkmp_info {
         unsigned char *tmp_rx_buf;
         unsigned int tmp_rx_buf_count;
 
-        int rx_enabled;
-        int rx_overflow;
+        bool rx_enabled;
+        bool rx_overflow;
 
-        int tx_enabled;
-        int tx_active;
+        bool tx_enabled;
+        bool tx_active;
         u32 idle_mode;
 
         unsigned char ie0_value;
@@ -238,13 +238,13 @@ typedef struct _synclinkmp_info {
 
         unsigned int irq_level;                 /* interrupt level */
         unsigned long irq_flags;
-        int irq_requested;                      /* nonzero if IRQ requested */
+        bool irq_requested;                     /* true if IRQ requested */
 
         MGSL_PARAMS params;                     /* communications parameters */
 
         unsigned char serial_signals;           /* current serial signal states */
 
-        int irq_occurred;                       /* for diagnostics use */
+        bool irq_occurred;                      /* for diagnostics use */
         unsigned int init_error;                /* Initialization startup error */
 
         u32 last_mem_alloc;
@@ -255,7 +255,7 @@ typedef struct _synclinkmp_info {
         unsigned char* sca_base;                /* HD64570 SCA Memory address */
         u32 phys_sca_base;
         u32 sca_offset;
-        int sca_base_requested;
+        bool sca_base_requested;
 
         unsigned char* lcr_base;                /* local config registers (PCI only) */
         u32 phys_lcr_base;
@@ -265,12 +265,12 @@ typedef struct _synclinkmp_info {
         unsigned char* statctrl_base;           /* status/control register memory */
         u32 phys_statctrl_base;
         u32 statctrl_offset;
-        int sca_statctrl_requested;
+        bool sca_statctrl_requested;
 
         u32 misc_ctrl_value;
         char flag_buf[MAX_ASYNC_BUFFER_SIZE];
         char char_buf[MAX_ASYNC_BUFFER_SIZE];
-        BOOLEAN drop_rts_on_tx_done;
+        bool drop_rts_on_tx_done;
 
         struct  _input_signal_events    input_signal_events;
 
@@ -571,12 +571,12 @@ static void shutdown(SLMP_INFO *info);
 static void program_hw(SLMP_INFO *info);
 static void change_params(SLMP_INFO *info);
 
-static int  init_adapter(SLMP_INFO *info);
-static int  register_test(SLMP_INFO *info);
-static int  irq_test(SLMP_INFO *info);
-static int  loopback_test(SLMP_INFO *info);
+static bool init_adapter(SLMP_INFO *info);
+static bool register_test(SLMP_INFO *info);
+static bool irq_test(SLMP_INFO *info);
+static bool loopback_test(SLMP_INFO *info);
 static int  adapter_test(SLMP_INFO *info);
-static int  memory_test(SLMP_INFO *info);
+static bool memory_test(SLMP_INFO *info);
 
 static void reset_adapter(SLMP_INFO *info);
 static void reset_port(SLMP_INFO *info);
@@ -587,7 +587,7 @@ static void rx_stop(SLMP_INFO *info);
 static void rx_start(SLMP_INFO *info);
 static void rx_reset_buffers(SLMP_INFO *info);
 static void rx_free_frame_buffers(SLMP_INFO *info, unsigned int first, unsigned int last);
-static int  rx_get_frame(SLMP_INFO *info);
+static bool rx_get_frame(SLMP_INFO *info);
 
 static void tx_start(SLMP_INFO *info);
 static void tx_stop(SLMP_INFO *info);
@@ -1473,7 +1473,7 @@ static inline int line_info(char *buf, SLMP_INFO *info)
 
 /* Called to print information about devices
  */
-int read_proc(char *page, char **start, off_t off, int count,
+static int read_proc(char *page, char **start, off_t off, int count,
               int *eof, void *data)
 {
         int len = 0, l;
@@ -2024,7 +2024,7 @@ static void hdlcdev_exit(SLMP_INFO *info)
 /* Return next bottom half action to perform.
  * Return Value:        BH action code or 0 if nothing to do.
  */
-int bh_action(SLMP_INFO *info)
+static int bh_action(SLMP_INFO *info)
 {
         unsigned long flags;
         int rc = 0;
@@ -2044,8 +2044,8 @@ int bh_action(SLMP_INFO *info)
 
         if (!rc) {
                 /* Mark BH routine as complete */
-                info->bh_running   = 0;
-                info->bh_requested = 0;
+                info->bh_running = false;
+                info->bh_requested = false;
         }
 
         spin_unlock_irqrestore(&info->lock,flags);
@@ -2055,7 +2055,7 @@ int bh_action(SLMP_INFO *info)
 
 /* Perform bottom half processing of work items queued by ISR.
  */
-void bh_handler(struct work_struct *work)
+static void bh_handler(struct work_struct *work)
 {
         SLMP_INFO *info = container_of(work, SLMP_INFO, task);
         int action;
@@ -2067,7 +2067,7 @@ void bh_handler(struct work_struct *work)
                 printk( "%s(%d):%s bh_handler() entry\n",
                         __FILE__,__LINE__,info->device_name);
 
-        info->bh_running = 1;
+        info->bh_running = true;
 
         while((action = bh_action(info)) != 0) {
 
@@ -2100,7 +2100,7 @@ void bh_handler(struct work_struct *work)
                         __FILE__,__LINE__,info->device_name);
 }
 
-void bh_receive(SLMP_INFO *info)
+static void bh_receive(SLMP_INFO *info)
 {
         if ( debug_level >= DEBUG_LEVEL_BH )
                 printk( "%s(%d):%s bh_receive()\n",
@@ -2109,7 +2109,7 @@ void bh_receive(SLMP_INFO *info)
         while( rx_get_frame(info) );
 }
 
-void bh_transmit(SLMP_INFO *info)
+static void bh_transmit(SLMP_INFO *info)
 {
         struct tty_struct *tty = info->tty;
 
@@ -2121,7 +2121,7 @@ void bh_transmit(SLMP_INFO *info)
                 tty_wakeup(tty);
 }
 
-void bh_status(SLMP_INFO *info)
+static void bh_status(SLMP_INFO *info)
 {
         if ( debug_level >= DEBUG_LEVEL_BH )
                 printk( "%s(%d):%s bh_status() entry\n",
@@ -2133,7 +2133,7 @@ void bh_status(SLMP_INFO *info)
         info->cts_chkcount = 0;
 }
 
-void isr_timer(SLMP_INFO * info)
+static void isr_timer(SLMP_INFO * info)
 {
         unsigned char timer = (info->port_num & 1) ? TIMER2 : TIMER0;
 
@@ -2152,14 +2152,14 @@ void isr_timer(SLMP_INFO * info)
          */
         write_reg(info, (unsigned char)(timer + TMCS), 0);
 
-        info->irq_occurred = TRUE;
+        info->irq_occurred = true;
 
         if ( debug_level >= DEBUG_LEVEL_ISR )
                 printk("%s(%d):%s isr_timer()\n",
                         __FILE__,__LINE__,info->device_name);
 }
 
-void isr_rxint(SLMP_INFO * info)
+static void isr_rxint(SLMP_INFO * info)
 {
         struct tty_struct *tty = info->tty;
         struct  mgsl_icount *icount = &info->icount;
@@ -2218,7 +2218,7 @@ void isr_rxint(SLMP_INFO * info)
 /*
  * handle async rx data interrupts
  */
-void isr_rxrdy(SLMP_INFO * info)
+static void isr_rxrdy(SLMP_INFO * info)
 {
         u16 status;
         unsigned char DataByte;
@@ -2232,7 +2232,7 @@ void isr_rxrdy(SLMP_INFO * info)
         while((status = read_reg(info,CST0)) & BIT0)
         {
                 int flag = 0;
-                int over = 0;
+                bool over = false;
                 DataByte = read_reg(info,TRB);
 
                 icount->rx++;
@@ -2265,7 +2265,7 @@ void isr_rxrdy(SLMP_INFO * info)
                                          * reported immediately, and doesn't
                                          * affect the current character
                                          */
-                                        over = 1;
+                                        over = true;
                                 }
                         }
                 }       /* end of if (error) */
@@ -2318,14 +2318,14 @@ static void isr_txeom(SLMP_INFO * info, unsigned char status)
                                 info->icount.txok++;
                 }
 
-                info->tx_active = 0;
+                info->tx_active = false;
                 info->tx_count = info->tx_put = info->tx_get = 0;
 
                 del_timer(&info->tx_timer);
 
                 if (info->params.mode != MGSL_MODE_ASYNC && info->drop_rts_on_tx_done ) {
                         info->serial_signals &= ~SerialSignal_RTS;
-                        info->drop_rts_on_tx_done = 0;
+                        info->drop_rts_on_tx_done = false;
                         set_signals(info);
                 }
 
@@ -2348,7 +2348,7 @@ static void isr_txeom(SLMP_INFO * info, unsigned char status)
 /*
  * handle tx status interrupts
  */
-void isr_txint(SLMP_INFO * info)
+static void isr_txint(SLMP_INFO * info)
 {
         unsigned char status = read_reg(info, SR1) & info->ie1_value & (UDRN + IDLE + CCTS);
 
@@ -2376,7 +2376,7 @@ void isr_txint(SLMP_INFO * info)
 /*
  * handle async tx data interrupts
  */
-void isr_txrdy(SLMP_INFO * info)
+static void isr_txrdy(SLMP_INFO * info)
 {
         if ( debug_level >= DEBUG_LEVEL_ISR )
                 printk("%s(%d):%s isr_txrdy() tx_count=%d\n",
@@ -2398,7 +2398,7 @@ void isr_txrdy(SLMP_INFO * info)
         if ( info->tx_count )
                 tx_load_fifo( info );
         else {
-                info->tx_active = 0;
+                info->tx_active = false;
                 info->ie0_value &= ~TXRDYE;
                 write_reg(info, IE0, info->ie0_value);
         }
@@ -2407,7 +2407,7 @@ void isr_txrdy(SLMP_INFO * info)
                 info->pending_bh |= BH_TRANSMIT;
 }
 
-void isr_rxdmaok(SLMP_INFO * info)
+static void isr_rxdmaok(SLMP_INFO * info)
 {
         /* BIT7 = EOT (end of transfer)
          * BIT6 = EOM (end of message/frame)
@@ -2424,7 +2424,7 @@ void isr_rxdmaok(SLMP_INFO * info)
         info->pending_bh |= BH_RECEIVE;
 }
 
-void isr_rxdmaerror(SLMP_INFO * info)
+static void isr_rxdmaerror(SLMP_INFO * info)
 {
         /* BIT5 = BOF (buffer overflow)
          * BIT4 = COF (counter overflow)
@@ -2438,11 +2438,11 @@ void isr_rxdmaerror(SLMP_INFO * info)
                 printk("%s(%d):%s isr_rxdmaerror(), status=%02x\n",
                         __FILE__,__LINE__,info->device_name,status);
 
-        info->rx_overflow = TRUE;
+        info->rx_overflow = true;
         info->pending_bh |= BH_RECEIVE;
 }
 
-void isr_txdmaok(SLMP_INFO * info)
+static void isr_txdmaok(SLMP_INFO * info)
 {
         unsigned char status_reg1 = read_reg(info, SR1);
 
@@ -2460,7 +2460,7 @@ void isr_txdmaok(SLMP_INFO * info)
         write_reg(info, IE0, info->ie0_value);
 }
 
-void isr_txdmaerror(SLMP_INFO * info)
+static void isr_txdmaerror(SLMP_INFO * info)
 {
         /* BIT5 = BOF (buffer overflow)
          * BIT4 = COF (counter overflow)
@@ -2477,7 +2477,7 @@ void isr_txdmaerror(SLMP_INFO * info)
 
 /* handle input serial signal changes
  */
-void isr_io_pin( SLMP_INFO *info, u16 status )
+static void isr_io_pin( SLMP_INFO *info, u16 status )
 {
         struct  mgsl_icount *icount;
 
@@ -2691,7 +2691,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
                                 printk("%s(%d):%s queueing bh task.\n",
                                         __FILE__,__LINE__,port->device_name);
                         schedule_work(&port->task);
-                        port->bh_requested = 1;
+                        port->bh_requested = true;
                 }
         }
 
@@ -3320,7 +3320,8 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
 {
         DECLARE_WAITQUEUE(wait, current);
         int             retval;
-        int             do_clocal = 0, extra_count = 0;
+        bool            do_clocal = false;
+        bool            extra_count = false;
         unsigned long   flags;
 
         if (debug_level >= DEBUG_LEVEL_INFO)
@@ -3335,7 +3336,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
         }
 
         if (tty->termios->c_cflag & CLOCAL)
-                do_clocal = 1;
+                do_clocal = true;
 
         /* Wait for carrier detect and the line to become
          * free (i.e., not in use by the callout).  While we are in
@@ -3353,7 +3354,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
 
         spin_lock_irqsave(&info->lock, flags);
         if (!tty_hung_up_p(filp)) {
-                extra_count = 1;
+                extra_count = true;
                 info->count--;
         }
         spin_unlock_irqrestore(&info->lock, flags);
@@ -3413,7 +3414,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
         return retval;
 }
 
-int alloc_dma_bufs(SLMP_INFO *info)
+static int alloc_dma_bufs(SLMP_INFO *info)
 {
         unsigned short BuffersPerFrame;
         unsigned short BufferCount;
@@ -3487,7 +3488,7 @@ int alloc_dma_bufs(SLMP_INFO *info)
 
 /* Allocate DMA buffers for the transmit and receive descriptor lists.
  */
-int alloc_buf_list(SLMP_INFO *info)
+static int alloc_buf_list(SLMP_INFO *info)
 {
         unsigned int i;
 
@@ -3546,7 +3547,7 @@ int alloc_buf_list(SLMP_INFO *info)
 
 /* Allocate the frame DMA buffers used by the specified buffer list.
  */
-int alloc_frame_bufs(SLMP_INFO *info, SCADESC *buf_list,SCADESC_EX *buf_list_ex,int count)
+static int alloc_frame_bufs(SLMP_INFO *info, SCADESC *buf_list,SCADESC_EX *buf_list_ex,int count)
 {
         int i;
         unsigned long phys_addr;
@@ -3563,7 +3564,7 @@ int alloc_frame_bufs(SLMP_INFO *info, SCADESC *buf_list,SCADESC_EX *buf_list_ex,
         return 0;
 }
 
-void free_dma_bufs(SLMP_INFO *info)
+static void free_dma_bufs(SLMP_INFO *info)
 {
         info->buffer_list = NULL;
         info->rx_buf_list = NULL;
@@ -3573,7 +3574,7 @@ void free_dma_bufs(SLMP_INFO *info)
 /* allocate buffer large enough to hold max_frame_size.
  * This buffer is used to pass an assembled frame to the line discipline.
  */
-int alloc_tmp_rx_buf(SLMP_INFO *info)
+static int alloc_tmp_rx_buf(SLMP_INFO *info)
 {
         info->tmp_rx_buf = kmalloc(info->max_frame_size, GFP_KERNEL);
         if (info->tmp_rx_buf == NULL)
@@ -3581,13 +3582,13 @@ int alloc_tmp_rx_buf(SLMP_INFO *info)
         return 0;
 }
 
-void free_tmp_rx_buf(SLMP_INFO *info)
+static void free_tmp_rx_buf(SLMP_INFO *info)
 {
         kfree(info->tmp_rx_buf);
         info->tmp_rx_buf = NULL;
 }
 
-int claim_resources(SLMP_INFO *info)
+static int claim_resources(SLMP_INFO *info)
 {
         if (request_mem_region(info->phys_memory_base,SCA_MEM_SIZE,"synclinkmp") == NULL) {
                 printk( "%s(%d):%s mem addr conflict, Addr=%08X\n",
@@ -3596,7 +3597,7 @@ int claim_resources(SLMP_INFO *info)
                 goto errout;
         }
         else
-                info->shared_mem_requested = 1;
+                info->shared_mem_requested = true;
 
         if (request_mem_region(info->phys_lcr_base + info->lcr_offset,128,"synclinkmp") == NULL) {
                 printk( "%s(%d):%s lcr mem addr conflict, Addr=%08X\n",
@@ -3605,7 +3606,7 @@ int claim_resources(SLMP_INFO *info)
                 goto errout;
         }
         else
-                info->lcr_mem_requested = 1;
+                info->lcr_mem_requested = true;
 
         if (request_mem_region(info->phys_sca_base + info->sca_offset,SCA_BASE_SIZE,"synclinkmp") == NULL) {
                 printk( "%s(%d):%s sca mem addr conflict, Addr=%08X\n",
@@ -3614,7 +3615,7 @@ int claim_resources(SLMP_INFO *info)
                 goto errout;
         }
         else
-                info->sca_base_requested = 1;
+                info->sca_base_requested = true;
 
         if (request_mem_region(info->phys_statctrl_base + info->statctrl_offset,SCA_REG_SIZE,"synclinkmp") == NULL) {
                 printk( "%s(%d):%s stat/ctrl mem addr conflict, Addr=%08X\n",
@@ -3623,7 +3624,7 @@ int claim_resources(SLMP_INFO *info)
                 goto errout;
         }
         else
-                info->sca_statctrl_requested = 1;
+                info->sca_statctrl_requested = true;
 
         info->memory_base = ioremap(info->phys_memory_base,SCA_MEM_SIZE);
         if (!info->memory_base) {
@@ -3674,7 +3675,7 @@ errout:
         return -ENODEV;
 }
 
-void release_resources(SLMP_INFO *info)
+static void release_resources(SLMP_INFO *info)
 {
         if ( debug_level >= DEBUG_LEVEL_INFO )
                 printk( "%s(%d):%s release_resources() entry\n",
@@ -3682,24 +3683,24 @@ void release_resources(SLMP_INFO *info)
 
         if ( info->irq_requested ) {
                 free_irq(info->irq_level, info);
-                info->irq_requested = 0;
+                info->irq_requested = false;
         }
 
         if ( info->shared_mem_requested ) {
                 release_mem_region(info->phys_memory_base,SCA_MEM_SIZE);
-                info->shared_mem_requested = 0;
+                info->shared_mem_requested = false;
         }
         if ( info->lcr_mem_requested ) {
                 release_mem_region(info->phys_lcr_base + info->lcr_offset,128);
-                info->lcr_mem_requested = 0;
+                info->lcr_mem_requested = false;
         }
         if ( info->sca_base_requested ) {
                 release_mem_region(info->phys_sca_base + info->sca_offset,SCA_BASE_SIZE);
-                info->sca_base_requested = 0;
+                info->sca_base_requested = false;
         }
         if ( info->sca_statctrl_requested ) {
                 release_mem_region(info->phys_statctrl_base + info->statctrl_offset,SCA_REG_SIZE);
-                info->sca_statctrl_requested = 0;
+                info->sca_statctrl_requested = false;
         }
 
         if (info->memory_base){
@@ -3730,7 +3731,7 @@ void release_resources(SLMP_INFO *info)
 /* Add the specified device instance data structure to the
  * global linked list of devices and increment the device count.
  */
-void add_device(SLMP_INFO *info)
+static void add_device(SLMP_INFO *info)
 {
         info->next_device = NULL;
         info->line = synclinkmp_device_count;
@@ -3853,7 +3854,7 @@ static SLMP_INFO *alloc_dev(int adapter_num, int port_num, struct pci_dev *pdev)
         return info;
 }
 
-void device_init(int adapter_num, struct pci_dev *pdev)
+static void device_init(int adapter_num, struct pci_dev *pdev)
 {
         SLMP_INFO *port_array[SCA_MAX_PORTS];
         int port;
@@ -3902,7 +3903,7 @@ void device_init(int adapter_num, struct pci_dev *pdev)
                                 port_array[0]->irq_level );
                 }
                 else {
-                        port_array[0]->irq_requested = 1;
+                        port_array[0]->irq_requested = true;
                         adapter_test(port_array[0]);
                 }
         }
@@ -4047,7 +4048,7 @@ module_exit(synclinkmp_exit);
  * The TxCLK and RxCLK signals are generated from the BRG and
  * the TxD is looped back to the RxD internally.
  */
-void enable_loopback(SLMP_INFO *info, int enable)
+static void enable_loopback(SLMP_INFO *info, int enable)
 {
         if (enable) {
                 /* MD2 (Mode Register 2)
@@ -4094,7 +4095,7 @@ void enable_loopback(SLMP_INFO *info, int enable)
  *      data_rate       data rate of clock in bits per second
  *                      A data rate of 0 disables the AUX clock.
  */
-void set_rate( SLMP_INFO *info, u32 data_rate )
+static void set_rate( SLMP_INFO *info, u32 data_rate )
 {
         u32 TMCValue;
         unsigned char BRValue;
@@ -4140,7 +4141,7 @@ void set_rate( SLMP_INFO *info, u32 data_rate )
 
 /* Disable receiver
  */
-void rx_stop(SLMP_INFO *info)
+static void rx_stop(SLMP_INFO *info)
 {
         if (debug_level >= DEBUG_LEVEL_ISR)
                 printk("%s(%d):%s rx_stop()\n",
@@ -4155,13 +4156,13 @@ void rx_stop(SLMP_INFO *info)
         write_reg(info, RXDMA + DCMD, SWABORT); /* reset/init Rx DMA */
         write_reg(info, RXDMA + DIR, 0);        /* disable Rx DMA interrupts */
 
-        info->rx_enabled = 0;
-        info->rx_overflow = 0;
+        info->rx_enabled = false;
+        info->rx_overflow = false;
 }
 
 /* enable the receiver
  */
-void rx_start(SLMP_INFO *info)
+static void rx_start(SLMP_INFO *info)
 {
         int i;
 
@@ -4211,14 +4212,14 @@ void rx_start(SLMP_INFO *info)
 
         write_reg(info, CMD, RXENABLE);
 
-        info->rx_overflow = FALSE;
-        info->rx_enabled = 1;
+        info->rx_overflow = false;
+        info->rx_enabled = true;
 }
 
 /* Enable the transmitter and send a transmit frame if
  * one is loaded in the DMA buffers.
  */
-void tx_start(SLMP_INFO *info)
+static void tx_start(SLMP_INFO *info)
 {
         if (debug_level >= DEBUG_LEVEL_ISR)
                 printk("%s(%d):%s tx_start() tx_count=%d\n",
@@ -4227,7 +4228,7 @@ void tx_start(SLMP_INFO *info)
         if (!info->tx_enabled ) {
                 write_reg(info, CMD, TXRESET);
                 write_reg(info, CMD, TXENABLE);
-                info->tx_enabled = TRUE;
+                info->tx_enabled = true;
         }
 
         if ( info->tx_count ) {
@@ -4236,7 +4237,7 @@ void tx_start(SLMP_INFO *info)
                 /* RTS and set a flag indicating that the driver should */
                 /* negate RTS when the transmission completes. */
 
-                info->drop_rts_on_tx_done = 0;
+                info->drop_rts_on_tx_done = false;
 
                 if (info->params.mode != MGSL_MODE_ASYNC) {
 
@@ -4245,7 +4246,7 @@ void tx_start(SLMP_INFO *info)
                                 if ( !(info->serial_signals & SerialSignal_RTS) ) {
                                         info->serial_signals |= SerialSignal_RTS;
                                         set_signals( info );
-                                        info->drop_rts_on_tx_done = 1;
+                                        info->drop_rts_on_tx_done = true;
                                 }
                         }
 
@@ -4282,13 +4283,13 @@ void tx_start(SLMP_INFO *info)
                         write_reg(info, IE0, info->ie0_value);
                 }
 
-                info->tx_active = 1;
+                info->tx_active = true;
         }
 }
 
 /* stop the transmitter and DMA
  */
-void tx_stop( SLMP_INFO *info )
+static void tx_stop( SLMP_INFO *info )
 {
         if (debug_level >= DEBUG_LEVEL_ISR)
                 printk("%s(%d):%s tx_stop()\n",
@@ -4308,14 +4309,14 @@ void tx_stop( SLMP_INFO *info )
         info->ie0_value &= ~TXRDYE;
         write_reg(info, IE0, info->ie0_value);  /* disable tx data interrupts */
 
-        info->tx_enabled = 0;
-        info->tx_active  = 0;
+        info->tx_enabled = false;
+        info->tx_active = false;
 }
 
 /* Fill the transmit FIFO until the FIFO is full or
  * there is no more data to load.
  */
-void tx_load_fifo(SLMP_INFO *info)
+static void tx_load_fifo(SLMP_INFO *info)
 {
         u8 TwoBytes[2];
 
@@ -4364,7 +4365,7 @@ void tx_load_fifo(SLMP_INFO *info)
 
 /* Reset a port to a known state
  */
-void reset_port(SLMP_INFO *info)
+static void reset_port(SLMP_INFO *info)
 {
         if (info->sca_base) {
 
@@ -4388,7 +4389,7 @@ void reset_port(SLMP_INFO *info)
 
 /* Reset all the ports to a known state.
  */
-void reset_adapter(SLMP_INFO *info)
+static void reset_adapter(SLMP_INFO *info)
 {
         int i;
 
@@ -4400,7 +4401,7 @@ void reset_adapter(SLMP_INFO *info)
 
 /* Program port for asynchronous communications.
  */
-void async_mode(SLMP_INFO *info)
+static void async_mode(SLMP_INFO *info)
 {
 
         unsigned char RegValue;
@@ -4539,7 +4540,7 @@ void async_mode(SLMP_INFO *info)
 
 /* Program the SCA for HDLC communications.
  */
-void hdlc_mode(SLMP_INFO *info)
+static void hdlc_mode(SLMP_INFO *info)
 {
         unsigned char RegValue;
         u32 DpllDivisor;
@@ -4741,7 +4742,7 @@ void hdlc_mode(SLMP_INFO *info)
 
 /* Set the transmit HDLC idle mode
  */
-void tx_set_idle(SLMP_INFO *info)
+static void tx_set_idle(SLMP_INFO *info)
 {
         unsigned char RegValue = 0xff;
 
@@ -4761,7 +4762,7 @@ void tx_set_idle(SLMP_INFO *info)
 
 /* Query the adapter for the state of the V24 status (input) signals.
  */
-void get_signals(SLMP_INFO *info)
+static void get_signals(SLMP_INFO *info)
 {
         u16 status = read_reg(info, SR3);
         u16 gpstatus = read_status_reg(info);
@@ -4790,7 +4791,7 @@ void get_signals(SLMP_INFO *info)
 /* Set the state of DTR and RTS based on contents of
  * serial_signals member of device context.
  */
-void set_signals(SLMP_INFO *info)
+static void set_signals(SLMP_INFO *info)
 {
         unsigned char RegValue;
         u16 EnableBit;
@@ -4819,7 +4820,7 @@ void set_signals(SLMP_INFO *info)
  * and set the current buffer to the first buffer. This effectively
  * makes all buffers free and discards any data in buffers.
  */
-void rx_reset_buffers(SLMP_INFO *info)
+static void rx_reset_buffers(SLMP_INFO *info)
 {
         rx_free_frame_buffers(info, 0, info->rx_buf_count - 1);
 }
@@ -4830,16 +4831,16 @@ void rx_reset_buffers(SLMP_INFO *info)
  * first  index of 1st receive buffer of frame
  * last   index of last receive buffer of frame
  */
-void rx_free_frame_buffers(SLMP_INFO *info, unsigned int first, unsigned int last)
+static void rx_free_frame_buffers(SLMP_INFO *info, unsigned int first, unsigned int last)
 {
-        int done = 0;
+        bool done = false;
 
         while(!done) {
                 /* reset current buffer for reuse */
                 info->rx_buf_list[first].status = 0xff;
 
                 if (first == last) {
-                        done = 1;
+                        done = true;
                         /* set new last rx descriptor address */
                         write_reg16(info, RXDMA + EDA, info->rx_buf_list_ex[first].phys_entry);
                 }
@@ -4856,14 +4857,14 @@ void rx_free_frame_buffers(SLMP_INFO *info, unsigned int first, unsigned int las
 /* Return a received frame from the receive DMA buffers.
  * Only frames received without errors are returned.
  *
- * Return Value:        1 if frame returned, otherwise 0
+ * Return Value:        true if frame returned, otherwise false
  */
-int rx_get_frame(SLMP_INFO *info)
+static bool rx_get_frame(SLMP_INFO *info)
 {
         unsigned int StartIndex, EndIndex;      /* index of 1st and last buffers of Rx frame */
         unsigned short status;
         unsigned int framesize = 0;
-        int ReturnCode = 0;
+        bool ReturnCode = false;
         unsigned long flags;
         struct tty_struct *tty = info->tty;
         unsigned char addr_field = 0xff;
@@ -5014,7 +5015,7 @@ CheckAgain:
         /* Free the buffers used by this frame. */
         rx_free_frame_buffers( info, StartIndex, EndIndex );
 
-        ReturnCode = 1;
+        ReturnCode = true;
 
 Cleanup:
         if ( info->rx_enabled && info->rx_overflow ) {
@@ -5033,7 +5034,7 @@ Cleanup:
 
 /* load the transmit DMA buffer with data
  */
-void tx_load_dma_buffer(SLMP_INFO *info, const char *buf, unsigned int count)
+static void tx_load_dma_buffer(SLMP_INFO *info, const char *buf, unsigned int count)
 {
         unsigned short copy_count;
         unsigned int i = 0;
@@ -5073,12 +5074,12 @@ void tx_load_dma_buffer(SLMP_INFO *info, const char *buf, unsigned int count)
         info->last_tx_buf = ++i;
 }
 
-int register_test(SLMP_INFO *info)
+static bool register_test(SLMP_INFO *info)
 {
         static unsigned char testval[] = {0x00, 0xff, 0xaa, 0x55, 0x69, 0x96};
         static unsigned int count = ARRAY_SIZE(testval);
         unsigned int i;
-        int rc = TRUE;
+        bool rc = true;
         unsigned long flags;
 
         spin_lock_irqsave(&info->lock,flags);
@@ -5101,7 +5102,7 @@ int register_test(SLMP_INFO *info)
                           (read_reg(info, SA0) != testval[(i+2)%count]) ||
                           (read_reg(info, SA1) != testval[(i+3)%count]) )
                 {
-                        rc = FALSE;
+                        rc = false;
                         break;
                 }
         }
@@ -5112,7 +5113,7 @@ int register_test(SLMP_INFO *info)
         return rc;
 }
 
-int irq_test(SLMP_INFO *info)
+static bool irq_test(SLMP_INFO *info)
 {
         unsigned long timeout;
         unsigned long flags;
@@ -5124,7 +5125,7 @@ int irq_test(SLMP_INFO *info)
 
         /* assume failure */
         info->init_error = DiagStatus_IrqFailure;
-        info->irq_occurred = FALSE;
+        info->irq_occurred = false;
 
         /* setup timer0 on SCA0 to interrupt */
 
@@ -5163,7 +5164,7 @@ int irq_test(SLMP_INFO *info)
 
 /* initialize individual SCA device (2 ports)
  */
-static int sca_init(SLMP_INFO *info)
+static bool sca_init(SLMP_INFO *info)
 {
         /* set wait controller to single mem partition (low), no wait states */
         write_reg(info, PABR0, 0);      /* wait controller addr boundary 0 */
@@ -5199,12 +5200,12 @@ static int sca_init(SLMP_INFO *info)
          */
         write_reg(info, ITCR, 0);
 
-        return TRUE;
+        return true;
 }
 
 /* initialize adapter hardware
  */
-int init_adapter(SLMP_INFO *info)
+static bool init_adapter(SLMP_INFO *info)
 {
         int i;
 
@@ -5257,20 +5258,20 @@ int init_adapter(SLMP_INFO *info)
         sca_init(info->port_array[0]);
         sca_init(info->port_array[2]);
 
-        return TRUE;
+        return true;
 }
 
 /* Loopback an HDLC frame to test the hardware
  * interrupt and DMA functions.
  */
-int loopback_test(SLMP_INFO *info)
+static bool loopback_test(SLMP_INFO *info)
 {
 #define TESTFRAMESIZE 20
 
         unsigned long timeout;
         u16 count = TESTFRAMESIZE;
         unsigned char buf[TESTFRAMESIZE];
-        int rc = FALSE;
+        bool rc = false;
         unsigned long flags;
 
         struct tty_struct *oldtty = info->tty;
@@ -5304,16 +5305,16 @@ int loopback_test(SLMP_INFO *info)
                 msleep_interruptible(10);
 
                 if (rx_get_frame(info)) {
-                        rc = TRUE;
+                        rc = true;
                         break;
                 }
         }
 
         /* verify received frame length and contents */
-        if (rc == TRUE &&
-                ( info->tmp_rx_buf_count != count ||
-                  memcmp(buf, info->tmp_rx_buf,count))) {
-                rc = FALSE;
+        if (rc &&
+            ( info->tmp_rx_buf_count != count ||
+              memcmp(buf, info->tmp_rx_buf,count))) {
+                rc = false;
         }
 
         spin_lock_irqsave(&info->lock,flags);
@@ -5328,7 +5329,7 @@ int loopback_test(SLMP_INFO *info)
 
 /* Perform diagnostics on hardware
  */
-int adapter_test( SLMP_INFO *info )
+static int adapter_test( SLMP_INFO *info )
 {
         unsigned long flags;
         if ( debug_level >= DEBUG_LEVEL_INFO )
@@ -5390,7 +5391,7 @@ int adapter_test( SLMP_INFO *info )
 
 /* Test the shared memory on a PCI adapter.
  */
-int memory_test(SLMP_INFO *info)
+static bool memory_test(SLMP_INFO *info)
 {
         static unsigned long testval[] = { 0x0, 0x55555555, 0xaaaaaaaa,
                 0x66666666, 0x99999999, 0xffffffff, 0x12345678 };
@@ -5404,7 +5405,7 @@ int memory_test(SLMP_INFO *info)
         for ( i = 0 ; i < count ; i++ ) {
                 *addr = testval[i];
                 if ( *addr != testval[i] )
-                        return FALSE;
+                        return false;
         }
 
         /* Test address lines with incrementing pattern over */
@@ -5419,12 +5420,12 @@ int memory_test(SLMP_INFO *info)
 
         for ( i = 0 ; i < limit ; i++ ) {
                 if ( *addr != i * 4 )
-                        return FALSE;
+                        return false;
                 addr++;
         }
 
         memset( info->memory_base, 0, SCA_MEM_SIZE );
-        return TRUE;
+        return true;
 }
 
 /* Load data into PCI adapter shared memory.
@@ -5442,7 +5443,7 @@ int memory_test(SLMP_INFO *info)
  * the write transation. This allows any pending DMA request to gain control
  * of the local bus in a timely fasion.
  */
-void load_pci_memory(SLMP_INFO *info, char* dest, const char* src, unsigned short count)
+static void load_pci_memory(SLMP_INFO *info, char* dest, const char* src, unsigned short count)
 {
         /* A load interval of 16 allows for 4 32-bit writes at */
         /* 136ns each for a maximum latency of 542ns on the local bus.*/
@@ -5461,7 +5462,7 @@ void load_pci_memory(SLMP_INFO *info, char* dest, const char* src, unsigned shor
         memcpy(dest, src, count % sca_pci_load_interval);
 }
 
-void trace_block(SLMP_INFO *info,const char* data, int count, int xmit)
+static void trace_block(SLMP_INFO *info,const char* data, int count, int xmit)
 {
         int i;
         int linecount;
@@ -5496,7 +5497,7 @@ void trace_block(SLMP_INFO *info,const char* data, int count, int xmit)
 /* called when HDLC frame times out
  * update stats and do tx completion processing
  */
-void tx_timeout(unsigned long context)
+static void tx_timeout(unsigned long context)
 {
         SLMP_INFO *info = (SLMP_INFO*)context;
         unsigned long flags;
@@ -5508,7 +5509,7 @@ void tx_timeout(unsigned long context)
                 info->icount.txtimeout++;
         }
         spin_lock_irqsave(&info->lock,flags);
-        info->tx_active = 0;
+        info->tx_active = false;
         info->tx_count = info->tx_put = info->tx_get = 0;
 
         spin_unlock_irqrestore(&info->lock,flags);
@@ -5523,7 +5524,7 @@ void tx_timeout(unsigned long context)
 
 /* called to periodically check the DSR/RI modem signal input status
  */
-void status_timeout(unsigned long context)
+static void status_timeout(unsigned long context)
 {
         u16 status = 0;
         SLMP_INFO *info = (SLMP_INFO*)context;
@@ -5574,36 +5575,36 @@ void status_timeout(unsigned long context)
         }
 
 
-unsigned char read_reg(SLMP_INFO * info, unsigned char Addr)
+static unsigned char read_reg(SLMP_INFO * info, unsigned char Addr)
 {
         CALC_REGADDR();
         return *RegAddr;
 }
-void write_reg(SLMP_INFO * info, unsigned char Addr, unsigned char Value)
+static void write_reg(SLMP_INFO * info, unsigned char Addr, unsigned char Value)
 {
         CALC_REGADDR();
         *RegAddr = Value;
 }
 
-u16 read_reg16(SLMP_INFO * info, unsigned char Addr)
+static u16 read_reg16(SLMP_INFO * info, unsigned char Addr)
 {
         CALC_REGADDR();
         return *((u16 *)RegAddr);
 }
 
-void write_reg16(SLMP_INFO * info, unsigned char Addr, u16 Value)
+static void write_reg16(SLMP_INFO * info, unsigned char Addr, u16 Value)
 {
         CALC_REGADDR();
         *((u16 *)RegAddr) = Value;
 }
 
-unsigned char read_status_reg(SLMP_INFO * info)
+static unsigned char read_status_reg(SLMP_INFO * info)
 {
         unsigned char *RegAddr = (unsigned char *)info->statctrl_base;
         return *RegAddr;
 }
 
-void write_control_reg(SLMP_INFO * info)
+static void write_control_reg(SLMP_INFO * info)
 {
         unsigned char *RegAddr = (unsigned char *)info->statctrl_base;
         *RegAddr = info->port_array[0]->ctrlreg_value;
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index de60e1ea4fb3..1ade193c9128 100644
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -271,8 +271,7 @@ static struct sysrq_key_op sysrq_term_op = {
 
 static void moom_callback(struct work_struct *ignored)
 {
-        out_of_memory(&NODE_DATA(0)->node_zonelists[ZONE_NORMAL],
-                        GFP_KERNEL, 0);
+        out_of_memory(node_zonelist(0, GFP_KERNEL), GFP_KERNEL, 0);
 }
 
 static DECLARE_WORK(moom_work, moom_callback);
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 9b58b894f823..df4c3ead9e2b 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -2054,6 +2054,7 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co
         unsigned long draw_from = 0, draw_to = 0;
         struct vc_data *vc;
         unsigned char vc_attr;
+        struct vt_notifier_param param;
         uint8_t rescan;
         uint8_t inverse;
         uint8_t width;
@@ -2113,6 +2114,8 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co
         if (IS_FG(vc))
                 hide_cursor(vc);
 
+        param.vc = vc;
+
         while (!tty->stopped && count) {
                 int orig = *buf;
                 c = orig;
@@ -2201,6 +2204,11 @@ rescan_last_byte:
                     tc = vc->vc_translate[vc->vc_toggle_meta ? (c | 0x80) : c];
                 }
 
+                param.c = tc;
+                if (atomic_notifier_call_chain(&vt_notifier_list, VT_PREWRITE,
+                                        &param) == NOTIFY_STOP)
+                        continue;
+
                 /* If the original code was a control character we
                  * only allow a glyph to be displayed if the code is
                  * not normally used (such as for cursor movement) or
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index d8db2f8ee411..24c62b848bf9 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -43,6 +43,7 @@ struct gpio_desc {
 /* flag symbols are bit numbers */
 #define FLAG_REQUESTED  0
 #define FLAG_IS_OUT     1
+#define FLAG_RESERVED   2
 
 #ifdef CONFIG_DEBUG_FS
         const char              *label;
@@ -68,6 +69,9 @@ static void gpio_ensure_requested(struct gpio_desc *desc)
         if (test_and_set_bit(FLAG_REQUESTED, &desc->flags) == 0) {
                 pr_warning("GPIO-%d autorequested\n", (int)(desc - gpio_desc));
                 desc_set_label(desc, "[auto]");
+                if (!try_module_get(desc->chip->owner))
+                        pr_err("GPIO-%d: module can't be gotten \n",
+                                        (int)(desc - gpio_desc));
         }
 }
 
@@ -77,6 +81,76 @@ static inline struct gpio_chip *gpio_to_chip(unsigned gpio)
         return gpio_desc[gpio].chip;
 }
 
+/* dynamic allocation of GPIOs, e.g. on a hotplugged device */
+static int gpiochip_find_base(int ngpio)
+{
+        int i;
+        int spare = 0;
+        int base = -ENOSPC;
+
+        for (i = ARCH_NR_GPIOS - 1; i >= 0 ; i--) {
+                struct gpio_desc *desc = &gpio_desc[i];
+                struct gpio_chip *chip = desc->chip;
+
+                if (!chip && !test_bit(FLAG_RESERVED, &desc->flags)) {
+                        spare++;
+                        if (spare == ngpio) {
+                                base = i;
+                                break;
+                        }
+                } else {
+                        spare = 0;
+                        if (chip)
+                                i -= chip->ngpio - 1;
+                }
+        }
+
+        if (gpio_is_valid(base))
+                pr_debug("%s: found new base at %d\n", __func__, base);
+        return base;
+}
+
+/**
+ * gpiochip_reserve() - reserve range of gpios to use with platform code only
+ * @start: starting gpio number
+ * @ngpio: number of gpios to reserve
+ * Context: platform init, potentially before irqs or kmalloc will work
+ *
+ * Returns a negative errno if any gpio within the range is already reserved
+ * or registered, else returns zero as a success code.  Use this function
+ * to mark a range of gpios as unavailable for dynamic gpio number allocation,
+ * for example because its driver support is not yet loaded.
+ */
+int __init gpiochip_reserve(int start, int ngpio)
+{
+        int ret = 0;
+        unsigned long flags;
+        int i;
+
+        if (!gpio_is_valid(start) || !gpio_is_valid(start + ngpio))
+                return -EINVAL;
+
+        spin_lock_irqsave(&gpio_lock, flags);
+
+        for (i = start; i < start + ngpio; i++) {
+                struct gpio_desc *desc = &gpio_desc[i];
+
+                if (desc->chip || test_bit(FLAG_RESERVED, &desc->flags)) {
+                        ret = -EBUSY;
+                        goto err;
+                }
+
+                set_bit(FLAG_RESERVED, &desc->flags);
+        }
+
+        pr_debug("%s: reserved gpios from %d to %d\n",
+                 __func__, start, start + ngpio - 1);
+err:
+        spin_unlock_irqrestore(&gpio_lock, flags);
+
+        return ret;
+}
+
 /**
  * gpiochip_add() - register a gpio_chip
  * @chip: the chip to register, with chip->base initialized
@@ -85,38 +159,49 @@ static inline struct gpio_chip *gpio_to_chip(unsigned gpio)
  * Returns a negative errno if the chip can't be registered, such as
  * because the chip->base is invalid or already associated with a
  * different chip.  Otherwise it returns zero as a success code.
+ *
+ * If chip->base is negative, this requests dynamic assignment of
+ * a range of valid GPIOs.
  */
 int gpiochip_add(struct gpio_chip *chip)
 {
         unsigned long   flags;
         int             status = 0;
         unsigned        id;
+        int             base = chip->base;
 
-        /* NOTE chip->base negative is reserved to mean a request for
-         * dynamic allocation.  We don't currently support that.
-         */
-
-        if (chip->base < 0 || (chip->base  + chip->ngpio) >= ARCH_NR_GPIOS) {
+        if ((!gpio_is_valid(base) || !gpio_is_valid(base + chip->ngpio))
+                        && base >= 0) {
                 status = -EINVAL;
                 goto fail;
         }
 
         spin_lock_irqsave(&gpio_lock, flags);
 
+        if (base < 0) {
+                base = gpiochip_find_base(chip->ngpio);
+                if (base < 0) {
+                        status = base;
+                        goto fail_unlock;
+                }
+                chip->base = base;
+        }
+
         /* these GPIO numbers must not be managed by another gpio_chip */
-        for (id = chip->base; id < chip->base + chip->ngpio; id++) {
+        for (id = base; id < base + chip->ngpio; id++) {
                 if (gpio_desc[id].chip != NULL) {
                         status = -EBUSY;
                         break;
                 }
         }
         if (status == 0) {
-                for (id = chip->base; id < chip->base + chip->ngpio; id++) {
+                for (id = base; id < base + chip->ngpio; id++) {
                         gpio_desc[id].chip = chip;
                         gpio_desc[id].flags = 0;
                 }
         }
 
+fail_unlock:
         spin_unlock_irqrestore(&gpio_lock, flags);
 fail:
         /* failures here can mean systems won't boot... */
@@ -171,12 +256,15 @@ int gpio_request(unsigned gpio, const char *label)
 
         spin_lock_irqsave(&gpio_lock, flags);
 
-        if (gpio >= ARCH_NR_GPIOS)
+        if (!gpio_is_valid(gpio))
                 goto done;
         desc = &gpio_desc[gpio];
         if (desc->chip == NULL)
                 goto done;
 
+        if (!try_module_get(desc->chip->owner))
+                goto done;
+
         /* NOTE:  gpio_request() can be called in early boot,
          * before IRQs are enabled.
          */
@@ -184,8 +272,10 @@ int gpio_request(unsigned gpio, const char *label)
         if (test_and_set_bit(FLAG_REQUESTED, &desc->flags) == 0) {
                 desc_set_label(desc, label ? : "?");
                 status = 0;
-        } else
+        } else {
                 status = -EBUSY;
+                module_put(desc->chip->owner);
+        }
 
 done:
         if (status)
@@ -201,7 +291,7 @@ void gpio_free(unsigned gpio)
         unsigned long           flags;
         struct gpio_desc        *desc;
 
-        if (gpio >= ARCH_NR_GPIOS) {
+        if (!gpio_is_valid(gpio)) {
                 WARN_ON(extra_checks);
                 return;
         }
@@ -209,9 +299,10 @@ void gpio_free(unsigned gpio)
         spin_lock_irqsave(&gpio_lock, flags);
 
         desc = &gpio_desc[gpio];
-        if (desc->chip && test_and_clear_bit(FLAG_REQUESTED, &desc->flags))
+        if (desc->chip && test_and_clear_bit(FLAG_REQUESTED, &desc->flags)) {
                 desc_set_label(desc, NULL);
-        else
+                module_put(desc->chip->owner);
+        } else
                 WARN_ON(extra_checks);
 
         spin_unlock_irqrestore(&gpio_lock, flags);
@@ -236,7 +327,7 @@ const char *gpiochip_is_requested(struct gpio_chip *chip, unsigned offset)
 {
         unsigned gpio = chip->base + offset;
 
-        if (gpio >= ARCH_NR_GPIOS || gpio_desc[gpio].chip != chip)
+        if (!gpio_is_valid(gpio) || gpio_desc[gpio].chip != chip)
                 return NULL;
         if (test_bit(FLAG_REQUESTED, &gpio_desc[gpio].flags) == 0)
                 return NULL;
@@ -267,7 +358,7 @@ int gpio_direction_input(unsigned gpio)
 
         spin_lock_irqsave(&gpio_lock, flags);
 
-        if (gpio >= ARCH_NR_GPIOS)
+        if (!gpio_is_valid(gpio))
                 goto fail;
         chip = desc->chip;
         if (!chip || !chip->get || !chip->direction_input)
@@ -305,7 +396,7 @@ int gpio_direction_output(unsigned gpio, int value)
 
         spin_lock_irqsave(&gpio_lock, flags);
 
-        if (gpio >= ARCH_NR_GPIOS)
+        if (!gpio_is_valid(gpio))
                 goto fail;
         chip = desc->chip;
         if (!chip || !chip->set || !chip->direction_output)
@@ -522,7 +613,7 @@ static int gpiolib_show(struct seq_file *s, void *unused)
 
         /* REVISIT this isn't locked against gpio_chip removal ... */
 
-        for (gpio = 0; gpio < ARCH_NR_GPIOS; gpio++) {
+        for (gpio = 0; gpio_is_valid(gpio); gpio++) {
                 if (chip == gpio_desc[gpio].chip)
                         continue;
                 chip = gpio_desc[gpio].chip;
diff --git a/drivers/gpio/mcp23s08.c b/drivers/gpio/mcp23s08.c
index bb60e8c1a1f0..7fb5b9d009d4 100644
--- a/drivers/gpio/mcp23s08.c
+++ b/drivers/gpio/mcp23s08.c
@@ -239,6 +239,7 @@ static int mcp23s08_probe(struct spi_device *spi)
         mcp->chip.base = pdata->base;
         mcp->chip.ngpio = 8;
         mcp->chip.can_sleep = 1;
+        mcp->chip.owner = THIS_MODULE;
 
         spi_set_drvdata(spi, mcp);
 
diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c
index 6e72fd31184d..e0e0af536108 100644
--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
@@ -189,6 +189,7 @@ static void pca953x_setup_gpio(struct pca953x_chip *chip, int gpios)
         gc->base = chip->gpio_start;
         gc->ngpio = gpios;
         gc->label = chip->client->name;
+        gc->owner = THIS_MODULE;
 }
 
 static int __devinit pca953x_probe(struct i2c_client *client)
diff --git a/drivers/gpio/pcf857x.c b/drivers/gpio/pcf857x.c
index c6b3b5378384..1106aa15ac79 100644
--- a/drivers/gpio/pcf857x.c
+++ b/drivers/gpio/pcf857x.c
@@ -159,6 +159,7 @@ static int pcf857x_probe(struct i2c_client *client)
 
         gpio->chip.base = pdata->gpio_base;
         gpio->chip.can_sleep = 1;
+        gpio->chip.owner = THIS_MODULE;
 
         /* NOTE:  the OnSemi jlc1562b is also largely compatible with
          * these parts, notably for output.  It has a low-resolution
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index e0d805f1b2bf..01427c51c7cc 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -654,7 +654,7 @@ static int usbhid_output_raw_report(struct hid_device *hid, __u8 *buf, size_t co
         ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
                 HID_REQ_SET_REPORT,
                 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
-                cpu_to_le16(((HID_OUTPUT_REPORT + 1) << 8) | *buf),
+                ((HID_OUTPUT_REPORT + 1) << 8) | *buf,
                 interface->desc.bInterfaceNumber, buf + 1, count - 1,
                 USB_CTRL_SET_TIMEOUT);
 
diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c
index 124445c20921..65038ca35e10 100644
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
@@ -419,17 +419,19 @@ icside_setup(void __iomem *base, struct cardinfo *info, struct expansion_card *e
 
         hwif = ide_find_port();
         if (hwif) {
-                int i;
-
                 /*
                  * Ensure we're using MMIO
                  */
                 default_hwif_mmiops(hwif);
 
-                for (i = 0; i <= 7; i++) {
-                        hwif->io_ports_array[i] = port;
-                        port += 1 << info->stepping;
-                }
+                hwif->io_ports.data_addr = port;
+                hwif->io_ports.error_addr = port + (1 << info->stepping);
+                hwif->io_ports.nsect_addr = port + (2 << info->stepping);
+                hwif->io_ports.lbal_addr = port + (3 << info->stepping);
+                hwif->io_ports.lbam_addr = port + (4 << info->stepping);
+                hwif->io_ports.lbah_addr = port + (5 << info->stepping);
+                hwif->io_ports.device_addr = port + (6 << info->stepping);
+                hwif->io_ports.status_addr = port + (7 << info->stepping);
                 hwif->io_ports.ctl_addr =
                         (unsigned long)base + info->ctrloffset;
                 hwif->irq     = ec->irq;
diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c
index a3573d40b4b7..f9210458aea0 100644
--- a/drivers/ide/legacy/q40ide.c
+++ b/drivers/ide/legacy/q40ide.c
@@ -36,23 +36,6 @@ static const unsigned long pcide_bases[Q40IDE_NUM_HWIFS] = {
     PCIDE_BASE6 */
 };
 
-
-    /*
-     *  Offsets from one of the above bases
-     */
-
-/* used to do addr translation here but it is easier to do in setup ports */
-/*#define IDE_OFF_B(x)  ((unsigned long)Q40_ISA_IO_B((IDE_##x##_OFFSET)))*/
-
-#define IDE_OFF_B(x)    ((unsigned long)((IDE_##x##_OFFSET)))
-#define IDE_OFF_W(x)    ((unsigned long)((IDE_##x##_OFFSET)))
-
-static const int pcide_offsets[IDE_NR_PORTS] = {
-    IDE_OFF_W(DATA), IDE_OFF_B(ERROR), IDE_OFF_B(NSECTOR), IDE_OFF_B(SECTOR),
-    IDE_OFF_B(LCYL), IDE_OFF_B(HCYL), 6 /*IDE_OFF_B(CURRENT)*/, IDE_OFF_B(STATUS),
-    518/*IDE_OFF(CMD)*/
-};
-
 static int q40ide_default_irq(unsigned long base)
 {
            switch (base) {
@@ -68,23 +51,22 @@ static int q40ide_default_irq(unsigned long base)
 /*
  * Addresses are pretranslated for Q40 ISA access.
  */
-void q40_ide_setup_ports ( hw_regs_t *hw,
-                        unsigned long base, int *offsets,
-                        unsigned long ctrl, unsigned long intr,
+static void q40_ide_setup_ports(hw_regs_t *hw, unsigned long base,
                         ide_ack_intr_t *ack_intr,
                         int irq)
 {
-        int i;
-
         memset(hw, 0, sizeof(hw_regs_t));
-        for (i = 0; i < IDE_NR_PORTS; i++) {
-                /* BIG FAT WARNING: 
-                   assumption: only DATA port is ever used in 16 bit mode */
-                if (i == 0)
-                        hw->io_ports_array[i] = Q40_ISA_IO_W(base + offsets[i]);
-                else
-                        hw->io_ports_array[i] = Q40_ISA_IO_B(base + offsets[i]);
-        }
+        /* BIG FAT WARNING: 
+           assumption: only DATA port is ever used in 16 bit mode */
+        hw->io_ports.data_addr = Q40_ISA_IO_W(base);
+        hw->io_ports.error_addr = Q40_ISA_IO_B(base + 1);
+        hw->io_ports.nsect_addr = Q40_ISA_IO_B(base + 2);
+        hw->io_ports.lbal_addr = Q40_ISA_IO_B(base + 3);
+        hw->io_ports.lbam_addr = Q40_ISA_IO_B(base + 4);
+        hw->io_ports.lbah_addr = Q40_ISA_IO_B(base + 5);
+        hw->io_ports.device_addr = Q40_ISA_IO_B(base + 6);
+        hw->io_ports.status_addr = Q40_ISA_IO_B(base + 7);
+        hw->io_ports.ctl_addr = Q40_ISA_IO_B(base + 0x206);
 
         hw->irq = irq;
         hw->ack_intr = ack_intr;
@@ -131,9 +113,8 @@ static int __init q40ide_init(void)
                 release_region(pcide_bases[i], 8);
                 continue;
         }
-        q40_ide_setup_ports(&hw,(unsigned long) pcide_bases[i], (int *)pcide_offsets, 
-                        pcide_bases[i]+0x206, 
-                        0, NULL,
+        q40_ide_setup_ports(&hw, pcide_bases[i],
+                        NULL,
 //                      m68kide_iops,
                         q40ide_default_irq(pcide_bases[i]));
 
diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c
index 1457b73850e7..7fb3cf81cfbf 100644
--- a/drivers/input/joystick/iforce/iforce-usb.c
+++ b/drivers/input/joystick/iforce/iforce-usb.c
@@ -159,7 +159,7 @@ static int iforce_usb_probe(struct usb_interface *intf,
 
         iforce->cr.bRequestType = USB_TYPE_VENDOR | USB_DIR_IN | USB_RECIP_INTERFACE;
         iforce->cr.wIndex = 0;
-        iforce->cr.wLength = 16;
+        iforce->cr.wLength = cpu_to_le16(16);
 
         usb_fill_int_urb(iforce->irq, dev, usb_rcvintpipe(dev, epirq->bEndpointAddress),
                         iforce->data, 16, iforce_usb_irq, iforce, epirq->bInterval);
diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c
index fed3c375ccf3..d8765cc93d27 100644
--- a/drivers/input/misc/sparcspkr.c
+++ b/drivers/input/misc/sparcspkr.c
@@ -2,33 +2,69 @@
  *  Driver for PC-speaker like devices found on various Sparc systems.
  *
  *  Copyright (c) 2002 Vojtech Pavlik
- *  Copyright (c) 2002, 2006 David S. Miller (davem@davemloft.net)
+ *  Copyright (c) 2002, 2006, 2008 David S. Miller (davem@davemloft.net)
  */
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/input.h>
-#include <linux/platform_device.h>
+#include <linux/of_device.h>
 
 #include <asm/io.h>
-#include <asm/ebus.h>
-#include <asm/isa.h>
 
 MODULE_AUTHOR("David S. Miller <davem@davemloft.net>");
 MODULE_DESCRIPTION("Sparc Speaker beeper driver");
 MODULE_LICENSE("GPL");
 
+struct grover_beep_info {
+        void __iomem    *freq_regs;
+        void __iomem    *enable_reg;
+};
+
+struct bbc_beep_info {
+        u32             clock_freq;
+        void __iomem    *regs;
+};
+
 struct sparcspkr_state {
         const char              *name;
-        unsigned long           iobase;
         int (*event)(struct input_dev *dev, unsigned int type, unsigned int code, int value);
         spinlock_t              lock;
         struct input_dev        *input_dev;
+        union {
+                struct grover_beep_info grover;
+                struct bbc_beep_info bbc;
+        } u;
 };
 
-static int ebus_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
+static u32 bbc_count_to_reg(struct bbc_beep_info *info, unsigned int count)
+{
+        u32 val, clock_freq = info->clock_freq;
+        int i;
+
+        if (!count)
+                return 0;
+
+        if (count <= clock_freq >> 20)
+                return 1 << 18;
+
+        if (count >= clock_freq >> 12)
+                return 1 << 10;
+
+        val = 1 << 18;
+        for (i = 19; i >= 11; i--) {
+                val >>= 1;
+                if (count <= clock_freq >> i)
+                        break;
+        }
+
+        return val;
+}
+
+static int bbc_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
         struct sparcspkr_state *state = dev_get_drvdata(dev->dev.parent);
+        struct bbc_beep_info *info = &state->u.bbc;
         unsigned int count = 0;
         unsigned long flags;
 
@@ -44,24 +80,29 @@ static int ebus_spkr_event(struct input_dev *dev, unsigned int type, unsigned in
         if (value > 20 && value < 32767)
                 count = 1193182 / value;
 
+        count = bbc_count_to_reg(info, count);
+
         spin_lock_irqsave(&state->lock, flags);
 
-        /* EBUS speaker only has on/off state, the frequency does not
-         * appear to be programmable.
-         */
-        if (state->iobase & 0x2UL)
-                outb(!!count, state->iobase);
-        else
-                outl(!!count, state->iobase);
+        if (count) {
+                outb(0x01,                 info->regs + 0);
+                outb(0x00,                 info->regs + 2);
+                outb((count >> 16) & 0xff, info->regs + 3);
+                outb((count >>  8) & 0xff, info->regs + 4);
+                outb(0x00,                 info->regs + 5);
+        } else {
+                outb(0x00,                 info->regs + 0);
+        }
 
         spin_unlock_irqrestore(&state->lock, flags);
 
         return 0;
 }
 
-static int isa_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
+static int grover_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
         struct sparcspkr_state *state = dev_get_drvdata(dev->dev.parent);
+        struct grover_beep_info *info = &state->u.grover;
         unsigned int count = 0;
         unsigned long flags;
 
@@ -81,15 +122,15 @@ static int isa_spkr_event(struct input_dev *dev, unsigned int type, unsigned int
 
         if (count) {
                 /* enable counter 2 */
-                outb(inb(state->iobase + 0x61) | 3, state->iobase + 0x61);
+                outb(inb(info->enable_reg) | 3, info->enable_reg);
                 /* set command for counter 2, 2 byte write */
-                outb(0xB6, state->iobase + 0x43);
+                outb(0xB6, info->freq_regs + 1);
                 /* select desired HZ */
-                outb(count & 0xff, state->iobase + 0x42);
-                outb((count >> 8) & 0xff, state->iobase + 0x42);
+                outb(count & 0xff, info->freq_regs + 0);
+                outb((count >> 8) & 0xff, info->freq_regs + 0);
         } else {
                 /* disable counter 2 */
-                outb(inb_p(state->iobase + 0x61) & 0xFC, state->iobase + 0x61);
+                outb(inb_p(info->enable_reg) & 0xFC, info->enable_reg);
         }
 
         spin_unlock_irqrestore(&state->lock, flags);
@@ -131,7 +172,7 @@ static int __devinit sparcspkr_probe(struct device *dev)
         return 0;
 }
 
-static int __devexit sparcspkr_remove(struct of_device *dev)
+static int sparcspkr_shutdown(struct of_device *dev)
 {
         struct sparcspkr_state *state = dev_get_drvdata(&dev->dev);
         struct input_dev *input_dev = state->input_dev;
@@ -139,115 +180,180 @@ static int __devexit sparcspkr_remove(struct of_device *dev)
         /* turn off the speaker */
         state->event(input_dev, EV_SND, SND_BELL, 0);
 
-        input_unregister_device(input_dev);
-
-        dev_set_drvdata(&dev->dev, NULL);
-        kfree(state);
-
         return 0;
 }
 
-static int sparcspkr_shutdown(struct of_device *dev)
+static int __devinit bbc_beep_probe(struct of_device *op, const struct of_device_id *match)
 {
-        struct sparcspkr_state *state = dev_get_drvdata(&dev->dev);
-        struct input_dev *input_dev = state->input_dev;
+        struct sparcspkr_state *state;
+        struct bbc_beep_info *info;
+        struct device_node *dp;
+        int err = -ENOMEM;
 
-        /* turn off the speaker */
-        state->event(input_dev, EV_SND, SND_BELL, 0);
+        state = kzalloc(sizeof(*state), GFP_KERNEL);
+        if (!state)
+                goto out_err;
+
+        state->name = "Sparc BBC Speaker";
+        state->event = bbc_spkr_event;
+        spin_lock_init(&state->lock);
+
+        dp = of_find_node_by_path("/");
+        err = -ENODEV;
+        if (!dp)
+                goto out_free;
+
+        info = &state->u.bbc;
+        info->clock_freq = of_getintprop_default(dp, "clock-frequency", 0);
+        if (!info->clock_freq)
+                goto out_free;
+
+        info->regs = of_ioremap(&op->resource[0], 0, 6, "bbc beep");
+        if (!info->regs)
+                goto out_free;
+
+        dev_set_drvdata(&op->dev, state);
+
+        err = sparcspkr_probe(&op->dev);
+        if (err)
+                goto out_clear_drvdata;
 
         return 0;
+
+out_clear_drvdata:
+        dev_set_drvdata(&op->dev, NULL);
+        of_iounmap(&op->resource[0], info->regs, 6);
+
+out_free:
+        kfree(state);
+out_err:
+        return err;
 }
 
-static int __devinit ebus_beep_probe(struct of_device *dev, const struct of_device_id *match)
+static int bbc_remove(struct of_device *op)
 {
-        struct linux_ebus_device *edev = to_ebus_device(&dev->dev);
-        struct sparcspkr_state *state;
-        int err;
+        struct sparcspkr_state *state = dev_get_drvdata(&op->dev);
+        struct input_dev *input_dev = state->input_dev;
+        struct bbc_beep_info *info = &state->u.bbc;
 
-        state = kzalloc(sizeof(*state), GFP_KERNEL);
-        if (!state)
-                return -ENOMEM;
+        /* turn off the speaker */
+        state->event(input_dev, EV_SND, SND_BELL, 0);
 
-        state->name = "Sparc EBUS Speaker";
-        state->iobase = edev->resource[0].start;
-        state->event = ebus_spkr_event;
-        spin_lock_init(&state->lock);
+        input_unregister_device(input_dev);
 
-        dev_set_drvdata(&dev->dev, state);
+        of_iounmap(&op->resource[0], info->regs, 6);
 
-        err = sparcspkr_probe(&dev->dev);
-        if (err) {
-                dev_set_drvdata(&dev->dev, NULL);
-                kfree(state);
-        }
+        dev_set_drvdata(&op->dev, NULL);
+        kfree(state);
 
         return 0;
 }
 
-static struct of_device_id ebus_beep_match[] = {
+static struct of_device_id bbc_beep_match[] = {
         {
                 .name = "beep",
+                .compatible = "SUNW,bbc-beep",
         },
         {},
 };
 
-static struct of_platform_driver ebus_beep_driver = {
-        .name           = "beep",
-        .match_table    = ebus_beep_match,
-        .probe          = ebus_beep_probe,
-        .remove         = __devexit_p(sparcspkr_remove),
+static struct of_platform_driver bbc_beep_driver = {
+        .name           = "bbcbeep",
+        .match_table    = bbc_beep_match,
+        .probe          = bbc_beep_probe,
+        .remove         = __devexit_p(bbc_remove),
         .shutdown       = sparcspkr_shutdown,
 };
 
-static int __devinit isa_beep_probe(struct of_device *dev, const struct of_device_id *match)
+static int __devinit grover_beep_probe(struct of_device *op, const struct of_device_id *match)
 {
-        struct sparc_isa_device *idev = to_isa_device(&dev->dev);
         struct sparcspkr_state *state;
-        int err;
+        struct grover_beep_info *info;
+        int err = -ENOMEM;
 
         state = kzalloc(sizeof(*state), GFP_KERNEL);
         if (!state)
-                return -ENOMEM;
+                goto out_err;
 
-        state->name = "Sparc ISA Speaker";
-        state->iobase = idev->resource.start;
-        state->event = isa_spkr_event;
+        state->name = "Sparc Grover Speaker";
+        state->event = grover_spkr_event;
         spin_lock_init(&state->lock);
 
-        dev_set_drvdata(&dev->dev, state);
+        info = &state->u.grover;
+        info->freq_regs = of_ioremap(&op->resource[2], 0, 2, "grover beep freq");
+        if (!info->freq_regs)
+                goto out_free;
 
-        err = sparcspkr_probe(&dev->dev);
-        if (err) {
-                dev_set_drvdata(&dev->dev, NULL);
-                kfree(state);
-        }
+        info->enable_reg = of_ioremap(&op->resource[3], 0, 1, "grover beep enable");
+        if (!info->enable_reg)
+                goto out_unmap_freq_regs;
+
+        dev_set_drvdata(&op->dev, state);
+
+        err = sparcspkr_probe(&op->dev);
+        if (err)
+                goto out_clear_drvdata;
+
+        return 0;
+
+out_clear_drvdata:
+        dev_set_drvdata(&op->dev, NULL);
+        of_iounmap(&op->resource[3], info->enable_reg, 1);
+
+out_unmap_freq_regs:
+        of_iounmap(&op->resource[2], info->freq_regs, 2);
+out_free:
+        kfree(state);
+out_err:
+        return err;
+}
+
+static int grover_remove(struct of_device *op)
+{
+        struct sparcspkr_state *state = dev_get_drvdata(&op->dev);
+        struct grover_beep_info *info = &state->u.grover;
+        struct input_dev *input_dev = state->input_dev;
+
+        /* turn off the speaker */
+        state->event(input_dev, EV_SND, SND_BELL, 0);
+
+        input_unregister_device(input_dev);
+
+        of_iounmap(&op->resource[3], info->enable_reg, 1);
+        of_iounmap(&op->resource[2], info->freq_regs, 2);
+
+        dev_set_drvdata(&op->dev, NULL);
+        kfree(state);
 
         return 0;
 }
 
-static struct of_device_id isa_beep_match[] = {
+static struct of_device_id grover_beep_match[] = {
         {
-                .name = "dma",
+                .name = "beep",
+                .compatible = "SUNW,smbus-beep",
         },
         {},
 };
 
-static struct of_platform_driver isa_beep_driver = {
-        .name           = "beep",
-        .match_table    = isa_beep_match,
-        .probe          = isa_beep_probe,
-        .remove         = __devexit_p(sparcspkr_remove),
+static struct of_platform_driver grover_beep_driver = {
+        .name           = "groverbeep",
+        .match_table    = grover_beep_match,
+        .probe          = grover_beep_probe,
+        .remove         = __devexit_p(grover_remove),
         .shutdown       = sparcspkr_shutdown,
 };
 
 static int __init sparcspkr_init(void)
 {
-        int err = of_register_driver(&ebus_beep_driver, &ebus_bus_type);
+        int err = of_register_driver(&bbc_beep_driver,
+                                     &of_platform_bus_type);
 
         if (!err) {
-                err = of_register_driver(&isa_beep_driver, &isa_bus_type);
+                err = of_register_driver(&grover_beep_driver,
+                                         &of_platform_bus_type);
                 if (err)
-                        of_unregister_driver(&ebus_beep_driver);
+                        of_unregister_driver(&bbc_beep_driver);
         }
 
         return err;
@@ -255,8 +361,8 @@ static int __init sparcspkr_init(void)
 
 static void __exit sparcspkr_exit(void)
 {
-        of_unregister_driver(&ebus_beep_driver);
-        of_unregister_driver(&isa_beep_driver);
+        of_unregister_driver(&bbc_beep_driver);
+        of_unregister_driver(&grover_beep_driver);
 }
 
 module_init(sparcspkr_init);
diff --git a/drivers/input/tablet/gtco.c b/drivers/input/tablet/gtco.c
index d2c6da264722..f66ca215cdec 100644
--- a/drivers/input/tablet/gtco.c
+++ b/drivers/input/tablet/gtco.c
@@ -897,7 +897,7 @@ static int gtco_probe(struct usb_interface *usbinterface,
         dbg("Extra descriptor success: type:%d  len:%d",
             hid_desc->bDescriptorType,  hid_desc->wDescriptorLength);
 
-        report = kzalloc(hid_desc->wDescriptorLength, GFP_KERNEL);
+        report = kzalloc(le16_to_cpu(hid_desc->wDescriptorLength), GFP_KERNEL);
         if (!report) {
                 err("No more memory for report");
                 error = -ENOMEM;
@@ -913,16 +913,16 @@ static int gtco_probe(struct usb_interface *usbinterface,
                                          REPORT_DEVICE_TYPE << 8,
                                          0, /* interface */
                                          report,
-                                         hid_desc->wDescriptorLength,
+                                         le16_to_cpu(hid_desc->wDescriptorLength),
                                          5000); /* 5 secs */
 
-                if (result == hid_desc->wDescriptorLength)
+                if (result == le16_to_cpu(hid_desc->wDescriptorLength))
                         break;
         }
 
         /* If we didn't get the report, fail */
         dbg("usb_control_msg result: :%d", result);
-        if (result != hid_desc->wDescriptorLength) {
+        if (result != le16_to_cpu(hid_desc->wDescriptorLength)) {
                 err("Failed to get HID Report Descriptor of size: %d",
                     hid_desc->wDescriptorLength);
                 error = -EIO;
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index 23ae66c76d47..24c6b7ca62be 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -350,7 +350,7 @@ static void capincci_free(struct capidev *cdev, u32 ncci)
                 if (ncci == 0xffffffff || np->ncci == ncci) {
                         *pp = (*pp)->next;
 #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
-                        if ((mp = np->minorp) != 0) {
+                        if ((mp = np->minorp) != NULL) {
 #if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE)
                                 capifs_free_ncci(mp->minor);
 #endif
@@ -366,7 +366,7 @@ static void capincci_free(struct capidev *cdev, u32 ncci)
                         }
 #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */
                         kfree(np);
-                        if (*pp == 0) return;
+                        if (*pp == NULL) return;
                 } else {
                         pp = &(*pp)->next;
                 }
@@ -483,7 +483,7 @@ static int handle_recv_skb(struct capiminor *mp, struct sk_buff *skb)
 #endif
                 goto bad;
         }
-        if ((nskb = gen_data_b3_resp_for(mp, skb)) == 0) {
+        if ((nskb = gen_data_b3_resp_for(mp, skb)) == NULL) {
                 printk(KERN_ERR "capi: gen_data_b3_resp failed\n");
                 goto bad;
         }
@@ -512,7 +512,7 @@ bad:
 static void handle_minor_recv(struct capiminor *mp)
 {
         struct sk_buff *skb;
-        while ((skb = skb_dequeue(&mp->inqueue)) != 0) {
+        while ((skb = skb_dequeue(&mp->inqueue)) != NULL) {
                 unsigned int len = skb->len;
                 mp->inbytes -= len;
                 if (handle_recv_skb(mp, skb) < 0) {
@@ -538,7 +538,7 @@ static int handle_minor_send(struct capiminor *mp)
                 return 0;
         }
 
-        while ((skb = skb_dequeue(&mp->outqueue)) != 0) {
+        while ((skb = skb_dequeue(&mp->outqueue)) != NULL) {
                 datahandle = mp->datahandle;
                 len = (u16)skb->len;
                 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
@@ -689,19 +689,19 @@ capi_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
         if (!cdev->ap.applid)
                 return -ENODEV;
 
-        if ((skb = skb_dequeue(&cdev->recvqueue)) == 0) {
+        if ((skb = skb_dequeue(&cdev->recvqueue)) == NULL) {
 
                 if (file->f_flags & O_NONBLOCK)
                         return -EAGAIN;
 
                 for (;;) {
                         interruptible_sleep_on(&cdev->recvwait);
-                        if ((skb = skb_dequeue(&cdev->recvqueue)) != 0)
+                        if ((skb = skb_dequeue(&cdev->recvqueue)) != NULL)
                                 break;
                         if (signal_pending(current))
                                 break;
                 }
-                if (skb == 0)
+                if (skb == NULL)
                         return -ERESTARTNOHAND;
         }
         if (skb->len > count) {
@@ -940,12 +940,12 @@ capi_ioctl(struct inode *inode, struct file *file,
                                 return -EFAULT;
 
                         mutex_lock(&cdev->ncci_list_mtx);
-                        if ((nccip = capincci_find(cdev, (u32) ncci)) == 0) {
+                        if ((nccip = capincci_find(cdev, (u32) ncci)) == NULL) {
                                 mutex_unlock(&cdev->ncci_list_mtx);
                                 return 0;
                         }
 #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
-                        if ((mp = nccip->minorp) != 0) {
+                        if ((mp = nccip->minorp) != NULL) {
                                 count += atomic_read(&mp->ttyopencount);
                         }
 #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */
@@ -966,7 +966,7 @@ capi_ioctl(struct inode *inode, struct file *file,
                                 return -EFAULT;
                         mutex_lock(&cdev->ncci_list_mtx);
                         nccip = capincci_find(cdev, (u32) ncci);
-                        if (!nccip || (mp = nccip->minorp) == 0) {
+                        if (!nccip || (mp = nccip->minorp) == NULL) {
                                 mutex_unlock(&cdev->ncci_list_mtx);
                                 return -ESRCH;
                         }
@@ -986,7 +986,7 @@ capi_open(struct inode *inode, struct file *file)
         if (file->private_data)
                 return -EEXIST;
 
-        if ((file->private_data = capidev_alloc()) == 0)
+        if ((file->private_data = capidev_alloc()) == NULL)
                 return -ENOMEM;
 
         return nonseekable_open(inode, file);
@@ -1023,9 +1023,9 @@ static int capinc_tty_open(struct tty_struct * tty, struct file * file)
         struct capiminor *mp;
         unsigned long flags;
 
-        if ((mp = capiminor_find(iminor(file->f_path.dentry->d_inode))) == 0)
+        if ((mp = capiminor_find(iminor(file->f_path.dentry->d_inode))) == NULL)
                 return -ENXIO;
-        if (mp->nccip == 0)
+        if (mp->nccip == NULL)
                 return -ENXIO;
 
         tty->driver_data = (void *)mp;
@@ -1058,7 +1058,7 @@ static void capinc_tty_close(struct tty_struct * tty, struct file * file)
 #ifdef _DEBUG_REFCOUNT
                 printk(KERN_DEBUG "capinc_tty_close ocount=%d\n", atomic_read(&mp->ttyopencount));
 #endif
-                if (mp->nccip == 0)
+                if (mp->nccip == NULL)
                         capiminor_free(mp);
         }
 
@@ -1526,9 +1526,9 @@ static int __init capi_init(void)
         char *compileinfo;
         int major_ret;
 
-        if ((p = strchr(revision, ':')) != 0 && p[1]) {
+        if ((p = strchr(revision, ':')) != NULL && p[1]) {
                 strlcpy(rev, p + 2, sizeof(rev));
-                if ((p = strchr(rev, '$')) != 0 && p > rev)
+                if ((p = strchr(rev, '$')) != NULL && p > rev)
                    *(p-1) = 0;
         } else
                 strcpy(rev, "1.0");
diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c
index cb42b690b45e..d5b4cc357a3c 100644
--- a/drivers/isdn/capi/capidrv.c
+++ b/drivers/isdn/capi/capidrv.c
@@ -335,7 +335,7 @@ static capidrv_plci *new_plci(capidrv_contr * card, int chan)
 
         plcip = kzalloc(sizeof(capidrv_plci), GFP_ATOMIC);
 
-        if (plcip == 0)
+        if (plcip == NULL)
                 return NULL;
 
         plcip->state = ST_PLCI_NONE;
@@ -404,7 +404,7 @@ static inline capidrv_ncci *new_ncci(capidrv_contr * card,
 
         nccip = kzalloc(sizeof(capidrv_ncci), GFP_ATOMIC);
 
-        if (nccip == 0)
+        if (nccip == NULL)
                 return NULL;
 
         nccip->ncci = ncci;
@@ -426,7 +426,7 @@ static inline capidrv_ncci *find_ncci(capidrv_contr * card, u32 ncci)
         capidrv_plci *plcip;
         capidrv_ncci *p;
 
-        if ((plcip = find_plci_by_ncci(card, ncci)) == 0)
+        if ((plcip = find_plci_by_ncci(card, ncci)) == NULL)
                 return NULL;
 
         for (p = plcip->ncci_list; p; p = p->next)
@@ -441,7 +441,7 @@ static inline capidrv_ncci *find_ncci_by_msgid(capidrv_contr * card,
         capidrv_plci *plcip;
         capidrv_ncci *p;
 
-        if ((plcip = find_plci_by_ncci(card, ncci)) == 0)
+        if ((plcip = find_plci_by_ncci(card, ncci)) == NULL)
                 return NULL;
 
         for (p = plcip->ncci_list; p; p = p->next)
@@ -755,7 +755,7 @@ static inline int new_bchan(capidrv_contr * card)
 {
         int i;
         for (i = 0; i < card->nbchan; i++) {
-                if (card->bchans[i].plcip == 0) {
+                if (card->bchans[i].plcip == NULL) {
                         card->bchans[i].disconnecting = 0;
                         return i;
                 }
@@ -877,7 +877,7 @@ static void handle_incoming_call(capidrv_contr * card, _cmsg * cmsg)
                 return;
         }
         bchan = &card->bchans[chan];
-        if ((plcip = new_plci(card, chan)) == 0) {
+        if ((plcip = new_plci(card, chan)) == NULL) {
                 printk(KERN_ERR "capidrv-%d: incoming call: no memory, sorry.\n", card->contrnr);
                 return;
         }
@@ -1388,12 +1388,12 @@ static void capidrv_recv_message(struct capi20_appl *ap, struct sk_buff *skb)
                 _cdebbuf *cdb = capi_cmsg2str(&s_cmsg);
 
                 if (cdb) {
-                        printk(KERN_DEBUG "%s: applid=%d %s\n", __FUNCTION__,
+                        printk(KERN_DEBUG "%s: applid=%d %s\n", __func__,
                                 ap->applid, cdb->buf);
                         cdebbuf_free(cdb);
                 } else
                         printk(KERN_DEBUG "%s: applid=%d %s not traced\n",
-                                __FUNCTION__, ap->applid,
+                                __func__, ap->applid,
                                 capi_cmd2str(s_cmsg.Command, s_cmsg.Subcommand));
         }
         if (s_cmsg.Command == CAPI_DATA_B3
@@ -1661,7 +1661,7 @@ static int capidrv_command(isdn_ctrl * c, capidrv_contr * card)
                                               NULL,     /* Useruserdata */
                                               NULL      /* Facilitydataarray */
                             );
-                        if ((plcip = new_plci(card, (c->arg % card->nbchan))) == 0) {
+                        if ((plcip = new_plci(card, (c->arg % card->nbchan))) == NULL) {
                                 cmd.command = ISDN_STAT_DHUP;
                                 cmd.driver = card->myid;
                                 cmd.arg = (c->arg % card->nbchan);
@@ -1966,7 +1966,7 @@ static void enable_dchannel_trace(capidrv_contr *card)
                         card->name, errcode);
            return;
         }
-        if (strstr(manufacturer, "AVM") == 0) {
+        if (strstr(manufacturer, "AVM") == NULL) {
            printk(KERN_ERR "%s: not from AVM, no d-channel trace possible (%s)\n",
                         card->name, manufacturer);
            return;
@@ -2291,10 +2291,10 @@ static int __init capidrv_init(void)
         u32 ncontr, contr;
         u16 errcode;
 
-        if ((p = strchr(revision, ':')) != 0 && p[1]) {
+        if ((p = strchr(revision, ':')) != NULL && p[1]) {
                 strncpy(rev, p + 2, sizeof(rev));
                 rev[sizeof(rev)-1] = 0;
-                if ((p = strchr(rev, '$')) != 0 && p > rev)
+                if ((p = strchr(rev, '$')) != NULL && p > rev)
                    *(p-1) = 0;
         } else
                 strcpy(rev, "1.0");
@@ -2335,10 +2335,10 @@ static void __exit capidrv_exit(void)
         char rev[32];
         char *p;
 
-        if ((p = strchr(revision, ':')) != 0) {
+        if ((p = strchr(revision, ':')) != NULL) {
                 strncpy(rev, p + 1, sizeof(rev));
                 rev[sizeof(rev)-1] = 0;
-                if ((p = strchr(rev, '$')) != 0)
+                if ((p = strchr(rev, '$')) != NULL)
                         *p = 0;
         } else {
                 strcpy(rev, " ??? ");
diff --git a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c
index 6d7c47ec0367..550e80f390a6 100644
--- a/drivers/isdn/capi/capifs.c
+++ b/drivers/isdn/capi/capifs.c
@@ -69,6 +69,7 @@ static int capifs_remount(struct super_block *s, int *flags, char *data)
                 } else if (sscanf(this_char, "mode=%o%c", &n, &dummy) == 1)
                         mode = n & ~S_IFMT;
                 else {
+                        kfree(new_opt);
                         printk("capifs: called with bogus options\n");
                         return -EINVAL;
                 }
@@ -189,9 +190,9 @@ static int __init capifs_init(void)
         char *p;
         int err;
 
-        if ((p = strchr(revision, ':')) != 0 && p[1]) {
+        if ((p = strchr(revision, ':')) != NULL && p[1]) {
                 strlcpy(rev, p + 2, sizeof(rev));
-                if ((p = strchr(rev, '$')) != 0 && p > rev)
+                if ((p = strchr(rev, '$')) != NULL && p > rev)
                    *(p-1) = 0;
         } else
                 strcpy(rev, "1.0");
diff --git a/drivers/isdn/capi/capilib.c b/drivers/isdn/capi/capilib.c
index 68409d971e73..fcaa1241ee77 100644
--- a/drivers/isdn/capi/capilib.c
+++ b/drivers/isdn/capi/capilib.c
@@ -4,7 +4,7 @@
 #include <linux/isdn/capilli.h>
 
 #define DBG(format, arg...) do { \
-printk(KERN_DEBUG "%s: " format "\n" , __FUNCTION__ , ## arg); \
+printk(KERN_DEBUG "%s: " format "\n" , __func__ , ## arg); \
 } while (0)
 
 struct capilib_msgidqueue {
@@ -44,7 +44,7 @@ static inline void mq_init(struct capilib_ncci * np)
 static inline int mq_enqueue(struct capilib_ncci * np, u16 msgid)
 {
         struct capilib_msgidqueue *mq;
-        if ((mq = np->msgidfree) == 0)
+        if ((mq = np->msgidfree) == NULL)
                 return 0;
         np->msgidfree = mq->next;
         mq->msgid = msgid;
diff --git a/drivers/isdn/capi/capiutil.c b/drivers/isdn/capi/capiutil.c
index 22379b94e88f..ebef4ce1b00c 100644
--- a/drivers/isdn/capi/capiutil.c
+++ b/drivers/isdn/capi/capiutil.c
@@ -450,7 +450,7 @@ static void pars_2_message(_cmsg * cmsg)
                         cmsg->l += 4;
                         break;
                 case _CSTRUCT:
-                        if (*(u8 **) OFF == 0) {
+                        if (*(u8 **) OFF == NULL) {
                                 *(cmsg->m + cmsg->l) = '\0';
                                 cmsg->l++;
                         } else if (**(_cstruct *) OFF != 0xff) {
diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c
index f55531869313..75726ea0fbbd 100644
--- a/drivers/isdn/capi/kcapi.c
+++ b/drivers/isdn/capi/kcapi.c
@@ -10,7 +10,7 @@
  *
  */
 
-#define CONFIG_AVMB1_COMPAT
+#define AVMB1_COMPAT
 
 #include "kcapi.h"
 #include <linux/module.h>
@@ -29,7 +29,7 @@
 #include <asm/uaccess.h>
 #include <linux/isdn/capicmd.h>
 #include <linux/isdn/capiutil.h>
-#ifdef CONFIG_AVMB1_COMPAT
+#ifdef AVMB1_COMPAT
 #include <linux/b1lli.h>
 #endif
 #include <linux/mutex.h>
@@ -154,7 +154,7 @@ static void register_appl(struct capi_ctr *card, u16 applid, capi_register_param
         if (card)
                 card->register_appl(card, applid, rparam);
         else
-                printk(KERN_WARNING "%s: cannot get card resources\n", __FUNCTION__);
+                printk(KERN_WARNING "%s: cannot get card resources\n", __func__);
 }
 
 
@@ -178,7 +178,7 @@ static void notify_up(u32 contr)
                 printk(KERN_DEBUG "kcapi: notify up contr %d\n", contr);
         }
         if (!card) {
-                printk(KERN_WARNING "%s: invalid contr %d\n", __FUNCTION__, contr);
+                printk(KERN_WARNING "%s: invalid contr %d\n", __func__, contr);
                 return;
         }
         for (applid = 1; applid <= CAPI_MAXAPPL; applid++) {
@@ -740,7 +740,7 @@ u16 capi20_get_profile(u32 contr, struct capi_profile *profp)
 
 EXPORT_SYMBOL(capi20_get_profile);
 
-#ifdef CONFIG_AVMB1_COMPAT
+#ifdef AVMB1_COMPAT
 static int old_capi_manufacturer(unsigned int cmd, void __user *data)
 {
         avmb1_loadandconfigdef ldef;
@@ -826,7 +826,7 @@ static int old_capi_manufacturer(unsigned int cmd, void __user *data)
                 card = capi_ctr_get(card);
                 if (!card)
                         return -ESRCH;
-                if (card->load_firmware == 0) {
+                if (card->load_firmware == NULL) {
                         printk(KERN_DEBUG "kcapi: load: no load function\n");
                         return -ESRCH;
                 }
@@ -835,7 +835,7 @@ static int old_capi_manufacturer(unsigned int cmd, void __user *data)
                         printk(KERN_DEBUG "kcapi: load: invalid parameter: length of t4file is %d ?\n", ldef.t4file.len);
                         return -EINVAL;
                 }
-                if (ldef.t4file.data == 0) {
+                if (ldef.t4file.data == NULL) {
                         printk(KERN_DEBUG "kcapi: load: invalid parameter: dataptr is 0\n");
                         return -EINVAL;
                 }
@@ -904,7 +904,7 @@ int capi20_manufacturer(unsigned int cmd, void __user *data)
         struct capi_ctr *card;
 
         switch (cmd) {
-#ifdef CONFIG_AVMB1_COMPAT
+#ifdef AVMB1_COMPAT
         case AVMB1_LOAD:
         case AVMB1_LOAD_AND_CONFIG:
         case AVMB1_RESETCARD:
@@ -951,7 +951,7 @@ int capi20_manufacturer(unsigned int cmd, void __user *data)
                         if (strcmp(driver->name, cdef.driver) == 0)
                                 break;
                 }
-                if (driver == 0) {
+                if (driver == NULL) {
                         printk(KERN_ERR "kcapi: driver \"%s\" not loaded.\n",
                                         cdef.driver);
                         return -ESRCH;
@@ -1004,9 +1004,9 @@ static int __init kcapi_init(void)
                 return ret;
         kcapi_proc_init();
 
-        if ((p = strchr(revision, ':')) != 0 && p[1]) {
+        if ((p = strchr(revision, ':')) != NULL && p[1]) {
                 strlcpy(rev, p + 2, sizeof(rev));
-                if ((p = strchr(rev, '$')) != 0 && p > rev)
+                if ((p = strchr(rev, '$')) != NULL && p > rev)
                    *(p-1) = 0;
         } else
                 strcpy(rev, "1.0");
diff --git a/drivers/isdn/capi/kcapi.h b/drivers/isdn/capi/kcapi.h
index 1cb2c40f9921..244711f7f838 100644
--- a/drivers/isdn/capi/kcapi.h
+++ b/drivers/isdn/capi/kcapi.h
@@ -17,7 +17,7 @@
 
 #ifdef KCAPI_DEBUG
 #define DBG(format, arg...) do { \
-printk(KERN_DEBUG "%s: " format "\n" , __FUNCTION__ , ## arg); \
+printk(KERN_DEBUG "%s: " format "\n" , __func__ , ## arg); \
 } while (0)
 #else
 #define DBG(format, arg...) /* */
diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
index 4484a6417235..abf05ec31760 100644
--- a/drivers/isdn/hardware/avm/b1.c
+++ b/drivers/isdn/hardware/avm/b1.c
@@ -661,11 +661,11 @@ int b1ctl_read_proc(char *page, char **start, off_t off,
         len += sprintf(page+len, "%-16s %s\n", "type", s);
         if (card->cardtype == avm_t1isa)
            len += sprintf(page+len, "%-16s %d\n", "cardnr", card->cardnr);
-        if ((s = cinfo->version[VER_DRIVER]) != 0)
+        if ((s = cinfo->version[VER_DRIVER]) != NULL)
            len += sprintf(page+len, "%-16s %s\n", "ver_driver", s);
-        if ((s = cinfo->version[VER_CARDTYPE]) != 0)
+        if ((s = cinfo->version[VER_CARDTYPE]) != NULL)
            len += sprintf(page+len, "%-16s %s\n", "ver_cardtype", s);
-        if ((s = cinfo->version[VER_SERIAL]) != 0)
+        if ((s = cinfo->version[VER_SERIAL]) != NULL)
            len += sprintf(page+len, "%-16s %s\n", "ver_serial", s);
 
         if (card->cardtype != avm_m1) {
@@ -788,9 +788,9 @@ static int __init b1_init(void)
         char *p;
         char rev[32];
 
-        if ((p = strchr(revision, ':')) != 0 && p[1]) {
+        if ((p = strchr(revision, ':')) != NULL && p[1]) {
                 strlcpy(rev, p + 2, 32);
-                if ((p = strchr(rev, '$')) != 0 && p > rev)
+                if ((p = strchr(rev, '$')) != NULL && p > rev)
                    *(p-1) = 0;
         } else
                 strcpy(rev, "1.0");
diff --git a/drivers/isdn/hardware/avm/b1dma.c b/drivers/isdn/hardware/avm/b1dma.c
index 669f6f67449c..da34b98e3de7 100644
--- a/drivers/isdn/hardware/avm/b1dma.c
+++ b/drivers/isdn/hardware/avm/b1dma.c
@@ -883,11 +883,11 @@ int b1dmactl_read_proc(char *page, char **start, off_t off,
         default: s = "???"; break;
         }
         len += sprintf(page+len, "%-16s %s\n", "type", s);
-        if ((s = cinfo->version[VER_DRIVER]) != 0)
+        if ((s = cinfo->version[VER_DRIVER]) != NULL)
            len += sprintf(page+len, "%-16s %s\n", "ver_driver", s);
-        if ((s = cinfo->version[VER_CARDTYPE]) != 0)
+        if ((s = cinfo->version[VER_CARDTYPE]) != NULL)
            len += sprintf(page+len, "%-16s %s\n", "ver_cardtype", s);
-        if ((s = cinfo->version[VER_SERIAL]) != 0)
+        if ((s = cinfo->version[VER_SERIAL]) != NULL)
            len += sprintf(page+len, "%-16s %s\n", "ver_serial", s);
 
         if (card->cardtype != avm_m1) {
@@ -970,9 +970,9 @@ static int __init b1dma_init(void)
         char *p;
         char rev[32];
 
-        if ((p = strchr(revision, ':')) != 0 && p[1]) {
+        if ((p = strchr(revision, ':')) != NULL && p[1]) {
                 strlcpy(rev, p + 2, sizeof(rev));
-                if ((p = strchr(rev, '$')) != 0 && p > rev)
+                if ((p = strchr(rev, '$')) != NULL && p > rev)
                    *(p-1) = 0;
         } else
                 strcpy(rev, "1.0");
diff --git a/drivers/isdn/hardware/avm/b1isa.c b/drivers/isdn/hardware/avm/b1isa.c
index 80fb488848b8..1e288eeb5e2a 100644
--- a/drivers/isdn/hardware/avm/b1isa.c
+++ b/drivers/isdn/hardware/avm/b1isa.c
@@ -203,9 +203,9 @@ static int __init b1isa_init(void)
         char rev[32];
         int i;
 
-        if ((p = strchr(revision, ':')) != 0 && p[1]) {
+        if ((p = strchr(revision, ':')) != NULL && p[1]) {
                 strlcpy(rev, p + 2, 32);
-                if ((p = strchr(rev, '$')) != 0 && p > rev)
+                if ((p = strchr(rev, '$')) != NULL && p > rev)
                    *(p-1) = 0;
         } else
                 strcpy(rev, "1.0");
diff --git a/drivers/isdn/hardware/avm/b1pci.c b/drivers/isdn/hardware/avm/b1pci.c
index 90e2e6643d19..5b314a2c4049 100644
--- a/drivers/isdn/hardware/avm/b1pci.c
+++ b/drivers/isdn/hardware/avm/b1pci.c
@@ -382,9 +382,9 @@ static int __init b1pci_init(void)
         char rev[32];
         int err;
 
-        if ((p = strchr(revision, ':')) != 0 && p[1]) {
+        if ((p = strchr(revision, ':')) != NULL && p[1]) {
                 strlcpy(rev, p + 2, 32);
-                if ((p = strchr(rev, '$')) != 0 && p > rev)
+                if ((p = strchr(rev, '$')) != NULL && p > rev)
                    *(p-1) = 0;
         } else
                 strcpy(rev, "1.0");
diff --git a/drivers/isdn/hardware/avm/b1pcmcia.c b/drivers/isdn/hardware/avm/b1pcmcia.c
index e479c0aef38d..7740403b40e1 100644
--- a/drivers/isdn/hardware/avm/b1pcmcia.c
+++ b/drivers/isdn/hardware/avm/b1pcmcia.c
@@ -201,9 +201,9 @@ static int __init b1pcmcia_init(void)
         char *p;
         char rev[32];
 
-        if ((p = strchr(revision, ':')) != 0 && p[1]) {
+        if ((p = strchr(revision, ':')) != NULL && p[1]) {
                 strlcpy(rev, p + 2, 32);
-                if ((p = strchr(rev, '$')) != 0 && p > rev)
+                if ((p = strchr(rev, '$')) != NULL && p > rev)
                    *(p-1) = 0;
         } else
                 strcpy(rev, "1.0");
diff --git a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c
index 4bbbbe688077..9df1d3f66c87 100644
--- a/drivers/isdn/hardware/avm/c4.c
+++ b/drivers/isdn/hardware/avm/c4.c
@@ -1088,11 +1088,11 @@ static int c4_read_proc(char *page, char **start, off_t off,
         default: s = "???"; break;
         }
         len += sprintf(page+len, "%-16s %s\n", "type", s);
-        if ((s = cinfo->version[VER_DRIVER]) != 0)
+        if ((s = cinfo->version[VER_DRIVER]) != NULL)
            len += sprintf(page+len, "%-16s %s\n", "ver_driver", s);
-        if ((s = cinfo->version[VER_CARDTYPE]) != 0)
+        if ((s = cinfo->version[VER_CARDTYPE]) != NULL)
            len += sprintf(page+len, "%-16s %s\n", "ver_cardtype", s);
-        if ((s = cinfo->version[VER_SERIAL]) != 0)
+        if ((s = cinfo->version[VER_SERIAL]) != NULL)
            len += sprintf(page+len, "%-16s %s\n", "ver_serial", s);
 
         if (card->cardtype != avm_m1) {
@@ -1167,7 +1167,7 @@ static int c4_add_card(struct capicardparams *p, struct pci_dev *dev,
         }
 
         card->mbase = ioremap(card->membase, 128);
-        if (card->mbase == 0) {
+        if (card->mbase == NULL) {
                 printk(KERN_NOTICE "c4: can't remap memory at 0x%lx\n",
                        card->membase);
                 retval = -EIO;
@@ -1291,9 +1291,9 @@ static int __init c4_init(void)
         char rev[32];
         int err;
 
-        if ((p = strchr(revision, ':')) != 0 && p[1]) {
+        if ((p = strchr(revision, ':')) != NULL && p[1]) {
                 strlcpy(rev, p + 2, 32);
-                if ((p = strchr(rev, '$')) != 0 && p > rev)
+                if ((p = strchr(rev, '$')) != NULL && p > rev)
                    *(p-1) = 0;
         } else
                 strcpy(rev, "1.0");
diff --git a/drivers/isdn/hardware/avm/t1isa.c b/drivers/isdn/hardware/avm/t1isa.c
index 6130724e46e7..e7724493738c 100644
--- a/drivers/isdn/hardware/avm/t1isa.c
+++ b/drivers/isdn/hardware/avm/t1isa.c
@@ -551,9 +551,9 @@ static int __init t1isa_init(void)
         char *p;
         int i;
 
-        if ((p = strchr(revision, ':')) != 0 && p[1]) {
+        if ((p = strchr(revision, ':')) != NULL && p[1]) {
                 strlcpy(rev, p + 2, 32);
-                if ((p = strchr(rev, '$')) != 0 && p > rev)
+                if ((p = strchr(rev, '$')) != NULL && p > rev)
                    *(p-1) = 0;
         } else
                 strcpy(rev, "1.0");
diff --git a/drivers/isdn/hardware/avm/t1pci.c b/drivers/isdn/hardware/avm/t1pci.c
index d1e253c94db4..e6d298d75146 100644
--- a/drivers/isdn/hardware/avm/t1pci.c
+++ b/drivers/isdn/hardware/avm/t1pci.c
@@ -233,9 +233,9 @@ static int __init t1pci_init(void)
         char rev[32];
         int err;
 
-        if ((p = strchr(revision, ':')) != 0 && p[1]) {
+        if ((p = strchr(revision, ':')) != NULL && p[1]) {
                 strlcpy(rev, p + 2, 32);
-                if ((p = strchr(rev, '$')) != 0 && p > rev)
+                if ((p = strchr(rev, '$')) != NULL && p > rev)
                    *(p-1) = 0;
         } else
                 strcpy(rev, "1.0");
diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c
index 6d39f9360766..5fcbdccd7a53 100644
--- a/drivers/isdn/hardware/eicon/divasmain.c
+++ b/drivers/isdn/hardware/eicon/divasmain.c
@@ -393,7 +393,7 @@ void diva_free_dma_map(void *hdev, struct _diva_dma_map_entry *pmap)
         dma_addr_t dma_handle;
         void *addr_handle;
 
-        for (i = 0; (pmap != 0); i++) {
+        for (i = 0; (pmap != NULL); i++) {
                 diva_get_dma_map_entry(pmap, i, &cpu_addr, &phys_addr);
                 if (!cpu_addr) {
                         break;
diff --git a/drivers/isdn/hardware/eicon/message.c b/drivers/isdn/hardware/eicon/message.c
index 1ff98e7eb794..599fed88222d 100644
--- a/drivers/isdn/hardware/eicon/message.c
+++ b/drivers/isdn/hardware/eicon/message.c
@@ -742,7 +742,7 @@ static void start_internal_command (dword Id, PLCI   *plci, t_std_internal_comma
   else
   {
     i = 1;
-    while (plci->internal_command_queue[i] != 0)
+    while (plci->internal_command_queue[i] != NULL)
       i++;
     plci->internal_command_queue[i] = command_function;
   }
@@ -758,7 +758,7 @@ static void next_internal_command (dword Id, PLCI   *plci)
 
   plci->internal_command = 0;
   plci->internal_command_queue[0] = NULL;
-  while (plci->internal_command_queue[1] != 0)
+  while (plci->internal_command_queue[1] != NULL)
   {
     for (i = 0; i < MAX_INTERNAL_COMMAND_LEVELS - 1; i++)
       plci->internal_command_queue[i] = plci->internal_command_queue[i+1];
@@ -9119,7 +9119,7 @@ word AdvCodecSupport(DIVA_CAPI_ADAPTER   *a, PLCI   *plci, APPL   *appl, byte ho
         dbug(1,dprintf("AdvSigPlci=0x%x",a->AdvSignalPLCI));
         return 0x2001; /* codec in use by another application */
       }
-      if(plci!=0)
+      if(plci!=NULL)
       {
         a->AdvSignalPLCI = plci;
         plci->tel=ADV_VOICE;
@@ -9144,7 +9144,7 @@ word AdvCodecSupport(DIVA_CAPI_ADAPTER   *a, PLCI   *plci, APPL   *appl, byte ho
         }
                                                /* indicate D-ch connect if  */
       }                                        /* codec is connected OK     */
-      if(plci!=0)
+      if(plci!=NULL)
       {
         a->AdvSignalPLCI = plci;
         plci->tel=ADV_VOICE;
@@ -9170,7 +9170,7 @@ word AdvCodecSupport(DIVA_CAPI_ADAPTER   *a, PLCI   *plci, APPL   *appl, byte ho
   {
     if(hook_listen) return 0x300B;               /* Facility not supported */
                                                  /* no hook with SCOM      */
-    if(plci!=0) plci->tel = CODEC;
+    if(plci!=NULL) plci->tel = CODEC;
     dbug(1,dprintf("S/SCOM codec"));
     /* first time we use the scom-s codec we must shut down the internal   */
     /* handset application of the card. This can be done by an assign with */
@@ -14604,7 +14604,7 @@ static void channel_xmit_extended_xon (PLCI   * plci) {
   int max_ch = ARRAY_SIZE(a->ch_flow_control);
   int i, one_requested = 0;
 
-  if ((!plci) || (!plci->Id) || ((a = plci->adapter) == 0)) {
+  if ((!plci) || (!plci->Id) || ((a = plci->adapter) == NULL)) {
     return;
   }
 
diff --git a/drivers/isdn/hisax/asuscom.c b/drivers/isdn/hisax/asuscom.c
index b96f3184c2e5..1f879b500d83 100644
--- a/drivers/isdn/hisax/asuscom.c
+++ b/drivers/isdn/hisax/asuscom.c
@@ -344,7 +344,7 @@ setup_asuscom(struct IsdnCard *card)
                                         err = pnp_activate_dev(pnp_d);
                                         if (err<0) {
                                                 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                        __FUNCTION__, err);
+                                                        __func__, err);
                                                 return(0);
                                         }
                                         card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c
index 0f1db1f669b2..7cabc5a19492 100644
--- a/drivers/isdn/hisax/avm_pci.c
+++ b/drivers/isdn/hisax/avm_pci.c
@@ -797,7 +797,7 @@ static int __devinit avm_pnp_setup(struct IsdnCardState *cs)
                         err = pnp_activate_dev(pnp_avm_d);
                         if (err<0) {
                                 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                        __FUNCTION__, err);
+                                        __func__, err);
                                 return(0);
                         }
                         cs->hw.avm.cfg_reg =
diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c
index 2d670856d141..018bd293e580 100644
--- a/drivers/isdn/hisax/diva.c
+++ b/drivers/isdn/hisax/diva.c
@@ -1088,7 +1088,7 @@ static int __devinit setup_diva_isapnp(struct IsdnCard *card)
                                 err = pnp_activate_dev(pnp_d);
                                 if (err<0) {
                                         printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                __FUNCTION__, err);
+                                                __func__, err);
                                         return(0);
                                 }
                                 card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c
index 2c3691fda300..aa29d1cf16af 100644
--- a/drivers/isdn/hisax/elsa.c
+++ b/drivers/isdn/hisax/elsa.c
@@ -937,7 +937,7 @@ setup_elsa_isapnp(struct IsdnCard *card)
                                         err = pnp_activate_dev(pnp_d);
                                         if (err<0) {
                                                 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                        __FUNCTION__, err);
+                                                        __func__, err);
                                                 return(0);
                                         }
                                         card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/hfc_sx.c b/drivers/isdn/hisax/hfc_sx.c
index f4a213877e35..d92e8d6c2ae2 100644
--- a/drivers/isdn/hisax/hfc_sx.c
+++ b/drivers/isdn/hisax/hfc_sx.c
@@ -1417,7 +1417,7 @@ setup_hfcsx(struct IsdnCard *card)
                                         err = pnp_activate_dev(pnp_d);
                                         if (err<0) {
                                                 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                        __FUNCTION__, err);
+                                                        __func__, err);
                                                 return(0);
                                         }
                                         card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c
index 98b0149bca68..8df889b0c1a9 100644
--- a/drivers/isdn/hisax/hfc_usb.c
+++ b/drivers/isdn/hisax/hfc_usb.c
@@ -905,7 +905,7 @@ rx_int_complete(struct urb *urb)
         if (status) {
                 printk(KERN_INFO
                        "HFC-S USB: %s error resubmitting URB fifo(%d)\n",
-                       __FUNCTION__, fifon);
+                       __func__, fifon);
         }
 }
 
@@ -1543,14 +1543,14 @@ hfc_usb_disconnect(struct usb_interface *intf)
                                 stop_isoc_chain(&context->fifos[i]);
                                 DBG(HFCUSB_DBG_INIT,
                                     "HFC-S USB: %s stopping ISOC chain Fifo(%i)",
-                                    __FUNCTION__, i);
+                                    __func__, i);
                         }
                 } else {
                         if (context->fifos[i].active > 0) {
                                 context->fifos[i].active = 0;
                                 DBG(HFCUSB_DBG_INIT,
                                     "HFC-S USB: %s unlinking URB for Fifo(%i)",
-                                    __FUNCTION__, i);
+                                    __func__, i);
                         }
                         usb_kill_urb(context->fifos[i].urb);
                         usb_free_urb(context->fifos[i].urb);
diff --git a/drivers/isdn/hisax/hfcscard.c b/drivers/isdn/hisax/hfcscard.c
index 909d6709ec16..cf082665cc8b 100644
--- a/drivers/isdn/hisax/hfcscard.c
+++ b/drivers/isdn/hisax/hfcscard.c
@@ -193,7 +193,7 @@ setup_hfcs(struct IsdnCard *card)
                                         err = pnp_activate_dev(pnp_d);
                                         if (err<0) {
                                                 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                        __FUNCTION__, err);
+                                                        __func__, err);
                                                 return(0);
                                         }
                                         card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/hisax_debug.h b/drivers/isdn/hisax/hisax_debug.h
index ceafecdb1037..5ed3b1c44184 100644
--- a/drivers/isdn/hisax/hisax_debug.h
+++ b/drivers/isdn/hisax/hisax_debug.h
@@ -27,14 +27,14 @@
 
 #define DBG(level, format, arg...) do { \
 if (level & __debug_variable) \
-printk(KERN_DEBUG "%s: " format "\n" , __FUNCTION__ , ## arg); \
+printk(KERN_DEBUG "%s: " format "\n" , __func__ , ## arg); \
 } while (0)
 
 #define DBG_PACKET(level,data,count) \
-  if (level & __debug_variable) dump_packet(__FUNCTION__,data,count)
+  if (level & __debug_variable) dump_packet(__func__,data,count)
 
 #define DBG_SKB(level,skb) \
-  if ((level & __debug_variable) && skb) dump_packet(__FUNCTION__,skb->data,skb->len)
+  if ((level & __debug_variable) && skb) dump_packet(__func__,skb->data,skb->len)
 
 
 static void __attribute__((unused))
diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
index 76043dedba5b..c0b4db2f8364 100644
--- a/drivers/isdn/hisax/hisax_fcpcipnp.c
+++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
@@ -68,7 +68,7 @@ static struct pci_device_id fcpci_ids[] = {
 
 MODULE_DEVICE_TABLE(pci, fcpci_ids);
 
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
 static struct pnp_device_id fcpnp_ids[] __devinitdata = {
         { 
                 .id             = "AVM0900",
@@ -914,7 +914,7 @@ static int __devinit fcpci_probe(struct pci_dev *pdev,
         return retval;
 }
 
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
 static int __devinit fcpnp_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
 {
         struct fritz_adapter *adapter;
@@ -935,7 +935,7 @@ static int __devinit fcpnp_probe(struct pnp_dev *pdev, const struct pnp_device_i
         pnp_disable_dev(pdev);
         retval = pnp_activate_dev(pdev);
         if (retval < 0) {
-                printk(KERN_WARNING "%s: pnp_activate_dev(%s) ret(%d)\n", __FUNCTION__,
+                printk(KERN_WARNING "%s: pnp_activate_dev(%s) ret(%d)\n", __func__,
                         (char *)dev_id->driver_data, retval);
                 goto err_free;
         }
@@ -974,6 +974,8 @@ static struct pnp_driver fcpnp_driver = {
         .remove         = __devexit_p(fcpnp_remove),
         .id_table       = fcpnp_ids,
 };
+#else
+static struct pnp_driver fcpnp_driver;
 #endif
 
 static void __devexit fcpci_remove(struct pci_dev *pdev)
@@ -1001,7 +1003,7 @@ static int __init hisax_fcpcipnp_init(void)
         retval = pci_register_driver(&fcpci_driver);
         if (retval)
                 return retval;
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
         retval = pnp_register_driver(&fcpnp_driver);
         if (retval < 0) {
                 pci_unregister_driver(&fcpci_driver);
@@ -1013,7 +1015,7 @@ static int __init hisax_fcpcipnp_init(void)
 
 static void __exit hisax_fcpcipnp_exit(void)
 {
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
         pnp_unregister_driver(&fcpnp_driver);
 #endif
         pci_unregister_driver(&fcpci_driver);
diff --git a/drivers/isdn/hisax/ix1_micro.c b/drivers/isdn/hisax/ix1_micro.c
index 2d18d4f1e57e..a92bf0d2cab2 100644
--- a/drivers/isdn/hisax/ix1_micro.c
+++ b/drivers/isdn/hisax/ix1_micro.c
@@ -252,7 +252,7 @@ setup_ix1micro(struct IsdnCard *card)
                                         err = pnp_activate_dev(pnp_d);
                                         if (err<0) {
                                                 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                        __FUNCTION__, err);
+                                                        __func__, err);
                                                 return(0);
                                         }
                                         card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/niccy.c b/drivers/isdn/hisax/niccy.c
index 421b8e6763d7..ef00633e1d2a 100644
--- a/drivers/isdn/hisax/niccy.c
+++ b/drivers/isdn/hisax/niccy.c
@@ -255,7 +255,7 @@ int __devinit setup_niccy(struct IsdnCard *card)
                         err = pnp_activate_dev(pnp_d);
                         if (err < 0) {
                                 printk(KERN_WARNING "%s: pnp_activate_dev "
-                                        "ret(%d)\n", __FUNCTION__, err);
+                                        "ret(%d)\n", __func__, err);
                                 return 0;
                         }
                         card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/sedlbauer.c b/drivers/isdn/hisax/sedlbauer.c
index 95425f3d2220..a10dfa82c734 100644
--- a/drivers/isdn/hisax/sedlbauer.c
+++ b/drivers/isdn/hisax/sedlbauer.c
@@ -555,7 +555,7 @@ setup_sedlbauer_isapnp(struct IsdnCard *card, int *bytecnt)
                                 err = pnp_activate_dev(pnp_d);
                                 if (err<0) {
                                         printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                __FUNCTION__, err);
+                                                __func__, err);
                                         return(0);
                                 }
                                 card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/st5481.h b/drivers/isdn/hisax/st5481.h
index 04416bad611d..2044e7173ab4 100644
--- a/drivers/isdn/hisax/st5481.h
+++ b/drivers/isdn/hisax/st5481.h
@@ -218,13 +218,13 @@ enum {
 #define L1_EVENT_COUNT (EV_TIMER3 + 1)
 
 #define ERR(format, arg...) \
-printk(KERN_ERR "%s:%s: " format "\n" , __FILE__,  __FUNCTION__ , ## arg)
+printk(KERN_ERR "%s:%s: " format "\n" , __FILE__,  __func__ , ## arg)
 
 #define WARN(format, arg...) \
-printk(KERN_WARNING "%s:%s: " format "\n" , __FILE__,  __FUNCTION__ , ## arg)
+printk(KERN_WARNING "%s:%s: " format "\n" , __FILE__,  __func__ , ## arg)
 
 #define INFO(format, arg...) \
-printk(KERN_INFO "%s:%s: " format "\n" , __FILE__,  __FUNCTION__ , ## arg)
+printk(KERN_INFO "%s:%s: " format "\n" , __FILE__,  __func__ , ## arg)
 
 #include "isdnhdlc.h"
 #include "fsm.h"
@@ -406,7 +406,7 @@ struct st5481_adapter {
 
 /*
  * Submit an URB with error reporting. This is a macro so
- * the __FUNCTION__ returns the caller function name.
+ * the __func__ returns the caller function name.
  */
 #define SUBMIT_URB(urb, mem_flags) \
 ({ \
@@ -470,7 +470,7 @@ extern int st5481_debug;
 #ifdef CONFIG_HISAX_DEBUG
 
 #define DBG_ISO_PACKET(level,urb) \
-  if (level & __debug_variable) dump_iso_packet(__FUNCTION__,urb)
+  if (level & __debug_variable) dump_iso_packet(__func__,urb)
 
 static void __attribute__((unused))
 dump_iso_packet(const char *name, struct urb *urb)
diff --git a/drivers/isdn/hisax/st5481_usb.c b/drivers/isdn/hisax/st5481_usb.c
index 4ada66b8b679..427a8b0520f5 100644
--- a/drivers/isdn/hisax/st5481_usb.c
+++ b/drivers/isdn/hisax/st5481_usb.c
@@ -342,7 +342,7 @@ void st5481_release_usb(struct st5481_adapter *adapter)
         usb_kill_urb(intr->urb);
         kfree(intr->urb->transfer_buffer);
         usb_free_urb(intr->urb);
-        ctrl->urb = NULL;
+        intr->urb = NULL;
 }
 
 /*
diff --git a/drivers/isdn/hisax/teles3.c b/drivers/isdn/hisax/teles3.c
index 6a5e379e0774..5dc9f1a43629 100644
--- a/drivers/isdn/hisax/teles3.c
+++ b/drivers/isdn/hisax/teles3.c
@@ -301,7 +301,7 @@ setup_teles3(struct IsdnCard *card)
                                         err = pnp_activate_dev(pnp_d);
                                         if (err<0) {
                                                 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                        __FUNCTION__, err);
+                                                        __func__, err);
                                                 return(0);
                                         }
                                         card->para[3] = pnp_port_start(pnp_d, 2);
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index d4ad6992f776..0f3c66de69bc 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -1924,7 +1924,7 @@ isdn_free_channel(int di, int ch, int usage)
 
         if ((di < 0) || (ch < 0)) {
                 printk(KERN_WARNING "%s: called with invalid drv(%d) or channel(%d)\n",
-                        __FUNCTION__, di, ch);
+                        __func__, di, ch);
                 return;
         }
         for (i = 0; i < ISDN_MAX_CHANNELS; i++)
diff --git a/drivers/isdn/i4l/isdn_net.h b/drivers/isdn/i4l/isdn_net.h
index bc2f0dd962ea..be4949715d55 100644
--- a/drivers/isdn/i4l/isdn_net.h
+++ b/drivers/isdn/i4l/isdn_net.h
@@ -108,7 +108,7 @@ static __inline__ void isdn_net_add_to_bundle(isdn_net_dev *nd, isdn_net_local *
 
         lp = nd->queue;
 //      printk(KERN_DEBUG "%s: lp:%s(%p) nlp:%s(%p) last(%p)\n",
-//              __FUNCTION__, lp->name, lp, nlp->name, nlp, lp->last);
+//              __func__, lp->name, lp, nlp->name, nlp, lp->last);
         nlp->last = lp->last;
         lp->last->next = nlp;
         lp->last = nlp;
@@ -129,7 +129,7 @@ static __inline__ void isdn_net_rm_from_bundle(isdn_net_local *lp)
                 master_lp = (isdn_net_local *) lp->master->priv;
 
 //      printk(KERN_DEBUG "%s: lp:%s(%p) mlp:%s(%p) last(%p) next(%p) mndq(%p)\n",
-//              __FUNCTION__, lp->name, lp, master_lp->name, master_lp, lp->last, lp->next, master_lp->netdev->queue);
+//              __func__, lp->name, lp, master_lp->name, master_lp, lp->last, lp->next, master_lp->netdev->queue);
         spin_lock_irqsave(&master_lp->netdev->queue_lock, flags);
         lp->last->next = lp->next;
         lp->next->last = lp->last;
@@ -141,7 +141,7 @@ static __inline__ void isdn_net_rm_from_bundle(isdn_net_local *lp)
         }
         lp->next = lp->last = lp;       /* (re)set own pointers */
 //      printk(KERN_DEBUG "%s: mndq(%p)\n",
-//              __FUNCTION__, master_lp->netdev->queue);
+//              __func__, master_lp->netdev->queue);
         spin_unlock_irqrestore(&master_lp->netdev->queue_lock, flags);
 }
 
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index 9f5fe372f83d..127cfdad68e7 100644
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -110,7 +110,7 @@ isdn_ppp_free(isdn_net_local * lp)
 
         if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) {
                 printk(KERN_ERR "%s: ppp_slot(%d) out of range\n",
-                        __FUNCTION__, lp->ppp_slot);
+                        __func__, lp->ppp_slot);
                 return 0;
         }
 
@@ -127,7 +127,7 @@ isdn_ppp_free(isdn_net_local * lp)
 #endif /* CONFIG_ISDN_MPP */
         if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) {
                 printk(KERN_ERR "%s: ppp_slot(%d) now invalid\n",
-                        __FUNCTION__, lp->ppp_slot);
+                        __func__, lp->ppp_slot);
                 return 0;
         }
         is = ippp_table[lp->ppp_slot];
@@ -226,7 +226,7 @@ isdn_ppp_wakeup_daemon(isdn_net_local * lp)
 {
         if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) {
                 printk(KERN_ERR "%s: ppp_slot(%d) out of range\n",
-                        __FUNCTION__, lp->ppp_slot);
+                        __func__, lp->ppp_slot);
                 return;
         }
         ippp_table[lp->ppp_slot]->state = IPPP_OPEN | IPPP_CONNECT | IPPP_NOBLOCK;
@@ -245,7 +245,7 @@ isdn_ppp_closewait(int slot)
 
         if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
                 printk(KERN_ERR "%s: slot(%d) out of range\n",
-                        __FUNCTION__, slot);
+                        __func__, slot);
                 return 0;
         }
         is = ippp_table[slot];
@@ -343,7 +343,7 @@ isdn_ppp_release(int min, struct file *file)
         is = file->private_data;
 
         if (!is) {
-                printk(KERN_ERR "%s: no file->private_data\n", __FUNCTION__);
+                printk(KERN_ERR "%s: no file->private_data\n", __func__);
                 return;
         }
         if (is->debug & 0x1)
@@ -353,7 +353,7 @@ isdn_ppp_release(int min, struct file *file)
                 isdn_net_dev *p = is->lp->netdev;
 
                 if (!p) {
-                        printk(KERN_ERR "%s: no lp->netdev\n", __FUNCTION__);
+                        printk(KERN_ERR "%s: no lp->netdev\n", __func__);
                         return;
                 }
                 is->state &= ~IPPP_CONNECT;     /* -> effect: no call of wakeup */
@@ -1080,7 +1080,7 @@ isdn_ppp_push_higher(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buff
                                 printk(KERN_DEBUG "isdn_ppp: VJC_UNCOMP\n");
                         if (net_dev->local->ppp_slot < 0) {
                                 printk(KERN_ERR "%s: net_dev->local->ppp_slot(%d) out of range\n",
-                                        __FUNCTION__, net_dev->local->ppp_slot);
+                                        __func__, net_dev->local->ppp_slot);
                                 goto drop_packet;
                         }
                         if (slhc_remember(ippp_table[net_dev->local->ppp_slot]->slcomp, skb->data, skb->len) <= 0) {
@@ -1107,7 +1107,7 @@ isdn_ppp_push_higher(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buff
                                                           skb_old->len);
                                 if (net_dev->local->ppp_slot < 0) {
                                         printk(KERN_ERR "%s: net_dev->local->ppp_slot(%d) out of range\n",
-                                                __FUNCTION__, net_dev->local->ppp_slot);
+                                                __func__, net_dev->local->ppp_slot);
                                         goto drop_packet;
                                 }
                                 pkt_len = slhc_uncompress(ippp_table[net_dev->local->ppp_slot]->slcomp,
@@ -1553,7 +1553,7 @@ static int isdn_ppp_mp_init( isdn_net_local * lp, ippp_bundle * add_to )
 
         if (lp->ppp_slot < 0) {
                 printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n",
-                        __FUNCTION__, lp->ppp_slot);
+                        __func__, lp->ppp_slot);
                 return(-EINVAL);
         }
 
@@ -1604,7 +1604,7 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,
         slot = lp->ppp_slot;
         if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
                 printk(KERN_ERR "%s: lp->ppp_slot(%d)\n",
-                        __FUNCTION__, lp->ppp_slot);
+                        __func__, lp->ppp_slot);
                 stats->frame_drops++;
                 dev_kfree_skb(skb);
                 spin_unlock_irqrestore(&mp->lock, flags);
@@ -1641,7 +1641,7 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,
                 slot = lpq->ppp_slot;
                 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
                         printk(KERN_ERR "%s: lpq->ppp_slot(%d)\n",
-                                __FUNCTION__, lpq->ppp_slot);
+                                __func__, lpq->ppp_slot);
                 } else {
                         u32 lls = ippp_table[slot]->last_link_seqno;
                         if (MP_LT(lls, minseq))
@@ -1875,7 +1875,7 @@ void isdn_ppp_mp_reassembly( isdn_net_dev * net_dev, isdn_net_local * lp,
 
         if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) {
                 printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n",
-                        __FUNCTION__, lp->ppp_slot);
+                        __func__, lp->ppp_slot);
                 return;
         }
         if( MP_FLAGS(from) == (MP_BEGIN_FRAG | MP_END_FRAG) ) {
@@ -2655,7 +2655,7 @@ static void isdn_ppp_receive_ccp(isdn_net_dev *net_dev, isdn_net_local *lp,
                 lp->ppp_slot);
         if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) {
                 printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n",
-                        __FUNCTION__, lp->ppp_slot);
+                        __func__, lp->ppp_slot);
                 return;
         }
         is = ippp_table[lp->ppp_slot];
@@ -2665,7 +2665,7 @@ static void isdn_ppp_receive_ccp(isdn_net_dev *net_dev, isdn_net_local *lp,
                 int slot = ((isdn_net_local *) (lp->master->priv))->ppp_slot;
                 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
                         printk(KERN_ERR "%s: slot(%d) out of range\n",
-                                __FUNCTION__, slot);
+                                __func__, slot);
                         return;
                 }       
                 mis = ippp_table[slot];
@@ -2829,7 +2829,7 @@ static void isdn_ppp_send_ccp(isdn_net_dev *net_dev, isdn_net_local *lp, struct
                 return;
         if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
                 printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n",
-                        __FUNCTION__, slot);
+                        __func__, slot);
                 return;
         }       
         is = ippp_table[slot];
@@ -2852,7 +2852,7 @@ static void isdn_ppp_send_ccp(isdn_net_dev *net_dev, isdn_net_local *lp, struct
                 slot = ((isdn_net_local *) (lp->master->priv))->ppp_slot;
                 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
                         printk(KERN_ERR "%s: slot(%d) out of range\n",
-                                __FUNCTION__, slot);
+                                __func__, slot);
                         return;
                 }       
                 mis = ippp_table[slot];
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index 133eb18e65cc..8af0df1d5b8c 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -1347,7 +1347,7 @@ isdn_tty_tiocmget(struct tty_struct *tty, struct file *file)
         modem_info *info = (modem_info *) tty->driver_data;
         u_char control, status;
 
-        if (isdn_tty_paranoia_check(info, tty->name, __FUNCTION__))
+        if (isdn_tty_paranoia_check(info, tty->name, __func__))
                 return -ENODEV;
         if (tty->flags & (1 << TTY_IO_ERROR))
                 return -EIO;
@@ -1372,7 +1372,7 @@ isdn_tty_tiocmset(struct tty_struct *tty, struct file *file,
 {
         modem_info *info = (modem_info *) tty->driver_data;
 
-        if (isdn_tty_paranoia_check(info, tty->name, __FUNCTION__))
+        if (isdn_tty_paranoia_check(info, tty->name, __func__))
                 return -ENODEV;
         if (tty->flags & (1 << TTY_IO_ERROR))
                 return -EIO;
@@ -1608,7 +1608,7 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
         if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_open"))
                 return -ENODEV;
         if (!try_module_get(info->owner)) {
-                printk(KERN_WARNING "%s: cannot reserve module\n", __FUNCTION__);
+                printk(KERN_WARNING "%s: cannot reserve module\n", __func__);
                 return -ENODEV;
         }
 #ifdef ISDN_DEBUG_MODEM_OPEN
diff --git a/drivers/md/dm-uevent.c b/drivers/md/dm-uevent.c
index 50377e5dc2a3..6f65883aef12 100644
--- a/drivers/md/dm-uevent.c
+++ b/drivers/md/dm-uevent.c
@@ -78,7 +78,7 @@ static struct dm_uevent *dm_build_path_uevent(struct mapped_device *md,
 
         event = dm_uevent_alloc(md);
         if (!event) {
-                DMERR("%s: dm_uevent_alloc() failed", __FUNCTION__);
+                DMERR("%s: dm_uevent_alloc() failed", __func__);
                 goto err_nomem;
         }
 
@@ -86,32 +86,32 @@ static struct dm_uevent *dm_build_path_uevent(struct mapped_device *md,
 
         if (add_uevent_var(&event->ku_env, "DM_TARGET=%s", ti->type->name)) {
                 DMERR("%s: add_uevent_var() for DM_TARGET failed",
-                      __FUNCTION__);
+                      __func__);
                 goto err_add;
         }
 
         if (add_uevent_var(&event->ku_env, "DM_ACTION=%s", dm_action)) {
                 DMERR("%s: add_uevent_var() for DM_ACTION failed",
-                      __FUNCTION__);
+                      __func__);
                 goto err_add;
         }
 
         if (add_uevent_var(&event->ku_env, "DM_SEQNUM=%u",
                            dm_next_uevent_seq(md))) {
                 DMERR("%s: add_uevent_var() for DM_SEQNUM failed",
-                      __FUNCTION__);
+                      __func__);
                 goto err_add;
         }
 
         if (add_uevent_var(&event->ku_env, "DM_PATH=%s", path)) {
-                DMERR("%s: add_uevent_var() for DM_PATH failed", __FUNCTION__);
+                DMERR("%s: add_uevent_var() for DM_PATH failed", __func__);
                 goto err_add;
         }
 
         if (add_uevent_var(&event->ku_env, "DM_NR_VALID_PATHS=%d",
                            nr_valid_paths)) {
                 DMERR("%s: add_uevent_var() for DM_NR_VALID_PATHS failed",
-                      __FUNCTION__);
+                      __func__);
                 goto err_add;
         }
 
@@ -146,25 +146,25 @@ void dm_send_uevents(struct list_head *events, struct kobject *kobj)
                 if (dm_copy_name_and_uuid(event->md, event->name,
                                           event->uuid)) {
                         DMERR("%s: dm_copy_name_and_uuid() failed",
-                              __FUNCTION__);
+                              __func__);
                         goto uevent_free;
                 }
 
                 if (add_uevent_var(&event->ku_env, "DM_NAME=%s", event->name)) {
                         DMERR("%s: add_uevent_var() for DM_NAME failed",
-                              __FUNCTION__);
+                              __func__);
                         goto uevent_free;
                 }
 
                 if (add_uevent_var(&event->ku_env, "DM_UUID=%s", event->uuid)) {
                         DMERR("%s: add_uevent_var() for DM_UUID failed",
-                              __FUNCTION__);
+                              __func__);
                         goto uevent_free;
                 }
 
                 r = kobject_uevent_env(kobj, event->action, event->ku_env.envp);
                 if (r)
-                        DMERR("%s: kobject_uevent_env failed", __FUNCTION__);
+                        DMERR("%s: kobject_uevent_env failed", __func__);
 uevent_free:
                 dm_uevent_free(event);
         }
@@ -187,7 +187,7 @@ void dm_path_uevent(enum dm_uevent_type event_type, struct dm_target *ti,
         struct dm_uevent *event;
 
         if (event_type >= ARRAY_SIZE(_dm_uevent_type_names)) {
-                DMERR("%s: Invalid event_type %d", __FUNCTION__, event_type);
+                DMERR("%s: Invalid event_type %d", __func__, event_type);
                 goto out;
         }
 
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 5ebfb4d79901..87620b705bee 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -731,9 +731,9 @@ static int super_90_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version
         else
                 rdev->desc_nr = sb->this_disk.number;
 
-        if (refdev == 0)
+        if (!refdev) {
                 ret = 1;
-        else {
+        } else {
                 __u64 ev1, ev2;
                 mdp_super_t *refsb = (mdp_super_t*)page_address(refdev->sb_page);
                 if (!uuid_equal(refsb, sb)) {
@@ -1116,9 +1116,9 @@ static int super_1_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version)
         else
                 rdev->desc_nr = le32_to_cpu(sb->dev_number);
 
-        if (refdev == 0)
+        if (!refdev) {
                 ret = 1;
-        else {
+        } else {
                 __u64 ev1, ev2;
                 struct mdp_superblock_1 *refsb = 
                         (struct mdp_superblock_1*)page_address(refdev->sb_page);
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index 3f299d835a2b..42ee1a2dc144 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -244,7 +244,8 @@ static void multipath_error (mddev_t *mddev, mdk_rdev_t *rdev)
                         conf->working_disks--;
                         mddev->degraded++;
                         printk(KERN_ALERT "multipath: IO failure on %s,"
-                                " disabling IO path. \n Operation continuing"
+                                " disabling IO path.\n"
+                                "multipath: Operation continuing"
                                 " on %d IO paths.\n",
                                 bdevname (rdev->bdev,b),
                                 conf->working_disks);
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index ff61b309129a..9fd473a6dbf5 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1008,8 +1008,8 @@ static void error(mddev_t *mddev, mdk_rdev_t *rdev)
         } else
                 set_bit(Faulty, &rdev->flags);
         set_bit(MD_CHANGE_DEVS, &mddev->flags);
-        printk(KERN_ALERT "raid1: Disk failure on %s, disabling device. \n"
-                "       Operation continuing on %d devices\n",
+        printk(KERN_ALERT "raid1: Disk failure on %s, disabling device.\n"
+                "raid1: Operation continuing on %d devices.\n",
                 bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded);
 }
 
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 32389d2f18fc..1e96aa3ff513 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1001,8 +1001,8 @@ static void error(mddev_t *mddev, mdk_rdev_t *rdev)
         }
         set_bit(Faulty, &rdev->flags);
         set_bit(MD_CHANGE_DEVS, &mddev->flags);
-        printk(KERN_ALERT "raid10: Disk failure on %s, disabling device. \n"
-                "       Operation continuing on %d devices\n",
+        printk(KERN_ALERT "raid10: Disk failure on %s, disabling device.\n"
+                "raid10: Operation continuing on %d devices.\n",
                 bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded);
 }
 
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index b162b839a662..968dacaced6d 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -63,6 +63,7 @@
 #define STRIPE_SHIFT            (PAGE_SHIFT - 9)
 #define STRIPE_SECTORS          (STRIPE_SIZE>>9)
 #define IO_THRESHOLD            1
+#define BYPASS_THRESHOLD        1
 #define NR_HASH                 (PAGE_SIZE / sizeof(struct hlist_head))
 #define HASH_MASK               (NR_HASH - 1)
 
@@ -398,6 +399,7 @@ static void ops_run_io(struct stripe_head *sh)
 
         might_sleep();
 
+        set_bit(STRIPE_IO_STARTED, &sh->state);
         for (i = disks; i--; ) {
                 int rw;
                 struct bio *bi;
@@ -433,7 +435,7 @@ static void ops_run_io(struct stripe_head *sh)
 
                         bi->bi_bdev = rdev->bdev;
                         pr_debug("%s: for %llu schedule op %ld on disc %d\n",
-                                __FUNCTION__, (unsigned long long)sh->sector,
+                                __func__, (unsigned long long)sh->sector,
                                 bi->bi_rw, i);
                         atomic_inc(&sh->count);
                         bi->bi_sector = sh->sector + rdev->data_offset;
@@ -520,7 +522,7 @@ static void ops_complete_biofill(void *stripe_head_ref)
         raid5_conf_t *conf = sh->raid_conf;
         int i;
 
-        pr_debug("%s: stripe %llu\n", __FUNCTION__,
+        pr_debug("%s: stripe %llu\n", __func__,
                 (unsigned long long)sh->sector);
 
         /* clear completed biofills */
@@ -569,7 +571,7 @@ static void ops_run_biofill(struct stripe_head *sh)
         raid5_conf_t *conf = sh->raid_conf;
         int i;
 
-        pr_debug("%s: stripe %llu\n", __FUNCTION__,
+        pr_debug("%s: stripe %llu\n", __func__,
                 (unsigned long long)sh->sector);
 
         for (i = sh->disks; i--; ) {
@@ -600,7 +602,7 @@ static void ops_complete_compute5(void *stripe_head_ref)
         int target = sh->ops.target;
         struct r5dev *tgt = &sh->dev[target];
 
-        pr_debug("%s: stripe %llu\n", __FUNCTION__,
+        pr_debug("%s: stripe %llu\n", __func__,
                 (unsigned long long)sh->sector);
 
         set_bit(R5_UPTODATE, &tgt->flags);
@@ -625,7 +627,7 @@ ops_run_compute5(struct stripe_head *sh, unsigned long pending)
         int i;
 
         pr_debug("%s: stripe %llu block: %d\n",
-                __FUNCTION__, (unsigned long long)sh->sector, target);
+                __func__, (unsigned long long)sh->sector, target);
         BUG_ON(!test_bit(R5_Wantcompute, &tgt->flags));
 
         for (i = disks; i--; )
@@ -653,7 +655,7 @@ static void ops_complete_prexor(void *stripe_head_ref)
 {
         struct stripe_head *sh = stripe_head_ref;
 
-        pr_debug("%s: stripe %llu\n", __FUNCTION__,
+        pr_debug("%s: stripe %llu\n", __func__,
                 (unsigned long long)sh->sector);
 
         set_bit(STRIPE_OP_PREXOR, &sh->ops.complete);
@@ -670,7 +672,7 @@ ops_run_prexor(struct stripe_head *sh, struct dma_async_tx_descriptor *tx)
         /* existing parity data subtracted */
         struct page *xor_dest = xor_srcs[count++] = sh->dev[pd_idx].page;
 
-        pr_debug("%s: stripe %llu\n", __FUNCTION__,
+        pr_debug("%s: stripe %llu\n", __func__,
                 (unsigned long long)sh->sector);
 
         for (i = disks; i--; ) {
@@ -699,7 +701,7 @@ ops_run_biodrain(struct stripe_head *sh, struct dma_async_tx_descriptor *tx,
          */
         int prexor = test_bit(STRIPE_OP_PREXOR, &pending);
 
-        pr_debug("%s: stripe %llu\n", __FUNCTION__,
+        pr_debug("%s: stripe %llu\n", __func__,
                 (unsigned long long)sh->sector);
 
         for (i = disks; i--; ) {
@@ -744,7 +746,7 @@ static void ops_complete_postxor(void *stripe_head_ref)
 {
         struct stripe_head *sh = stripe_head_ref;
 
-        pr_debug("%s: stripe %llu\n", __FUNCTION__,
+        pr_debug("%s: stripe %llu\n", __func__,
                 (unsigned long long)sh->sector);
 
         set_bit(STRIPE_OP_POSTXOR, &sh->ops.complete);
@@ -757,7 +759,7 @@ static void ops_complete_write(void *stripe_head_ref)
         struct stripe_head *sh = stripe_head_ref;
         int disks = sh->disks, i, pd_idx = sh->pd_idx;
 
-        pr_debug("%s: stripe %llu\n", __FUNCTION__,
+        pr_debug("%s: stripe %llu\n", __func__,
                 (unsigned long long)sh->sector);
 
         for (i = disks; i--; ) {
@@ -787,7 +789,7 @@ ops_run_postxor(struct stripe_head *sh, struct dma_async_tx_descriptor *tx,
         unsigned long flags;
         dma_async_tx_callback callback;
 
-        pr_debug("%s: stripe %llu\n", __FUNCTION__,
+        pr_debug("%s: stripe %llu\n", __func__,
                 (unsigned long long)sh->sector);
 
         /* check if prexor is active which means only process blocks
@@ -837,7 +839,7 @@ static void ops_complete_check(void *stripe_head_ref)
         struct stripe_head *sh = stripe_head_ref;
         int pd_idx = sh->pd_idx;
 
-        pr_debug("%s: stripe %llu\n", __FUNCTION__,
+        pr_debug("%s: stripe %llu\n", __func__,
                 (unsigned long long)sh->sector);
 
         if (test_and_clear_bit(STRIPE_OP_MOD_DMA_CHECK, &sh->ops.pending) &&
@@ -859,7 +861,7 @@ static void ops_run_check(struct stripe_head *sh)
         int count = 0, pd_idx = sh->pd_idx, i;
         struct page *xor_dest = xor_srcs[count++] = sh->dev[pd_idx].page;
 
-        pr_debug("%s: stripe %llu\n", __FUNCTION__,
+        pr_debug("%s: stripe %llu\n", __func__,
                 (unsigned long long)sh->sector);
 
         for (i = disks; i--; ) {
@@ -1260,8 +1262,8 @@ static void error(mddev_t *mddev, mdk_rdev_t *rdev)
                 }
                 set_bit(Faulty, &rdev->flags);
                 printk (KERN_ALERT
-                        "raid5: Disk failure on %s, disabling device."
-                        " Operation continuing on %d devices\n",
+                        "raid5: Disk failure on %s, disabling device.\n"
+                        "raid5: Operation continuing on %d devices.\n",
                         bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded);
         }
 }
@@ -1720,6 +1722,9 @@ handle_write_operations5(struct stripe_head *sh, int rcw, int expand)
                                 locked++;
                         }
                 }
+                if (locked + 1 == disks)
+                        if (!test_and_set_bit(STRIPE_FULL_WRITE, &sh->state))
+                                atomic_inc(&sh->raid_conf->pending_full_writes);
         } else {
                 BUG_ON(!(test_bit(R5_UPTODATE, &sh->dev[pd_idx].flags) ||
                         test_bit(R5_Wantcompute, &sh->dev[pd_idx].flags)));
@@ -1759,7 +1764,7 @@ handle_write_operations5(struct stripe_head *sh, int rcw, int expand)
         locked++;
 
         pr_debug("%s: stripe %llu locked: %d pending: %lx\n",
-                __FUNCTION__, (unsigned long long)sh->sector,
+                __func__, (unsigned long long)sh->sector,
                 locked, sh->ops.pending);
 
         return locked;
@@ -1947,6 +1952,9 @@ handle_requests_to_failed_array(raid5_conf_t *conf, struct stripe_head *sh,
                                         STRIPE_SECTORS, 0, 0);
         }
 
+        if (test_and_clear_bit(STRIPE_FULL_WRITE, &sh->state))
+                if (atomic_dec_and_test(&conf->pending_full_writes))
+                        md_wakeup_thread(conf->mddev->thread);
 }
 
 /* __handle_issuing_new_read_requests5 - returns 0 if there are no more disks
@@ -2149,6 +2157,10 @@ static void handle_completed_write_requests(raid5_conf_t *conf,
                                                         0);
                         }
                 }
+
+        if (test_and_clear_bit(STRIPE_FULL_WRITE, &sh->state))
+                if (atomic_dec_and_test(&conf->pending_full_writes))
+                        md_wakeup_thread(conf->mddev->thread);
 }
 
 static void handle_issuing_new_write_requests5(raid5_conf_t *conf,
@@ -2333,6 +2345,9 @@ static void handle_issuing_new_write_requests6(raid5_conf_t *conf,
                                 s->locked++;
                                 set_bit(R5_Wantwrite, &sh->dev[i].flags);
                         }
+                if (s->locked == disks)
+                        if (!test_and_set_bit(STRIPE_FULL_WRITE, &sh->state))
+                                atomic_inc(&conf->pending_full_writes);
                 /* after a RECONSTRUCT_WRITE, the stripe MUST be in-sync */
                 set_bit(STRIPE_INSYNC, &sh->state);
 
@@ -3094,6 +3109,8 @@ static void handle_stripe6(struct stripe_head *sh, struct page *tmp_page)
                 else
                         continue;
 
+                set_bit(STRIPE_IO_STARTED, &sh->state);
+
                 bi = &sh->dev[i].req;
 
                 bi->bi_rw = rw;
@@ -3164,7 +3181,7 @@ static void raid5_activate_delayed(raid5_conf_t *conf)
                         clear_bit(STRIPE_DELAYED, &sh->state);
                         if (!test_and_set_bit(STRIPE_PREREAD_ACTIVE, &sh->state))
                                 atomic_inc(&conf->preread_active_stripes);
-                        list_add_tail(&sh->lru, &conf->handle_list);
+                        list_add_tail(&sh->lru, &conf->hold_list);
                 }
         } else
                 blk_plug_device(conf->mddev->queue);
@@ -3442,6 +3459,58 @@ static int chunk_aligned_read(struct request_queue *q, struct bio * raid_bio)
         }
 }
 
+/* __get_priority_stripe - get the next stripe to process
+ *
+ * Full stripe writes are allowed to pass preread active stripes up until
+ * the bypass_threshold is exceeded.  In general the bypass_count
+ * increments when the handle_list is handled before the hold_list; however, it
+ * will not be incremented when STRIPE_IO_STARTED is sampled set signifying a
+ * stripe with in flight i/o.  The bypass_count will be reset when the
+ * head of the hold_list has changed, i.e. the head was promoted to the
+ * handle_list.
+ */
+static struct stripe_head *__get_priority_stripe(raid5_conf_t *conf)
+{
+        struct stripe_head *sh;
+
+        pr_debug("%s: handle: %s hold: %s full_writes: %d bypass_count: %d\n",
+                  __func__,
+                  list_empty(&conf->handle_list) ? "empty" : "busy",
+                  list_empty(&conf->hold_list) ? "empty" : "busy",
+                  atomic_read(&conf->pending_full_writes), conf->bypass_count);
+
+        if (!list_empty(&conf->handle_list)) {
+                sh = list_entry(conf->handle_list.next, typeof(*sh), lru);
+
+                if (list_empty(&conf->hold_list))
+                        conf->bypass_count = 0;
+                else if (!test_bit(STRIPE_IO_STARTED, &sh->state)) {
+                        if (conf->hold_list.next == conf->last_hold)
+                                conf->bypass_count++;
+                        else {
+                                conf->last_hold = conf->hold_list.next;
+                                conf->bypass_count -= conf->bypass_threshold;
+                                if (conf->bypass_count < 0)
+                                        conf->bypass_count = 0;
+                        }
+                }
+        } else if (!list_empty(&conf->hold_list) &&
+                   ((conf->bypass_threshold &&
+                     conf->bypass_count > conf->bypass_threshold) ||
+                    atomic_read(&conf->pending_full_writes) == 0)) {
+                sh = list_entry(conf->hold_list.next,
+                                typeof(*sh), lru);
+                conf->bypass_count -= conf->bypass_threshold;
+                if (conf->bypass_count < 0)
+                        conf->bypass_count = 0;
+        } else
+                return NULL;
+
+        list_del_init(&sh->lru);
+        atomic_inc(&sh->count);
+        BUG_ON(atomic_read(&sh->count) != 1);
+        return sh;
+}
 
 static int make_request(struct request_queue *q, struct bio * bi)
 {
@@ -3914,7 +3983,6 @@ static void raid5d(mddev_t *mddev)
         handled = 0;
         spin_lock_irq(&conf->device_lock);
         while (1) {
-                struct list_head *first;
                 struct bio *bio;
 
                 if (conf->seq_flush != conf->seq_write) {
@@ -3936,17 +4004,12 @@ static void raid5d(mddev_t *mddev)
                         handled++;
                 }
 
-                if (list_empty(&conf->handle_list)) {
+                sh = __get_priority_stripe(conf);
+
+                if (!sh) {
                         async_tx_issue_pending_all();
                         break;
                 }
-
-                first = conf->handle_list.next;
-                sh = list_entry(first, struct stripe_head, lru);
-
-                list_del_init(first);
-                atomic_inc(&sh->count);
-                BUG_ON(atomic_read(&sh->count)!= 1);
                 spin_unlock_irq(&conf->device_lock);
                 
                 handled++;
@@ -3978,15 +4041,13 @@ static ssize_t
 raid5_store_stripe_cache_size(mddev_t *mddev, const char *page, size_t len)
 {
         raid5_conf_t *conf = mddev_to_conf(mddev);
-        char *end;
-        int new;
+        unsigned long new;
         if (len >= PAGE_SIZE)
                 return -EINVAL;
         if (!conf)
                 return -ENODEV;
 
-        new = simple_strtoul(page, &end, 10);
-        if (!*page || (*end && *end != '\n') )
+        if (strict_strtoul(page, 10, &new))
                 return -EINVAL;
         if (new <= 16 || new > 32768)
                 return -EINVAL;
@@ -4011,6 +4072,40 @@ raid5_stripecache_size = __ATTR(stripe_cache_size, S_IRUGO | S_IWUSR,
                                 raid5_store_stripe_cache_size);
 
 static ssize_t
+raid5_show_preread_threshold(mddev_t *mddev, char *page)
+{
+        raid5_conf_t *conf = mddev_to_conf(mddev);
+        if (conf)
+                return sprintf(page, "%d\n", conf->bypass_threshold);
+        else
+                return 0;
+}
+
+static ssize_t
+raid5_store_preread_threshold(mddev_t *mddev, const char *page, size_t len)
+{
+        raid5_conf_t *conf = mddev_to_conf(mddev);
+        unsigned long new;
+        if (len >= PAGE_SIZE)
+                return -EINVAL;
+        if (!conf)
+                return -ENODEV;
+
+        if (strict_strtoul(page, 10, &new))
+                return -EINVAL;
+        if (new > conf->max_nr_stripes)
+                return -EINVAL;
+        conf->bypass_threshold = new;
+        return len;
+}
+
+static struct md_sysfs_entry
+raid5_preread_bypass_threshold = __ATTR(preread_bypass_threshold,
+                                        S_IRUGO | S_IWUSR,
+                                        raid5_show_preread_threshold,
+                                        raid5_store_preread_threshold);
+
+static ssize_t
 stripe_cache_active_show(mddev_t *mddev, char *page)
 {
         raid5_conf_t *conf = mddev_to_conf(mddev);
@@ -4026,6 +4121,7 @@ raid5_stripecache_active = __ATTR_RO(stripe_cache_active);
 static struct attribute *raid5_attrs[] =  {
         &raid5_stripecache_size.attr,
         &raid5_stripecache_active.attr,
+        &raid5_preread_bypass_threshold.attr,
         NULL,
 };
 static struct attribute_group raid5_attrs_group = {
@@ -4130,12 +4226,14 @@ static int run(mddev_t *mddev)
         init_waitqueue_head(&conf->wait_for_stripe);
         init_waitqueue_head(&conf->wait_for_overlap);
         INIT_LIST_HEAD(&conf->handle_list);
+        INIT_LIST_HEAD(&conf->hold_list);
         INIT_LIST_HEAD(&conf->delayed_list);
         INIT_LIST_HEAD(&conf->bitmap_list);
         INIT_LIST_HEAD(&conf->inactive_list);
         atomic_set(&conf->active_stripes, 0);
         atomic_set(&conf->preread_active_stripes, 0);
         atomic_set(&conf->active_aligned_reads, 0);
+        conf->bypass_threshold = BYPASS_THRESHOLD;
 
         pr_debug("raid5: run(%s) called.\n", mdname(mddev));
 
diff --git a/drivers/md/raid6algos.c b/drivers/md/raid6algos.c
index 77a6e4bf503d..21987e3dbe6c 100644
--- a/drivers/md/raid6algos.c
+++ b/drivers/md/raid6algos.c
@@ -121,7 +121,8 @@ int __init raid6_select_algo(void)
                         j0 = jiffies;
                         while ( (j1 = jiffies) == j0 )
                                 cpu_relax();
-                        while ( (jiffies-j1) < (1 << RAID6_TIME_JIFFIES_LG2) ) {
+                        while (time_before(jiffies,
+                                            j1 + (1<<RAID6_TIME_JIFFIES_LG2))) {
                                 (*algo)->gen_syndrome(disks, PAGE_SIZE, dptrs);
                                 perf++;
                         }
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index d545c98dd5e7..01ea99c9bc1a 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -13,7 +13,7 @@
 /*
  * TODO:
  * - remove "mark pages reserved-hacks" from memory allocation code
- *   and implement nopage()
+ *   and implement fault()
  * - check decimation, calculating and reporting image size when
  *   using decimation
  * - implement read(), user mode buffers and overlay (?)
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c
index 13bac53db69a..6e655b4c6682 100644
--- a/drivers/mfd/sm501.c
+++ b/drivers/mfd/sm501.c
@@ -22,6 +22,7 @@
 
 #include <linux/sm501.h>
 #include <linux/sm501-regs.h>
+#include <linux/serial_8250.h>
 
 #include <asm/io.h>
 
@@ -723,13 +724,14 @@ static void sm501_device_release(struct device *dev)
 */
 
 static struct platform_device *
-sm501_create_subdev(struct sm501_devdata *sm,
-                    char *name, unsigned int res_count)
+sm501_create_subdev(struct sm501_devdata *sm, char *name,
+                    unsigned int res_count, unsigned int platform_data_size)
 {
         struct sm501_device *smdev;
 
         smdev = kzalloc(sizeof(struct sm501_device) +
-                        sizeof(struct resource) * res_count, GFP_KERNEL);
+                        (sizeof(struct resource) * res_count) +
+                        platform_data_size, GFP_KERNEL);
         if (!smdev)
                 return NULL;
 
@@ -737,11 +739,15 @@ sm501_create_subdev(struct sm501_devdata *sm,
 
         smdev->pdev.name = name;
         smdev->pdev.id = sm->pdev_id;
-        smdev->pdev.resource = (struct resource *)(smdev+1);
-        smdev->pdev.num_resources = res_count;
-
         smdev->pdev.dev.parent = sm->dev;
 
+        if (res_count) {
+                smdev->pdev.resource = (struct resource *)(smdev+1);
+                smdev->pdev.num_resources = res_count;
+        }
+        if (platform_data_size)
+                smdev->pdev.dev.platform_data = (void *)(smdev+1);
+
         return &smdev->pdev;
 }
 
@@ -829,7 +835,7 @@ static int sm501_register_usbhost(struct sm501_devdata *sm,
 {
         struct platform_device *pdev;
 
-        pdev = sm501_create_subdev(sm, "sm501-usb", 3);
+        pdev = sm501_create_subdev(sm, "sm501-usb", 3, 0);
         if (!pdev)
                 return -ENOMEM;
 
@@ -840,12 +846,55 @@ static int sm501_register_usbhost(struct sm501_devdata *sm,
         return sm501_register_device(sm, pdev);
 }
 
+static void sm501_setup_uart_data(struct sm501_devdata *sm,
+                                  struct plat_serial8250_port *uart_data,
+                                  unsigned int offset)
+{
+        uart_data->membase = sm->regs + offset;
+        uart_data->mapbase = sm->io_res->start + offset;
+        uart_data->iotype = UPIO_MEM;
+        uart_data->irq = sm->irq;
+        uart_data->flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_SHARE_IRQ;
+        uart_data->regshift = 2;
+        uart_data->uartclk = (9600 * 16);
+}
+
+static int sm501_register_uart(struct sm501_devdata *sm, int devices)
+{
+        struct platform_device *pdev;
+        struct plat_serial8250_port *uart_data;
+
+        pdev = sm501_create_subdev(sm, "serial8250", 0,
+                                   sizeof(struct plat_serial8250_port) * 3);
+        if (!pdev)
+                return -ENOMEM;
+
+        uart_data = pdev->dev.platform_data;
+
+        if (devices & SM501_USE_UART0) {
+                sm501_setup_uart_data(sm, uart_data++, 0x30000);
+                sm501_unit_power(sm->dev, SM501_GATE_UART0, 1);
+                sm501_modify_reg(sm->dev, SM501_IRQ_MASK, 1 << 12, 0);
+                sm501_modify_reg(sm->dev, SM501_GPIO63_32_CONTROL, 0x01e0, 0);
+        }
+        if (devices & SM501_USE_UART1) {
+                sm501_setup_uart_data(sm, uart_data++, 0x30020);
+                sm501_unit_power(sm->dev, SM501_GATE_UART1, 1);
+                sm501_modify_reg(sm->dev, SM501_IRQ_MASK, 1 << 13, 0);
+                sm501_modify_reg(sm->dev, SM501_GPIO63_32_CONTROL, 0x1e00, 0);
+        }
+
+        pdev->id = PLAT8250_DEV_SM501;
+
+        return sm501_register_device(sm, pdev);
+}
+
 static int sm501_register_display(struct sm501_devdata *sm,
                                   resource_size_t *mem_avail)
 {
         struct platform_device *pdev;
 
-        pdev = sm501_create_subdev(sm, "sm501-fb", 4);
+        pdev = sm501_create_subdev(sm, "sm501-fb", 4, 0);
         if (!pdev)
                 return -ENOMEM;
 
@@ -963,6 +1012,7 @@ static unsigned int sm501_mem_local[] = {
 
 static int sm501_init_dev(struct sm501_devdata *sm)
 {
+        struct sm501_initdata *idata;
         resource_size_t mem_avail;
         unsigned long dramctrl;
         unsigned long devid;
@@ -980,6 +1030,9 @@ static int sm501_init_dev(struct sm501_devdata *sm)
                 return -EINVAL;
         }
 
+        /* disable irqs */
+        writel(0, sm->regs + SM501_IRQ_MASK);
+
         dramctrl = readl(sm->regs + SM501_DRAM_CONTROL);
         mem_avail = sm501_mem_local[(dramctrl >> 13) & 0x7];
 
@@ -998,15 +1051,14 @@ static int sm501_init_dev(struct sm501_devdata *sm)
 
         /* check to see if we have some device initialisation */
 
-        if (sm->platdata) {
-                struct sm501_platdata *pdata = sm->platdata;
+        idata = sm->platdata ? sm->platdata->init : NULL;
+        if (idata) {
+                sm501_init_regs(sm, idata);
 
-                if (pdata->init) {
-                        sm501_init_regs(sm, sm->platdata->init);
-
-                        if (pdata->init->devices & SM501_USE_USB_HOST)
-                                sm501_register_usbhost(sm, &mem_avail);
-                }
+                if (idata->devices & SM501_USE_USB_HOST)
+                        sm501_register_usbhost(sm, &mem_avail);
+                if (idata->devices & (SM501_USE_UART0 | SM501_USE_UART1))
+                        sm501_register_uart(sm, idata->devices);
         }
 
         ret = sm501_check_clocks(sm);
diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c
index 5e859486eaf8..ad34e2d22524 100644
--- a/drivers/mfd/ucb1x00-ts.c
+++ b/drivers/mfd/ucb1x00-ts.c
@@ -204,8 +204,7 @@ static inline int ucb1x00_ts_pen_down(struct ucb1x00_ts *ts)
 static int ucb1x00_thread(void *_ts)
 {
         struct ucb1x00_ts *ts = _ts;
-        struct task_struct *tsk = current;
-        DECLARE_WAITQUEUE(wait, tsk);
+        DECLARE_WAITQUEUE(wait, current);
         int valid = 0;
 
         set_freezable();
@@ -234,7 +233,7 @@ static int ucb1x00_thread(void *_ts)
 
 
                 if (ucb1x00_ts_pen_down(ts)) {
-                        set_task_state(tsk, TASK_INTERRUPTIBLE);
+                        set_current_state(TASK_INTERRUPTIBLE);
 
                         ucb1x00_enable_irq(ts->ucb, UCB_IRQ_TSPX, machine_is_collie() ? UCB_RISING : UCB_FALLING);
                         ucb1x00_disable(ts->ucb);
@@ -262,7 +261,7 @@ static int ucb1x00_thread(void *_ts)
                                 valid = 1;
                         }
 
-                        set_task_state(tsk, TASK_INTERRUPTIBLE);
+                        set_current_state(TASK_INTERRUPTIBLE);
                         timeout = HZ / 100;
                 }
 
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index c2642bc1d49b..2c343aae38d4 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -56,7 +56,7 @@ obj-$(CONFIG_RTL8187)	+= rtl8187.o
 
 obj-$(CONFIG_ADM8211)   += adm8211.o
 
-obj-$(CONFIG_IWLCORE)   += iwlwifi/
+obj-$(CONFIG_IWLWIFI)   += iwlwifi/
 obj-$(CONFIG_RT2X00)    += rt2x00/
 
 obj-$(CONFIG_P54_COMMON)        += p54/
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index c4e631d14bfe..9a25f550fd16 100644
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -1,6 +1,11 @@
+config IWLWIFI
+        bool
+        default n
+
 config IWLCORE
         tristate "Intel Wireless Wifi Core"
         depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
+        select IWLWIFI
 
 config IWLWIFI_LEDS
         bool
@@ -106,6 +111,7 @@ config IWL3945
         tristate "Intel PRO/Wireless 3945ABG/BG Network Connection"
         depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
         select FW_LOADER
+        select IWLWIFI
         ---help---
           Select to build the driver supporting the:
 
diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
index b07ba2a14119..9304c4555079 100644
--- a/drivers/oprofile/buffer_sync.c
+++ b/drivers/oprofile/buffer_sync.c
@@ -491,7 +491,7 @@ typedef enum {
  */
 void sync_buffer(int cpu)
 {
-        struct oprofile_cpu_buffer * cpu_buf = &cpu_buffer[cpu];
+        struct oprofile_cpu_buffer *cpu_buf = &per_cpu(cpu_buffer, cpu);
         struct mm_struct *mm = NULL;
         struct task_struct * new;
         unsigned long cookie = 0;
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c
index c93d3d2640ab..efcbf4b4579f 100644
--- a/drivers/oprofile/cpu_buffer.c
+++ b/drivers/oprofile/cpu_buffer.c
@@ -27,7 +27,7 @@
 #include "buffer_sync.h"
 #include "oprof.h"
 
-struct oprofile_cpu_buffer cpu_buffer[NR_CPUS] __cacheline_aligned;
+DEFINE_PER_CPU_SHARED_ALIGNED(struct oprofile_cpu_buffer, cpu_buffer);
 
 static void wq_sync_buffer(struct work_struct *work);
 
@@ -39,7 +39,7 @@ void free_cpu_buffers(void)
         int i;
  
         for_each_online_cpu(i)
-                vfree(cpu_buffer[i].buffer);
+                vfree(per_cpu(cpu_buffer, i).buffer);
 }
 
 int alloc_cpu_buffers(void)
@@ -49,7 +49,7 @@ int alloc_cpu_buffers(void)
         unsigned long buffer_size = fs_cpu_buffer_size;
  
         for_each_online_cpu(i) {
-                struct oprofile_cpu_buffer * b = &cpu_buffer[i];
+                struct oprofile_cpu_buffer *b = &per_cpu(cpu_buffer, i);
  
                 b->buffer = vmalloc_node(sizeof(struct op_sample) * buffer_size,
                         cpu_to_node(i));
@@ -83,7 +83,7 @@ void start_cpu_work(void)
         work_enabled = 1;
 
         for_each_online_cpu(i) {
-                struct oprofile_cpu_buffer * b = &cpu_buffer[i];
+                struct oprofile_cpu_buffer *b = &per_cpu(cpu_buffer, i);
 
                 /*
                  * Spread the work by 1 jiffy per cpu so they dont all
@@ -100,7 +100,7 @@ void end_cpu_work(void)
         work_enabled = 0;
 
         for_each_online_cpu(i) {
-                struct oprofile_cpu_buffer * b = &cpu_buffer[i];
+                struct oprofile_cpu_buffer *b = &per_cpu(cpu_buffer, i);
 
                 cancel_delayed_work(&b->work);
         }
@@ -227,7 +227,7 @@ static void oprofile_end_trace(struct oprofile_cpu_buffer * cpu_buf)
 void oprofile_add_ext_sample(unsigned long pc, struct pt_regs * const regs,
                                 unsigned long event, int is_kernel)
 {
-        struct oprofile_cpu_buffer * cpu_buf = &cpu_buffer[smp_processor_id()];
+        struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var(cpu_buffer);
 
         if (!backtrace_depth) {
                 log_sample(cpu_buf, pc, is_kernel, event);
@@ -254,13 +254,13 @@ void oprofile_add_sample(struct pt_regs * const regs, unsigned long event)
 
 void oprofile_add_pc(unsigned long pc, int is_kernel, unsigned long event)
 {
-        struct oprofile_cpu_buffer * cpu_buf = &cpu_buffer[smp_processor_id()];
+        struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var(cpu_buffer);
         log_sample(cpu_buf, pc, is_kernel, event);
 }
 
 void oprofile_add_trace(unsigned long pc)
 {
-        struct oprofile_cpu_buffer * cpu_buf = &cpu_buffer[smp_processor_id()];
+        struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var(cpu_buffer);
 
         if (!cpu_buf->tracing)
                 return;
diff --git a/drivers/oprofile/cpu_buffer.h b/drivers/oprofile/cpu_buffer.h
index c66c025abe75..13588174311d 100644
--- a/drivers/oprofile/cpu_buffer.h
+++ b/drivers/oprofile/cpu_buffer.h
@@ -14,6 +14,7 @@
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
 #include <linux/cache.h>
+#include <linux/sched.h>
  
 struct task_struct;
  
@@ -47,7 +48,7 @@ struct oprofile_cpu_buffer {
         struct delayed_work work;
 } ____cacheline_aligned;
 
-extern struct oprofile_cpu_buffer cpu_buffer[];
+DECLARE_PER_CPU(struct oprofile_cpu_buffer, cpu_buffer);
 
 void cpu_buffer_reset(struct oprofile_cpu_buffer * cpu_buf);
 
diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
index d1f6d776e9e4..f99b28e7b79a 100644
--- a/drivers/oprofile/oprofile_stats.c
+++ b/drivers/oprofile/oprofile_stats.c
@@ -23,7 +23,7 @@ void oprofile_reset_stats(void)
         int i;
  
         for_each_possible_cpu(i) {
-                cpu_buf = &cpu_buffer[i]; 
+                cpu_buf = &per_cpu(cpu_buffer, i);
                 cpu_buf->sample_received = 0;
                 cpu_buf->sample_lost_overflow = 0;
                 cpu_buf->backtrace_aborted = 0;
@@ -49,7 +49,7 @@ void oprofile_create_stats_files(struct super_block * sb, struct dentry * root)
                 return;
 
         for_each_possible_cpu(i) {
-                cpu_buf = &cpu_buffer[i]; 
+                cpu_buf = &per_cpu(cpu_buffer, i);
                 snprintf(buf, 10, "cpu%d", i);
                 cpudir = oprofilefs_mkdir(sb, dir, buf);
  
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index 12a1645a2e43..e85cbf116db1 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -167,7 +167,7 @@ static int pnp_bus_suspend(struct device *dev, pm_message_t state)
                         return error;
         }
 
-        if (pnp_dev->protocol && pnp_dev->protocol->suspend)
+        if (pnp_dev->protocol->suspend)
                 pnp_dev->protocol->suspend(pnp_dev, state);
         return 0;
 }
@@ -181,7 +181,7 @@ static int pnp_bus_resume(struct device *dev)
         if (!pnp_drv)
                 return 0;
 
-        if (pnp_dev->protocol && pnp_dev->protocol->resume)
+        if (pnp_dev->protocol->resume)
                 pnp_dev->protocol->resume(pnp_dev);
 
         if (pnp_can_write(pnp_dev)) {
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index 37993206ae5d..e4daf4635c48 100644
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -49,8 +49,11 @@ static void quirk_awe32_resources(struct pnp_dev *dev)
                 port2->max += 0x400;
                 port3->min += 0x800;
                 port3->max += 0x800;
+                dev_info(&dev->dev,
+                        "AWE32 quirk - added ioports 0x%lx and 0x%lx\n",
+                        (unsigned long)port2->min,
+                        (unsigned long)port3->min);
         }
-        printk(KERN_INFO "pnp: AWE32 quirk - adding two ports\n");
 }
 
 static void quirk_cmi8330_resources(struct pnp_dev *dev)
@@ -73,7 +76,8 @@ static void quirk_cmi8330_resources(struct pnp_dev *dev)
                             IORESOURCE_DMA_8BIT)
                                 dma->map = 0x000A;
         }
-        printk(KERN_INFO "pnp: CMI8330 quirk - fixing interrupts and dma\n");
+        dev_info(&dev->dev, "CMI8330 quirk - forced possible IRQs to 5, 7, 10 "
+                "and DMA channels to 1, 3\n");
 }
 
 static void quirk_sb16audio_resources(struct pnp_dev *dev)
@@ -104,8 +108,7 @@ static void quirk_sb16audio_resources(struct pnp_dev *dev)
                 changed = 1;
         }
         if (changed)
-                printk(KERN_INFO
-                       "pnp: SB audio device quirk - increasing port range\n");
+                dev_info(&dev->dev, "SB audio device quirk - increased port range\n");
 }
 
 
@@ -214,8 +217,8 @@ void pnp_fixup_device(struct pnp_dev *dev)
                         quirk = pnp_fixups[i].quirk_function;
 
 #ifdef DEBUG
-                        dev_dbg(&dev->dev, "calling quirk 0x%p", quirk);
-                        print_fn_descriptor_symbol(": %s()\n",
+                        dev_dbg(&dev->dev, "calling ");
+                        print_fn_descriptor_symbol("%s()\n",
                                 (unsigned long) *quirk);
 #endif
                         (*quirk)(dev);
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 02a4c8cf2b2d..6cc2c0330230 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -20,10 +20,6 @@ menuconfig RTC_CLASS
 
 if RTC_CLASS
 
-if GEN_RTC || RTC
-comment "Conflicting RTC option has been selected, check GEN_RTC and RTC"
-endif
-
 config RTC_HCTOSYS
         bool "Set system time from RTC on startup and resume"
         depends on RTC_CLASS = y
@@ -304,6 +300,7 @@ comment "Platform RTC drivers"
 config RTC_DRV_CMOS
         tristate "PC-style 'CMOS'"
         depends on X86 || ALPHA || ARM || M32R || ATARI || PPC || MIPS
+        default y if X86
         help
           Say "yes" here to get direct support for the real time clock
           found in every PC or ACPI-based system, and some other boards.
diff --git a/drivers/rtc/rtc-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c
index 52abffc86bcd..39e64ab1ecb7 100644
--- a/drivers/rtc/rtc-at91rm9200.c
+++ b/drivers/rtc/rtc-at91rm9200.c
@@ -83,7 +83,7 @@ static int at91_rtc_readtime(struct device *dev, struct rtc_time *tm)
         tm->tm_yday = rtc_year_days(tm->tm_mday, tm->tm_mon, tm->tm_year);
         tm->tm_year = tm->tm_year - 1900;
 
-        pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __FUNCTION__,
+        pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __func__,
                 1900 + tm->tm_year, tm->tm_mon, tm->tm_mday,
                 tm->tm_hour, tm->tm_min, tm->tm_sec);
 
@@ -97,7 +97,7 @@ static int at91_rtc_settime(struct device *dev, struct rtc_time *tm)
 {
         unsigned long cr;
 
-        pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __FUNCTION__,
+        pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __func__,
                 1900 + tm->tm_year, tm->tm_mon, tm->tm_mday,
                 tm->tm_hour, tm->tm_min, tm->tm_sec);
 
@@ -142,7 +142,7 @@ static int at91_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm)
         alrm->enabled = (at91_sys_read(AT91_RTC_IMR) & AT91_RTC_ALARM)
                         ? 1 : 0;
 
-        pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __FUNCTION__,
+        pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __func__,
                 1900 + tm->tm_year, tm->tm_mon, tm->tm_mday,
                 tm->tm_hour, tm->tm_min, tm->tm_sec);
 
@@ -178,7 +178,7 @@ static int at91_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
         if (alrm->enabled)
                 at91_sys_write(AT91_RTC_IER, AT91_RTC_ALARM);
 
-        pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __FUNCTION__,
+        pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __func__,
                 at91_alarm_year, tm.tm_mon, tm.tm_mday, tm.tm_hour,
                 tm.tm_min, tm.tm_sec);
 
@@ -193,7 +193,7 @@ static int at91_rtc_ioctl(struct device *dev, unsigned int cmd,
 {
         int ret = 0;
 
-        pr_debug("%s(): cmd=%08x, arg=%08lx.\n", __FUNCTION__, cmd, arg);
+        pr_debug("%s(): cmd=%08x, arg=%08lx.\n", __func__, cmd, arg);
 
         switch (cmd) {
         case RTC_AIE_OFF:       /* alarm off */
@@ -265,7 +265,7 @@ static irqreturn_t at91_rtc_interrupt(int irq, void *dev_id)
 
                 rtc_update_irq(rtc, 1, events);
 
-                pr_debug("%s(): num=%ld, events=0x%02lx\n", __FUNCTION__,
+                pr_debug("%s(): num=%ld, events=0x%02lx\n", __func__,
                         events >> 8, events & 0x000000FF);
 
                 return IRQ_HANDLED;
diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c
index 56728a2a3385..38d8742a4bdf 100644
--- a/drivers/rtc/rtc-at91sam9.c
+++ b/drivers/rtc/rtc-at91sam9.c
@@ -288,7 +288,7 @@ static irqreturn_t at91_rtc_interrupt(int irq, void *_rtc)
 
         rtc_update_irq(rtc->rtcdev, 1, events);
 
-        pr_debug("%s: num=%ld, events=0x%02lx\n", __FUNCTION__,
+        pr_debug("%s: num=%ld, events=0x%02lx\n", __func__,
                 events >> 8, events & 0x000000FF);
 
         return IRQ_HANDLED;
diff --git a/drivers/rtc/rtc-ds1302.c b/drivers/rtc/rtc-ds1302.c
index 7b002ceeaa7d..b9397818f73a 100644
--- a/drivers/rtc/rtc-ds1302.c
+++ b/drivers/rtc/rtc-ds1302.c
@@ -122,7 +122,7 @@ static int ds1302_rtc_read_time(struct device *dev, struct rtc_time *tm)
 
         dev_dbg(dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
                 "mday=%d, mon=%d, year=%d, wday=%d\n",
-                __FUNCTION__,
+                __func__,
                 tm->tm_sec, tm->tm_min, tm->tm_hour,
                 tm->tm_mday, tm->tm_mon + 1, tm->tm_year, tm->tm_wday);
 
diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c
index d08912f18ddd..a83a40b3ebaa 100644
--- a/drivers/rtc/rtc-ds1511.c
+++ b/drivers/rtc/rtc-ds1511.c
@@ -181,8 +181,7 @@ ds1511_wdog_disable(void)
  * stupidly, some callers call with year unmolested;
  * and some call with  year = year - 1900.  thanks.
  */
- int
-ds1511_rtc_set_time(struct device *dev, struct rtc_time *rtc_tm)
+static int ds1511_rtc_set_time(struct device *dev, struct rtc_time *rtc_tm)
 {
         u8 mon, day, dow, hrs, min, sec, yrs, cen;
         unsigned int flags;
@@ -245,8 +244,7 @@ ds1511_rtc_set_time(struct device *dev, struct rtc_time *rtc_tm)
         return 0;
 }
 
- int
-ds1511_rtc_read_time(struct device *dev, struct rtc_time *rtc_tm)
+static int ds1511_rtc_read_time(struct device *dev, struct rtc_time *rtc_tm)
 {
         unsigned int century;
         unsigned int flags;
diff --git a/drivers/rtc/rtc-ds1672.c b/drivers/rtc/rtc-ds1672.c
index e0900ca678ec..6fa4556f5f5c 100644
--- a/drivers/rtc/rtc-ds1672.c
+++ b/drivers/rtc/rtc-ds1672.c
@@ -50,13 +50,13 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm)
 
         /* read date registers */
         if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) {
-                dev_err(&client->dev, "%s: read error\n", __FUNCTION__);
+                dev_err(&client->dev, "%s: read error\n", __func__);
                 return -EIO;
         }
 
         dev_dbg(&client->dev,
                 "%s: raw read data - counters=%02x,%02x,%02x,%02x\n",
-                __FUNCTION__, buf[0], buf[1], buf[2], buf[3]);
+                __func__, buf[0], buf[1], buf[2], buf[3]);
 
         time = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
 
@@ -64,7 +64,7 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm)
 
         dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
                 "mday=%d, mon=%d, year=%d, wday=%d\n",
-                __FUNCTION__, tm->tm_sec, tm->tm_min, tm->tm_hour,
+                __func__, tm->tm_sec, tm->tm_min, tm->tm_hour,
                 tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
 
         return 0;
@@ -84,7 +84,7 @@ static int ds1672_set_mmss(struct i2c_client *client, unsigned long secs)
 
         xfer = i2c_master_send(client, buf, 6);
         if (xfer != 6) {
-                dev_err(&client->dev, "%s: send: %d\n", __FUNCTION__, xfer);
+                dev_err(&client->dev, "%s: send: %d\n", __func__, xfer);
                 return -EIO;
         }
 
@@ -98,7 +98,7 @@ static int ds1672_set_datetime(struct i2c_client *client, struct rtc_time *tm)
         dev_dbg(&client->dev,
                 "%s: secs=%d, mins=%d, hours=%d, "
                 "mday=%d, mon=%d, year=%d, wday=%d\n",
-                __FUNCTION__,
+                __func__,
                 tm->tm_sec, tm->tm_min, tm->tm_hour,
                 tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
 
@@ -133,7 +133,7 @@ static int ds1672_get_control(struct i2c_client *client, u8 *status)
 
         /* read control register */
         if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) {
-                dev_err(&client->dev, "%s: read error\n", __FUNCTION__);
+                dev_err(&client->dev, "%s: read error\n", __func__);
                 return -EIO;
         }
 
@@ -199,7 +199,7 @@ static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind)
         struct i2c_client *client;
         struct rtc_device *rtc;
 
-        dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
+        dev_dbg(&adapter->dev, "%s\n", __func__);
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
                 err = -ENODEV;
diff --git a/drivers/rtc/rtc-isl1208.c b/drivers/rtc/rtc-isl1208.c
index 725b0c73c333..fb15e3fb4ce2 100644
--- a/drivers/rtc/rtc-isl1208.c
+++ b/drivers/rtc/rtc-isl1208.c
@@ -15,16 +15,15 @@
 #include <linux/bcd.h>
 #include <linux/rtc.h>
 
-#define DRV_NAME "isl1208"
-#define DRV_VERSION "0.2"
+#define DRV_VERSION "0.3"
 
 /* Register map */
 /* rtc section */
 #define ISL1208_REG_SC  0x00
 #define ISL1208_REG_MN  0x01
 #define ISL1208_REG_HR  0x02
-#define ISL1208_REG_HR_MIL     (1<<7) /* 24h/12h mode */
-#define ISL1208_REG_HR_PM      (1<<5) /* PM/AM bit in 12h mode */
+#define ISL1208_REG_HR_MIL     (1<<7)   /* 24h/12h mode */
+#define ISL1208_REG_HR_PM      (1<<5)   /* PM/AM bit in 12h mode */
 #define ISL1208_REG_DT  0x03
 #define ISL1208_REG_MO  0x04
 #define ISL1208_REG_YR  0x05
@@ -33,14 +32,14 @@
 
 /* control/status section */
 #define ISL1208_REG_SR  0x07
-#define ISL1208_REG_SR_ARST    (1<<7) /* auto reset */
-#define ISL1208_REG_SR_XTOSCB  (1<<6) /* crystal oscillator */
-#define ISL1208_REG_SR_WRTC    (1<<4) /* write rtc */
-#define ISL1208_REG_SR_ALM     (1<<2) /* alarm */
-#define ISL1208_REG_SR_BAT     (1<<1) /* battery */
-#define ISL1208_REG_SR_RTCF    (1<<0) /* rtc fail */
+#define ISL1208_REG_SR_ARST    (1<<7)   /* auto reset */
+#define ISL1208_REG_SR_XTOSCB  (1<<6)   /* crystal oscillator */
+#define ISL1208_REG_SR_WRTC    (1<<4)   /* write rtc */
+#define ISL1208_REG_SR_ALM     (1<<2)   /* alarm */
+#define ISL1208_REG_SR_BAT     (1<<1)   /* battery */
+#define ISL1208_REG_SR_RTCF    (1<<0)   /* rtc fail */
 #define ISL1208_REG_INT 0x08
-#define ISL1208_REG_09  0x09 /* reserved */
+#define ISL1208_REG_09  0x09    /* reserved */
 #define ISL1208_REG_ATR 0x0a
 #define ISL1208_REG_DTR 0x0b
 
@@ -58,39 +57,21 @@
 #define ISL1208_REG_USR2 0x13
 #define ISL1208_USR_SECTION_LEN 2
 
-/* i2c configuration */
-#define ISL1208_I2C_ADDR 0xde
-
-static const unsigned short normal_i2c[] = {
-        ISL1208_I2C_ADDR>>1, I2C_CLIENT_END
-};
-I2C_CLIENT_INSMOD; /* defines addr_data */
-
-static int isl1208_attach_adapter(struct i2c_adapter *adapter);
-static int isl1208_detach_client(struct i2c_client *client);
-
-static struct i2c_driver isl1208_driver = {
-        .driver         = {
-                .name   = DRV_NAME,
-        },
-        .id             = I2C_DRIVERID_ISL1208,
-        .attach_adapter = &isl1208_attach_adapter,
-        .detach_client  = &isl1208_detach_client,
-};
+static struct i2c_driver isl1208_driver;
 
 /* block read */
 static int
 isl1208_i2c_read_regs(struct i2c_client *client, u8 reg, u8 buf[],
-                       unsigned len)
+                      unsigned len)
 {
         u8 reg_addr[1] = { reg };
         struct i2c_msg msgs[2] = {
-                { client->addr, client->flags, sizeof(reg_addr), reg_addr },
-                { client->addr, client->flags | I2C_M_RD, len, buf }
+                {client->addr, 0, sizeof(reg_addr), reg_addr}
+                ,
+                {client->addr, I2C_M_RD, len, buf}
         };
         int ret;
 
-        BUG_ON(len == 0);
         BUG_ON(reg > ISL1208_REG_USR2);
         BUG_ON(reg + len > ISL1208_REG_USR2 + 1);
 
@@ -103,15 +84,14 @@ isl1208_i2c_read_regs(struct i2c_client *client, u8 reg, u8 buf[],
 /* block write */
 static int
 isl1208_i2c_set_regs(struct i2c_client *client, u8 reg, u8 const buf[],
-                       unsigned len)
+                     unsigned len)
 {
         u8 i2c_buf[ISL1208_REG_USR2 + 2];
         struct i2c_msg msgs[1] = {
-                { client->addr, client->flags, len + 1, i2c_buf }
+                {client->addr, 0, len + 1, i2c_buf}
         };
         int ret;
 
-        BUG_ON(len == 0);
         BUG_ON(reg > ISL1208_REG_USR2);
         BUG_ON(reg + len > ISL1208_REG_USR2 + 1);
 
@@ -125,7 +105,8 @@ isl1208_i2c_set_regs(struct i2c_client *client, u8 reg, u8 const buf[],
 }
 
 /* simple check to see wether we have a isl1208 */
-static int isl1208_i2c_validate_client(struct i2c_client *client)
+static int
+isl1208_i2c_validate_client(struct i2c_client *client)
 {
         u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, };
         u8 zero_mask[ISL1208_RTC_SECTION_LEN] = {
@@ -139,24 +120,29 @@ static int isl1208_i2c_validate_client(struct i2c_client *client)
                 return ret;
 
         for (i = 0; i < ISL1208_RTC_SECTION_LEN; ++i) {
-                if (regs[i] & zero_mask[i]) /* check if bits are cleared */
+                if (regs[i] & zero_mask[i])     /* check if bits are cleared */
                         return -ENODEV;
         }
 
         return 0;
 }
 
-static int isl1208_i2c_get_sr(struct i2c_client *client)
+static int
+isl1208_i2c_get_sr(struct i2c_client *client)
 {
-        return i2c_smbus_read_byte_data(client, ISL1208_REG_SR) == -1 ? -EIO:0;
+        int sr = i2c_smbus_read_byte_data(client, ISL1208_REG_SR);
+        if (sr < 0)
+                return -EIO;
+
+        return sr;
 }
 
-static int isl1208_i2c_get_atr(struct i2c_client *client)
+static int
+isl1208_i2c_get_atr(struct i2c_client *client)
 {
         int atr = i2c_smbus_read_byte_data(client, ISL1208_REG_ATR);
-
         if (atr < 0)
-                return -EIO;
+                return atr;
 
         /* The 6bit value in the ATR register controls the load
          * capacitance C_load * in steps of 0.25pF
@@ -169,51 +155,54 @@ static int isl1208_i2c_get_atr(struct i2c_client *client)
          *
          */
 
-        atr &= 0x3f; /* mask out lsb */
-        atr ^= 1<<5; /* invert 6th bit */
-        atr += 2*9; /* add offset of 4.5pF; unit[atr] = 0.25pF */
+        atr &= 0x3f;            /* mask out lsb */
+        atr ^= 1 << 5;          /* invert 6th bit */
+        atr += 2 * 9;           /* add offset of 4.5pF; unit[atr] = 0.25pF */
 
         return atr;
 }
 
-static int isl1208_i2c_get_dtr(struct i2c_client *client)
+static int
+isl1208_i2c_get_dtr(struct i2c_client *client)
 {
         int dtr = i2c_smbus_read_byte_data(client, ISL1208_REG_DTR);
-
         if (dtr < 0)
                 return -EIO;
 
         /* dtr encodes adjustments of {-60,-40,-20,0,20,40,60} ppm */
-        dtr = ((dtr & 0x3) * 20) * (dtr & (1<<2) ? -1 : 1);
+        dtr = ((dtr & 0x3) * 20) * (dtr & (1 << 2) ? -1 : 1);
 
         return dtr;
 }
 
-static int isl1208_i2c_get_usr(struct i2c_client *client)
+static int
+isl1208_i2c_get_usr(struct i2c_client *client)
 {
         u8 buf[ISL1208_USR_SECTION_LEN] = { 0, };
         int ret;
 
-        ret = isl1208_i2c_read_regs (client, ISL1208_REG_USR1, buf,
-                                   ISL1208_USR_SECTION_LEN);
+        ret = isl1208_i2c_read_regs(client, ISL1208_REG_USR1, buf,
+                                    ISL1208_USR_SECTION_LEN);
         if (ret < 0)
                 return ret;
 
         return (buf[1] << 8) | buf[0];
 }
 
-static int isl1208_i2c_set_usr(struct i2c_client *client, u16 usr)
+static int
+isl1208_i2c_set_usr(struct i2c_client *client, u16 usr)
 {
         u8 buf[ISL1208_USR_SECTION_LEN];
 
         buf[0] = usr & 0xff;
         buf[1] = (usr >> 8) & 0xff;
 
-        return isl1208_i2c_set_regs (client, ISL1208_REG_USR1, buf,
-                                     ISL1208_USR_SECTION_LEN);
+        return isl1208_i2c_set_regs(client, ISL1208_REG_USR1, buf,
+                                    ISL1208_USR_SECTION_LEN);
 }
 
-static int isl1208_rtc_proc(struct device *dev, struct seq_file *seq)
+static int
+isl1208_rtc_proc(struct device *dev, struct seq_file *seq)
 {
         struct i2c_client *const client = to_i2c_client(dev);
         int sr, dtr, atr, usr;
@@ -230,20 +219,19 @@ static int isl1208_rtc_proc(struct device *dev, struct seq_file *seq)
                    (sr & ISL1208_REG_SR_ALM) ? " ALM" : "",
                    (sr & ISL1208_REG_SR_WRTC) ? " WRTC" : "",
                    (sr & ISL1208_REG_SR_XTOSCB) ? " XTOSCB" : "",
-                   (sr & ISL1208_REG_SR_ARST) ? " ARST" : "",
-                   sr);
+                   (sr & ISL1208_REG_SR_ARST) ? " ARST" : "", sr);
 
         seq_printf(seq, "batt_status\t: %s\n",
                    (sr & ISL1208_REG_SR_RTCF) ? "bad" : "okay");
 
         dtr = isl1208_i2c_get_dtr(client);
-        if (dtr >= 0 -1)
+        if (dtr >= 0 - 1)
                 seq_printf(seq, "digital_trim\t: %d ppm\n", dtr);
 
         atr = isl1208_i2c_get_atr(client);
         if (atr >= 0)
                 seq_printf(seq, "analog_trim\t: %d.%.2d pF\n",
-                           atr>>2, (atr&0x3)*25);
+                           atr >> 2, (atr & 0x3) * 25);
 
         usr = isl1208_i2c_get_usr(client);
         if (usr >= 0)
@@ -252,9 +240,8 @@ static int isl1208_rtc_proc(struct device *dev, struct seq_file *seq)
         return 0;
 }
 
-
-static int isl1208_i2c_read_time(struct i2c_client *client,
-                                 struct rtc_time *tm)
+static int
+isl1208_i2c_read_time(struct i2c_client *client, struct rtc_time *tm)
 {
         int sr;
         u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, };
@@ -274,27 +261,30 @@ static int isl1208_i2c_read_time(struct i2c_client *client,
 
         tm->tm_sec = BCD2BIN(regs[ISL1208_REG_SC]);
         tm->tm_min = BCD2BIN(regs[ISL1208_REG_MN]);
-        { /* HR field has a more complex interpretation */
+
+        /* HR field has a more complex interpretation */
+        {
                 const u8 _hr = regs[ISL1208_REG_HR];
-                if (_hr & ISL1208_REG_HR_MIL) /* 24h format */
+                if (_hr & ISL1208_REG_HR_MIL)   /* 24h format */
                         tm->tm_hour = BCD2BIN(_hr & 0x3f);
-                else { // 12h format
+                else {
+                        /* 12h format */
                         tm->tm_hour = BCD2BIN(_hr & 0x1f);
-                        if (_hr & ISL1208_REG_HR_PM) /* PM flag set */
+                        if (_hr & ISL1208_REG_HR_PM)    /* PM flag set */
                                 tm->tm_hour += 12;
                 }
         }
 
         tm->tm_mday = BCD2BIN(regs[ISL1208_REG_DT]);
-        tm->tm_mon = BCD2BIN(regs[ISL1208_REG_MO]) - 1; /* rtc starts at 1 */
+        tm->tm_mon = BCD2BIN(regs[ISL1208_REG_MO]) - 1; /* rtc starts at 1 */
         tm->tm_year = BCD2BIN(regs[ISL1208_REG_YR]) + 100;
         tm->tm_wday = BCD2BIN(regs[ISL1208_REG_DW]);
 
         return 0;
 }
 
-static int isl1208_i2c_read_alarm(struct i2c_client *client,
-                                  struct rtc_wkalrm *alarm)
+static int
+isl1208_i2c_read_alarm(struct i2c_client *client, struct rtc_wkalrm *alarm)
 {
         struct rtc_time *const tm = &alarm->time;
         u8 regs[ISL1208_ALARM_SECTION_LEN] = { 0, };
@@ -307,7 +297,7 @@ static int isl1208_i2c_read_alarm(struct i2c_client *client,
         }
 
         sr = isl1208_i2c_read_regs(client, ISL1208_REG_SCA, regs,
-                                  ISL1208_ALARM_SECTION_LEN);
+                                   ISL1208_ALARM_SECTION_LEN);
         if (sr < 0) {
                 dev_err(&client->dev, "%s: reading alarm section failed\n",
                         __func__);
@@ -315,23 +305,25 @@ static int isl1208_i2c_read_alarm(struct i2c_client *client,
         }
 
         /* MSB of each alarm register is an enable bit */
-        tm->tm_sec  = BCD2BIN(regs[ISL1208_REG_SCA-ISL1208_REG_SCA] & 0x7f);
-        tm->tm_min  = BCD2BIN(regs[ISL1208_REG_MNA-ISL1208_REG_SCA] & 0x7f);
-        tm->tm_hour = BCD2BIN(regs[ISL1208_REG_HRA-ISL1208_REG_SCA] & 0x3f);
-        tm->tm_mday = BCD2BIN(regs[ISL1208_REG_DTA-ISL1208_REG_SCA] & 0x3f);
-        tm->tm_mon  = BCD2BIN(regs[ISL1208_REG_MOA-ISL1208_REG_SCA] & 0x1f)-1;
-        tm->tm_wday = BCD2BIN(regs[ISL1208_REG_DWA-ISL1208_REG_SCA] & 0x03);
+        tm->tm_sec = BCD2BIN(regs[ISL1208_REG_SCA - ISL1208_REG_SCA] & 0x7f);
+        tm->tm_min = BCD2BIN(regs[ISL1208_REG_MNA - ISL1208_REG_SCA] & 0x7f);
+        tm->tm_hour = BCD2BIN(regs[ISL1208_REG_HRA - ISL1208_REG_SCA] & 0x3f);
+        tm->tm_mday = BCD2BIN(regs[ISL1208_REG_DTA - ISL1208_REG_SCA] & 0x3f);
+        tm->tm_mon =
+                BCD2BIN(regs[ISL1208_REG_MOA - ISL1208_REG_SCA] & 0x1f) - 1;
+        tm->tm_wday = BCD2BIN(regs[ISL1208_REG_DWA - ISL1208_REG_SCA] & 0x03);
 
         return 0;
 }
 
-static int isl1208_rtc_read_time(struct device *dev, struct rtc_time *tm)
+static int
+isl1208_rtc_read_time(struct device *dev, struct rtc_time *tm)
 {
         return isl1208_i2c_read_time(to_i2c_client(dev), tm);
 }
 
-static int isl1208_i2c_set_time(struct i2c_client *client,
-                                struct rtc_time const *tm)
+static int
+isl1208_i2c_set_time(struct i2c_client *client, struct rtc_time const *tm)
 {
         int sr;
         u8 regs[ISL1208_RTC_SECTION_LEN] = { 0, };
@@ -353,7 +345,7 @@ static int isl1208_i2c_set_time(struct i2c_client *client,
         }
 
         /* set WRTC */
-        sr = i2c_smbus_write_byte_data (client, ISL1208_REG_SR,
+        sr = i2c_smbus_write_byte_data(client, ISL1208_REG_SR,
                                        sr | ISL1208_REG_SR_WRTC);
         if (sr < 0) {
                 dev_err(&client->dev, "%s: writing SR failed\n", __func__);
@@ -369,7 +361,7 @@ static int isl1208_i2c_set_time(struct i2c_client *client,
         }
 
         /* clear WRTC again */
-        sr = i2c_smbus_write_byte_data (client, ISL1208_REG_SR,
+        sr = i2c_smbus_write_byte_data(client, ISL1208_REG_SR,
                                        sr & ~ISL1208_REG_SR_WRTC);
         if (sr < 0) {
                 dev_err(&client->dev, "%s: writing SR failed\n", __func__);
@@ -380,70 +372,69 @@ static int isl1208_i2c_set_time(struct i2c_client *client,
 }
 
 
-static int isl1208_rtc_set_time(struct device *dev, struct rtc_time *tm)
+static int
+isl1208_rtc_set_time(struct device *dev, struct rtc_time *tm)
 {
         return isl1208_i2c_set_time(to_i2c_client(dev), tm);
 }
 
-static int isl1208_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
+static int
+isl1208_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
 {
         return isl1208_i2c_read_alarm(to_i2c_client(dev), alarm);
 }
 
 static const struct rtc_class_ops isl1208_rtc_ops = {
-        .proc           = isl1208_rtc_proc,
-        .read_time      = isl1208_rtc_read_time,
-        .set_time       = isl1208_rtc_set_time,
-        .read_alarm     = isl1208_rtc_read_alarm,
-        //.set_alarm    = isl1208_rtc_set_alarm,
+        .proc = isl1208_rtc_proc,
+        .read_time = isl1208_rtc_read_time,
+        .set_time = isl1208_rtc_set_time,
+        .read_alarm = isl1208_rtc_read_alarm,
+        /*.set_alarm    = isl1208_rtc_set_alarm, */
 };
 
 /* sysfs interface */
 
-static ssize_t isl1208_sysfs_show_atrim(struct device *dev,
-                                        struct device_attribute *attr,
-                                        char *buf)
+static ssize_t
+isl1208_sysfs_show_atrim(struct device *dev,
+                         struct device_attribute *attr, char *buf)
 {
-        int atr;
-
-        atr = isl1208_i2c_get_atr(to_i2c_client(dev));
+        int atr = isl1208_i2c_get_atr(to_i2c_client(dev));
         if (atr < 0)
                 return atr;
 
-        return sprintf(buf, "%d.%.2d pF\n", atr>>2, (atr&0x3)*25);
+        return sprintf(buf, "%d.%.2d pF\n", atr >> 2, (atr & 0x3) * 25);
 }
+
 static DEVICE_ATTR(atrim, S_IRUGO, isl1208_sysfs_show_atrim, NULL);
 
-static ssize_t isl1208_sysfs_show_dtrim(struct device *dev,
-                                        struct device_attribute *attr,
-                                        char *buf)
+static ssize_t
+isl1208_sysfs_show_dtrim(struct device *dev,
+                         struct device_attribute *attr, char *buf)
 {
-        int dtr;
-
-        dtr = isl1208_i2c_get_dtr(to_i2c_client(dev));
+        int dtr = isl1208_i2c_get_dtr(to_i2c_client(dev));
         if (dtr < 0)
                 return dtr;
 
         return sprintf(buf, "%d ppm\n", dtr);
 }
+
 static DEVICE_ATTR(dtrim, S_IRUGO, isl1208_sysfs_show_dtrim, NULL);
 
-static ssize_t isl1208_sysfs_show_usr(struct device *dev,
-                                       struct device_attribute *attr,
-                                       char *buf)
+static ssize_t
+isl1208_sysfs_show_usr(struct device *dev,
+                       struct device_attribute *attr, char *buf)
 {
-        int usr;
-
-        usr = isl1208_i2c_get_usr(to_i2c_client(dev));
+        int usr = isl1208_i2c_get_usr(to_i2c_client(dev));
         if (usr < 0)
                 return usr;
 
         return sprintf(buf, "0x%.4x\n", usr);
 }
 
-static ssize_t isl1208_sysfs_store_usr(struct device *dev,
-                                       struct device_attribute *attr,
-                                       const char *buf, size_t count)
+static ssize_t
+isl1208_sysfs_store_usr(struct device *dev,
+                        struct device_attribute *attr,
+                        const char *buf, size_t count)
 {
         int usr = -1;
 
@@ -460,124 +451,116 @@ static ssize_t isl1208_sysfs_store_usr(struct device *dev,
 
         return isl1208_i2c_set_usr(to_i2c_client(dev), usr) ? -EIO : count;
 }
+
 static DEVICE_ATTR(usr, S_IRUGO | S_IWUSR, isl1208_sysfs_show_usr,
                    isl1208_sysfs_store_usr);
 
 static int
-isl1208_probe(struct i2c_adapter *adapter, int addr, int kind)
+isl1208_sysfs_register(struct device *dev)
 {
-        int rc = 0;
-        struct i2c_client *new_client = NULL;
-        struct rtc_device *rtc = NULL;
+        int err;
+
+        err = device_create_file(dev, &dev_attr_atrim);
+        if (err)
+                return err;
 
-        if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
-                rc = -ENODEV;
-                goto failout;
+        err = device_create_file(dev, &dev_attr_dtrim);
+        if (err) {
+                device_remove_file(dev, &dev_attr_atrim);
+                return err;
         }
 
-        new_client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (new_client == NULL) {
-                rc = -ENOMEM;
-                goto failout;
+        err = device_create_file(dev, &dev_attr_usr);
+        if (err) {
+                device_remove_file(dev, &dev_attr_atrim);
+                device_remove_file(dev, &dev_attr_dtrim);
         }
 
-        new_client->addr = addr;
-        new_client->adapter = adapter;
-        new_client->driver = &isl1208_driver;
-        new_client->flags = 0;
-        strcpy(new_client->name, DRV_NAME);
+        return 0;
+}
 
-        if (kind < 0) {
-                rc = isl1208_i2c_validate_client(new_client);
-                if (rc < 0)
-                        goto failout;
-        }
+static int
+isl1208_sysfs_unregister(struct device *dev)
+{
+        device_remove_file(dev, &dev_attr_atrim);
+        device_remove_file(dev, &dev_attr_atrim);
+        device_remove_file(dev, &dev_attr_usr);
+
+        return 0;
+}
+
+static int
+isl1208_probe(struct i2c_client *client)
+{
+        int rc = 0;
+        struct rtc_device *rtc;
 
-        rc = i2c_attach_client(new_client);
-        if (rc < 0)
-                goto failout;
+        if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
+                return -ENODEV;
 
-        dev_info(&new_client->dev,
+        if (isl1208_i2c_validate_client(client) < 0)
+                return -ENODEV;
+
+        dev_info(&client->dev,
                  "chip found, driver version " DRV_VERSION "\n");
 
         rtc = rtc_device_register(isl1208_driver.driver.name,
-                                  &new_client->dev,
-                                  &isl1208_rtc_ops, THIS_MODULE);
-
-        if (IS_ERR(rtc)) {
-                rc = PTR_ERR(rtc);
-                goto failout_detach;
-        }
+                                  &client->dev, &isl1208_rtc_ops,
+                                  THIS_MODULE);
+        if (IS_ERR(rtc))
+                return PTR_ERR(rtc);
 
-        i2c_set_clientdata(new_client, rtc);
+        i2c_set_clientdata(client, rtc);
 
-        rc = isl1208_i2c_get_sr(new_client);
+        rc = isl1208_i2c_get_sr(client);
         if (rc < 0) {
-                dev_err(&new_client->dev, "reading status failed\n");
-                goto failout_unregister;
+                dev_err(&client->dev, "reading status failed\n");
+                goto exit_unregister;
         }
 
         if (rc & ISL1208_REG_SR_RTCF)
-                dev_warn(&new_client->dev, "rtc power failure detected, "
+                dev_warn(&client->dev, "rtc power failure detected, "
                          "please set clock.\n");
 
-        rc = device_create_file(&new_client->dev, &dev_attr_atrim);
-        if (rc < 0)
-                goto failout_unregister;
-        rc = device_create_file(&new_client->dev, &dev_attr_dtrim);
-        if (rc < 0)
-                goto failout_atrim;
-        rc = device_create_file(&new_client->dev, &dev_attr_usr);
-        if (rc < 0)
-                goto failout_dtrim;
+        rc = isl1208_sysfs_register(&client->dev);
+        if (rc)
+                goto exit_unregister;
 
         return 0;
 
- failout_dtrim:
-        device_remove_file(&new_client->dev, &dev_attr_dtrim);
- failout_atrim:
-        device_remove_file(&new_client->dev, &dev_attr_atrim);
- failout_unregister:
+exit_unregister:
         rtc_device_unregister(rtc);
- failout_detach:
-        i2c_detach_client(new_client);
- failout:
-        kfree(new_client);
-        return rc;
-}
 
-static int
-isl1208_attach_adapter (struct i2c_adapter *adapter)
-{
-        return i2c_probe(adapter, &addr_data, isl1208_probe);
+        return rc;
 }
 
 static int
-isl1208_detach_client(struct i2c_client *client)
+isl1208_remove(struct i2c_client *client)
 {
-        int rc;
-        struct rtc_device *const rtc = i2c_get_clientdata(client);
-
-        if (rtc)
-                rtc_device_unregister(rtc); /* do we need to kfree? */
-
-        rc = i2c_detach_client(client);
-        if (rc)
-                return rc;
+        struct rtc_device *rtc = i2c_get_clientdata(client);
 
-        kfree(client);
+        isl1208_sysfs_unregister(&client->dev);
+        rtc_device_unregister(rtc);
 
         return 0;
 }
 
-/* module management */
+static struct i2c_driver isl1208_driver = {
+        .driver = {
+                   .name = "rtc-isl1208",
+                   },
+        .probe = isl1208_probe,
+        .remove = isl1208_remove,
+};
 
-static int __init isl1208_init(void)
+static int __init
+isl1208_init(void)
 {
         return i2c_add_driver(&isl1208_driver);
 }
 
-static void __exit isl1208_exit(void)
+static void __exit
+isl1208_exit(void)
 {
         i2c_del_driver(&isl1208_driver);
 }
diff --git a/drivers/rtc/rtc-max6900.c b/drivers/rtc/rtc-max6900.c
index 7683412970c4..ded3c0abad83 100644
--- a/drivers/rtc/rtc-max6900.c
+++ b/drivers/rtc/rtc-max6900.c
@@ -98,7 +98,7 @@ static int max6900_i2c_read_regs(struct i2c_client *client, u8 *buf)
         rc = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
         if (rc != ARRAY_SIZE(msgs)) {
                 dev_err(&client->dev, "%s: register read failed\n",
-                        __FUNCTION__);
+                        __func__);
                 return -EIO;
         }
         return 0;
@@ -150,7 +150,7 @@ static int max6900_i2c_write_regs(struct i2c_client *client, u8 const *buf)
 
 write_failed:
         dev_err(&client->dev, "%s: register write failed\n",
-                __FUNCTION__);
+                __func__);
         return -EIO;
 }
 
@@ -214,7 +214,7 @@ static int max6900_i2c_clear_write_protect(struct i2c_client *client)
         rc = i2c_smbus_write_byte_data (client, MAX6900_REG_CONTROL_WRITE, 0);
         if (rc < 0) {
                 dev_err(&client->dev, "%s: control register write failed\n",
-                        __FUNCTION__);
+                        __func__);
                 return -EIO;
         }
         return 0;
diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c
index 1f956dc5d56e..12f0310ae89c 100644
--- a/drivers/rtc/rtc-max6902.c
+++ b/drivers/rtc/rtc-max6902.c
@@ -140,7 +140,7 @@ static int max6902_get_datetime(struct device *dev, struct rtc_time *dt)
         dt->tm_year -= 1900;
 
 #ifdef MAX6902_DEBUG
-        printk("\n%s : Read RTC values\n",__FUNCTION__);
+        printk("\n%s : Read RTC values\n",__func__);
         printk("tm_hour: %i\n",dt->tm_hour);
         printk("tm_min : %i\n",dt->tm_min);
         printk("tm_sec : %i\n",dt->tm_sec);
@@ -158,7 +158,7 @@ static int max6902_set_datetime(struct device *dev, struct rtc_time *dt)
         dt->tm_year = dt->tm_year+1900;
 
 #ifdef MAX6902_DEBUG
-        printk("\n%s : Setting RTC values\n",__FUNCTION__);
+        printk("\n%s : Setting RTC values\n",__func__);
         printk("tm_sec : %i\n",dt->tm_sec);
         printk("tm_min : %i\n",dt->tm_min);
         printk("tm_hour: %i\n",dt->tm_hour);
diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c
index b3317fcc16c3..a41681d26eba 100644
--- a/drivers/rtc/rtc-pcf8563.c
+++ b/drivers/rtc/rtc-pcf8563.c
@@ -18,17 +18,7 @@
 #include <linux/bcd.h>
 #include <linux/rtc.h>
 
-#define DRV_VERSION "0.4.2"
-
-/* Addresses to scan: none
- * This chip cannot be reliably autodetected. An empty eeprom
- * located at 0x51 will pass the validation routine due to
- * the way the registers are implemented.
- */
-static const unsigned short normal_i2c[] = { I2C_CLIENT_END };
-
-/* Module parameters */
-I2C_CLIENT_INSMOD;
+#define DRV_VERSION "0.4.3"
 
 #define PCF8563_REG_ST1         0x00 /* status */
 #define PCF8563_REG_ST2         0x01
@@ -53,8 +43,10 @@ I2C_CLIENT_INSMOD;
 #define PCF8563_SC_LV           0x80 /* low voltage */
 #define PCF8563_MO_C            0x80 /* century */
 
+static struct i2c_driver pcf8563_driver;
+
 struct pcf8563 {
-        struct i2c_client client;
+        struct rtc_device *rtc;
         /*
          * The meaning of MO_C bit varies by the chip type.
          * From PCF8563 datasheet: this bit is toggled when the years
@@ -72,16 +64,13 @@ struct pcf8563 {
         int c_polarity; /* 0: MO_C=1 means 19xx, otherwise MO_C=1 means 20xx */
 };
 
-static int pcf8563_probe(struct i2c_adapter *adapter, int address, int kind);
-static int pcf8563_detach(struct i2c_client *client);
-
 /*
  * In the routines that deal directly with the pcf8563 hardware, we use
  * rtc_time -- month 0-11, hour 0-23, yr = calendar year-epoch.
  */
 static int pcf8563_get_datetime(struct i2c_client *client, struct rtc_time *tm)
 {
-        struct pcf8563 *pcf8563 = container_of(client, struct pcf8563, client);
+        struct pcf8563 *pcf8563 = i2c_get_clientdata(client);
         unsigned char buf[13] = { PCF8563_REG_ST1 };
 
         struct i2c_msg msgs[] = {
@@ -91,7 +80,7 @@ static int pcf8563_get_datetime(struct i2c_client *client, struct rtc_time *tm)
 
         /* read registers */
         if ((i2c_transfer(client->adapter, msgs, 2)) != 2) {
-                dev_err(&client->dev, "%s: read error\n", __FUNCTION__);
+                dev_err(&client->dev, "%s: read error\n", __func__);
                 return -EIO;
         }
 
@@ -102,7 +91,7 @@ static int pcf8563_get_datetime(struct i2c_client *client, struct rtc_time *tm)
         dev_dbg(&client->dev,
                 "%s: raw data is st1=%02x, st2=%02x, sec=%02x, min=%02x, hr=%02x, "
                 "mday=%02x, wday=%02x, mon=%02x, year=%02x\n",
-                __FUNCTION__,
+                __func__,
                 buf[0], buf[1], buf[2], buf[3],
                 buf[4], buf[5], buf[6], buf[7],
                 buf[8]);
@@ -123,7 +112,7 @@ static int pcf8563_get_datetime(struct i2c_client *client, struct rtc_time *tm)
 
         dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
                 "mday=%d, mon=%d, year=%d, wday=%d\n",
-                __FUNCTION__,
+                __func__,
                 tm->tm_sec, tm->tm_min, tm->tm_hour,
                 tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
 
@@ -138,13 +127,13 @@ static int pcf8563_get_datetime(struct i2c_client *client, struct rtc_time *tm)
 
 static int pcf8563_set_datetime(struct i2c_client *client, struct rtc_time *tm)
 {
-        struct pcf8563 *pcf8563 = container_of(client, struct pcf8563, client);
+        struct pcf8563 *pcf8563 = i2c_get_clientdata(client);
         int i, err;
         unsigned char buf[9];
 
         dev_dbg(&client->dev, "%s: secs=%d, mins=%d, hours=%d, "
                 "mday=%d, mon=%d, year=%d, wday=%d\n",
-                __FUNCTION__,
+                __func__,
                 tm->tm_sec, tm->tm_min, tm->tm_hour,
                 tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
 
@@ -174,7 +163,7 @@ static int pcf8563_set_datetime(struct i2c_client *client, struct rtc_time *tm)
                 if (err != sizeof(data)) {
                         dev_err(&client->dev,
                                 "%s: err=%d addr=%02x, data=%02x\n",
-                                __FUNCTION__, err, data[0], data[1]);
+                                __func__, err, data[0], data[1]);
                         return -EIO;
                 }
         };
@@ -219,7 +208,7 @@ static int pcf8563_validate_client(struct i2c_client *client)
                 if (xfer != ARRAY_SIZE(msgs)) {
                         dev_err(&client->dev,
                                 "%s: could not read register 0x%02X\n",
-                                __FUNCTION__, pattern[i].reg);
+                                __func__, pattern[i].reg);
 
                         return -EIO;
                 }
@@ -231,7 +220,7 @@ static int pcf8563_validate_client(struct i2c_client *client)
                         dev_dbg(&client->dev,
                                 "%s: pattern=%d, reg=%x, mask=0x%02x, min=%d, "
                                 "max=%d, value=%d, raw=0x%02X\n",
-                                __FUNCTION__, i, pattern[i].reg, pattern[i].mask,
+                                __func__, i, pattern[i].reg, pattern[i].mask,
                                 pattern[i].min, pattern[i].max,
                                 value, buf);
 
@@ -257,100 +246,67 @@ static const struct rtc_class_ops pcf8563_rtc_ops = {
         .set_time       = pcf8563_rtc_set_time,
 };
 
-static int pcf8563_attach(struct i2c_adapter *adapter)
-{
-        return i2c_probe(adapter, &addr_data, pcf8563_probe);
-}
-
-static struct i2c_driver pcf8563_driver = {
-        .driver         = {
-                .name   = "pcf8563",
-        },
-        .id             = I2C_DRIVERID_PCF8563,
-        .attach_adapter = &pcf8563_attach,
-        .detach_client  = &pcf8563_detach,
-};
-
-static int pcf8563_probe(struct i2c_adapter *adapter, int address, int kind)
+static int pcf8563_probe(struct i2c_client *client)
 {
         struct pcf8563 *pcf8563;
-        struct i2c_client *client;
-        struct rtc_device *rtc;
 
         int err = 0;
 
-        dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
+        dev_dbg(&client->dev, "%s\n", __func__);
 
-        if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
-                err = -ENODEV;
-                goto exit;
-        }
+        if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
+                return -ENODEV;
 
-        if (!(pcf8563 = kzalloc(sizeof(struct pcf8563), GFP_KERNEL))) {
-                err = -ENOMEM;
-                goto exit;
-        }
-
-        client = &pcf8563->client;
-        client->addr = address;
-        client->driver = &pcf8563_driver;
-        client->adapter = adapter;
-
-        strlcpy(client->name, pcf8563_driver.driver.name, I2C_NAME_SIZE);
+        pcf8563 = kzalloc(sizeof(struct pcf8563), GFP_KERNEL);
+        if (!pcf8563)
+                return -ENOMEM;
 
         /* Verify the chip is really an PCF8563 */
-        if (kind < 0) {
-                if (pcf8563_validate_client(client) < 0) {
-                        err = -ENODEV;
-                        goto exit_kfree;
-                }
-        }
-
-        /* Inform the i2c layer */
-        if ((err = i2c_attach_client(client)))
+        if (pcf8563_validate_client(client) < 0) {
+                err = -ENODEV;
                 goto exit_kfree;
+        }
 
         dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");
 
-        rtc = rtc_device_register(pcf8563_driver.driver.name, &client->dev,
-                                &pcf8563_rtc_ops, THIS_MODULE);
+        pcf8563->rtc = rtc_device_register(pcf8563_driver.driver.name,
+                                &client->dev, &pcf8563_rtc_ops, THIS_MODULE);
 
-        if (IS_ERR(rtc)) {
-                err = PTR_ERR(rtc);
-                goto exit_detach;
+        if (IS_ERR(pcf8563->rtc)) {
+                err = PTR_ERR(pcf8563->rtc);
+                goto exit_kfree;
         }
 
-        i2c_set_clientdata(client, rtc);
+        i2c_set_clientdata(client, pcf8563);
 
         return 0;
 
-exit_detach:
-        i2c_detach_client(client);
-
 exit_kfree:
         kfree(pcf8563);
 
-exit:
         return err;
 }
 
-static int pcf8563_detach(struct i2c_client *client)
+static int pcf8563_remove(struct i2c_client *client)
 {
-        struct pcf8563 *pcf8563 = container_of(client, struct pcf8563, client);
-        int err;
-        struct rtc_device *rtc = i2c_get_clientdata(client);
+        struct pcf8563 *pcf8563 = i2c_get_clientdata(client);
 
-        if (rtc)
-                rtc_device_unregister(rtc);
-
-        if ((err = i2c_detach_client(client)))
-                return err;
+        if (pcf8563->rtc)
+                rtc_device_unregister(pcf8563->rtc);
 
         kfree(pcf8563);
 
         return 0;
 }
 
+static struct i2c_driver pcf8563_driver = {
+        .driver         = {
+                .name   = "rtc-pcf8563",
+        },
+        .probe          = pcf8563_probe,
+        .remove         = pcf8563_remove,
+};
+
 static int __init pcf8563_init(void)
 {
         return i2c_add_driver(&pcf8563_driver);
diff --git a/drivers/rtc/rtc-pcf8583.c b/drivers/rtc/rtc-pcf8583.c
index 8b3997007506..3d09d8f0b1f0 100644
--- a/drivers/rtc/rtc-pcf8583.c
+++ b/drivers/rtc/rtc-pcf8583.c
@@ -15,7 +15,7 @@
 #include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/string.h>
-#include <linux/mc146818rtc.h>
+#include <linux/rtc.h>
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/bcd.h>
diff --git a/drivers/rtc/rtc-rs5c313.c b/drivers/rtc/rtc-rs5c313.c
index 664e89a817ed..1c14d4497c4d 100644
--- a/drivers/rtc/rtc-rs5c313.c
+++ b/drivers/rtc/rtc-rs5c313.c
@@ -228,7 +228,7 @@ static int rs5c313_rtc_read_time(struct device *dev, struct rtc_time *tm)
                 ndelay(700);    /* CE:L */
 
                 if (cnt++ > 100) {
-                        dev_err(dev, "%s: timeout error\n", __FUNCTION__);
+                        dev_err(dev, "%s: timeout error\n", __func__);
                         return -EIO;
                 }
         }
@@ -289,7 +289,7 @@ static int rs5c313_rtc_set_time(struct device *dev, struct rtc_time *tm)
                 ndelay(700);    /* CE:L */
 
                 if (cnt++ > 100) {
-                        dev_err(dev, "%s: timeout error\n", __FUNCTION__);
+                        dev_err(dev, "%s: timeout error\n", __func__);
                         return -EIO;
                 }
         }
diff --git a/drivers/rtc/rtc-rs5c372.c b/drivers/rtc/rtc-rs5c372.c
index 6b67b5097927..7e63074708eb 100644
--- a/drivers/rtc/rtc-rs5c372.c
+++ b/drivers/rtc/rtc-rs5c372.c
@@ -99,7 +99,7 @@ static int rs5c_get_regs(struct rs5c372 *rs5c)
          * least 80219 chips; this works around that bug.
          */
         if ((i2c_transfer(client->adapter, msgs, 1)) != 1) {
-                pr_debug("%s: can't read registers\n", rs5c->rtc->name);
+                dev_warn(&client->dev, "can't read registers\n");
                 return -EIO;
         }
 
@@ -166,7 +166,7 @@ static int rs5c372_get_datetime(struct i2c_client *client, struct rtc_time *tm)
 
         dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
                 "mday=%d, mon=%d, year=%d, wday=%d\n",
-                __FUNCTION__,
+                __func__,
                 tm->tm_sec, tm->tm_min, tm->tm_hour,
                 tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
 
@@ -181,7 +181,7 @@ static int rs5c372_set_datetime(struct i2c_client *client, struct rtc_time *tm)
 
         dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d "
                 "mday=%d, mon=%d, year=%d, wday=%d\n",
-                __FUNCTION__,
+                __func__,
                 tm->tm_sec, tm->tm_min, tm->tm_hour,
                 tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
 
@@ -195,7 +195,7 @@ static int rs5c372_set_datetime(struct i2c_client *client, struct rtc_time *tm)
         buf[7] = BIN2BCD(tm->tm_year - 100);
 
         if ((i2c_master_send(client, buf, 8)) != 8) {
-                dev_err(&client->dev, "%s: write error\n", __FUNCTION__);
+                dev_err(&client->dev, "%s: write error\n", __func__);
                 return -EIO;
         }
 
@@ -220,7 +220,7 @@ static int rs5c372_get_trim(struct i2c_client *client, int *osc, int *trim)
                 *osc = (tmp & RS5C372_TRIM_XSL) ? 32000 : 32768;
 
         if (trim) {
-                dev_dbg(&client->dev, "%s: raw trim=%x\n", __FUNCTION__, tmp);
+                dev_dbg(&client->dev, "%s: raw trim=%x\n", __func__, tmp);
                 tmp &= RS5C372_TRIM_MASK;
                 if (tmp & 0x3e) {
                         int t = tmp & 0x3f;
@@ -500,7 +500,7 @@ static int rs5c372_probe(struct i2c_client *client)
         struct rs5c372 *rs5c372;
         struct rtc_time tm;
 
-        dev_dbg(&client->dev, "%s\n", __FUNCTION__);
+        dev_dbg(&client->dev, "%s\n", __func__);
 
         if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
                 err = -ENODEV;
@@ -512,12 +512,12 @@ static int rs5c372_probe(struct i2c_client *client)
                 goto exit;
         }
 
-        /* we read registers 0x0f then 0x00-0x0f; skip the first one */
-        rs5c372->regs=&rs5c372->buf[1];
-
         rs5c372->client = client;
         i2c_set_clientdata(client, rs5c372);
 
+        /* we read registers 0x0f then 0x00-0x0f; skip the first one */
+        rs5c372->regs = &rs5c372->buf[1];
+
         err = rs5c_get_regs(rs5c372);
         if (err < 0)
                 goto exit_kfree;
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index 9f4d5129a496..f26e0cad8f16 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -68,7 +68,7 @@ static void s3c_rtc_setaie(int to)
 {
         unsigned int tmp;
 
-        pr_debug("%s: aie=%d\n", __FUNCTION__, to);
+        pr_debug("%s: aie=%d\n", __func__, to);
 
         tmp = readb(s3c_rtc_base + S3C2410_RTCALM) & ~S3C2410_RTCALM_ALMEN;
 
@@ -82,7 +82,7 @@ static void s3c_rtc_setpie(int to)
 {
         unsigned int tmp;
 
-        pr_debug("%s: pie=%d\n", __FUNCTION__, to);
+        pr_debug("%s: pie=%d\n", __func__, to);
 
         spin_lock_irq(&s3c_rtc_pie_lock);
         tmp = readb(s3c_rtc_base + S3C2410_TICNT) & ~S3C2410_TICNT_ENABLE;
@@ -457,7 +457,7 @@ static int s3c_rtc_probe(struct platform_device *pdev)
         struct resource *res;
         int ret;
 
-        pr_debug("%s: probe=%p\n", __FUNCTION__, pdev);
+        pr_debug("%s: probe=%p\n", __func__, pdev);
 
         /* find the IRQs */
 
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index c594b34c6767..110699bb4787 100644
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -361,7 +361,7 @@ static int sh_rtc_read_time(struct device *dev, struct rtc_time *tm)
 
         dev_dbg(dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
                 "mday=%d, mon=%d, year=%d, wday=%d\n",
-                __FUNCTION__,
+                __func__,
                 tm->tm_sec, tm->tm_min, tm->tm_hour,
                 tm->tm_mday, tm->tm_mon + 1, tm->tm_year, tm->tm_wday);
 
diff --git a/drivers/rtc/rtc-sysfs.c b/drivers/rtc/rtc-sysfs.c
index 4d27ccc4fc06..2531ce4c9db0 100644
--- a/drivers/rtc/rtc-sysfs.c
+++ b/drivers/rtc/rtc-sysfs.c
@@ -145,6 +145,8 @@ rtc_sysfs_set_wakealarm(struct device *dev, struct device_attribute *attr,
         unsigned long now, alarm;
         struct rtc_wkalrm alm;
         struct rtc_device *rtc = to_rtc_device(dev);
+        char *buf_ptr;
+        int adjust = 0;
 
         /* Only request alarms that trigger in the future.  Disable them
          * by writing another time, e.g. 0 meaning Jan 1 1970 UTC.
@@ -154,7 +156,15 @@ rtc_sysfs_set_wakealarm(struct device *dev, struct device_attribute *attr,
                 return retval;
         rtc_tm_to_time(&alm.time, &now);
 
-        alarm = simple_strtoul(buf, NULL, 0);
+        buf_ptr = (char *)buf;
+        if (*buf_ptr == '+') {
+                buf_ptr++;
+                adjust = 1;
+        }
+        alarm = simple_strtoul(buf_ptr, NULL, 0);
+        if (adjust) {
+                alarm += now;
+        }
         if (alarm > now) {
                 /* Avoid accidentally clobbering active alarms; we can't
                  * entirely prevent that here, without even the minimal
diff --git a/drivers/rtc/rtc-test.c b/drivers/rtc/rtc-test.c
index 254c9fce27da..bc930022004a 100644
--- a/drivers/rtc/rtc-test.c
+++ b/drivers/rtc/rtc-test.c
@@ -147,7 +147,7 @@ static int __devexit test_remove(struct platform_device *plat_dev)
         return 0;
 }
 
-static struct platform_driver test_drv = {
+static struct platform_driver test_driver = {
         .probe  = test_probe,
         .remove = __devexit_p(test_remove),
         .driver = {
@@ -160,7 +160,7 @@ static int __init test_init(void)
 {
         int err;
 
-        if ((err = platform_driver_register(&test_drv)))
+        if ((err = platform_driver_register(&test_driver)))
                 return err;
 
         if ((test0 = platform_device_alloc("rtc-test", 0)) == NULL) {
@@ -191,7 +191,7 @@ exit_free_test0:
         platform_device_put(test0);
 
 exit_driver_unregister:
-        platform_driver_unregister(&test_drv);
+        platform_driver_unregister(&test_driver);
         return err;
 }
 
@@ -199,7 +199,7 @@ static void __exit test_exit(void)
 {
         platform_device_unregister(test0);
         platform_device_unregister(test1);
-        platform_driver_unregister(&test_drv);
+        platform_driver_unregister(&test_driver);
 }
 
 MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
diff --git a/drivers/rtc/rtc-v3020.c b/drivers/rtc/rtc-v3020.c
index 24203a06051a..10025d840268 100644
--- a/drivers/rtc/rtc-v3020.c
+++ b/drivers/rtc/rtc-v3020.c
@@ -107,7 +107,7 @@ static int v3020_read_time(struct device *dev, struct rtc_time *dt)
         dt->tm_year = BCD2BIN(tmp)+100;
 
 #ifdef DEBUG
-        printk("\n%s : Read RTC values\n",__FUNCTION__);
+        printk("\n%s : Read RTC values\n",__func__);
         printk("tm_hour: %i\n",dt->tm_hour);
         printk("tm_min : %i\n",dt->tm_min);
         printk("tm_sec : %i\n",dt->tm_sec);
@@ -126,7 +126,7 @@ static int v3020_set_time(struct device *dev, struct rtc_time *dt)
         struct v3020 *chip = dev_get_drvdata(dev);
 
 #ifdef DEBUG
-        printk("\n%s : Setting RTC values\n",__FUNCTION__);
+        printk("\n%s : Setting RTC values\n",__func__);
         printk("tm_sec : %i\n",dt->tm_sec);
         printk("tm_min : %i\n",dt->tm_min);
         printk("tm_hour: %i\n",dt->tm_hour);
diff --git a/drivers/rtc/rtc-x1205.c b/drivers/rtc/rtc-x1205.c
index b90fb1866ce9..095282f63523 100644
--- a/drivers/rtc/rtc-x1205.c
+++ b/drivers/rtc/rtc-x1205.c
@@ -22,20 +22,7 @@
 #include <linux/rtc.h>
 #include <linux/delay.h>
 
-#define DRV_VERSION "1.0.7"
-
-/* Addresses to scan: none. This chip is located at
- * 0x6f and uses a two bytes register addressing.
- * Two bytes need to be written to read a single register,
- * while most other chips just require one and take the second
- * one as the data to be written. To prevent corrupting
- * unknown chips, the user must explicitly set the probe parameter.
- */
-
-static const unsigned short normal_i2c[] = { I2C_CLIENT_END };
-
-/* Insmod parameters */
-I2C_CLIENT_INSMOD;
+#define DRV_VERSION "1.0.8"
 
 /* offsets into CCR area */
 
@@ -91,19 +78,7 @@ I2C_CLIENT_INSMOD;
 
 #define X1205_HR_MIL            0x80    /* Set in ccr.hour for 24 hr mode */
 
-/* Prototypes */
-static int x1205_attach(struct i2c_adapter *adapter);
-static int x1205_detach(struct i2c_client *client);
-static int x1205_probe(struct i2c_adapter *adapter, int address, int kind);
-
-static struct i2c_driver x1205_driver = {
-        .driver         = {
-                .name   = "x1205",
-        },
-        .id             = I2C_DRIVERID_X1205,
-        .attach_adapter = &x1205_attach,
-        .detach_client  = &x1205_detach,
-};
+static struct i2c_driver x1205_driver;
 
 /*
  * In the routines that deal directly with the x1205 hardware, we use
@@ -124,14 +99,14 @@ static int x1205_get_datetime(struct i2c_client *client, struct rtc_time *tm,
 
         /* read date registers */
         if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) {
-                dev_err(&client->dev, "%s: read error\n", __FUNCTION__);
+                dev_err(&client->dev, "%s: read error\n", __func__);
                 return -EIO;
         }
 
         dev_dbg(&client->dev,
                 "%s: raw read data - sec=%02x, min=%02x, hr=%02x, "
                 "mday=%02x, mon=%02x, year=%02x, wday=%02x, y2k=%02x\n",
-                __FUNCTION__,
+                __func__,
                 buf[0], buf[1], buf[2], buf[3],
                 buf[4], buf[5], buf[6], buf[7]);
 
@@ -146,7 +121,7 @@ static int x1205_get_datetime(struct i2c_client *client, struct rtc_time *tm,
 
         dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
                 "mday=%d, mon=%d, year=%d, wday=%d\n",
-                __FUNCTION__,
+                __func__,
                 tm->tm_sec, tm->tm_min, tm->tm_hour,
                 tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
 
@@ -164,7 +139,7 @@ static int x1205_get_status(struct i2c_client *client, unsigned char *sr)
 
         /* read status register */
         if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) {
-                dev_err(&client->dev, "%s: read error\n", __FUNCTION__);
+                dev_err(&client->dev, "%s: read error\n", __func__);
                 return -EIO;
         }
 
@@ -187,7 +162,7 @@ static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm,
 
         dev_dbg(&client->dev,
                 "%s: secs=%d, mins=%d, hours=%d\n",
-                __FUNCTION__,
+                __func__,
                 tm->tm_sec, tm->tm_min, tm->tm_hour);
 
         buf[CCR_SEC] = BIN2BCD(tm->tm_sec);
@@ -200,7 +175,7 @@ static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm,
         if (datetoo) {
                 dev_dbg(&client->dev,
                         "%s: mday=%d, mon=%d, year=%d, wday=%d\n",
-                        __FUNCTION__,
+                        __func__,
                         tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
 
                 buf[CCR_MDAY] = BIN2BCD(tm->tm_mday);
@@ -216,12 +191,12 @@ static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm,
 
         /* this sequence is required to unlock the chip */
         if ((xfer = i2c_master_send(client, wel, 3)) != 3) {
-                dev_err(&client->dev, "%s: wel - %d\n", __FUNCTION__, xfer);
+                dev_err(&client->dev, "%s: wel - %d\n", __func__, xfer);
                 return -EIO;
         }
 
         if ((xfer = i2c_master_send(client, rwel, 3)) != 3) {
-                dev_err(&client->dev, "%s: rwel - %d\n", __FUNCTION__, xfer);
+                dev_err(&client->dev, "%s: rwel - %d\n", __func__, xfer);
                 return -EIO;
         }
 
@@ -233,7 +208,7 @@ static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm,
                 if (xfer != 3) {
                         dev_err(&client->dev,
                                 "%s: xfer=%d addr=%02x, data=%02x\n",
-                                __FUNCTION__,
+                                __func__,
                                  xfer, rdata[1], rdata[2]);
                         return -EIO;
                 }
@@ -241,7 +216,7 @@ static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm,
 
         /* disable further writes */
         if ((xfer = i2c_master_send(client, diswe, 3)) != 3) {
-                dev_err(&client->dev, "%s: diswe - %d\n", __FUNCTION__, xfer);
+                dev_err(&client->dev, "%s: diswe - %d\n", __func__, xfer);
                 return -EIO;
         }
 
@@ -274,11 +249,11 @@ static int x1205_get_dtrim(struct i2c_client *client, int *trim)
 
         /* read dtr register */
         if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) {
-                dev_err(&client->dev, "%s: read error\n", __FUNCTION__);
+                dev_err(&client->dev, "%s: read error\n", __func__);
                 return -EIO;
         }
 
-        dev_dbg(&client->dev, "%s: raw dtr=%x\n", __FUNCTION__, dtr);
+        dev_dbg(&client->dev, "%s: raw dtr=%x\n", __func__, dtr);
 
         *trim = 0;
 
@@ -306,11 +281,11 @@ static int x1205_get_atrim(struct i2c_client *client, int *trim)
 
         /* read atr register */
         if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) {
-                dev_err(&client->dev, "%s: read error\n", __FUNCTION__);
+                dev_err(&client->dev, "%s: read error\n", __func__);
                 return -EIO;
         }
 
-        dev_dbg(&client->dev, "%s: raw atr=%x\n", __FUNCTION__, atr);
+        dev_dbg(&client->dev, "%s: raw atr=%x\n", __func__, atr);
 
         /* atr is a two's complement value on 6 bits,
          * perform sign extension. The formula is
@@ -319,11 +294,11 @@ static int x1205_get_atrim(struct i2c_client *client, int *trim)
         if (atr & 0x20)
                 atr |= 0xC0;
 
-        dev_dbg(&client->dev, "%s: raw atr=%x (%d)\n", __FUNCTION__, atr, atr);
+        dev_dbg(&client->dev, "%s: raw atr=%x (%d)\n", __func__, atr, atr);
 
         *trim = (atr * 250) + 11000;
 
-        dev_dbg(&client->dev, "%s: real=%d\n", __FUNCTION__, *trim);
+        dev_dbg(&client->dev, "%s: real=%d\n", __func__, *trim);
 
         return 0;
 }
@@ -377,7 +352,7 @@ static int x1205_validate_client(struct i2c_client *client)
                 if ((xfer = i2c_transfer(client->adapter, msgs, 2)) != 2) {
                         dev_err(&client->dev,
                                 "%s: could not read register %x\n",
-                                __FUNCTION__, probe_zero_pattern[i]);
+                                __func__, probe_zero_pattern[i]);
 
                         return -EIO;
                 }
@@ -385,7 +360,7 @@ static int x1205_validate_client(struct i2c_client *client)
                 if ((buf & probe_zero_pattern[i+1]) != 0) {
                         dev_err(&client->dev,
                                 "%s: register=%02x, zero pattern=%d, value=%x\n",
-                                __FUNCTION__, probe_zero_pattern[i], i, buf);
+                                __func__, probe_zero_pattern[i], i, buf);
 
                         return -ENODEV;
                 }
@@ -405,7 +380,7 @@ static int x1205_validate_client(struct i2c_client *client)
                 if ((xfer = i2c_transfer(client->adapter, msgs, 2)) != 2) {
                         dev_err(&client->dev,
                                 "%s: could not read register %x\n",
-                                __FUNCTION__, probe_limits_pattern[i].reg);
+                                __func__, probe_limits_pattern[i].reg);
 
                         return -EIO;
                 }
@@ -416,7 +391,7 @@ static int x1205_validate_client(struct i2c_client *client)
                         value < probe_limits_pattern[i].min) {
                         dev_dbg(&client->dev,
                                 "%s: register=%x, lim pattern=%d, value=%d\n",
-                                __FUNCTION__, probe_limits_pattern[i].reg,
+                                __func__, probe_limits_pattern[i].reg,
                                 i, value);
 
                         return -ENODEV;
@@ -497,58 +472,49 @@ static ssize_t x1205_sysfs_show_dtrim(struct device *dev,
 }
 static DEVICE_ATTR(dtrim, S_IRUGO, x1205_sysfs_show_dtrim, NULL);
 
-static int x1205_attach(struct i2c_adapter *adapter)
+static int x1205_sysfs_register(struct device *dev)
+{
+        int err;
+
+        err = device_create_file(dev, &dev_attr_atrim);
+        if (err)
+                return err;
+
+        err = device_create_file(dev, &dev_attr_dtrim);
+        if (err)
+                device_remove_file(dev, &dev_attr_atrim);
+
+        return err;
+}
+
+static void x1205_sysfs_unregister(struct device *dev)
 {
-        return i2c_probe(adapter, &addr_data, x1205_probe);
+        device_remove_file(dev, &dev_attr_atrim);
+        device_remove_file(dev, &dev_attr_dtrim);
 }
 
-static int x1205_probe(struct i2c_adapter *adapter, int address, int kind)
+
+static int x1205_probe(struct i2c_client *client)
 {
         int err = 0;
         unsigned char sr;
-        struct i2c_client *client;
         struct rtc_device *rtc;
 
-        dev_dbg(&adapter->dev, "%s\n", __FUNCTION__);
-
-        if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
-                err = -ENODEV;
-                goto exit;
-        }
-
-        if (!(client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL))) {
-                err = -ENOMEM;
-                goto exit;
-        }
-
-        /* I2C client */
-        client->addr = address;
-        client->driver = &x1205_driver;
-        client->adapter = adapter;
+        dev_dbg(&client->dev, "%s\n", __func__);
 
-        strlcpy(client->name, x1205_driver.driver.name, I2C_NAME_SIZE);
-
-        /* Verify the chip is really an X1205 */
-        if (kind < 0) {
-                if (x1205_validate_client(client) < 0) {
-                        err = -ENODEV;
-                        goto exit_kfree;
-                }
-        }
+        if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
+                return -ENODEV;
 
-        /* Inform the i2c layer */
-        if ((err = i2c_attach_client(client)))
-                goto exit_kfree;
+        if (x1205_validate_client(client) < 0)
+                return -ENODEV;
 
         dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");
 
         rtc = rtc_device_register(x1205_driver.driver.name, &client->dev,
                                 &x1205_rtc_ops, THIS_MODULE);
 
-        if (IS_ERR(rtc)) {
-                err = PTR_ERR(rtc);
-                goto exit_detach;
-        }
+        if (IS_ERR(rtc))
+                return PTR_ERR(rtc);
 
         i2c_set_clientdata(client, rtc);
 
@@ -565,45 +531,35 @@ static int x1205_probe(struct i2c_adapter *adapter, int address, int kind)
         else
                 dev_err(&client->dev, "couldn't read status\n");
 
-        err = device_create_file(&client->dev, &dev_attr_atrim);
-        if (err) goto exit_devreg;
-        err = device_create_file(&client->dev, &dev_attr_dtrim);
-        if (err) goto exit_atrim;
+        err = x1205_sysfs_register(&client->dev);
+        if (err)
+                goto exit_devreg;
 
         return 0;
 
-exit_atrim:
-        device_remove_file(&client->dev, &dev_attr_atrim);
-
 exit_devreg:
         rtc_device_unregister(rtc);
 
-exit_detach:
-        i2c_detach_client(client);
-
-exit_kfree:
-        kfree(client);
-
-exit:
         return err;
 }
 
-static int x1205_detach(struct i2c_client *client)
+static int x1205_remove(struct i2c_client *client)
 {
-        int err;
         struct rtc_device *rtc = i2c_get_clientdata(client);
 
-        if (rtc)
-                rtc_device_unregister(rtc);
-
-        if ((err = i2c_detach_client(client)))
-                return err;
-
-        kfree(client);
-
+        rtc_device_unregister(rtc);
+        x1205_sysfs_unregister(&client->dev);
         return 0;
 }
 
+static struct i2c_driver x1205_driver = {
+        .driver         = {
+                .name   = "rtc-x1205",
+        },
+        .probe          = x1205_probe,
+        .remove         = x1205_remove,
+};
+
 static int __init x1205_init(void)
 {
         return i2c_add_driver(&x1205_driver);
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 04787eab1016..bb52d2fbac18 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -36,7 +36,7 @@ static int dcssblk_open(struct inode *inode, struct file *filp);
 static int dcssblk_release(struct inode *inode, struct file *filp);
 static int dcssblk_make_request(struct request_queue *q, struct bio *bio);
 static int dcssblk_direct_access(struct block_device *bdev, sector_t secnum,
-                                 unsigned long *data);
+                                 void **kaddr, unsigned long *pfn);
 
 static char dcssblk_segments[DCSSBLK_PARM_LEN] = "\0";
 
@@ -636,7 +636,7 @@ fail:
 
 static int
 dcssblk_direct_access (struct block_device *bdev, sector_t secnum,
-                        unsigned long *data)
+                        void **kaddr, unsigned long *pfn)
 {
         struct dcssblk_dev_info *dev_info;
         unsigned long pgoff;
@@ -649,7 +649,9 @@ dcssblk_direct_access (struct block_device *bdev, sector_t secnum,
         pgoff = secnum / (PAGE_SIZE / 512);
         if ((pgoff+1)*PAGE_SIZE-1 > dev_info->end - dev_info->start)
                 return -ERANGE;
-        *data = (unsigned long) (dev_info->start+pgoff*PAGE_SIZE);
+        *kaddr = (void *) (dev_info->start+pgoff*PAGE_SIZE);
+        *pfn = virt_to_phys(*kaddr) >> PAGE_SHIFT;
+
         return 0;
 }
 
diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c
index 2aa6bfe8fdb3..f59463601874 100644
--- a/drivers/serial/68360serial.c
+++ b/drivers/serial/68360serial.c
@@ -51,6 +51,7 @@ extern int  kgdb_output_string (const char* s, unsigned int count);
 
 /* #ifdef CONFIG_SERIAL_CONSOLE */ /* This seems to be a post 2.0 thing - mles */
 #include <linux/console.h>
+#include <linux/jiffies.h>
 
 /* this defines the index into rs_table for the port to use
  */
@@ -1729,7 +1730,7 @@ static void rs_360_wait_until_sent(struct tty_struct *tty, int timeout)
                 msleep_interruptible(jiffies_to_msecs(char_time));
                 if (signal_pending(current))
                         break;
-                if (timeout && ((orig_jiffies + timeout) < jiffies))
+                if (timeout && (time_after(jiffies, orig_jiffies + timeout)))
                         break;
                 /* The 'tx_cur' is really the next buffer to send.  We
                  * have to back up to the previous BD and wait for it
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 96a585e1cee8..ea41f2626458 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -1868,6 +1868,7 @@ static int serial8250_startup(struct uart_port *port)
         }
 
         if (is_real_interrupt(up->port.irq)) {
+                unsigned char iir1;
                 /*
                  * Test for UARTs that do not reassert THRE when the
                  * transmitter is idle and the interrupt has already
@@ -1881,7 +1882,7 @@ static int serial8250_startup(struct uart_port *port)
                 wait_for_xmitr(up, UART_LSR_THRE);
                 serial_out_sync(up, UART_IER, UART_IER_THRI);
                 udelay(1); /* allow THRE to set */
-                serial_in(up, UART_IIR);
+                iir1 = serial_in(up, UART_IIR);
                 serial_out(up, UART_IER, 0);
                 serial_out_sync(up, UART_IER, UART_IER_THRI);
                 udelay(1); /* allow a working UART time to re-assert THRE */
@@ -1894,7 +1895,7 @@ static int serial8250_startup(struct uart_port *port)
                  * If the interrupt is not reasserted, setup a timer to
                  * kick the UART on a regular basis.
                  */
-                if (iir & UART_IIR_NO_INT) {
+                if (!(iir1 & UART_IIR_NO_INT) && (iir & UART_IIR_NO_INT)) {
                         pr_debug("ttyS%d - using backup timer\n", port->line);
                         up->timer.function = serial8250_backup_timeout;
                         up->timer.data = (unsigned long)up;
@@ -2228,7 +2229,9 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
         }
         serial8250_set_mctrl(&up->port, up->port.mctrl);
         spin_unlock_irqrestore(&up->port.lock, flags);
-        tty_termios_encode_baud_rate(termios, baud, baud);
+        /* Don't rewrite B0 */
+        if (tty_termios_baud_rate(termios))
+                tty_termios_encode_baud_rate(termios, baud, baud);
 }
 
 static void
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index f97224ce59da..6e57382b9137 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -775,7 +775,7 @@ pci_default_setup(struct serial_private *priv, struct pciserial_board *board,
  * This list is ordered alphabetically by vendor then device.
  * Specific entries must come before more generic entries.
  */
-static struct pci_serial_quirk pci_serial_quirks[] = {
+static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
         /*
         * ADDI-DATA GmbH communication cards <info@addi-data.com>
         */
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index 55492fa095a2..c065a704a93a 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -96,7 +96,6 @@
 
  /* PDC registers */
 #define UART_PUT_PTCR(port,v)   __raw_writel(v, (port)->membase + ATMEL_PDC_PTCR)
-#define UART_GET_TCR(port)      __raw_readl((port)->membase + ATMEL_PDC_TCR)
 #define UART_GET_PTSR(port)     __raw_readl((port)->membase + ATMEL_PDC_PTSR)
 
 #define UART_PUT_RPR(port,v)    __raw_writel(v, (port)->membase + ATMEL_PDC_RPR)
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index 383c4e660cd5..88e7c1d5b919 100644
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -3582,6 +3582,8 @@ rs_tiocmset(struct tty_struct *tty, struct file *file,
 {
         struct e100_serial *info = (struct e100_serial *)tty->driver_data;
 
+        lock_kernel();
+
         if (clear & TIOCM_RTS)
                 e100_rts(info, 0);
         if (clear & TIOCM_DTR)
@@ -3601,6 +3603,8 @@ rs_tiocmset(struct tty_struct *tty, struct file *file,
                 e100_ri_out(info, 1);
         if (set & TIOCM_CD)
                 e100_cd_out(info, 1);
+
+        unlock_kernel();
         return 0;
 }
 
@@ -3610,6 +3614,7 @@ rs_tiocmget(struct tty_struct *tty, struct file *file)
         struct e100_serial *info = (struct e100_serial *)tty->driver_data;
         unsigned int result;
 
+        lock_kernel();
         result =
                 (!E100_RTS_GET(info) ? TIOCM_RTS : 0)
                 | (!E100_DTR_GET(info) ? TIOCM_DTR : 0)
@@ -3618,6 +3623,8 @@ rs_tiocmget(struct tty_struct *tty, struct file *file)
                 | (!E100_CD_GET(info) ? TIOCM_CAR : 0)
                 | (!E100_CTS_GET(info) ? TIOCM_CTS : 0);
 
+        unlock_kernel();
+
 #ifdef SERIAL_DEBUG_IO
         printk(KERN_DEBUG "ser%i: modem state: %i 0x%08X\n",
                 info->line, result, result);
diff --git a/drivers/serial/dz.c b/drivers/serial/dz.c
index 116211fcd36f..0dddd68b20d2 100644
--- a/drivers/serial/dz.c
+++ b/drivers/serial/dz.c
@@ -819,7 +819,7 @@ static void dz_console_putchar(struct uart_port *uport, int ch)
                 dz_out(dport, DZ_TCR, mask);
                 iob();
                 udelay(2);
-        } while (loops--);
+        } while (--loops);
 
         if (loops)                              /* Cannot send otherwise. */
                 dz_out(dport, DZ_TDR, ch);
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index a9ca03ead3e5..977ce820ce30 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -329,13 +329,15 @@ EXPORT_SYMBOL(uart_update_timeout);
  *      If it's still invalid, we try 9600 baud.
  *
  *      Update the @termios structure to reflect the baud rate
- *      we're actually going to be using.
+ *      we're actually going to be using. Don't do this for the case
+ *      where B0 is requested ("hang up").
  */
 unsigned int
 uart_get_baud_rate(struct uart_port *port, struct ktermios *termios,
                    struct ktermios *old, unsigned int min, unsigned int max)
 {
         unsigned int try, baud, altbaud = 38400;
+        int hung_up = 0;
         upf_t flags = port->flags & UPF_SPD_MASK;
 
         if (flags == UPF_SPD_HI)
@@ -360,8 +362,10 @@ uart_get_baud_rate(struct uart_port *port, struct ktermios *termios,
                 /*
                  * Special case: B0 rate.
                  */
-                if (baud == 0)
+                if (baud == 0) {
+                        hung_up = 1;
                         baud = 9600;
+                }
 
                 if (baud >= min && baud <= max)
                         return baud;
@@ -373,7 +377,9 @@ uart_get_baud_rate(struct uart_port *port, struct ktermios *termios,
                 termios->c_cflag &= ~CBAUD;
                 if (old) {
                         baud = tty_termios_baud_rate(old);
-                        tty_termios_encode_baud_rate(termios, baud, baud);
+                        if (!hung_up)
+                                tty_termios_encode_baud_rate(termios,
+                                                                baud, baud);
                         old = NULL;
                         continue;
                 }
@@ -382,7 +388,8 @@ uart_get_baud_rate(struct uart_port *port, struct ktermios *termios,
                  * As a last resort, if the quotient is zero,
                  * default to 9600 bps
                  */
-                tty_termios_encode_baud_rate(termios, 9600, 9600);
+                if (!hung_up)
+                        tty_termios_encode_baud_rate(termios, 9600, 9600);
         }
 
         return 0;
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 3271379a36db..90a20a152ebf 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -1231,7 +1231,7 @@ static inline struct console *SUNZILOG_CONSOLE(void)
 #define SUNZILOG_CONSOLE()      (NULL)
 #endif
 
-static void __devinit sunzilog_init_kbdms(struct uart_sunzilog_port *up, int channel)
+static void __devinit sunzilog_init_kbdms(struct uart_sunzilog_port *up)
 {
         int baud, brg;
 
@@ -1305,7 +1305,7 @@ static void __devinit sunzilog_init_hw(struct uart_sunzilog_port *up)
                 up->curregs[R7] = 0x7E; /* SDLC Flag    */
                 up->curregs[R9] = NV;
                 up->curregs[R7p] = 0x00;
-                sunzilog_init_kbdms(up, up->port.line);
+                sunzilog_init_kbdms(up);
                 /* Only enable interrupts if an ISR handler available */
                 if (up->flags & SUNZILOG_FLAG_ISR_HANDLER)
                         up->curregs[R9] |= MIE;
diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c
index 98ab649c1ff9..bb6ce6bba32f 100644
--- a/drivers/serial/vr41xx_siu.c
+++ b/drivers/serial/vr41xx_siu.c
@@ -1,7 +1,7 @@
 /*
  *  Driver for NEC VR4100 series Serial Interface Unit.
  *
- *  Copyright (C) 2004-2007  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *  Copyright (C) 2004-2008  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
  *
  *  Based on drivers/serial/8250.c, by Russell King.
  *
@@ -840,6 +840,19 @@ static int __devinit siu_console_init(void)
 
 console_initcall(siu_console_init);
 
+void __init vr41xx_siu_early_setup(struct uart_port *port)
+{
+        if (port->type == PORT_UNKNOWN)
+                return;
+
+        siu_uart_ports[port->line].line = port->line;
+        siu_uart_ports[port->line].type = port->type;
+        siu_uart_ports[port->line].uartclk = SIU_BAUD_BASE * 16;
+        siu_uart_ports[port->line].mapbase = port->mapbase;
+        siu_uart_ports[port->line].mapbase = port->mapbase;
+        siu_uart_ports[port->line].ops = &siu_uart_ops;
+}
+
 #define SERIAL_VR41XX_CONSOLE   &siu_console
 #else
 #define SERIAL_VR41XX_CONSOLE   NULL
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index d8107890db15..fae9e8f3d092 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -5,11 +5,9 @@
 # nobody's needed a slave side API yet.  The master-role API is not
 # fully appropriate there, so it'd need some thought to do well.
 #
-menu "SPI support"
-        depends on HAS_IOMEM
-
-config SPI
+menuconfig SPI
         bool "SPI support"
+        depends on HAS_IOMEM
         help
           The "Serial Peripheral Interface" is a low level synchronous
           protocol.  Chips that support SPI can have data transfer rates
@@ -28,9 +26,11 @@ config SPI
           (half duplex), SSP, SSI, and PSP.  This driver framework should
           work with most such devices and controllers.
 
+if SPI
+
 config SPI_DEBUG
         boolean "Debug support for SPI drivers"
-        depends on SPI && DEBUG_KERNEL
+        depends on DEBUG_KERNEL
         help
           Say "yes" to enable debug messaging (like dev_dbg and pr_debug),
           sysfs, and debugfs support in SPI controller and protocol drivers.
@@ -245,5 +245,4 @@ config SPI_TLE62X0
 
 # (slave support would go here)
 
-endmenu # "SPI support"
-
+endif # SPI
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index 1749a27be066..02c8e305b14f 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -616,7 +616,7 @@ static int atmel_spi_transfer(struct spi_device *spi, struct spi_message *msg)
                 return -ESHUTDOWN;
 
         list_for_each_entry(xfer, &msg->transfers, transfer_list) {
-                if (!(xfer->tx_buf || xfer->rx_buf)) {
+                if (!(xfer->tx_buf || xfer->rx_buf) && xfer->len) {
                         dev_dbg(&spi->dev, "missing rx or tx buf\n");
                         return -EINVAL;
                 }
diff --git a/drivers/spi/omap_uwire.c b/drivers/spi/omap_uwire.c
index 5f00bd6500ef..d9ae111c27ae 100644
--- a/drivers/spi/omap_uwire.c
+++ b/drivers/spi/omap_uwire.c
@@ -151,7 +151,7 @@ static int wait_uwire_csr_flag(u16 mask, u16 val, int might_not_catch)
                 if (time_after(jiffies, max_jiffies)) {
                         printk(KERN_ERR "%s: timeout. reg=%#06x "
                                         "mask=%#06x val=%#06x\n",
-                               __FUNCTION__, w, mask, val);
+                               __func__, w, mask, val);
                         return -1;
                 }
                 c++;
@@ -437,7 +437,7 @@ static int uwire_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
         }
         omap_uwire_configure_mode(spi->chip_select, flags);
         pr_debug("%s: uwire flags %02x, armxor %lu KHz, SCK %lu KHz\n",
-                        __FUNCTION__, flags,
+                        __func__, flags,
                         clk_get_rate(uwire->ck) / 1000,
                         rate / 1000);
         status = 0;
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index 147e26a78d64..654bb58be630 100644
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -67,8 +67,11 @@ MODULE_ALIAS("platform:pxa2xx-spi");
                                 | SSCR1_SPH | SSCR1_SPO | SSCR1_LBM)
 
 #define DEFINE_SSP_REG(reg, off) \
-static inline u32 read_##reg(void *p) { return __raw_readl(p + (off)); } \
-static inline void write_##reg(u32 v, void *p) { __raw_writel(v, p + (off)); }
+static inline u32 read_##reg(void const __iomem *p) \
+{ return __raw_readl(p + (off)); } \
+\
+static inline void write_##reg(u32 v, void __iomem *p) \
+{ __raw_writel(v, p + (off)); }
 
 DEFINE_SSP_REG(SSCR0, 0x00)
 DEFINE_SSP_REG(SSCR1, 0x04)
@@ -106,7 +109,7 @@ struct driver_data {
         u32 *null_dma_buf;
 
         /* SSP register addresses */
-        void *ioaddr;
+        void __iomem *ioaddr;
         u32 ssdr_physical;
 
         /* SSP masks*/
@@ -173,7 +176,7 @@ static int flush(struct driver_data *drv_data)
 {
         unsigned long limit = loops_per_jiffy << 1;
 
-        void *reg = drv_data->ioaddr;
+        void __iomem *reg = drv_data->ioaddr;
 
         do {
                 while (read_SSSR(reg) & SSSR_RNE) {
@@ -191,7 +194,7 @@ static void null_cs_control(u32 command)
 
 static int null_writer(struct driver_data *drv_data)
 {
-        void *reg = drv_data->ioaddr;
+        void __iomem *reg = drv_data->ioaddr;
         u8 n_bytes = drv_data->n_bytes;
 
         if (((read_SSSR(reg) & 0x00000f00) == 0x00000f00)
@@ -206,7 +209,7 @@ static int null_writer(struct driver_data *drv_data)
 
 static int null_reader(struct driver_data *drv_data)
 {
-        void *reg = drv_data->ioaddr;
+        void __iomem *reg = drv_data->ioaddr;
         u8 n_bytes = drv_data->n_bytes;
 
         while ((read_SSSR(reg) & SSSR_RNE)
@@ -220,7 +223,7 @@ static int null_reader(struct driver_data *drv_data)
 
 static int u8_writer(struct driver_data *drv_data)
 {
-        void *reg = drv_data->ioaddr;
+        void __iomem *reg = drv_data->ioaddr;
 
         if (((read_SSSR(reg) & 0x00000f00) == 0x00000f00)
                 || (drv_data->tx == drv_data->tx_end))
@@ -234,7 +237,7 @@ static int u8_writer(struct driver_data *drv_data)
 
 static int u8_reader(struct driver_data *drv_data)
 {
-        void *reg = drv_data->ioaddr;
+        void __iomem *reg = drv_data->ioaddr;
 
         while ((read_SSSR(reg) & SSSR_RNE)
                 && (drv_data->rx < drv_data->rx_end)) {
@@ -247,7 +250,7 @@ static int u8_reader(struct driver_data *drv_data)
 
 static int u16_writer(struct driver_data *drv_data)
 {
-        void *reg = drv_data->ioaddr;
+        void __iomem *reg = drv_data->ioaddr;
 
         if (((read_SSSR(reg) & 0x00000f00) == 0x00000f00)
                 || (drv_data->tx == drv_data->tx_end))
@@ -261,7 +264,7 @@ static int u16_writer(struct driver_data *drv_data)
 
 static int u16_reader(struct driver_data *drv_data)
 {
-        void *reg = drv_data->ioaddr;
+        void __iomem *reg = drv_data->ioaddr;
 
         while ((read_SSSR(reg) & SSSR_RNE)
                 && (drv_data->rx < drv_data->rx_end)) {
@@ -274,7 +277,7 @@ static int u16_reader(struct driver_data *drv_data)
 
 static int u32_writer(struct driver_data *drv_data)
 {
-        void *reg = drv_data->ioaddr;
+        void __iomem *reg = drv_data->ioaddr;
 
         if (((read_SSSR(reg) & 0x00000f00) == 0x00000f00)
                 || (drv_data->tx == drv_data->tx_end))
@@ -288,7 +291,7 @@ static int u32_writer(struct driver_data *drv_data)
 
 static int u32_reader(struct driver_data *drv_data)
 {
-        void *reg = drv_data->ioaddr;
+        void __iomem *reg = drv_data->ioaddr;
 
         while ((read_SSSR(reg) & SSSR_RNE)
                 && (drv_data->rx < drv_data->rx_end)) {
@@ -412,7 +415,7 @@ static void giveback(struct driver_data *drv_data)
                 msg->complete(msg->context);
 }
 
-static int wait_ssp_rx_stall(void *ioaddr)
+static int wait_ssp_rx_stall(void const __iomem *ioaddr)
 {
         unsigned long limit = loops_per_jiffy << 1;
 
@@ -432,9 +435,9 @@ static int wait_dma_channel_stop(int channel)
         return limit;
 }
 
-void dma_error_stop(struct driver_data *drv_data, const char *msg)
+static void dma_error_stop(struct driver_data *drv_data, const char *msg)
 {
-        void *reg = drv_data->ioaddr;
+        void __iomem *reg = drv_data->ioaddr;
 
         /* Stop and reset */
         DCSR(drv_data->rx_channel) = RESET_DMA_CHANNEL;
@@ -456,7 +459,7 @@ void dma_error_stop(struct driver_data *drv_data, const char *msg)
 
 static void dma_transfer_complete(struct driver_data *drv_data)
 {
-        void *reg = drv_data->ioaddr;
+        void __iomem *reg = drv_data->ioaddr;
         struct spi_message *msg = drv_data->cur_msg;
 
         /* Clear and disable interrupts on SSP and DMA channels*/
@@ -536,7 +539,7 @@ static void dma_handler(int channel, void *data)
 static irqreturn_t dma_transfer(struct driver_data *drv_data)
 {
         u32 irq_status;
-        void *reg = drv_data->ioaddr;
+        void __iomem *reg = drv_data->ioaddr;
 
         irq_status = read_SSSR(reg) & drv_data->mask_sr;
         if (irq_status & SSSR_ROR) {
@@ -570,7 +573,7 @@ static irqreturn_t dma_transfer(struct driver_data *drv_data)
 
 static void int_error_stop(struct driver_data *drv_data, const char* msg)
 {
-        void *reg = drv_data->ioaddr;
+        void __iomem *reg = drv_data->ioaddr;
 
         /* Stop and reset SSP */
         write_SSSR(drv_data->clear_sr, reg);
@@ -588,7 +591,7 @@ static void int_error_stop(struct driver_data *drv_data, const char* msg)
 
 static void int_transfer_complete(struct driver_data *drv_data)
 {
-        void *reg = drv_data->ioaddr;
+        void __iomem *reg = drv_data->ioaddr;
 
         /* Stop SSP */
         write_SSSR(drv_data->clear_sr, reg);
@@ -614,7 +617,7 @@ static void int_transfer_complete(struct driver_data *drv_data)
 
 static irqreturn_t interrupt_transfer(struct driver_data *drv_data)
 {
-        void *reg = drv_data->ioaddr;
+        void __iomem *reg = drv_data->ioaddr;
 
         u32 irq_mask = (read_SSCR1(reg) & SSCR1_TIE) ?
                         drv_data->mask_sr : drv_data->mask_sr & ~SSSR_TFS;
@@ -675,7 +678,7 @@ static irqreturn_t interrupt_transfer(struct driver_data *drv_data)
 static irqreturn_t ssp_int(int irq, void *dev_id)
 {
         struct driver_data *drv_data = dev_id;
-        void *reg = drv_data->ioaddr;
+        void __iomem *reg = drv_data->ioaddr;
 
         if (!drv_data->cur_msg) {
 
@@ -695,7 +698,8 @@ static irqreturn_t ssp_int(int irq, void *dev_id)
         return drv_data->transfer_handler(drv_data);
 }
 
-int set_dma_burst_and_threshold(struct chip_data *chip, struct spi_device *spi,
+static int set_dma_burst_and_threshold(struct chip_data *chip,
+                                struct spi_device *spi,
                                 u8 bits_per_word, u32 *burst_code,
                                 u32 *threshold)
 {
@@ -809,7 +813,7 @@ static void pump_transfers(unsigned long data)
         struct spi_transfer *previous = NULL;
         struct chip_data *chip = NULL;
         struct ssp_device *ssp = drv_data->ssp;
-        void *reg = drv_data->ioaddr;
+        void __iomem *reg = drv_data->ioaddr;
         u32 clk_div = 0;
         u8 bits = 0;
         u32 speed = 0;
@@ -1338,7 +1342,7 @@ static int __init pxa2xx_spi_probe(struct platform_device *pdev)
         struct device *dev = &pdev->dev;
         struct pxa2xx_spi_master *platform_info;
         struct spi_master *master;
-        struct driver_data *drv_data = 0;
+        struct driver_data *drv_data = NULL;
         struct ssp_device *ssp;
         int status = 0;
 
diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c
index 71e881419cdd..96cc39ecb6e2 100644
--- a/drivers/spi/spi_bitbang.c
+++ b/drivers/spi/spi_bitbang.c
@@ -214,7 +214,7 @@ int spi_bitbang_setup(struct spi_device *spi)
                 return retval;
 
         dev_dbg(&spi->dev, "%s, mode %d, %u bits/w, %u nsec/bit\n",
-                        __FUNCTION__, spi->mode & (SPI_CPOL | SPI_CPHA),
+                        __func__, spi->mode & (SPI_CPOL | SPI_CPHA),
                         spi->bits_per_word, 2 * cs->nsecs);
 
         /* NOTE we _need_ to call chipselect() early, ideally with adapter
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
index d4ba640366b6..c730d05bfeb6 100644
--- a/drivers/spi/spi_imx.c
+++ b/drivers/spi/spi_imx.c
@@ -270,19 +270,26 @@ struct chip_data {
 
 static void pump_messages(struct work_struct *work);
 
-static int flush(struct driver_data *drv_data)
+static void flush(struct driver_data *drv_data)
 {
-        unsigned long limit = loops_per_jiffy << 1;
         void __iomem *regs = drv_data->regs;
-        volatile u32 d;
+        u32 control;
 
         dev_dbg(&drv_data->pdev->dev, "flush\n");
+
+        /* Wait for end of transaction */
         do {
-                while (readl(regs + SPI_INT_STATUS) & SPI_STATUS_RR)
-                        d = readl(regs + SPI_RXDATA);
-        } while ((readl(regs + SPI_CONTROL) & SPI_CONTROL_XCH) && limit--);
+                control = readl(regs + SPI_CONTROL);
+        } while (control & SPI_CONTROL_XCH);
+
+        /* Release chip select if requested, transfer delays are
+           handled in pump_transfers */
+        if (drv_data->cs_change)
+                drv_data->cs_control(SPI_CS_DEASSERT);
 
-        return limit;
+        /* Disable SPI to flush FIFOs */
+        writel(control & ~SPI_CONTROL_SPIEN, regs + SPI_CONTROL);
+        writel(control, regs + SPI_CONTROL);
 }
 
 static void restore_state(struct driver_data *drv_data)
@@ -570,6 +577,7 @@ static void giveback(struct spi_message *message, struct driver_data *drv_data)
         writel(0, regs + SPI_INT_STATUS);
         writel(0, regs + SPI_DMA);
 
+        /* Unconditioned deselct */
         drv_data->cs_control(SPI_CS_DEASSERT);
 
         message->state = NULL;
@@ -592,13 +600,10 @@ static void dma_err_handler(int channel, void *data, int errcode)
         /* Disable both rx and tx dma channels */
         imx_dma_disable(drv_data->rx_channel);
         imx_dma_disable(drv_data->tx_channel);
-
-        if (flush(drv_data) == 0)
-                dev_err(&drv_data->pdev->dev,
-                                "dma_err_handler - flush failed\n");
-
         unmap_dma_buffers(drv_data);
 
+        flush(drv_data);
+
         msg->state = ERROR_STATE;
         tasklet_schedule(&drv_data->pump_transfers);
 }
@@ -612,8 +617,7 @@ static void dma_tx_handler(int channel, void *data)
         imx_dma_disable(channel);
 
         /* Now waits for TX FIFO empty */
-        writel(readl(drv_data->regs + SPI_INT_STATUS) | SPI_INTEN_TE,
-                        drv_data->regs + SPI_INT_STATUS);
+        writel(SPI_INTEN_TE, drv_data->regs + SPI_INT_STATUS);
 }
 
 static irqreturn_t dma_transfer(struct driver_data *drv_data)
@@ -621,19 +625,18 @@ static irqreturn_t dma_transfer(struct driver_data *drv_data)
         u32 status;
         struct spi_message *msg = drv_data->cur_msg;
         void __iomem *regs = drv_data->regs;
-        unsigned long limit;
 
         status = readl(regs + SPI_INT_STATUS);
 
-        if ((status & SPI_INTEN_RO) && (status & SPI_STATUS_RO)) {
+        if ((status & (SPI_INTEN_RO | SPI_STATUS_RO))
+                        == (SPI_INTEN_RO | SPI_STATUS_RO)) {
                 writel(status & ~SPI_INTEN, regs + SPI_INT_STATUS);
 
+                imx_dma_disable(drv_data->tx_channel);
                 imx_dma_disable(drv_data->rx_channel);
                 unmap_dma_buffers(drv_data);
 
-                if (flush(drv_data) == 0)
-                        dev_err(&drv_data->pdev->dev,
-                                "dma_transfer - flush failed\n");
+                flush(drv_data);
 
                 dev_warn(&drv_data->pdev->dev,
                                 "dma_transfer - fifo overun\n");
@@ -649,20 +652,17 @@ static irqreturn_t dma_transfer(struct driver_data *drv_data)
 
                 if (drv_data->rx) {
                         /* Wait end of transfer before read trailing data */
-                        limit = loops_per_jiffy << 1;
-                        while ((readl(regs + SPI_CONTROL) & SPI_CONTROL_XCH) &&
-                                        limit--);
-
-                        if (limit == 0)
-                                dev_err(&drv_data->pdev->dev,
-                                        "dma_transfer - end of tx failed\n");
-                        else
-                                dev_dbg(&drv_data->pdev->dev,
-                                        "dma_transfer - end of tx\n");
+                        while (readl(regs + SPI_CONTROL) & SPI_CONTROL_XCH)
+                                cpu_relax();
 
                         imx_dma_disable(drv_data->rx_channel);
                         unmap_dma_buffers(drv_data);
 
+                        /* Release chip select if requested, transfer delays are
+                           handled in pump_transfers() */
+                        if (drv_data->cs_change)
+                                drv_data->cs_control(SPI_CS_DEASSERT);
+
                         /* Calculate number of trailing data and read them */
                         dev_dbg(&drv_data->pdev->dev,
                                 "dma_transfer - test = 0x%08X\n",
@@ -676,19 +676,12 @@ static irqreturn_t dma_transfer(struct driver_data *drv_data)
                         /* Write only transfer */
                         unmap_dma_buffers(drv_data);
 
-                        if (flush(drv_data) == 0)
-                                dev_err(&drv_data->pdev->dev,
-                                        "dma_transfer - flush failed\n");
+                        flush(drv_data);
                 }
 
                 /* End of transfer, update total byte transfered */
                 msg->actual_length += drv_data->len;
 
-                /* Release chip select if requested, transfer delays are
-                   handled in pump_transfers() */
-                if (drv_data->cs_change)
-                        drv_data->cs_control(SPI_CS_DEASSERT);
-
                 /* Move to next transfer */
                 msg->state = next_transfer(drv_data);
 
@@ -711,44 +704,43 @@ static irqreturn_t interrupt_wronly_transfer(struct driver_data *drv_data)
 
         status = readl(regs + SPI_INT_STATUS);
 
-        while (status & SPI_STATUS_TH) {
+        if (status & SPI_INTEN_TE) {
+                /* TXFIFO Empty Interrupt on the last transfered word */
+                writel(status & ~SPI_INTEN, regs + SPI_INT_STATUS);
                 dev_dbg(&drv_data->pdev->dev,
-                        "interrupt_wronly_transfer - status = 0x%08X\n", status);
+                        "interrupt_wronly_transfer - end of tx\n");
 
-                /* Pump data */
-                if (write(drv_data)) {
-                        writel(readl(regs + SPI_INT_STATUS) & ~SPI_INTEN,
-                                regs + SPI_INT_STATUS);
+                flush(drv_data);
 
-                        dev_dbg(&drv_data->pdev->dev,
-                                "interrupt_wronly_transfer - end of tx\n");
+                /* Update total byte transfered */
+                msg->actual_length += drv_data->len;
 
-                        if (flush(drv_data) == 0)
-                                dev_err(&drv_data->pdev->dev,
-                                        "interrupt_wronly_transfer - "
-                                        "flush failed\n");
+                /* Move to next transfer */
+                msg->state = next_transfer(drv_data);
 
-                        /* End of transfer, update total byte transfered */
-                        msg->actual_length += drv_data->len;
+                /* Schedule transfer tasklet */
+                tasklet_schedule(&drv_data->pump_transfers);
 
-                        /* Release chip select if requested, transfer delays are
-                           handled in pump_transfers */
-                        if (drv_data->cs_change)
-                                drv_data->cs_control(SPI_CS_DEASSERT);
+                return IRQ_HANDLED;
+        } else {
+                while (status & SPI_STATUS_TH) {
+                        dev_dbg(&drv_data->pdev->dev,
+                                "interrupt_wronly_transfer - status = 0x%08X\n",
+                                status);
 
-                        /* Move to next transfer */
-                        msg->state = next_transfer(drv_data);
+                        /* Pump data */
+                        if (write(drv_data)) {
+                                /* End of TXFIFO writes,
+                                   now wait until TXFIFO is empty */
+                                writel(SPI_INTEN_TE, regs + SPI_INT_STATUS);
+                                return IRQ_HANDLED;
+                        }
 
-                        /* Schedule transfer tasklet */
-                        tasklet_schedule(&drv_data->pump_transfers);
+                        status = readl(regs + SPI_INT_STATUS);
 
-                        return IRQ_HANDLED;
+                        /* We did something */
+                        handled = IRQ_HANDLED;
                 }
-
-                status = readl(regs + SPI_INT_STATUS);
-
-                /* We did something */
-                handled = IRQ_HANDLED;
         }
 
         return handled;
@@ -758,45 +750,31 @@ static irqreturn_t interrupt_transfer(struct driver_data *drv_data)
 {
         struct spi_message *msg = drv_data->cur_msg;
         void __iomem *regs = drv_data->regs;
-        u32 status;
+        u32 status, control;
         irqreturn_t handled = IRQ_NONE;
         unsigned long limit;
 
         status = readl(regs + SPI_INT_STATUS);
 
-        while (status & (SPI_STATUS_TH | SPI_STATUS_RO)) {
+        if (status & SPI_INTEN_TE) {
+                /* TXFIFO Empty Interrupt on the last transfered word */
+                writel(status & ~SPI_INTEN, regs + SPI_INT_STATUS);
                 dev_dbg(&drv_data->pdev->dev,
-                        "interrupt_transfer - status = 0x%08X\n", status);
-
-                if (status & SPI_STATUS_RO) {
-                        writel(readl(regs + SPI_INT_STATUS) & ~SPI_INTEN,
-                                regs + SPI_INT_STATUS);
-
-                        dev_warn(&drv_data->pdev->dev,
-                                "interrupt_transfer - fifo overun\n"
-                                "    data not yet written = %d\n"
-                                "    data not yet read    = %d\n",
-                                data_to_write(drv_data),
-                                data_to_read(drv_data));
-
-                        if (flush(drv_data) == 0)
-                                dev_err(&drv_data->pdev->dev,
-                                        "interrupt_transfer - flush failed\n");
-
-                        msg->state = ERROR_STATE;
-                        tasklet_schedule(&drv_data->pump_transfers);
+                        "interrupt_transfer - end of tx\n");
 
-                        return IRQ_HANDLED;
-                }
-
-                /* Pump data */
-                read(drv_data);
-                if (write(drv_data)) {
-                        writel(readl(regs + SPI_INT_STATUS) & ~SPI_INTEN,
-                                regs + SPI_INT_STATUS);
+                if (msg->state == ERROR_STATE) {
+                        /* RXFIFO overrun was detected and message aborted */
+                        flush(drv_data);
+                } else {
+                        /* Wait for end of transaction */
+                        do {
+                                control = readl(regs + SPI_CONTROL);
+                        } while (control & SPI_CONTROL_XCH);
 
-                        dev_dbg(&drv_data->pdev->dev,
-                                "interrupt_transfer - end of tx\n");
+                        /* Release chip select if requested, transfer delays are
+                           handled in pump_transfers */
+                        if (drv_data->cs_change)
+                                drv_data->cs_control(SPI_CS_DEASSERT);
 
                         /* Read trailing bytes */
                         limit = loops_per_jiffy << 1;
@@ -810,27 +788,54 @@ static irqreturn_t interrupt_transfer(struct driver_data *drv_data)
                                 dev_dbg(&drv_data->pdev->dev,
                                         "interrupt_transfer - end of rx\n");
 
-                        /* End of transfer, update total byte transfered */
+                        /* Update total byte transfered */
                         msg->actual_length += drv_data->len;
 
-                        /* Release chip select if requested, transfer delays are
-                           handled in pump_transfers */
-                        if (drv_data->cs_change)
-                                drv_data->cs_control(SPI_CS_DEASSERT);
-
                         /* Move to next transfer */
                         msg->state = next_transfer(drv_data);
+                }
 
-                        /* Schedule transfer tasklet */
-                        tasklet_schedule(&drv_data->pump_transfers);
+                /* Schedule transfer tasklet */
+                tasklet_schedule(&drv_data->pump_transfers);
 
-                        return IRQ_HANDLED;
-                }
+                return IRQ_HANDLED;
+        } else {
+                while (status & (SPI_STATUS_TH | SPI_STATUS_RO)) {
+                        dev_dbg(&drv_data->pdev->dev,
+                                "interrupt_transfer - status = 0x%08X\n",
+                                status);
+
+                        if (status & SPI_STATUS_RO) {
+                                /* RXFIFO overrun, abort message end wait
+                                   until TXFIFO is empty */
+                                writel(SPI_INTEN_TE, regs + SPI_INT_STATUS);
+
+                                dev_warn(&drv_data->pdev->dev,
+                                        "interrupt_transfer - fifo overun\n"
+                                        "    data not yet written = %d\n"
+                                        "    data not yet read    = %d\n",
+                                        data_to_write(drv_data),
+                                        data_to_read(drv_data));
+
+                                msg->state = ERROR_STATE;
+
+                                return IRQ_HANDLED;
+                        }
 
-                status = readl(regs + SPI_INT_STATUS);
+                        /* Pump data */
+                        read(drv_data);
+                        if (write(drv_data)) {
+                                /* End of TXFIFO writes,
+                                   now wait until TXFIFO is empty */
+                                writel(SPI_INTEN_TE, regs + SPI_INT_STATUS);
+                                return IRQ_HANDLED;
+                        }
 
-                /* We did something */
-                handled = IRQ_HANDLED;
+                        status = readl(regs + SPI_INT_STATUS);
+
+                        /* We did something */
+                        handled = IRQ_HANDLED;
+                }
         }
 
         return handled;
diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c
index be15a6213205..189f706b9e4b 100644
--- a/drivers/spi/spi_mpc83xx.c
+++ b/drivers/spi/spi_mpc83xx.c
@@ -310,7 +310,7 @@ static int mpc83xx_spi_setup(struct spi_device *spi)
                 return retval;
 
         dev_dbg(&spi->dev, "%s, mode %d, %u bits/w, %u nsec\n",
-                __FUNCTION__, spi->mode & (SPI_CPOL | SPI_CPHA),
+                __func__, spi->mode & (SPI_CPOL | SPI_CPHA),
                 spi->bits_per_word, 2 * mpc83xx_spi->nsecs);
 
         /* NOTE we _need_ to call chipselect() early, ideally with adapter
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c
index b7476b888197..34bfb7dd7764 100644
--- a/drivers/spi/spi_s3c24xx.c
+++ b/drivers/spi/spi_s3c24xx.c
@@ -169,7 +169,7 @@ static int s3c24xx_spi_setup(struct spi_device *spi)
         }
 
         dev_dbg(&spi->dev, "%s: mode %d, %u bpw, %d hz\n",
-                __FUNCTION__, spi->mode, spi->bits_per_word,
+                __func__, spi->mode, spi->bits_per_word,
                 spi->max_speed_hz);
 
         return 0;
diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c
index cf6aef34fe25..113a0468ffcb 100644
--- a/drivers/spi/xilinx_spi.c
+++ b/drivers/spi/xilinx_spi.c
@@ -151,13 +151,13 @@ static int xilinx_spi_setup_transfer(struct spi_device *spi,
         hz = (t) ? t->speed_hz : spi->max_speed_hz;
         if (bits_per_word != 8) {
                 dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n",
-                        __FUNCTION__, bits_per_word);
+                        __func__, bits_per_word);
                 return -EINVAL;
         }
 
         if (hz && xspi->speed_hz > hz) {
                 dev_err(&spi->dev, "%s, unsupported clock rate %uHz\n",
-                        __FUNCTION__, hz);
+                        __func__, hz);
                 return -EINVAL;
         }
 
@@ -181,7 +181,7 @@ static int xilinx_spi_setup(struct spi_device *spi)
 
         if (spi->mode & ~MODEBITS) {
                 dev_err(&spi->dev, "%s, unsupported mode bits %x\n",
-                        __FUNCTION__, spi->mode & ~MODEBITS);
+                        __func__, spi->mode & ~MODEBITS);
                 return -EINVAL;
         }
 
@@ -190,7 +190,7 @@ static int xilinx_spi_setup(struct spi_device *spi)
                 return retval;
 
         dev_dbg(&spi->dev, "%s, mode %d, %u bits/w, %u nsec/bit\n",
-                __FUNCTION__, spi->mode & MODEBITS, spi->bits_per_word, 0);
+                __func__, spi->mode & MODEBITS, spi->bits_per_word, 0);
 
         return 0;
 }
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
index d470c72b737e..5ea3093bc40f 100644
--- a/drivers/usb/atm/cxacru.c
+++ b/drivers/usb/atm/cxacru.c
@@ -38,6 +38,7 @@
 #include <linux/device.h>
 #include <linux/firmware.h>
 #include <linux/mutex.h>
+#include <asm/unaligned.h>
 
 #include "usbatm.h"
 
@@ -573,7 +574,7 @@ static int cxacru_cm_get_array(struct cxacru_data *instance, enum cxacru_cm_requ
                                u32 *data, int size)
 {
         int ret, len;
-        u32 *buf;
+        __le32 *buf;
         int offb, offd;
         const int stride = CMD_PACKET_SIZE / (4 * 2) - 1;
         int buflen =  ((size - 1) / stride + 1 + size * 2) * 4;
@@ -837,7 +838,7 @@ static int cxacru_fw(struct usb_device *usb_dev, enum cxacru_fw_request fw,
                 buf[offb++] = l;
                 buf[offb++] = code1;
                 buf[offb++] = code2;
-                *((u32 *) (buf + offb)) = cpu_to_le32(addr);
+                put_unaligned(cpu_to_le32(addr), (__le32 *)(buf + offb));
                 offb += 4;
                 addr += l;
                 if(l)
@@ -874,8 +875,9 @@ static void cxacru_upload_firmware(struct cxacru_data *instance,
         int off;
         struct usbatm_data *usbatm = instance->usbatm;
         struct usb_device *usb_dev = usbatm->usb_dev;
-        u16 signature[] = { usb_dev->descriptor.idVendor, usb_dev->descriptor.idProduct };
-        u32 val;
+        __le16 signature[] = { usb_dev->descriptor.idVendor,
+                               usb_dev->descriptor.idProduct };
+        __le32 val;
 
         dbg("cxacru_upload_firmware");
 
@@ -955,7 +957,7 @@ static void cxacru_upload_firmware(struct cxacru_data *instance,
         /* Load config data (le32), doing one packet at a time */
         if (cf)
                 for (off = 0; off < cf->size / 4; ) {
-                        u32 buf[CMD_PACKET_SIZE / 4 - 1];
+                        __le32 buf[CMD_PACKET_SIZE / 4 - 1];
                         int i, len = min_t(int, cf->size / 4 - off, CMD_PACKET_SIZE / 4 / 2 - 1);
                         buf[0] = cpu_to_le32(len);
                         for (i = 0; i < len; i++, off++) {
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index abb7d7410e63..4220f22b6660 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -996,7 +996,7 @@ static void __uea_load_page_e4(struct uea_softc *sc, u8 pageno, int boot)
                 blockoffset = sc->dsp_firm->data + le32_to_cpu(blockidx->PageOffset);
 
                 bi.dwSize = cpu_to_be32(blocksize);
-                bi.dwAddress = swab32(blockidx->PageAddress);
+                bi.dwAddress = cpu_to_be32(le32_to_cpu(blockidx->PageAddress));
 
                 uea_dbg(INS_TO_USBDEV(sc),
                        "sending block %u for DSP page %u size %u address %x\n",
@@ -1040,7 +1040,7 @@ static void uea_load_page_e4(struct work_struct *work)
                 return;
 
         p = (struct l1_code *) sc->dsp_firm->data;
-        if (pageno >= p->page_header[0].PageNumber) {
+        if (pageno >= le16_to_cpu(p->page_header[0].PageNumber)) {
                 uea_err(INS_TO_USBDEV(sc), "invalid DSP page %u requested\n", pageno);
                 return;
         }
@@ -1065,7 +1065,7 @@ static void uea_load_page_e4(struct work_struct *work)
         bi.bPageNumber = 0xff;
         bi.wReserved = cpu_to_be16(UEA_RESERVED);
         bi.dwSize = cpu_to_be32(E4_PAGE_BYTES(p->page_header[0].PageSize));
-        bi.dwAddress = swab32(p->page_header[0].PageAddress);
+        bi.dwAddress = cpu_to_be32(le32_to_cpu(p->page_header[0].PageAddress));
 
         /* send block info through the IDMA pipe */
         if (uea_idma_write(sc, &bi, E4_BLOCK_INFO_SIZE))
diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c
index fc6f3483be44..ce337cb5d137 100644
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/amd5536udc.c
@@ -328,6 +328,7 @@ udc_ep_enable(struct usb_ep *usbep, const struct usb_endpoint_descriptor *desc)
         u32                     tmp;
         unsigned long           iflags;
         u8 udc_csr_epix;
+        unsigned                maxpacket;
 
         if (!usbep
                         || usbep->name == ep0_string
@@ -354,9 +355,10 @@ udc_ep_enable(struct usb_ep *usbep, const struct usb_endpoint_descriptor *desc)
         writel(tmp, &dev->ep[ep->num].regs->ctl);
 
         /* set max packet size */
+        maxpacket = le16_to_cpu(desc->wMaxPacketSize);
         tmp = readl(&dev->ep[ep->num].regs->bufout_maxpkt);
-        tmp = AMD_ADDBITS(tmp, desc->wMaxPacketSize, UDC_EP_MAX_PKT_SIZE);
-        ep->ep.maxpacket = desc->wMaxPacketSize;
+        tmp = AMD_ADDBITS(tmp, maxpacket, UDC_EP_MAX_PKT_SIZE);
+        ep->ep.maxpacket = maxpacket;
         writel(tmp, &dev->ep[ep->num].regs->bufout_maxpkt);
 
         /* IN ep */
@@ -370,8 +372,8 @@ udc_ep_enable(struct usb_ep *usbep, const struct usb_endpoint_descriptor *desc)
                 /* double buffering: fifo size = 2 x max packet size */
                 tmp = AMD_ADDBITS(
                                 tmp,
-                                desc->wMaxPacketSize * UDC_EPIN_BUFF_SIZE_MULT
-                                                / UDC_DWORD_BYTES,
+                                maxpacket * UDC_EPIN_BUFF_SIZE_MULT
+                                          / UDC_DWORD_BYTES,
                                 UDC_EPIN_BUFF_SIZE);
                 writel(tmp, &dev->ep[ep->num].regs->bufin_framenum);
 
@@ -390,7 +392,7 @@ udc_ep_enable(struct usb_ep *usbep, const struct usb_endpoint_descriptor *desc)
 
                 /* set max packet size UDC CSR  */
                 tmp = readl(&dev->csr->ne[ep->num - UDC_CSR_EP_OUT_IX_OFS]);
-                tmp = AMD_ADDBITS(tmp, desc->wMaxPacketSize,
+                tmp = AMD_ADDBITS(tmp, maxpacket,
                                         UDC_CSR_NE_MAX_PKT);
                 writel(tmp, &dev->csr->ne[ep->num - UDC_CSR_EP_OUT_IX_OFS]);
 
@@ -407,7 +409,7 @@ udc_ep_enable(struct usb_ep *usbep, const struct usb_endpoint_descriptor *desc)
         /* set ep values */
         tmp = readl(&dev->csr->ne[udc_csr_epix]);
         /* max packet */
-        tmp = AMD_ADDBITS(tmp, desc->wMaxPacketSize, UDC_CSR_NE_MAX_PKT);
+        tmp = AMD_ADDBITS(tmp, maxpacket, UDC_CSR_NE_MAX_PKT);
         /* ep number */
         tmp = AMD_ADDBITS(tmp, desc->bEndpointAddress, UDC_CSR_NE_NUM);
         /* ep direction */
@@ -2832,7 +2834,7 @@ __acquires(dev->lock)
                 /* make usb request for gadget driver */
                 memset(&setup_data, 0 , sizeof(union udc_setup_data));
                 setup_data.request.bRequest = USB_REQ_SET_CONFIGURATION;
-                setup_data.request.wValue = dev->cur_config;
+                setup_data.request.wValue = cpu_to_le16(dev->cur_config);
 
                 /* programm the NE registers */
                 for (i = 0; i < UDC_EP_NUM; i++) {
@@ -2881,8 +2883,8 @@ __acquires(dev->lock)
                 memset(&setup_data, 0 , sizeof(union udc_setup_data));
                 setup_data.request.bRequest = USB_REQ_SET_INTERFACE;
                 setup_data.request.bRequestType = USB_RECIP_INTERFACE;
-                setup_data.request.wValue = dev->cur_alt;
-                setup_data.request.wIndex = dev->cur_intf;
+                setup_data.request.wValue = cpu_to_le16(dev->cur_alt);
+                setup_data.request.wIndex = cpu_to_le16(dev->cur_intf);
 
                 DBG(dev, "SET_INTERFACE interrupt: alt=%d intf=%d\n",
                                 dev->cur_alt, dev->cur_intf);
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index 66293105d136..42036192a03c 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -1555,8 +1555,7 @@ hub_descriptor (struct usb_hub_descriptor *desc)
         memset (desc, 0, sizeof *desc);
         desc->bDescriptorType = 0x29;
         desc->bDescLength = 9;
-        desc->wHubCharacteristics = (__force __u16)
-                        (__constant_cpu_to_le16 (0x0001));
+        desc->wHubCharacteristics = cpu_to_le16(0x0001);
         desc->bNbrPorts = 1;
         desc->bitmap [0] = 0xff;
         desc->bitmap [1] = 0xff;
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
index ff3a8513e64d..7f4d4828e3aa 100644
--- a/drivers/usb/gadget/gmidi.c
+++ b/drivers/usb/gadget/gmidi.c
@@ -229,7 +229,7 @@ static const struct usb_ac_header_descriptor_1 ac_header_desc = {
         .bDescriptorType =      USB_DT_CS_INTERFACE,
         .bDescriptorSubtype =   USB_MS_HEADER,
         .bcdADC =               __constant_cpu_to_le16(0x0100),
-        .wTotalLength =         USB_DT_AC_HEADER_SIZE(1),
+        .wTotalLength =         __constant_cpu_to_le16(USB_DT_AC_HEADER_SIZE(1)),
         .bInCollection =        1,
         .baInterfaceNr = {
                 [0] =           GMIDI_MS_INTERFACE,
@@ -253,9 +253,9 @@ static const struct usb_ms_header_descriptor ms_header_desc = {
         .bDescriptorType =      USB_DT_CS_INTERFACE,
         .bDescriptorSubtype =   USB_MS_HEADER,
         .bcdMSC =               __constant_cpu_to_le16(0x0100),
-        .wTotalLength =         USB_DT_MS_HEADER_SIZE
+        .wTotalLength =         __constant_cpu_to_le16(USB_DT_MS_HEADER_SIZE
                                 + 2*USB_DT_MIDI_IN_SIZE
-                                + 2*USB_DT_MIDI_OUT_SIZE(1),
+                                + 2*USB_DT_MIDI_OUT_SIZE(1)),
 };
 
 #define JACK_IN_EMB     1
diff --git a/drivers/usb/gadget/m66592-udc.h b/drivers/usb/gadget/m66592-udc.h
index be0a4c1f80a2..f118f00f1466 100644
--- a/drivers/usb/gadget/m66592-udc.h
+++ b/drivers/usb/gadget/m66592-udc.h
@@ -485,7 +485,7 @@ struct m66592 {
         struct m66592_ep        *epaddr2ep[16];
 
         struct usb_request      *ep0_req;       /* for internal request */
-        u16                     ep0_data;       /* for internal request */
+        __le16                  ep0_data;       /* for internal request */
         u16                     old_vbus;
 
         struct timer_list       timer;
diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
index 4af90df8e7de..0f82fdcaef09 100644
--- a/drivers/usb/host/ehci-dbg.c
+++ b/drivers/usb/host/ehci-dbg.c
@@ -398,7 +398,7 @@ static void qh_lines (
         unsigned                size = *sizep;
         char                    *next = *nextp;
         char                    mark;
-        u32                     list_end = EHCI_LIST_END(ehci);
+        __le32                  list_end = EHCI_LIST_END(ehci);
 
         if (qh->hw_qtd_next == list_end)        /* NEC does this */
                 mark = '@';
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index efffef64f59d..f13d1029aeb2 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -530,7 +530,7 @@ ehci_hub_descriptor (
         if (HCS_INDICATOR (ehci->hcs_params))
                 temp |= 0x0080;         /* per-port indicators (LEDs) */
 #endif
-        desc->wHubCharacteristics = (__force __u16)cpu_to_le16 (temp);
+        desc->wHubCharacteristics = cpu_to_le16(temp);
 }
 
 /*-------------------------------------------------------------------------*/
diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
index 5ae689139dd0..b85b54160cda 100644
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -285,7 +285,7 @@ qh_completions (struct ehci_hcd *ehci, struct ehci_qh *qh)
         int                     stopped;
         unsigned                count = 0;
         u8                      state;
-        u32                     halt = HALT_BIT(ehci);
+        __le32                  halt = HALT_BIT(ehci);
 
         if (unlikely (list_empty (&qh->qtd_list)))
                 return count;
@@ -883,7 +883,7 @@ static struct ehci_qh *qh_append_tds (
 )
 {
         struct ehci_qh          *qh = NULL;
-        u32                     qh_addr_mask = cpu_to_hc32(ehci, 0x7f);
+        __hc32                  qh_addr_mask = cpu_to_hc32(ehci, 0x7f);
 
         qh = (struct ehci_qh *) *ptr;
         if (unlikely (qh == NULL)) {
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index f4fa93dabdde..16667342b3c3 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -993,7 +993,7 @@ static void prepare_setup_packet(struct r8a66597 *r8a66597,
                                  struct r8a66597_td *td)
 {
         int i;
-        u16 *p = (u16 *)td->urb->setup_packet;
+        __le16 *p = (__le16 *)td->urb->setup_packet;
         unsigned long setup_addr = USBREQ;
 
         r8a66597_write(r8a66597, make_devsel(td->address) | td->maxpacket,
@@ -1001,7 +1001,7 @@ static void prepare_setup_packet(struct r8a66597 *r8a66597,
         r8a66597_write(r8a66597, ~(SIGN | SACK), INTSTS1);
 
         for (i = 0; i < 4; i++) {
-                r8a66597_write(r8a66597, cpu_to_le16(p[i]), setup_addr);
+                r8a66597_write(r8a66597, le16_to_cpu(p[i]), setup_addr);
                 setup_addr += 2;
         }
         r8a66597_write(r8a66597, SUREQ, DCPCTR);
@@ -2131,7 +2131,7 @@ static int r8a66597_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
         case GetPortStatus:
                 if (wIndex > R8A66597_MAX_ROOT_HUB)
                         goto error;
-                *(u32 *)buf = cpu_to_le32(rh->port);
+                *(__le32 *)buf = cpu_to_le32(rh->port);
                 break;
         case SetPortFeature:
                 if (wIndex > R8A66597_MAX_ROOT_HUB)
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 274276cf8621..3fd7a0c12078 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -1100,7 +1100,7 @@ sl811h_hub_descriptor (
         /* no overcurrent errors detection/handling */
         temp |= 0x0010;
 
-        desc->wHubCharacteristics = (__force __u16)cpu_to_le16(temp);
+        desc->wHubCharacteristics = cpu_to_le16(temp);
 
         /* two bitmaps:  ports removable, and legacy PortPwrCtrlMask */
         desc->bitmap[0] = 0 << 1;
diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c
index a238817762ad..9b1bb347dc2d 100644
--- a/drivers/usb/serial/aircable.c
+++ b/drivers/usb/serial/aircable.c
@@ -209,7 +209,7 @@ static void aircable_send(struct usb_serial_port *port)
         int count, result;
         struct aircable_private *priv = usb_get_serial_port_data(port);
         unsigned char* buf;
-        u16 *dbuf;
+        __le16 *dbuf;
         dbg("%s - port %d", __func__, port->number);
         if (port->write_urb_busy)
                 return;
@@ -227,7 +227,7 @@ static void aircable_send(struct usb_serial_port *port)
 
         buf[0] = TX_HEADER_0;
         buf[1] = TX_HEADER_1;
-        dbuf = (u16 *)&buf[2];
+        dbuf = (__le16 *)&buf[2];
         *dbuf = cpu_to_le16((u16)count);
         serial_buf_get(priv->tx_buf,buf + HCI_HEADER_LENGTH, MAX_HCI_FRAMESIZE);
 
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index 32121794808d..0230d3c0888a 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -541,7 +541,7 @@ static int cypress_earthmate_startup (struct usb_serial *serial)
         /* All Earthmate devices use the separated-count packet
            format!  Idiotic. */
         priv->pkt_fmt = packet_format_1;
-        if (serial->dev->descriptor.idProduct != PRODUCT_ID_EARTHMATEUSB) {
+        if (serial->dev->descriptor.idProduct != cpu_to_le16(PRODUCT_ID_EARTHMATEUSB)) {
                 /* The old original USB Earthmate seemed able to
                    handle GET_CONFIG requests; everything they've
                    produced since that time crashes if this command is
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 23f51a41093e..c7329f43d9c9 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1104,7 +1104,7 @@ static int ftdi_mtxorb_hack_setup(struct usb_serial *serial)
         struct usb_endpoint_descriptor *ep_desc = &ep->desc;
 
         if (ep->enabled && ep_desc->wMaxPacketSize == 0) {
-                ep_desc->wMaxPacketSize = 0x40;
+                ep_desc->wMaxPacketSize = cpu_to_le16(0x40);
                 info("Fixing invalid wMaxPacketSize on read pipe");
         }
 
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index ce2e487f3240..06b52f4098f1 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -2993,7 +2993,7 @@ static int edge_startup (struct usb_serial *serial)
                                 usb_fill_bulk_urb(edge_serial->read_urb, dev,
                                                   usb_rcvbulkpipe(dev, endpoint->bEndpointAddress),
                                                   edge_serial->bulk_in_buffer,
-                                                  endpoint->wMaxPacketSize,
+                                                  le16_to_cpu(endpoint->wMaxPacketSize),
                                                   edge_bulk_in_callback,
                                                   edge_serial);
                                 bulk_in_found = true;
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index b395ac759888..f328948d74e3 100644
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -54,6 +54,7 @@
 #include <linux/tty_flip.h>
 #include <linux/module.h>
 #include <asm/uaccess.h>
+#include <asm/unaligned.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 #include "kl5kusb105.h"
@@ -235,7 +236,7 @@ static int klsi_105_get_line_state(struct usb_serial_port *port,
         if (rc < 0)
                 err("Reading line status failed (error = %d)", rc);
         else {
-                status = le16_to_cpu(*(u16 *)status_buf);
+                status = le16_to_cpu(get_unaligned((__le16 *)status_buf));
 
                 info("%s - read status %x %x", __func__,
                      status_buf[0], status_buf[1]);
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index d92bb6501c84..a9625c180dc3 100644
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -98,7 +98,7 @@ struct oti6858_buf {
 
 /* format of the control packet */
 struct oti6858_control_pkt {
-        u16     divisor;        /* baud rate = 96000000 / (16 * divisor), LE */
+        __le16  divisor;        /* baud rate = 96000000 / (16 * divisor), LE */
 #define OTI6858_MAX_BAUD_RATE   3000000
         u8      frame_fmt;
 #define FMT_STOP_BITS_MASK      0xc0
@@ -211,7 +211,7 @@ struct oti6858_private {
         struct delayed_work delayed_write_work;
 
         struct {
-                u16 divisor;
+                __le16 divisor;
                 u8 frame_fmt;
                 u8 control;
         } pending_setup;
@@ -450,7 +450,7 @@ static void oti6858_set_termios(struct usb_serial_port *port,
         unsigned long flags;
         unsigned int cflag;
         u8 frame_fmt, control;
-        u16 divisor;
+        __le16 divisor;
         int br;
 
         dbg("%s(port = %d)", __func__, port->number);
@@ -505,11 +505,12 @@ static void oti6858_set_termios(struct usb_serial_port *port,
                 divisor = 0;
         } else {
                 int real_br;
+                int new_divisor;
                 br = min(br, OTI6858_MAX_BAUD_RATE);
 
-                divisor = (96000000 + 8 * br) / (16 * br);
-                real_br = 96000000 / (16 * divisor);
-                divisor = cpu_to_le16(divisor);
+                new_divisor = (96000000 + 8 * br) / (16 * br);
+                real_br = 96000000 / (16 * new_divisor);
+                divisor = cpu_to_le16(new_divisor);
                 tty_encode_baud_rate(port->tty, real_br, real_br);
         }
 
diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c
index 2282d620186e..55b2570b8b8b 100644
--- a/drivers/usb/serial/spcp8x5.c
+++ b/drivers/usb/serial/spcp8x5.c
@@ -310,17 +310,18 @@ static int spcp8x5_startup(struct usb_serial *serial)
         struct spcp8x5_private *priv;
         int i;
         enum spcp8x5_type type = SPCP825_007_TYPE;
+        u16 product = le16_to_cpu(serial->dev->descriptor.idProduct);
 
-        if (serial->dev->descriptor.idProduct == 0x0201)
+        if (product == 0x0201)
                 type = SPCP825_007_TYPE;
-        else if (serial->dev->descriptor.idProduct == 0x0231)
+        else if (product == 0x0231)
                 type = SPCP835_TYPE;
-        else if (serial->dev->descriptor.idProduct == 0x0235)
+        else if (product == 0x0235)
                 type = SPCP825_008_TYPE;
-        else if (serial->dev->descriptor.idProduct == 0x0204)
+        else if (product == 0x0204)
                 type = SPCP825_INTERMATIC_TYPE;
-        else if (serial->dev->descriptor.idProduct == 0x0471 &&
-                 serial->dev->descriptor.idVendor == 0x081e)
+        else if (product == 0x0471 &&
+                 serial->dev->descriptor.idVendor == cpu_to_le16(0x081e))
                 type = SPCP825_PHILIP_TYPE;
         dev_dbg(&serial->dev->dev, "device type = %d\n", (int)type);
 
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index e3dc8f8d0c3e..a576dc261732 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -139,6 +139,30 @@ config FB_SYS_IMAGEBLIT
           blitting. This is used by drivers that don't provide their own
           (accelerated) version and the framebuffer is in system RAM.
 
+menuconfig FB_FOREIGN_ENDIAN
+        bool "Framebuffer foreign endianness support"
+        depends on FB
+        ---help---
+          This menu will let you enable support for the framebuffers with
+          non-native endianness (e.g. Little-Endian framebuffer on a
+          Big-Endian machine). Most probably you don't have such hardware,
+          so it's safe to say "n" here.
+
+choice
+        prompt "Choice endianness support"
+        depends on FB_FOREIGN_ENDIAN
+
+config FB_BOTH_ENDIAN
+        bool "Support for Big- and Little-Endian framebuffers"
+
+config FB_BIG_ENDIAN
+        bool "Support for Big-Endian framebuffers only"
+
+config FB_LITTLE_ENDIAN
+        bool "Support for Little-Endian framebuffers only"
+
+endchoice
+
 config FB_SYS_FOPS
        tristate
        depends on FB
@@ -149,6 +173,16 @@ config FB_DEFERRED_IO
         depends on FB
         default y
 
+config FB_METRONOME
+        tristate
+        depends on FB
+        depends on FB_DEFERRED_IO
+
+config FB_HECUBA
+        tristate
+        depends on FB
+        depends on FB_DEFERRED_IO
+
 config FB_SVGALIB
         tristate
         depends on FB
@@ -546,7 +580,7 @@ config FB_VGA16
 
 config FB_BF54X_LQ043
         tristate "SHARP LQ043 TFT LCD (BF548 EZKIT)"
-        depends on FB && (BF54x)
+        depends on FB && (BF54x) && !BF542
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -674,20 +708,18 @@ config FB_IMAC
         help
           This is the frame buffer device driver for the Intel-based Macintosh
 
-config FB_HECUBA
-       tristate "Hecuba board support"
+config FB_N411
+       tristate "N411 Apollo/Hecuba devkit support"
        depends on FB && X86 && MMU
        select FB_SYS_FILLRECT
        select FB_SYS_COPYAREA
        select FB_SYS_IMAGEBLIT
        select FB_SYS_FOPS
        select FB_DEFERRED_IO
+       select FB_HECUBA
        help
-         This enables support for the Hecuba board. This driver was tested
-         with an E-Ink 800x600 display and x86 SBCs through a 16 bit GPIO
-         interface (8 bit data, 4 bit control). If you anticipate using
-         this driver, say Y or M; otherwise say N. You must specify the
-         GPIO IO address to be used for setting control and data.
+         This enables support for the Apollo display controller in its
+         Hecuba form using the n411 devkit.
 
 config FB_HGA
         tristate "Hercules mono graphics support"
@@ -1087,7 +1119,7 @@ config FB_CARILLO_RANCH
           This driver supports the LE80578 (Carillo Ranch) board
 
 config FB_INTEL
-        tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G support (EXPERIMENTAL)"
+        tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support (EXPERIMENTAL)"
         depends on FB && EXPERIMENTAL && PCI && X86
         select AGP
         select AGP_INTEL
@@ -1097,7 +1129,7 @@ config FB_INTEL
         select FB_CFB_IMAGEBLIT
         help
           This driver supports the on-board graphics built in to the Intel
-          830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM chipsets.
+          830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM chipsets.
           Say Y if you have and plan to use such a board.
 
           If you say Y here and want DDC/I2C support you must first say Y to
@@ -1779,6 +1811,16 @@ config FB_MBX_DEBUG
 
          If unsure, say N.
 
+config FB_FSL_DIU
+        tristate "Freescale DIU framebuffer support"
+        depends on FB && FSL_SOC
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        select PPC_LIB_RHEAP
+        ---help---
+          Framebuffer driver for the Freescale SoC DIU
+
 config FB_W100
         tristate "W100 frame buffer support"
         depends on FB && PXA_SHARPSL
@@ -1893,19 +1935,18 @@ config FB_XILINX
           framebuffer. ML300 carries a 640*480 LCD display on the board,
           ML403 uses a standard DB15 VGA connector.
 
-config FB_METRONOME
-       tristate "Metronome display controller support"
+config FB_AM200EPD
+       tristate "AM-200 E-Ink EPD devkit support"
        depends on FB && ARCH_PXA && MMU
        select FB_SYS_FILLRECT
        select FB_SYS_COPYAREA
        select FB_SYS_IMAGEBLIT
        select FB_SYS_FOPS
        select FB_DEFERRED_IO
+       select FB_METRONOME
        help
-         This enables support for the Metronome display controller. Tested
-         with an E-Ink 800x600 display and Gumstix Connex through an AMLCD
-         interface. Please read <file:Documentation/fb/metronomefb.txt>
-         for more information.
+         This enables support for the Metronome display controller used on
+         the E-Ink AM-200 EPD devkit.
 
 config FB_VIRTUAL
         tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index f172b9b73314..04bca35403ff 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -29,6 +29,7 @@ obj-$(CONFIG_FB_DEFERRED_IO)   += fb_defio.o
 
 # Hardware specific drivers go first
 obj-$(CONFIG_FB_AMIGA)            += amifb.o c2p.o
+obj-$(CONFIG_FB_AM200EPD)         += am200epd.o
 obj-$(CONFIG_FB_ARC)              += arcfb.o
 obj-$(CONFIG_FB_CLPS711X)         += clps711xfb.o
 obj-$(CONFIG_FB_CYBER2000)        += cyber2000fb.o
@@ -107,6 +108,7 @@ obj-$(CONFIG_FB_METRONOME)        += metronomefb.o
 obj-$(CONFIG_FB_S1D13XXX)         += s1d13xxxfb.o
 obj-$(CONFIG_FB_IMX)              += imxfb.o
 obj-$(CONFIG_FB_S3C2410)          += s3c2410fb.o
+obj-$(CONFIG_FB_FSL_DIU)          += fsl-diu-fb.o
 obj-$(CONFIG_FB_PNX4008_DUM)      += pnx4008/
 obj-$(CONFIG_FB_PNX4008_DUM_RGB)  += pnx4008/
 obj-$(CONFIG_FB_IBM_GXT4500)      += gxt4500.o
diff --git a/drivers/video/am200epd.c b/drivers/video/am200epd.c
new file mode 100644
index 000000000000..51e26c1f5e8b
--- /dev/null
+++ b/drivers/video/am200epd.c
@@ -0,0 +1,295 @@
+/*
+ * linux/drivers/video/am200epd.c -- Platform device for AM200 EPD kit
+ *
+ * Copyright (C) 2008, Jaya Kumar
+ *
+ * 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.
+ *
+ * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven.
+ *
+ * This work was made possible by help and equipment support from E-Ink
+ * Corporation. http://support.eink.com/community
+ *
+ * This driver is written to be used with the Metronome display controller.
+ * on the AM200 EPD prototype kit/development kit with an E-Ink 800x600
+ * Vizplex EPD on a Gumstix board using the Lyre interface board.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/list.h>
+#include <linux/uaccess.h>
+#include <linux/irq.h>
+
+#include <video/metronomefb.h>
+
+#include <asm/arch/pxa-regs.h>
+
+/* register offsets for gpio control */
+#define LED_GPIO_PIN 51
+#define STDBY_GPIO_PIN 48
+#define RST_GPIO_PIN 49
+#define RDY_GPIO_PIN 32
+#define ERR_GPIO_PIN 17
+#define PCBPWR_GPIO_PIN 16
+
+#define AF_SEL_GPIO_N 0x3
+#define GAFR0_U_OFFSET(pin) ((pin - 16) * 2)
+#define GAFR1_L_OFFSET(pin) ((pin - 32) * 2)
+#define GAFR1_U_OFFSET(pin) ((pin - 48) * 2)
+#define GPDR1_OFFSET(pin) (pin - 32)
+#define GPCR1_OFFSET(pin) (pin - 32)
+#define GPSR1_OFFSET(pin) (pin - 32)
+#define GPCR0_OFFSET(pin) (pin)
+#define GPSR0_OFFSET(pin) (pin)
+
+static void am200_set_gpio_output(int pin, int val)
+{
+        u8 index;
+
+        index = pin >> 4;
+
+        switch (index) {
+        case 1:
+                if (val)
+                        GPSR0 |= (1 << GPSR0_OFFSET(pin));
+                else
+                        GPCR0 |= (1 << GPCR0_OFFSET(pin));
+                break;
+        case 2:
+                break;
+        case 3:
+                if (val)
+                        GPSR1 |= (1 << GPSR1_OFFSET(pin));
+                else
+                        GPCR1 |= (1 << GPCR1_OFFSET(pin));
+                break;
+        default:
+                printk(KERN_ERR "unimplemented\n");
+        }
+}
+
+static void __devinit am200_init_gpio_pin(int pin, int dir)
+{
+        u8 index;
+        /* dir 0 is output, 1 is input
+        - do 2 things here:
+        - set gpio alternate function to standard gpio
+        - set gpio direction to input or output  */
+
+        index = pin >> 4;
+        switch (index) {
+        case 1:
+                GAFR0_U &= ~(AF_SEL_GPIO_N << GAFR0_U_OFFSET(pin));
+
+                if (dir)
+                        GPDR0 &= ~(1 << pin);
+                else
+                        GPDR0 |= (1 << pin);
+                break;
+        case 2:
+                GAFR1_L &= ~(AF_SEL_GPIO_N << GAFR1_L_OFFSET(pin));
+
+                if (dir)
+                        GPDR1 &= ~(1 << GPDR1_OFFSET(pin));
+                else
+                        GPDR1 |= (1 << GPDR1_OFFSET(pin));
+                break;
+        case 3:
+                GAFR1_U &= ~(AF_SEL_GPIO_N << GAFR1_U_OFFSET(pin));
+
+                if (dir)
+                        GPDR1 &= ~(1 << GPDR1_OFFSET(pin));
+                else
+                        GPDR1 |= (1 << GPDR1_OFFSET(pin));
+                break;
+        default:
+                printk(KERN_ERR "unimplemented\n");
+        }
+}
+
+static void am200_init_gpio_regs(struct metronomefb_par *par)
+{
+        am200_init_gpio_pin(LED_GPIO_PIN, 0);
+        am200_set_gpio_output(LED_GPIO_PIN, 0);
+
+        am200_init_gpio_pin(STDBY_GPIO_PIN, 0);
+        am200_set_gpio_output(STDBY_GPIO_PIN, 0);
+
+        am200_init_gpio_pin(RST_GPIO_PIN, 0);
+        am200_set_gpio_output(RST_GPIO_PIN, 0);
+
+        am200_init_gpio_pin(RDY_GPIO_PIN, 1);
+
+        am200_init_gpio_pin(ERR_GPIO_PIN, 1);
+
+        am200_init_gpio_pin(PCBPWR_GPIO_PIN, 0);
+        am200_set_gpio_output(PCBPWR_GPIO_PIN, 0);
+}
+
+static void am200_disable_lcd_controller(struct metronomefb_par *par)
+{
+        LCSR = 0xffffffff;      /* Clear LCD Status Register */
+        LCCR0 |= LCCR0_DIS;     /* Disable LCD Controller */
+
+        /* we reset and just wait for things to settle */
+        msleep(200);
+}
+
+static void am200_enable_lcd_controller(struct metronomefb_par *par)
+{
+        LCSR = 0xffffffff;
+        FDADR0 = par->metromem_desc_dma;
+        LCCR0 |= LCCR0_ENB;
+}
+
+static void am200_init_lcdc_regs(struct metronomefb_par *par)
+{
+        /* here we do:
+        - disable the lcd controller
+        - setup lcd control registers
+        - setup dma descriptor
+        - reenable lcd controller
+        */
+
+        /* disable the lcd controller */
+        am200_disable_lcd_controller(par);
+
+        /* setup lcd control registers */
+        LCCR0 = LCCR0_LDM | LCCR0_SFM | LCCR0_IUM | LCCR0_EFM | LCCR0_PAS
+                | LCCR0_QDM | LCCR0_BM | LCCR0_OUM;
+
+        LCCR1 = (par->info->var.xres/2 - 1) /* pixels per line */
+                | (27 << 10) /* hsync pulse width - 1 */
+                | (33 << 16) /* eol pixel count */
+                | (33 << 24); /* bol pixel count */
+
+        LCCR2 = (par->info->var.yres - 1) /* lines per panel */
+                | (24 << 10) /* vsync pulse width - 1 */
+                | (2 << 16) /* eof pixel count */
+                | (0 << 24); /* bof pixel count */
+
+        LCCR3 = 2 /* pixel clock divisor */
+                | (24 << 8) /* AC Bias pin freq */
+                | LCCR3_16BPP /* BPP */
+                | LCCR3_PCP;  /* PCP falling edge */
+
+}
+
+static void am200_post_dma_setup(struct metronomefb_par *par)
+{
+        par->metromem_desc->mFDADR0 = par->metromem_desc_dma;
+        par->metromem_desc->mFSADR0 = par->metromem_dma;
+        par->metromem_desc->mFIDR0 = 0;
+        par->metromem_desc->mLDCMD0 = par->info->var.xres
+                                        * par->info->var.yres;
+        am200_enable_lcd_controller(par);
+}
+
+static void am200_free_irq(struct fb_info *info)
+{
+        free_irq(IRQ_GPIO(RDY_GPIO_PIN), info);
+}
+
+static irqreturn_t am200_handle_irq(int irq, void *dev_id)
+{
+        struct fb_info *info = dev_id;
+        struct metronomefb_par *par = info->par;
+
+        wake_up_interruptible(&par->waitq);
+        return IRQ_HANDLED;
+}
+
+static int am200_setup_irq(struct fb_info *info)
+{
+        int retval;
+
+        retval = request_irq(IRQ_GPIO(RDY_GPIO_PIN), am200_handle_irq,
+                                IRQF_DISABLED, "AM200", info);
+        if (retval) {
+                printk(KERN_ERR "am200epd: request_irq failed: %d\n", retval);
+                return retval;
+        }
+
+        return set_irq_type(IRQ_GPIO(RDY_GPIO_PIN), IRQT_FALLING);
+}
+
+static void am200_set_rst(struct metronomefb_par *par, int state)
+{
+        am200_set_gpio_output(RST_GPIO_PIN, state);
+}
+
+static void am200_set_stdby(struct metronomefb_par *par, int state)
+{
+        am200_set_gpio_output(STDBY_GPIO_PIN, state);
+}
+
+static int am200_wait_event(struct metronomefb_par *par)
+{
+        return wait_event_timeout(par->waitq, (GPLR1 & 0x01), HZ);
+}
+
+static int am200_wait_event_intr(struct metronomefb_par *par)
+{
+        return wait_event_interruptible_timeout(par->waitq, (GPLR1 & 0x01), HZ);
+}
+
+static struct metronome_board am200_board = {
+        .owner                  = THIS_MODULE,
+        .free_irq               = am200_free_irq,
+        .setup_irq              = am200_setup_irq,
+        .init_gpio_regs         = am200_init_gpio_regs,
+        .init_lcdc_regs         = am200_init_lcdc_regs,
+        .post_dma_setup         = am200_post_dma_setup,
+        .set_rst                = am200_set_rst,
+        .set_stdby              = am200_set_stdby,
+        .met_wait_event         = am200_wait_event,
+        .met_wait_event_intr    = am200_wait_event_intr,
+};
+
+static struct platform_device *am200_device;
+
+static int __init am200_init(void)
+{
+        int ret;
+
+        /* request our platform independent driver */
+        request_module("metronomefb");
+
+        am200_device = platform_device_alloc("metronomefb", -1);
+        if (!am200_device)
+                return -ENOMEM;
+
+        platform_device_add_data(am200_device, &am200_board,
+                                        sizeof(am200_board));
+
+        /* this _add binds metronomefb to am200. metronomefb refcounts am200 */
+        ret = platform_device_add(am200_device);
+
+        if (ret)
+                platform_device_put(am200_device);
+
+        return ret;
+}
+
+static void __exit am200_exit(void)
+{
+        platform_device_unregister(am200_device);
+}
+
+module_init(am200_init);
+module_exit(am200_exit);
+
+MODULE_DESCRIPTION("board driver for am200 metronome epd kit");
+MODULE_AUTHOR("Jaya Kumar");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index 4c9ec3f58c52..e6492c1048bf 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -96,7 +96,7 @@
 #endif
 
 #ifdef DEBUG
-#  define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args)
+#  define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)
 #else
 #  define DPRINTK(fmt, args...)
 #endif
diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c
index 8a1b07c74394..5001bd4ef466 100644
--- a/drivers/video/arkfb.c
+++ b/drivers/video/arkfb.c
@@ -101,7 +101,7 @@ static const struct svga_timing_regs ark_timing_regs     = {
 
 /* Module parameters */
 
-static char *mode = "640x480-8@60";
+static char *mode_option __devinitdata = "640x480-8@60";
 
 #ifdef CONFIG_MTRR
 static int mtrr = 1;
@@ -111,8 +111,10 @@ MODULE_AUTHOR("(c) 2007 Ondrej Zajicek <santiago@crfreenet.org>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("fbdev driver for ARK 2000PV");
 
-module_param(mode, charp, 0444);
-MODULE_PARM_DESC(mode, "Default video mode ('640x480-8@60', etc)");
+module_param(mode_option, charp, 0444);
+MODULE_PARM_DESC(mode_option, "Default video mode ('640x480-8@60', etc)");
+module_param_named(mode, mode_option, charp, 0444);
+MODULE_PARM_DESC(mode, "Default video mode ('640x480-8@60', etc) (deprecated)");
 
 #ifdef CONFIG_MTRR
 module_param(mtrr, int, 0444);
@@ -941,7 +943,7 @@ static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_
         }
 
         /* Allocate and fill driver data structure */
-        info = framebuffer_alloc(sizeof(struct arkfb_info), NULL);
+        info = framebuffer_alloc(sizeof(struct arkfb_info), &(dev->dev));
         if (! info) {
                 dev_err(&(dev->dev), "cannot allocate memory\n");
                 return -ENOMEM;
@@ -956,20 +958,20 @@ static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_
         /* Prepare PCI device */
         rc = pci_enable_device(dev);
         if (rc < 0) {
-                dev_err(&(dev->dev), "cannot enable PCI device\n");
+                dev_err(info->dev, "cannot enable PCI device\n");
                 goto err_enable_device;
         }
 
         rc = pci_request_regions(dev, "arkfb");
         if (rc < 0) {
-                dev_err(&(dev->dev), "cannot reserve framebuffer region\n");
+                dev_err(info->dev, "cannot reserve framebuffer region\n");
                 goto err_request_regions;
         }
 
         par->dac = ics5342_init(ark_dac_read_regs, ark_dac_write_regs, info);
         if (! par->dac) {
                 rc = -ENOMEM;
-                dev_err(&(dev->dev), "RAMDAC initialization failed\n");
+                dev_err(info->dev, "RAMDAC initialization failed\n");
                 goto err_dac;
         }
 
@@ -980,7 +982,7 @@ static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_
         info->screen_base = pci_iomap(dev, 0, 0);
         if (! info->screen_base) {
                 rc = -ENOMEM;
-                dev_err(&(dev->dev), "iomap for framebuffer failed\n");
+                dev_err(info->dev, "iomap for framebuffer failed\n");
                 goto err_iomap;
         }
 
@@ -999,22 +1001,22 @@ static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_
         info->pseudo_palette = (void*) (par->pseudo_palette);
 
         /* Prepare startup mode */
-        rc = fb_find_mode(&(info->var), info, mode, NULL, 0, NULL, 8);
+        rc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8);
         if (! ((rc == 1) || (rc == 2))) {
                 rc = -EINVAL;
-                dev_err(&(dev->dev), "mode %s not found\n", mode);
+                dev_err(info->dev, "mode %s not found\n", mode_option);
                 goto err_find_mode;
         }
 
         rc = fb_alloc_cmap(&info->cmap, 256, 0);
         if (rc < 0) {
-                dev_err(&(dev->dev), "cannot allocate colormap\n");
+                dev_err(info->dev, "cannot allocate colormap\n");
                 goto err_alloc_cmap;
         }
 
         rc = register_framebuffer(info);
         if (rc < 0) {
-                dev_err(&(dev->dev), "cannot register framebugger\n");
+                dev_err(info->dev, "cannot register framebugger\n");
                 goto err_reg_fb;
         }
 
@@ -1088,7 +1090,7 @@ static int ark_pci_suspend (struct pci_dev* dev, pm_message_t state)
         struct fb_info *info = pci_get_drvdata(dev);
         struct arkfb_info *par = info->par;
 
-        dev_info(&(dev->dev), "suspend\n");
+        dev_info(info->dev, "suspend\n");
 
         acquire_console_sem();
         mutex_lock(&(par->open_lock));
@@ -1119,7 +1121,7 @@ static int ark_pci_resume (struct pci_dev* dev)
         struct fb_info *info = pci_get_drvdata(dev);
         struct arkfb_info *par = info->par;
 
-        dev_info(&(dev->dev), "resume\n");
+        dev_info(info->dev, "resume\n");
 
         acquire_console_sem();
         mutex_lock(&(par->open_lock));
@@ -1190,7 +1192,7 @@ static int __init arkfb_init(void)
                 return -ENODEV;
 
         if (option && *option)
-                mode = option;
+                mode_option = option;
 #endif
 
         pr_debug("arkfb: initializing\n");
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c
index 5d4fbaa53a6c..dff35474b854 100644
--- a/drivers/video/atafb.c
+++ b/drivers/video/atafb.c
@@ -1270,7 +1270,7 @@ again:
 
         gstart = (prescale / 2 + plen * left_margin) / prescale;
         /* gend1 is for hde (gend-gstart multiple of align), shifter's xres */
-        gend1 = gstart + ((xres + align - 1) / align) * align * plen / prescale;
+        gend1 = gstart + roundup(xres, align) * plen / prescale;
         /* gend2 is for hbb, visible xres (rest to gend1 is cut off by hblank) */
         gend2 = gstart + xres * plen / prescale;
         par->HHT = plen * (left_margin + xres + right_margin) /
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index fc65c02306dd..8ffdf3578768 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -31,7 +31,8 @@
 #define ATMEL_LCDC_CVAL_DEFAULT         0xc8
 #define ATMEL_LCDC_DMA_BURST_LEN        8
 
-#if defined(CONFIG_ARCH_AT91SAM9263) || defined(CONFIG_ARCH_AT91CAP9)
+#if defined(CONFIG_ARCH_AT91SAM9263) || defined(CONFIG_ARCH_AT91CAP9) || \
+        defined(CONFIG_ARCH_AT91SAM9RL)
 #define ATMEL_LCDC_FIFO_SIZE            2048
 #else
 #define ATMEL_LCDC_FIFO_SIZE            512
@@ -250,6 +251,8 @@ static int atmel_lcdfb_alloc_video_memory(struct atmel_lcdfb_info *sinfo)
                 return -ENOMEM;
         }
 
+        memset(info->screen_base, 0, info->fix.smem_len);
+
         return 0;
 }
 
@@ -336,19 +339,35 @@ static int atmel_lcdfb_check_var(struct fb_var_screeninfo *var,
                 break;
         case 15:
         case 16:
-                var->red.offset = 0;
+                if (sinfo->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) {
+                        /* RGB:565 mode */
+                        var->red.offset = 11;
+                        var->blue.offset = 0;
+                        var->green.length = 6;
+                } else {
+                        /* BGR:555 mode */
+                        var->red.offset = 0;
+                        var->blue.offset = 10;
+                        var->green.length = 5;
+                }
                 var->green.offset = 5;
-                var->blue.offset = 10;
-                var->red.length = var->green.length = var->blue.length = 5;
+                var->red.length = var->blue.length = 5;
                 break;
         case 32:
                 var->transp.offset = 24;
                 var->transp.length = 8;
                 /* fall through */
         case 24:
-                var->red.offset = 0;
+                if (sinfo->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) {
+                        /* RGB:888 mode */
+                        var->red.offset = 16;
+                        var->blue.offset = 0;
+                } else {
+                        /* BGR:888 mode */
+                        var->red.offset = 0;
+                        var->blue.offset = 16;
+                }
                 var->green.offset = 8;
-                var->blue.offset = 16;
                 var->red.length = var->green.length = var->blue.length = 8;
                 break;
         default:
@@ -634,7 +653,6 @@ static int __init atmel_lcdfb_init_fbinfo(struct atmel_lcdfb_info *sinfo)
         struct fb_info *info = sinfo->info;
         int ret = 0;
 
-        memset_io(info->screen_base, 0, info->fix.smem_len);
         info->var.activate |= FB_ACTIVATE_FORCE | FB_ACTIVATE_NOW;
 
         dev_info(info->device,
@@ -696,6 +714,7 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
                 sinfo->atmel_lcdfb_power_control = pdata_sinfo->atmel_lcdfb_power_control;
                 sinfo->guard_time = pdata_sinfo->guard_time;
                 sinfo->lcdcon_is_backlight = pdata_sinfo->lcdcon_is_backlight;
+                sinfo->lcd_wiring_mode = pdata_sinfo->lcd_wiring_mode;
         } else {
                 dev_err(dev, "cannot get default configuration\n");
                 goto free_info;
@@ -764,6 +783,11 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
                 info->screen_base = ioremap(info->fix.smem_start, info->fix.smem_len);
                 if (!info->screen_base)
                         goto release_intmem;
+
+                /*
+                 * Don't clear the framebuffer -- someone may have set
+                 * up a splash image.
+                 */
         } else {
                 /* alocate memory buffer */
                 ret = atmel_lcdfb_alloc_video_memory(sinfo);
@@ -903,10 +927,42 @@ static int __exit atmel_lcdfb_remove(struct platform_device *pdev)
         return 0;
 }
 
+#ifdef CONFIG_PM
+
+static int atmel_lcdfb_suspend(struct platform_device *pdev, pm_message_t mesg)
+{
+        struct fb_info *info = platform_get_drvdata(pdev);
+        struct atmel_lcdfb_info *sinfo = info->par;
+
+        sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
+        lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, 0);
+        if (sinfo->atmel_lcdfb_power_control)
+                sinfo->atmel_lcdfb_power_control(0);
+        atmel_lcdfb_stop_clock(sinfo);
+        return 0;
+}
+
+static int atmel_lcdfb_resume(struct platform_device *pdev)
+{
+        struct fb_info *info = platform_get_drvdata(pdev);
+        struct atmel_lcdfb_info *sinfo = info->par;
+
+        atmel_lcdfb_start_clock(sinfo);
+        if (sinfo->atmel_lcdfb_power_control)
+                sinfo->atmel_lcdfb_power_control(1);
+        lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, sinfo->saved_lcdcon);
+        return 0;
+}
+
+#else
+#define atmel_lcdfb_suspend     NULL
+#define atmel_lcdfb_resume      NULL
+#endif
+
 static struct platform_driver atmel_lcdfb_driver = {
         .remove         = __exit_p(atmel_lcdfb_remove),
-
-// FIXME need suspend, resume
+        .suspend        = atmel_lcdfb_suspend,
+        .resume         = atmel_lcdfb_resume,
 
         .driver         = {
                 .name   = "atmel_lcdfb",
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index cbd3308b6690..24ee96c4e9e9 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -91,7 +91,7 @@
 #undef DEBUG
 
 #ifdef DEBUG
-#define DBG(fmt, args...)               printk(KERN_DEBUG "aty128fb: %s " fmt, __FUNCTION__, ##args);
+#define DBG(fmt, args...)               printk(KERN_DEBUG "aty128fb: %s " fmt, __func__, ##args);
 #else
 #define DBG(fmt, args...)
 #endif
@@ -1885,7 +1885,7 @@ static int __devinit aty128_init(struct pci_dev *pdev, const struct pci_device_i
 
         /* range check to make sure */
         if (ent->driver_data < ARRAY_SIZE(r128_family))
-            strncat(video_card, r128_family[ent->driver_data], sizeof(video_card));
+            strlcat(video_card, r128_family[ent->driver_data], sizeof(video_card));
 
         printk(KERN_INFO "aty128fb: %s [chip rev 0x%x] ", video_card, chip_rev);
 
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 62f9c6e387cc..e4bcf5376a99 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -2621,10 +2621,13 @@ static int __devinit aty_init(struct fb_info *info)
 #endif /* CONFIG_FB_ATY_CT */
         info->var = var;
 
-        fb_alloc_cmap(&info->cmap, 256, 0);
+        if (fb_alloc_cmap(&info->cmap, 256, 0) < 0)
+                goto aty_init_exit;
 
-        if (register_framebuffer(info) < 0)
+        if (register_framebuffer(info) < 0) {
+                fb_dealloc_cmap(&info->cmap);
                 goto aty_init_exit;
+        }
 
         fb_list = info;
 
diff --git a/drivers/video/aty/mach64_ct.c b/drivers/video/aty/mach64_ct.c
index cc9e9779b75f..c50c7cf26fe9 100644
--- a/drivers/video/aty/mach64_ct.c
+++ b/drivers/video/aty/mach64_ct.c
@@ -197,7 +197,7 @@ static int aty_dsp_gt(const struct fb_info *info, u32 bpp, struct pll_ct *pll)
         pll->dsp_config = (dsp_precision << 20) | (pll->dsp_loop_latency << 16) | dsp_xclks;
 #ifdef DEBUG
         printk("atyfb(%s): dsp_config 0x%08x, dsp_on_off 0x%08x\n",
-                __FUNCTION__, pll->dsp_config, pll->dsp_on_off);
+                __func__, pll->dsp_config, pll->dsp_on_off);
 #endif
         return 0;
 }
@@ -225,7 +225,7 @@ static int aty_valid_pll_ct(const struct fb_info *info, u32 vclk_per, struct pll
                 (par->ref_clk_per * pll->pll_ref_div);
 #ifdef DEBUG
         printk("atyfb(%s): pllvclk=%d MHz, vclk=%d MHz\n",
-                __FUNCTION__, pllvclk, pllvclk / pll->vclk_post_div_real);
+                __func__, pllvclk, pllvclk / pll->vclk_post_div_real);
 #endif
         pll->pll_vclk_cntl = 0x03; /* VCLK = PLL_VCLK/VCLKx_POST */
 
@@ -269,7 +269,7 @@ static u32 aty_pll_to_var_ct(const struct fb_info *info, const union aty_pll *pl
         }
 #endif
 #ifdef DEBUG
-        printk("atyfb(%s): calculated 0x%08X(%i)\n", __FUNCTION__, ret, ret);
+        printk("atyfb(%s): calculated 0x%08X(%i)\n", __func__, ret, ret);
 #endif
         return ret;
 }
@@ -284,11 +284,11 @@ void aty_set_pll_ct(const struct fb_info *info, const union aty_pll *pll)
 #ifdef DEBUG
         printk("atyfb(%s): about to program:\n"
                 "pll_ext_cntl=0x%02x pll_gen_cntl=0x%02x pll_vclk_cntl=0x%02x\n",
-                __FUNCTION__,
+                __func__,
                 pll->ct.pll_ext_cntl, pll->ct.pll_gen_cntl, pll->ct.pll_vclk_cntl);
 
         printk("atyfb(%s): setting clock %lu for FeedBackDivider %i, ReferenceDivider %i, PostDivider %i(%i)\n",
-                __FUNCTION__,
+                __func__,
                 par->clk_wr_offset, pll->ct.vclk_fb_div,
                 pll->ct.pll_ref_div, pll->ct.vclk_post_div, pll->ct.vclk_post_div_real);
 #endif
@@ -428,7 +428,7 @@ static int __devinit aty_init_pll_ct(const struct fb_info *info,
 
 #ifdef DEBUG
         printk("atyfb(%s): mclk_fb_mult=%d, xclk_post_div=%d\n",
-                __FUNCTION__, pll->ct.mclk_fb_mult, pll->ct.xclk_post_div);
+                __func__, pll->ct.mclk_fb_mult, pll->ct.xclk_post_div);
 #endif
 
         memcntl = aty_ld_le32(MEM_CNTL, par);
@@ -540,7 +540,7 @@ static int __devinit aty_init_pll_ct(const struct fb_info *info,
         pllmclk = (1000000 * pll->ct.mclk_fb_mult * pll->ct.mclk_fb_div) /
                         (par->ref_clk_per * pll->ct.pll_ref_div);
         printk("atyfb(%s): pllmclk=%d MHz, xclk=%d MHz\n",
-                __FUNCTION__, pllmclk, pllmclk / pll->ct.xclk_post_div_real);
+                __func__, pllmclk, pllmclk / pll->ct.xclk_post_div_real);
 #endif
 
         if (M64_HAS(SDRAM_MAGIC_PLL) && (par->ram_type >= SDRAM))
@@ -581,7 +581,7 @@ static int __devinit aty_init_pll_ct(const struct fb_info *info,
                 pllsclk = (1000000 * 2 * pll->ct.sclk_fb_div) /
                         (par->ref_clk_per * pll->ct.pll_ref_div);
                 printk("atyfb(%s): use sclk, pllsclk=%d MHz, sclk=mclk=%d MHz\n",
-                        __FUNCTION__, pllsclk, pllsclk / sclk_post_div_real);
+                        __func__, pllsclk, pllsclk / sclk_post_div_real);
 #endif
         }
 
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 62867cb63fef..72cd0d2f14ec 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -52,11 +52,14 @@
 
 #define RADEON_VERSION  "0.2.0"
 
+#include "radeonfb.h"
+
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/ctype.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
@@ -91,7 +94,6 @@
 
 #include "../edid.h" // MOVE THAT TO include/video
 #include "ati_ids.h"
-#include "radeonfb.h"               
 
 #define MAX_MAPPED_VRAM (2048*2048*4)
 #define MIN_MAPPED_VRAM (1024*768*1)
@@ -1488,7 +1490,7 @@ static void radeon_calc_pll_regs(struct radeonfb_info *rinfo, struct radeon_regs
                 freq = rinfo->pll.ppll_max;
         if (freq*12 < rinfo->pll.ppll_min)
                 freq = rinfo->pll.ppll_min / 12;
-        RTRACE("freq = %lu, PLL min = %u, PLL max = %u\n",
+        pr_debug("freq = %lu, PLL min = %u, PLL max = %u\n",
                freq, rinfo->pll.ppll_min, rinfo->pll.ppll_max);
 
         for (post_div = &post_divs[0]; post_div->divider; ++post_div) {
@@ -1509,7 +1511,7 @@ static void radeon_calc_pll_regs(struct radeonfb_info *rinfo, struct radeon_regs
                 post_div = &post_divs[post_div->bitvalue];
                 pll_output_freq = post_div->divider * freq;
         }
-        RTRACE("ref_div = %d, ref_clk = %d, output_freq = %d\n",
+        pr_debug("ref_div = %d, ref_clk = %d, output_freq = %d\n",
                rinfo->pll.ref_div, rinfo->pll.ref_clk,
                pll_output_freq);
 
@@ -1519,7 +1521,7 @@ static void radeon_calc_pll_regs(struct radeonfb_info *rinfo, struct radeon_regs
                 post_div = &post_divs[post_div->bitvalue];
                 pll_output_freq = post_div->divider * freq;
         }
-        RTRACE("ref_div = %d, ref_clk = %d, output_freq = %d\n",
+        pr_debug("ref_div = %d, ref_clk = %d, output_freq = %d\n",
                rinfo->pll.ref_div, rinfo->pll.ref_clk,
                pll_output_freq);
 
@@ -1528,9 +1530,9 @@ static void radeon_calc_pll_regs(struct radeonfb_info *rinfo, struct radeon_regs
         regs->ppll_ref_div = rinfo->pll.ref_div;
         regs->ppll_div_3 = fb_div | (post_div->bitvalue << 16);
 
-        RTRACE("post div = 0x%x\n", post_div->bitvalue);
-        RTRACE("fb_div = 0x%x\n", fb_div);
-        RTRACE("ppll_div_3 = 0x%x\n", regs->ppll_div_3);
+        pr_debug("post div = 0x%x\n", post_div->bitvalue);
+        pr_debug("fb_div = 0x%x\n", fb_div);
+        pr_debug("ppll_div_3 = 0x%x\n", regs->ppll_div_3);
 }
 
 static int radeonfb_set_par(struct fb_info *info)
@@ -1602,9 +1604,9 @@ static int radeonfb_set_par(struct fb_info *info)
         dotClock = 1000000000 / pixClock;
         freq = dotClock / 10; /* x100 */
 
-        RTRACE("hStart = %d, hEnd = %d, hTotal = %d\n",
+        pr_debug("hStart = %d, hEnd = %d, hTotal = %d\n",
                 hSyncStart, hSyncEnd, hTotal);
-        RTRACE("vStart = %d, vEnd = %d, vTotal = %d\n",
+        pr_debug("vStart = %d, vEnd = %d, vTotal = %d\n",
                 vSyncStart, vSyncEnd, vTotal);
 
         hsync_wid = (hSyncEnd - hSyncStart) / 8;
@@ -1713,16 +1715,16 @@ static int radeonfb_set_par(struct fb_info *info)
                 newmode->surf_info[i] = 0;
         }
 
-        RTRACE("h_total_disp = 0x%x\t   hsync_strt_wid = 0x%x\n",
+        pr_debug("h_total_disp = 0x%x\t   hsync_strt_wid = 0x%x\n",
                 newmode->crtc_h_total_disp, newmode->crtc_h_sync_strt_wid);
-        RTRACE("v_total_disp = 0x%x\t   vsync_strt_wid = 0x%x\n",
+        pr_debug("v_total_disp = 0x%x\t   vsync_strt_wid = 0x%x\n",
                 newmode->crtc_v_total_disp, newmode->crtc_v_sync_strt_wid);
 
         rinfo->bpp = mode->bits_per_pixel;
         rinfo->depth = depth;
 
-        RTRACE("pixclock = %lu\n", (unsigned long)pixClock);
-        RTRACE("freq = %lu\n", (unsigned long)freq);
+        pr_debug("pixclock = %lu\n", (unsigned long)pixClock);
+        pr_debug("freq = %lu\n", (unsigned long)freq);
 
         /* We use PPLL_DIV_3 */
         newmode->clk_cntl_index = 0x300;
@@ -1986,7 +1988,7 @@ static void fixup_memory_mappings(struct radeonfb_info *rinfo)
         if (rinfo->has_CRTC2)
                 OUTREG(CRTC2_GEN_CNTL, save_crtc2_gen_cntl);    
 
-        RTRACE("aper_base: %08x MC_FB_LOC to: %08x, MC_AGP_LOC to: %08x\n",
+        pr_debug("aper_base: %08x MC_FB_LOC to: %08x, MC_AGP_LOC to: %08x\n",
                 aper_base,
                 ((aper_base + aper_size - 1) & 0xffff0000) | (aper_base >> 16),
                 0xffff0000 | (agp_base >> 16));
@@ -2083,7 +2085,7 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo)
          * ToDo: identify these cases
          */
 
-        RTRACE("radeonfb (%s): Found %ldk of %s %d bits wide videoram\n",
+        pr_debug("radeonfb (%s): Found %ldk of %s %d bits wide videoram\n",
                pci_name(rinfo->pdev),
                rinfo->video_ram / 1024,
                rinfo->vram_ddr ? "DDR" : "SDRAM",
@@ -2158,8 +2160,9 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev,
         struct fb_info *info;
         struct radeonfb_info *rinfo;
         int ret;
+        unsigned char c1, c2;
 
-        RTRACE("radeonfb_pci_register BEGIN\n");
+        pr_debug("radeonfb_pci_register BEGIN\n");
         
         /* Enable device in PCI config */
         ret = pci_enable_device(pdev);
@@ -2185,9 +2188,15 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev,
         rinfo->lvds_timer.function = radeon_lvds_timer_func;
         rinfo->lvds_timer.data = (unsigned long)rinfo;
 
-        strcpy(rinfo->name, "ATI Radeon XX ");
-        rinfo->name[11] = ent->device >> 8;
-        rinfo->name[12] = ent->device & 0xFF;
+        c1 = ent->device >> 8;
+        c2 = ent->device & 0xff;
+        if (isprint(c1) && isprint(c2))
+                snprintf(rinfo->name, sizeof(rinfo->name),
+                         "ATI Radeon %x \"%c%c\"", ent->device & 0xffff, c1, c2);
+        else
+                snprintf(rinfo->name, sizeof(rinfo->name),
+                         "ATI Radeon %x", ent->device & 0xffff);
+
         rinfo->family = ent->driver_data & CHIP_FAMILY_MASK;
         rinfo->chipset = pdev->device;
         rinfo->has_CRTC2 = (ent->driver_data & CHIP_HAS_CRTC2) != 0;
@@ -2278,7 +2287,7 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev,
                 goto err_unmap_rom;
         }
 
-        RTRACE("radeonfb (%s): mapped %ldk videoram\n", pci_name(rinfo->pdev),
+        pr_debug("radeonfb (%s): mapped %ldk videoram\n", pci_name(rinfo->pdev),
                rinfo->mapped_vram/1024);
 
         /*
@@ -2373,7 +2382,7 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev,
 
         if (rinfo->bios_seg)
                 radeon_unmap_ROM(rinfo, pdev);
-        RTRACE("radeonfb_pci_register END\n");
+        pr_debug("radeonfb_pci_register END\n");
 
         return 0;
 err_unmap_fb:
diff --git a/drivers/video/aty/radeon_i2c.c b/drivers/video/aty/radeon_i2c.c
index 7db9de681716..f9e7c29ad9bf 100644
--- a/drivers/video/aty/radeon_i2c.c
+++ b/drivers/video/aty/radeon_i2c.c
@@ -1,3 +1,5 @@
+#include "radeonfb.h"
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
@@ -11,7 +13,6 @@
 #include <asm/io.h>
 
 #include <video/radeon.h>
-#include "radeonfb.h"
 #include "../edid.h"
 
 static void radeon_gpio_setscl(void* data, int state)
@@ -77,7 +78,7 @@ static int radeon_setup_i2c_bus(struct radeon_i2c_chan *chan, const char *name)
         chan->algo.setscl               = radeon_gpio_setscl;
         chan->algo.getsda               = radeon_gpio_getsda;
         chan->algo.getscl               = radeon_gpio_getscl;
-        chan->algo.udelay               = 40;
+        chan->algo.udelay               = 10;
         chan->algo.timeout              = 20;
         chan->algo.data                 = chan; 
         
@@ -148,21 +149,21 @@ int radeon_probe_i2c_connector(struct radeonfb_info *rinfo, int conn,
         if (out_edid)
                 *out_edid = edid;
         if (!edid) {
-                RTRACE("radeonfb: I2C (port %d) ... not found\n", conn);
+                pr_debug("radeonfb: I2C (port %d) ... not found\n", conn);
                 return MT_NONE;
         }
         if (edid[0x14] & 0x80) {
                 /* Fix detection using BIOS tables */
                 if (rinfo->is_mobility /*&& conn == ddc_dvi*/ &&
                     (INREG(LVDS_GEN_CNTL) & LVDS_ON)) {
-                        RTRACE("radeonfb: I2C (port %d) ... found LVDS panel\n", conn);
+                        pr_debug("radeonfb: I2C (port %d) ... found LVDS panel\n", conn);
                         return MT_LCD;
                 } else {
-                        RTRACE("radeonfb: I2C (port %d) ... found TMDS panel\n", conn);
+                        pr_debug("radeonfb: I2C (port %d) ... found TMDS panel\n", conn);
                         return MT_DFP;
                 }
         }
-        RTRACE("radeonfb: I2C (port %d) ... found CRT display\n", conn);
+        pr_debug("radeonfb: I2C (port %d) ... found CRT display\n", conn);
         return MT_CRT;
 }
 
diff --git a/drivers/video/aty/radeon_monitor.c b/drivers/video/aty/radeon_monitor.c
index 2030ed813429..b4d4b88afc09 100644
--- a/drivers/video/aty/radeon_monitor.c
+++ b/drivers/video/aty/radeon_monitor.c
@@ -69,11 +69,11 @@ static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_
         u8 *tmp;
         int i, mt = MT_NONE;  
         
-        RTRACE("analyzing OF properties...\n");
+        pr_debug("analyzing OF properties...\n");
         pmt = of_get_property(dp, "display-type", NULL);
         if (!pmt)
                 return MT_NONE;
-        RTRACE("display-type: %s\n", pmt);
+        pr_debug("display-type: %s\n", pmt);
         /* OF says "LCD" for DFP as well, we discriminate from the caller of this
          * function
          */
@@ -117,7 +117,7 @@ static int __devinit radeon_probe_OF_head(struct radeonfb_info *rinfo, int head_
 {
         struct device_node *dp;
 
-        RTRACE("radeon_probe_OF_head\n");
+        pr_debug("radeon_probe_OF_head\n");
 
         dp = rinfo->of_node;
         while (dp == NULL)
@@ -135,7 +135,7 @@ static int __devinit radeon_probe_OF_head(struct radeonfb_info *rinfo, int head_
                         if (!pname)
                                 return MT_NONE;
                         len = strlen(pname);
-                        RTRACE("head: %s (letter: %c, head_no: %d)\n",
+                        pr_debug("head: %s (letter: %c, head_no: %d)\n",
                                pname, pname[len-1], head_no);
                         if (pname[len-1] == 'A' && head_no == 0) {
                                 int mt = radeon_parse_montype_prop(dp, out_EDID, 0);
@@ -185,7 +185,7 @@ static int __devinit radeon_get_panel_info_BIOS(struct radeonfb_info *rinfo)
                 rinfo->panel_info.xres, rinfo->panel_info.yres);
 
         rinfo->panel_info.pwr_delay = BIOS_IN16(tmp + 44);
-        RTRACE("BIOS provided panel power delay: %d\n", rinfo->panel_info.pwr_delay);
+        pr_debug("BIOS provided panel power delay: %d\n", rinfo->panel_info.pwr_delay);
         if (rinfo->panel_info.pwr_delay > 2000 || rinfo->panel_info.pwr_delay <= 0)
                 rinfo->panel_info.pwr_delay = 2000;
 
@@ -199,16 +199,16 @@ static int __devinit radeon_get_panel_info_BIOS(struct radeonfb_info *rinfo)
             rinfo->panel_info.fbk_divider > 3) {
                 rinfo->panel_info.use_bios_dividers = 1;
                 printk(KERN_INFO "radeondb: BIOS provided dividers will be used\n");
-                RTRACE("ref_divider = %x\n", rinfo->panel_info.ref_divider);
-                RTRACE("post_divider = %x\n", rinfo->panel_info.post_divider);
-                RTRACE("fbk_divider = %x\n", rinfo->panel_info.fbk_divider);
+                pr_debug("ref_divider = %x\n", rinfo->panel_info.ref_divider);
+                pr_debug("post_divider = %x\n", rinfo->panel_info.post_divider);
+                pr_debug("fbk_divider = %x\n", rinfo->panel_info.fbk_divider);
         }
-        RTRACE("Scanning BIOS table ...\n");
+        pr_debug("Scanning BIOS table ...\n");
         for(i=0; i<32; i++) {
                 tmp0 = BIOS_IN16(tmp+64+i*2);
                 if (tmp0 == 0)
                         break;
-                RTRACE(" %d x %d\n", BIOS_IN16(tmp0), BIOS_IN16(tmp0+2));
+                pr_debug(" %d x %d\n", BIOS_IN16(tmp0), BIOS_IN16(tmp0+2));
                 if ((BIOS_IN16(tmp0) == rinfo->panel_info.xres) &&
                     (BIOS_IN16(tmp0+2) == rinfo->panel_info.yres)) {
                         rinfo->panel_info.hblank = (BIOS_IN16(tmp0+17) - BIOS_IN16(tmp0+19)) * 8;
@@ -227,19 +227,19 @@ static int __devinit radeon_get_panel_info_BIOS(struct radeonfb_info *rinfo)
                         /* Mark panel infos valid */
                         rinfo->panel_info.valid = 1;
 
-                        RTRACE("Found panel in BIOS table:\n");
-                        RTRACE("  hblank: %d\n", rinfo->panel_info.hblank);
-                        RTRACE("  hOver_plus: %d\n", rinfo->panel_info.hOver_plus);
-                        RTRACE("  hSync_width: %d\n", rinfo->panel_info.hSync_width);
-                        RTRACE("  vblank: %d\n", rinfo->panel_info.vblank);
-                        RTRACE("  vOver_plus: %d\n", rinfo->panel_info.vOver_plus);
-                        RTRACE("  vSync_width: %d\n", rinfo->panel_info.vSync_width);
-                        RTRACE("  clock: %d\n", rinfo->panel_info.clock);
+                        pr_debug("Found panel in BIOS table:\n");
+                        pr_debug("  hblank: %d\n", rinfo->panel_info.hblank);
+                        pr_debug("  hOver_plus: %d\n", rinfo->panel_info.hOver_plus);
+                        pr_debug("  hSync_width: %d\n", rinfo->panel_info.hSync_width);
+                        pr_debug("  vblank: %d\n", rinfo->panel_info.vblank);
+                        pr_debug("  vOver_plus: %d\n", rinfo->panel_info.vOver_plus);
+                        pr_debug("  vSync_width: %d\n", rinfo->panel_info.vSync_width);
+                        pr_debug("  clock: %d\n", rinfo->panel_info.clock);
                                 
                         return 1;
                 }
         }
-        RTRACE("Didn't find panel in BIOS table !\n");
+        pr_debug("Didn't find panel in BIOS table !\n");
 
         return 0;
 }
@@ -271,18 +271,18 @@ static void __devinit radeon_parse_connector_info(struct radeonfb_info *rinfo)
          * DEBUG is enabled
          */
         chips = BIOS_IN8(offset++) >> 4;
-        RTRACE("%d chips in connector info\n", chips);
+        pr_debug("%d chips in connector info\n", chips);
         for (i = 0; i < chips; i++) {
                 tmp = BIOS_IN8(offset++);
                 connectors = tmp & 0x0f;
-                RTRACE(" - chip %d has %d connectors\n", tmp >> 4, connectors);
+                pr_debug(" - chip %d has %d connectors\n", tmp >> 4, connectors);
                 for (conn = 0; ; conn++) {
                         tmp = BIOS_IN16(offset);
                         if (tmp == 0)
                                 break;
                         offset += 2;
                         type = (tmp >> 12) & 0x0f;
-                        RTRACE("  * connector %d of type %d (%s) : %04x\n",
+                        pr_debug("  * connector %d of type %d (%s) : %04x\n",
                                conn, type, __conn_type_table[type], tmp);
                 }
         }
@@ -449,7 +449,7 @@ void __devinit radeon_probe_screens(struct radeonfb_info *rinfo,
                  * a layout for each card ?
                  */
 
-                RTRACE("Using specified monitor layout: %s", monitor_layout);
+                pr_debug("Using specified monitor layout: %s", monitor_layout);
 #ifdef CONFIG_FB_RADEON_I2C
                 if (!ignore_edid) {
                         if (rinfo->mon1_type != MT_NONE)
@@ -479,9 +479,9 @@ void __devinit radeon_probe_screens(struct radeonfb_info *rinfo,
                  * Auto-detecting display type (well... trying to ...)
                  */
                 
-                RTRACE("Starting monitor auto detection...\n");
+                pr_debug("Starting monitor auto detection...\n");
 
-#if DEBUG && defined(CONFIG_FB_RADEON_I2C)
+#if defined(DEBUG) && defined(CONFIG_FB_RADEON_I2C)
                 {
                         u8 *EDIDs[4] = { NULL, NULL, NULL, NULL };
                         int mon_types[4] = {MT_NONE, MT_NONE, MT_NONE, MT_NONE};
@@ -756,7 +756,7 @@ void __devinit radeon_check_modes(struct radeonfb_info *rinfo, const char *mode_
         if (!rinfo->panel_info.use_bios_dividers && rinfo->mon1_type != MT_CRT
             && rinfo->mon1_EDID) {
                 struct fb_var_screeninfo var;
-                RTRACE("Parsing EDID data for panel info\n");
+                pr_debug("Parsing EDID data for panel info\n");
                 if (fb_parse_edid(rinfo->mon1_EDID, &var) == 0) {
                         if (var.xres >= rinfo->panel_info.xres &&
                             var.yres >= rinfo->panel_info.yres)
@@ -776,7 +776,7 @@ void __devinit radeon_check_modes(struct radeonfb_info *rinfo, const char *mode_
         if (rinfo->mon1_type != MT_CRT && rinfo->panel_info.valid) {
                 struct fb_var_screeninfo *var = &info->var;
 
-                RTRACE("Setting up default mode based on panel info\n");
+                pr_debug("Setting up default mode based on panel info\n");
                 var->xres = rinfo->panel_info.xres;
                 var->yres = rinfo->panel_info.yres;
                 var->xres_virtual = rinfo->panel_info.xres;
@@ -824,7 +824,7 @@ void __devinit radeon_check_modes(struct radeonfb_info *rinfo, const char *mode_
                 int                     dbsize;
                 char                    modename[32];
 
-                RTRACE("Guessing panel info...\n");
+                pr_debug("Guessing panel info...\n");
                 if (rinfo->panel_info.xres == 0 || rinfo->panel_info.yres == 0) {
                         u32 tmp = INREG(FP_HORZ_STRETCH) & HORZ_PANEL_SIZE;
                         rinfo->panel_info.xres = ((tmp >> HORZ_PANEL_SHIFT) + 1) * 8;
diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h
index 5eac1ce52e72..c347e38cd0b0 100644
--- a/drivers/video/aty/radeonfb.h
+++ b/drivers/video/aty/radeonfb.h
@@ -1,6 +1,10 @@
 #ifndef __RADEONFB_H__
 #define __RADEONFB_H__
 
+#ifdef CONFIG_FB_RADEON_DEBUG
+#define DEBUG           1
+#endif
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -365,22 +369,6 @@ struct radeonfb_info {
 
 
 /*
- * Debugging stuffs
- */
-#ifdef CONFIG_FB_RADEON_DEBUG
-#define DEBUG           1
-#else
-#define DEBUG           0
-#endif
-
-#if DEBUG
-#define RTRACE          printk
-#else
-#define RTRACE          if(0) printk
-#endif
-
-
-/*
  * IO macros
  */
 
diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c
index eefba3d0e4b9..49834a67a623 100644
--- a/drivers/video/bf54x-lq043fb.c
+++ b/drivers/video/bf54x-lq043fb.c
@@ -336,7 +336,7 @@ static int bfin_bf54x_fb_check_var(struct fb_var_screeninfo *var,
 {
 
         if (var->bits_per_pixel != LCD_BPP) {
-                pr_debug("%s: depth not supported: %u BPP\n", __FUNCTION__,
+                pr_debug("%s: depth not supported: %u BPP\n", __func__,
                          var->bits_per_pixel);
                 return -EINVAL;
         }
@@ -345,7 +345,7 @@ static int bfin_bf54x_fb_check_var(struct fb_var_screeninfo *var,
             info->var.xres_virtual != var->xres_virtual ||
             info->var.yres_virtual != var->yres_virtual) {
                 pr_debug("%s: Resolution not supported: X%u x Y%u \n",
-                         __FUNCTION__, var->xres, var->yres);
+                         __func__, var->xres, var->yres);
                 return -EINVAL;
         }
 
@@ -355,7 +355,7 @@ static int bfin_bf54x_fb_check_var(struct fb_var_screeninfo *var,
 
         if ((info->fix.line_length * var->yres_virtual) > info->fix.smem_len) {
                 pr_debug("%s: Memory Limit requested yres_virtual = %u\n",
-                         __FUNCTION__, var->yres_virtual);
+                         __func__, var->yres_virtual);
                 return -ENOMEM;
         }
 
@@ -652,7 +652,7 @@ static int __init bfin_bf54x_probe(struct platform_device *pdev)
                 goto out7;
         }
 
-        if (request_irq(info->irq, (void *)bfin_bf54x_irq_error, IRQF_DISABLED,
+        if (request_irq(info->irq, bfin_bf54x_irq_error, IRQF_DISABLED,
                         "PPI ERROR", info) < 0) {
                 printk(KERN_ERR DRIVER_NAME
                        ": unable to request PPI ERROR IRQ\n");
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c
index 833b10c84064..275d9dab0c61 100644
--- a/drivers/video/bw2.c
+++ b/drivers/video/bw2.c
@@ -339,7 +339,7 @@ static int __devinit bw2_probe(struct of_device *op, const struct of_device_id *
 
         dev_set_drvdata(&op->dev, info);
 
-        printk("%s: bwtwo at %lx:%lx\n",
+        printk(KERN_INFO "%s: bwtwo at %lx:%lx\n",
                dp->full_name, par->which_io, par->physbase);
 
         return 0;
@@ -399,10 +399,9 @@ static int __init bw2_init(void)
 
 static void __exit bw2_exit(void)
 {
-        return of_unregister_driver(&bw2_driver);
+        of_unregister_driver(&bw2_driver);
 }
 
-
 module_init(bw2_init);
 module_exit(bw2_exit);
 
diff --git a/drivers/video/cfbcopyarea.c b/drivers/video/cfbcopyarea.c
index b07e419b12d2..df03f3776dcc 100644
--- a/drivers/video/cfbcopyarea.c
+++ b/drivers/video/cfbcopyarea.c
@@ -44,15 +44,16 @@
      */
 
 static void
-bitcpy(unsigned long __iomem *dst, int dst_idx, const unsigned long __iomem *src,
-        int src_idx, int bits, unsigned n, u32 bswapmask)
+bitcpy(struct fb_info *p, unsigned long __iomem *dst, int dst_idx,
+                const unsigned long __iomem *src, int src_idx, int bits,
+                unsigned n, u32 bswapmask)
 {
         unsigned long first, last;
         int const shift = dst_idx-src_idx;
         int left, right;
 
-        first = fb_shifted_pixels_mask_long(dst_idx, bswapmask);
-        last = ~fb_shifted_pixels_mask_long((dst_idx+n) % bits, bswapmask);
+        first = fb_shifted_pixels_mask_long(p, dst_idx, bswapmask);
+        last = ~fb_shifted_pixels_mask_long(p, (dst_idx+n) % bits, bswapmask);
 
         if (!shift) {
                 // Same alignment for source and dest
@@ -202,8 +203,9 @@ bitcpy(unsigned long __iomem *dst, int dst_idx, const unsigned long __iomem *src
      */
 
 static void
-bitcpy_rev(unsigned long __iomem *dst, int dst_idx, const unsigned long __iomem *src,
-                int src_idx, int bits, unsigned n, u32 bswapmask)
+bitcpy_rev(struct fb_info *p, unsigned long __iomem *dst, int dst_idx,
+                const unsigned long __iomem *src, int src_idx, int bits,
+                unsigned n, u32 bswapmask)
 {
         unsigned long first, last;
         int shift;
@@ -221,8 +223,9 @@ bitcpy_rev(unsigned long __iomem *dst, int dst_idx, const unsigned long __iomem
 
         shift = dst_idx-src_idx;
 
-        first = fb_shifted_pixels_mask_long(bits - 1 - dst_idx, bswapmask);
-        last = ~fb_shifted_pixels_mask_long(bits - 1 - ((dst_idx-n) % bits), bswapmask);
+        first = fb_shifted_pixels_mask_long(p, bits - 1 - dst_idx, bswapmask);
+        last = ~fb_shifted_pixels_mask_long(p, bits - 1 - ((dst_idx-n) % bits),
+                                            bswapmask);
 
         if (!shift) {
                 // Same alignment for source and dest
@@ -404,7 +407,7 @@ void cfb_copyarea(struct fb_info *p, const struct fb_copyarea *area)
                         dst_idx &= (bytes - 1);
                         src += src_idx >> (ffs(bits) - 1);
                         src_idx &= (bytes - 1);
-                        bitcpy_rev(dst, dst_idx, src, src_idx, bits,
+                        bitcpy_rev(p, dst, dst_idx, src, src_idx, bits,
                                 width*p->var.bits_per_pixel, bswapmask);
                 }
         } else {
@@ -413,7 +416,7 @@ void cfb_copyarea(struct fb_info *p, const struct fb_copyarea *area)
                         dst_idx &= (bytes - 1);
                         src += src_idx >> (ffs(bits) - 1);
                         src_idx &= (bytes - 1);
-                        bitcpy(dst, dst_idx, src, src_idx, bits,
+                        bitcpy(p, dst, dst_idx, src, src_idx, bits,
                                 width*p->var.bits_per_pixel, bswapmask);
                         dst_idx += bits_per_line;
                         src_idx += bits_per_line;
diff --git a/drivers/video/cfbfillrect.c b/drivers/video/cfbfillrect.c
index 23d70a12e4da..64b35766b2a2 100644
--- a/drivers/video/cfbfillrect.c
+++ b/drivers/video/cfbfillrect.c
@@ -36,16 +36,16 @@
      */
 
 static void
-bitfill_aligned(unsigned long __iomem *dst, int dst_idx, unsigned long pat,
-                unsigned n, int bits, u32 bswapmask)
+bitfill_aligned(struct fb_info *p, unsigned long __iomem *dst, int dst_idx,
+                unsigned long pat, unsigned n, int bits, u32 bswapmask)
 {
         unsigned long first, last;
 
         if (!n)
                 return;
 
-        first = fb_shifted_pixels_mask_long(dst_idx, bswapmask);
-        last = ~fb_shifted_pixels_mask_long((dst_idx+n) % bits, bswapmask);
+        first = fb_shifted_pixels_mask_long(p, dst_idx, bswapmask);
+        last = ~fb_shifted_pixels_mask_long(p, (dst_idx+n) % bits, bswapmask);
 
         if (dst_idx+n <= bits) {
                 // Single word
@@ -93,16 +93,16 @@ bitfill_aligned(unsigned long __iomem *dst, int dst_idx, unsigned long pat,
      */
 
 static void
-bitfill_unaligned(unsigned long __iomem *dst, int dst_idx, unsigned long pat,
-                        int left, int right, unsigned n, int bits)
+bitfill_unaligned(struct fb_info *p, unsigned long __iomem *dst, int dst_idx,
+                  unsigned long pat, int left, int right, unsigned n, int bits)
 {
         unsigned long first, last;
 
         if (!n)
                 return;
 
-        first = FB_SHIFT_HIGH(~0UL, dst_idx);
-        last = ~(FB_SHIFT_HIGH(~0UL, (dst_idx+n) % bits));
+        first = FB_SHIFT_HIGH(p, ~0UL, dst_idx);
+        last = ~(FB_SHIFT_HIGH(p, ~0UL, (dst_idx+n) % bits));
 
         if (dst_idx+n <= bits) {
                 // Single word
@@ -147,8 +147,9 @@ bitfill_unaligned(unsigned long __iomem *dst, int dst_idx, unsigned long pat,
      *  Aligned pattern invert using 32/64-bit memory accesses
      */
 static void
-bitfill_aligned_rev(unsigned long __iomem *dst, int dst_idx, unsigned long pat,
-                unsigned n, int bits, u32 bswapmask)
+bitfill_aligned_rev(struct fb_info *p, unsigned long __iomem *dst,
+                    int dst_idx, unsigned long pat, unsigned n, int bits,
+                    u32 bswapmask)
 {
         unsigned long val = pat, dat;
         unsigned long first, last;
@@ -156,8 +157,8 @@ bitfill_aligned_rev(unsigned long __iomem *dst, int dst_idx, unsigned long pat,
         if (!n)
                 return;
 
-        first = fb_shifted_pixels_mask_long(dst_idx, bswapmask);
-        last = ~fb_shifted_pixels_mask_long((dst_idx+n) % bits, bswapmask);
+        first = fb_shifted_pixels_mask_long(p, dst_idx, bswapmask);
+        last = ~fb_shifted_pixels_mask_long(p, (dst_idx+n) % bits, bswapmask);
 
         if (dst_idx+n <= bits) {
                 // Single word
@@ -217,16 +218,17 @@ bitfill_aligned_rev(unsigned long __iomem *dst, int dst_idx, unsigned long pat,
      */
 
 static void
-bitfill_unaligned_rev(unsigned long __iomem *dst, int dst_idx, unsigned long pat,
-                        int left, int right, unsigned n, int bits)
+bitfill_unaligned_rev(struct fb_info *p, unsigned long __iomem *dst,
+                      int dst_idx, unsigned long pat, int left, int right,
+                      unsigned n, int bits)
 {
         unsigned long first, last, dat;
 
         if (!n)
                 return;
 
-        first = FB_SHIFT_HIGH(~0UL, dst_idx);
-        last = ~(FB_SHIFT_HIGH(~0UL, (dst_idx+n) % bits));
+        first = FB_SHIFT_HIGH(p, ~0UL, dst_idx);
+        last = ~(FB_SHIFT_HIGH(p, ~0UL, (dst_idx+n) % bits));
 
         if (dst_idx+n <= bits) {
                 // Single word
@@ -306,7 +308,8 @@ void cfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect)
                 p->fbops->fb_sync(p);
         if (!left) {
                 u32 bswapmask = fb_compute_bswapmask(p);
-                void (*fill_op32)(unsigned long __iomem *dst, int dst_idx,
+                void (*fill_op32)(struct fb_info *p,
+                                  unsigned long __iomem *dst, int dst_idx,
                                   unsigned long pat, unsigned n, int bits,
                                   u32 bswapmask) = NULL;
 
@@ -325,16 +328,17 @@ void cfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect)
                 while (height--) {
                         dst += dst_idx >> (ffs(bits) - 1);
                         dst_idx &= (bits - 1);
-                        fill_op32(dst, dst_idx, pat, width*bpp, bits, bswapmask);
+                        fill_op32(p, dst, dst_idx, pat, width*bpp, bits,
+                                  bswapmask);
                         dst_idx += p->fix.line_length*8;
                 }
         } else {
                 int right;
                 int r;
                 int rot = (left-dst_idx) % bpp;
-                void (*fill_op)(unsigned long __iomem *dst, int dst_idx,
-                                unsigned long pat, int left, int right,
-                                unsigned n, int bits) = NULL;
+                void (*fill_op)(struct fb_info *p, unsigned long __iomem *dst,
+                                int dst_idx, unsigned long pat, int left,
+                                int right, unsigned n, int bits) = NULL;
 
                 /* rotate pattern to correct start position */
                 pat = pat << rot | pat >> (bpp-rot);
@@ -355,7 +359,7 @@ void cfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect)
                 while (height--) {
                         dst += dst_idx >> (ffs(bits) - 1);
                         dst_idx &= (bits - 1);
-                        fill_op(dst, dst_idx, pat, left, right,
+                        fill_op(p, dst, dst_idx, pat, left, right,
                                 width*bpp, bits);
                         r = (p->fix.line_length*8) % bpp;
                         pat = pat << (bpp-r) | pat >> r;
diff --git a/drivers/video/cfbimgblt.c b/drivers/video/cfbimgblt.c
index f598907b42ad..baed57d3cfff 100644
--- a/drivers/video/cfbimgblt.c
+++ b/drivers/video/cfbimgblt.c
@@ -38,35 +38,31 @@
 #define DEBUG
 
 #ifdef DEBUG
-#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt,__FUNCTION__,## args)
+#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt,__func__,## args)
 #else
 #define DPRINTK(fmt, args...)
 #endif
 
-static const u32 cfb_tab8[] = {
-#if defined(__BIG_ENDIAN)
+static const u32 cfb_tab8_be[] = {
     0x00000000,0x000000ff,0x0000ff00,0x0000ffff,
     0x00ff0000,0x00ff00ff,0x00ffff00,0x00ffffff,
     0xff000000,0xff0000ff,0xff00ff00,0xff00ffff,
     0xffff0000,0xffff00ff,0xffffff00,0xffffffff
-#elif defined(__LITTLE_ENDIAN)
+};
+
+static const u32 cfb_tab8_le[] = {
     0x00000000,0xff000000,0x00ff0000,0xffff0000,
     0x0000ff00,0xff00ff00,0x00ffff00,0xffffff00,
     0x000000ff,0xff0000ff,0x00ff00ff,0xffff00ff,
     0x0000ffff,0xff00ffff,0x00ffffff,0xffffffff
-#else
-#error FIXME: No endianness??
-#endif
 };
 
-static const u32 cfb_tab16[] = {
-#if defined(__BIG_ENDIAN)
+static const u32 cfb_tab16_be[] = {
     0x00000000, 0x0000ffff, 0xffff0000, 0xffffffff
-#elif defined(__LITTLE_ENDIAN)
+};
+
+static const u32 cfb_tab16_le[] = {
     0x00000000, 0xffff0000, 0x0000ffff, 0xffffffff
-#else
-#error FIXME: No endianness??
-#endif
 };
 
 static const u32 cfb_tab32[] = {
@@ -98,7 +94,8 @@ static inline void color_imageblit(const struct fb_image *image,
                 val = 0;
                 
                 if (start_index) {
-                        u32 start_mask = ~fb_shifted_pixels_mask_u32(start_index, bswapmask);
+                        u32 start_mask = ~fb_shifted_pixels_mask_u32(p,
+                                                start_index, bswapmask);
                         val = FB_READL(dst) & start_mask;
                         shift = start_index;
                 }
@@ -108,20 +105,21 @@ static inline void color_imageblit(const struct fb_image *image,
                                 color = palette[*src];
                         else
                                 color = *src;
-                        color <<= FB_LEFT_POS(bpp);
-                        val |= FB_SHIFT_HIGH(color, shift ^ bswapmask);
+                        color <<= FB_LEFT_POS(p, bpp);
+                        val |= FB_SHIFT_HIGH(p, color, shift ^ bswapmask);
                         if (shift >= null_bits) {
                                 FB_WRITEL(val, dst++);
         
                                 val = (shift == null_bits) ? 0 : 
-                                        FB_SHIFT_LOW(color, 32 - shift);
+                                        FB_SHIFT_LOW(p, color, 32 - shift);
                         }
                         shift += bpp;
                         shift &= (32 - 1);
                         src++;
                 }
                 if (shift) {
-                        u32 end_mask = fb_shifted_pixels_mask_u32(shift, bswapmask);
+                        u32 end_mask = fb_shifted_pixels_mask_u32(p, shift,
+                                                bswapmask);
 
                         FB_WRITEL((FB_READL(dst) & end_mask) | val, dst);
                 }
@@ -152,8 +150,8 @@ static inline void slow_imageblit(const struct fb_image *image, struct fb_info *
         u32 bswapmask = fb_compute_bswapmask(p);
 
         dst2 = (u32 __iomem *) dst1;
-        fgcolor <<= FB_LEFT_POS(bpp);
-        bgcolor <<= FB_LEFT_POS(bpp);
+        fgcolor <<= FB_LEFT_POS(p, bpp);
+        bgcolor <<= FB_LEFT_POS(p, bpp);
 
         for (i = image->height; i--; ) {
                 shift = val = 0;
@@ -164,7 +162,8 @@ static inline void slow_imageblit(const struct fb_image *image, struct fb_info *
 
                 /* write leading bits */
                 if (start_index) {
-                        u32 start_mask = ~fb_shifted_pixels_mask_u32(start_index, bswapmask);
+                        u32 start_mask = ~fb_shifted_pixels_mask_u32(p,
+                                                start_index, bswapmask);
                         val = FB_READL(dst) & start_mask;
                         shift = start_index;
                 }
@@ -172,13 +171,13 @@ static inline void slow_imageblit(const struct fb_image *image, struct fb_info *
                 while (j--) {
                         l--;
                         color = (*s & (1 << l)) ? fgcolor : bgcolor;
-                        val |= FB_SHIFT_HIGH(color, shift ^ bswapmask);
+                        val |= FB_SHIFT_HIGH(p, color, shift ^ bswapmask);
                         
                         /* Did the bitshift spill bits to the next long? */
                         if (shift >= null_bits) {
                                 FB_WRITEL(val, dst++);
                                 val = (shift == null_bits) ? 0 :
-                                        FB_SHIFT_LOW(color,32 - shift);
+                                        FB_SHIFT_LOW(p, color, 32 - shift);
                         }
                         shift += bpp;
                         shift &= (32 - 1);
@@ -187,7 +186,8 @@ static inline void slow_imageblit(const struct fb_image *image, struct fb_info *
 
                 /* write trailing bits */
                 if (shift) {
-                        u32 end_mask = fb_shifted_pixels_mask_u32(shift, bswapmask);
+                        u32 end_mask = fb_shifted_pixels_mask_u32(p, shift,
+                                                bswapmask);
 
                         FB_WRITEL((FB_READL(dst) & end_mask) | val, dst);
                 }
@@ -223,13 +223,13 @@ static inline void fast_imageblit(const struct fb_image *image, struct fb_info *
         u32 __iomem *dst;
         const u32 *tab = NULL;
         int i, j, k;
-                
+
         switch (bpp) {
         case 8:
-                tab = cfb_tab8;
+                tab = fb_be_math(p) ? cfb_tab8_be : cfb_tab8_le;
                 break;
         case 16:
-                tab = cfb_tab16;
+                tab = fb_be_math(p) ? cfb_tab16_be : cfb_tab16_le;
                 break;
         case 32:
         default:
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c
index fdc9f43ec30a..0db0fecba93b 100644
--- a/drivers/video/cg14.c
+++ b/drivers/video/cg14.c
@@ -556,7 +556,7 @@ static int __devinit cg14_probe(struct of_device *op, const struct of_device_id
 
         dev_set_drvdata(&op->dev, info);
 
-        printk("%s: cgfourteen at %lx:%lx, %dMB\n",
+        printk(KERN_INFO "%s: cgfourteen at %lx:%lx, %dMB\n",
                dp->full_name,
                par->iospace, par->physbase,
                par->ramsize >> 20);
@@ -605,7 +605,7 @@ static struct of_platform_driver cg14_driver = {
         .remove         = __devexit_p(cg14_remove),
 };
 
-int __init cg14_init(void)
+static int __init cg14_init(void)
 {
         if (fb_get_options("cg14fb", NULL))
                 return -ENODEV;
@@ -613,7 +613,7 @@ int __init cg14_init(void)
         return of_register_driver(&cg14_driver, &of_bus_type);
 }
 
-void __exit cg14_exit(void)
+static void __exit cg14_exit(void)
 {
         of_unregister_driver(&cg14_driver);
 }
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c
index a5c7fb331527..010ea53978f8 100644
--- a/drivers/video/cg3.c
+++ b/drivers/video/cg3.c
@@ -419,7 +419,7 @@ static int __devinit cg3_probe(struct of_device *op,
 
         dev_set_drvdata(&op->dev, info);
 
-        printk("%s: cg3 at %lx:%lx\n",
+        printk(KERN_INFO "%s: cg3 at %lx:%lx\n",
                dp->full_name, par->which_io, par->physbase);
 
         return 0;
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c
index 549891d76ef5..fc90db6da65a 100644
--- a/drivers/video/cg6.c
+++ b/drivers/video/cg6.c
@@ -781,7 +781,7 @@ static int __devinit cg6_probe(struct of_device *op,
 
         dev_set_drvdata(&op->dev, info);
 
-        printk("%s: CGsix [%s] at %lx:%lx\n",
+        printk(KERN_INFO "%s: CGsix [%s] at %lx:%lx\n",
                dp->full_name, info->fix.id,
                par->which_io, par->physbase);
 
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index f7e2d5add831..35ac9d956b3d 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -81,7 +81,7 @@
 /* debug output */
 #ifdef CIRRUSFB_DEBUG
 #define DPRINTK(fmt, args...) \
-        printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args)
+        printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)
 #else
 #define DPRINTK(fmt, args...)
 #endif
@@ -91,7 +91,7 @@
 #define assert(expr) \
         if (!(expr)) { \
                 printk("Assertion failed! %s,%s,%s,line=%d\n", \
-                #expr, __FILE__, __FUNCTION__, __LINE__); \
+                #expr, __FILE__, __func__, __LINE__); \
         }
 #else
 #define assert(expr)
@@ -3117,7 +3117,7 @@ static void bestclock(long freq, long *best, long *nom,
                                 }
                         }
                 }
-                d = ((143181 * n) + f - 1) / f;
+                d = DIV_ROUND_UP(143181 * n, f);
                 if ((d >= 7) && (d <= 63)) {
                         if (d > 31)
                                 d = (d / 2) * 2;
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 022282494d3f..8eda7b60df8f 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -92,7 +92,7 @@
 #include "fbcon.h"
 
 #ifdef FBCONDEBUG
-#  define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args)
+#  define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)
 #else
 #  define DPRINTK(fmt, args...)
 #endif
@@ -620,8 +620,7 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
         if (fb_get_color_depth(&info->var, &info->fix) == 1)
                 erase &= ~0x400;
         logo_height = fb_prepare_logo(info, ops->rotate);
-        logo_lines = (logo_height + vc->vc_font.height - 1) /
-                vc->vc_font.height;
+        logo_lines = DIV_ROUND_UP(logo_height, vc->vc_font.height);
         q = (unsigned short *) (vc->vc_origin +
                                 vc->vc_size_row * rows);
         step = logo_lines * cols;
diff --git a/drivers/video/console/fbcon.h b/drivers/video/console/fbcon.h
index 3706307e70ed..0135e0395456 100644
--- a/drivers/video/console/fbcon.h
+++ b/drivers/video/console/fbcon.h
@@ -104,10 +104,14 @@ struct fbcon_ops {
 #define attr_blink(s) \
         ((s) & 0x8000)
         
-#define mono_col(info)                                                  \
-        (~(0xfff << (max((info)->var.green.length,                      \
-                         max((info)->var.red.length,                    \
-                             (info)->var.blue.length)))) & 0xff)
+
+static inline int mono_col(const struct fb_info *info)
+{
+        __u32 max_len;
+        max_len = max(info->var.green.length, info->var.red.length);
+        max_len = max(info->var.blue.length, max_len);
+        return ~(0xfff << (max_len & 0xff));
+}
 
 static inline int attr_col_ec(int shift, struct vc_data *vc,
                               struct fb_info *info, int is_fg)
diff --git a/drivers/video/fb_draw.h b/drivers/video/fb_draw.h
index a2a0618d86a5..1db622192bde 100644
--- a/drivers/video/fb_draw.h
+++ b/drivers/video/fb_draw.h
@@ -94,41 +94,44 @@ static inline unsigned long fb_rev_pixels_in_long(unsigned long val,
         return val;
 }
 
-static inline u32 fb_shifted_pixels_mask_u32(u32 index, u32 bswapmask)
+static inline u32 fb_shifted_pixels_mask_u32(struct fb_info *p, u32 index,
+                                             u32 bswapmask)
 {
         u32 mask;
 
         if (!bswapmask) {
-                mask = FB_SHIFT_HIGH(~(u32)0, index);
+                mask = FB_SHIFT_HIGH(p, ~(u32)0, index);
         } else {
-                mask = 0xff << FB_LEFT_POS(8);
-                mask = FB_SHIFT_LOW(mask, index & (bswapmask)) & mask;
-                mask = FB_SHIFT_HIGH(mask, index & ~(bswapmask));
+                mask = 0xff << FB_LEFT_POS(p, 8);
+                mask = FB_SHIFT_LOW(p, mask, index & (bswapmask)) & mask;
+                mask = FB_SHIFT_HIGH(p, mask, index & ~(bswapmask));
 #if defined(__i386__) || defined(__x86_64__)
                 /* Shift argument is limited to 0 - 31 on x86 based CPU's */
                 if(index + bswapmask < 32)
 #endif
-                        mask |= FB_SHIFT_HIGH(~(u32)0,
+                        mask |= FB_SHIFT_HIGH(p, ~(u32)0,
                                         (index + bswapmask) & ~(bswapmask));
         }
         return mask;
 }
 
-static inline unsigned long fb_shifted_pixels_mask_long(u32 index, u32 bswapmask)
+static inline unsigned long fb_shifted_pixels_mask_long(struct fb_info *p,
+                                                        u32 index,
+                                                        u32 bswapmask)
 {
         unsigned long mask;
 
         if (!bswapmask) {
-                mask = FB_SHIFT_HIGH(~0UL, index);
+                mask = FB_SHIFT_HIGH(p, ~0UL, index);
         } else {
-                mask = 0xff << FB_LEFT_POS(8);
-                mask = FB_SHIFT_LOW(mask, index & (bswapmask)) & mask;
-                mask = FB_SHIFT_HIGH(mask, index & ~(bswapmask));
+                mask = 0xff << FB_LEFT_POS(p, 8);
+                mask = FB_SHIFT_LOW(p, mask, index & (bswapmask)) & mask;
+                mask = FB_SHIFT_HIGH(p, mask, index & ~(bswapmask));
 #if defined(__i386__) || defined(__x86_64__)
                 /* Shift argument is limited to 0 - 31 on x86 based CPU's */
                 if(index + bswapmask < BITS_PER_LONG)
 #endif
-                        mask |= FB_SHIFT_HIGH(~0UL,
+                        mask |= FB_SHIFT_HIGH(p, ~0UL,
                                         (index + bswapmask) & ~(bswapmask));
         }
         return mask;
@@ -158,8 +161,8 @@ static inline unsigned long fb_rev_pixels_in_long(unsigned long val,
         return val;
 }
 
-#define fb_shifted_pixels_mask_u32(i, b) FB_SHIFT_HIGH(~(u32)0, (i))
-#define fb_shifted_pixels_mask_long(i, b) FB_SHIFT_HIGH(~0UL, (i))
+#define fb_shifted_pixels_mask_u32(p, i, b) FB_SHIFT_HIGH((p), ~(u32)0, (i))
+#define fb_shifted_pixels_mask_long(p, i, b) FB_SHIFT_HIGH((p), ~0UL, (i))
 #define fb_compute_bswapmask(...) 0
 
 #endif  /* CONFIG_FB_CFB_REV_PIXELS_IN_BYTE */
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 01072f4b3e8f..776f7fcd2fbf 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -26,6 +26,7 @@
 #include <linux/init.h>
 #include <linux/linux_logo.h>
 #include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 #include <linux/console.h>
 #ifdef CONFIG_KMOD
 #include <linux/kmod.h>
@@ -632,27 +633,51 @@ int fb_prepare_logo(struct fb_info *info, int rotate) { return 0; }
 int fb_show_logo(struct fb_info *info, int rotate) { return 0; }
 #endif /* CONFIG_LOGO */
 
-static int fbmem_read_proc(char *buf, char **start, off_t offset,
-                           int len, int *eof, void *private)
+static void *fb_seq_start(struct seq_file *m, loff_t *pos)
 {
-        struct fb_info **fi;
-        int clen;
-
-        clen = 0;
-        for (fi = registered_fb; fi < &registered_fb[FB_MAX] && clen < 4000;
-             fi++)
-                if (*fi)
-                        clen += sprintf(buf + clen, "%d %s\n",
-                                        (*fi)->node,
-                                        (*fi)->fix.id);
-        *start = buf + offset;
-        if (clen > offset)
-                clen -= offset;
-        else
-                clen = 0;
-        return clen < len ? clen : len;
+        return (*pos < FB_MAX) ? pos : NULL;
+}
+
+static void *fb_seq_next(struct seq_file *m, void *v, loff_t *pos)
+{
+        (*pos)++;
+        return (*pos < FB_MAX) ? pos : NULL;
+}
+
+static void fb_seq_stop(struct seq_file *m, void *v)
+{
+}
+
+static int fb_seq_show(struct seq_file *m, void *v)
+{
+        int i = *(loff_t *)v;
+        struct fb_info *fi = registered_fb[i];
+
+        if (fi)
+                seq_printf(m, "%d %s\n", fi->node, fi->fix.id);
+        return 0;
+}
+
+static const struct seq_operations proc_fb_seq_ops = {
+        .start  = fb_seq_start,
+        .next   = fb_seq_next,
+        .stop   = fb_seq_stop,
+        .show   = fb_seq_show,
+};
+
+static int proc_fb_open(struct inode *inode, struct file *file)
+{
+        return seq_open(file, &proc_fb_seq_ops);
 }
 
+static const struct file_operations fb_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = proc_fb_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = seq_release,
+};
+
 static ssize_t
 fb_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
 {
@@ -1057,7 +1082,7 @@ fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
         case FBIOPUT_CON2FBMAP:
                 if (copy_from_user(&con2fb, argp, sizeof(con2fb)))
                         return - EFAULT;
-                if (con2fb.console < 0 || con2fb.console > MAX_NR_CONSOLES)
+                if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
                     return -EINVAL;
                 if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
                     return -EINVAL;
@@ -1352,6 +1377,32 @@ static const struct file_operations fb_fops = {
 
 struct class *fb_class;
 EXPORT_SYMBOL(fb_class);
+
+static int fb_check_foreignness(struct fb_info *fi)
+{
+        const bool foreign_endian = fi->flags & FBINFO_FOREIGN_ENDIAN;
+
+        fi->flags &= ~FBINFO_FOREIGN_ENDIAN;
+
+#ifdef __BIG_ENDIAN
+        fi->flags |= foreign_endian ? 0 : FBINFO_BE_MATH;
+#else
+        fi->flags |= foreign_endian ? FBINFO_BE_MATH : 0;
+#endif /* __BIG_ENDIAN */
+
+        if (fi->flags & FBINFO_BE_MATH && !fb_be_math(fi)) {
+                pr_err("%s: enable CONFIG_FB_BIG_ENDIAN to "
+                       "support this framebuffer\n", fi->fix.id);
+                return -ENOSYS;
+        } else if (!(fi->flags & FBINFO_BE_MATH) && fb_be_math(fi)) {
+                pr_err("%s: enable CONFIG_FB_LITTLE_ENDIAN to "
+                       "support this framebuffer\n", fi->fix.id);
+                return -ENOSYS;
+        }
+
+        return 0;
+}
+
 /**
  *      register_framebuffer - registers a frame buffer device
  *      @fb_info: frame buffer info structure
@@ -1371,6 +1422,10 @@ register_framebuffer(struct fb_info *fb_info)
 
         if (num_registered_fb == FB_MAX)
                 return -ENXIO;
+
+        if (fb_check_foreignness(fb_info))
+                return -ENOSYS;
+
         num_registered_fb++;
         for (i = 0 ; i < FB_MAX; i++)
                 if (!registered_fb[i])
@@ -1503,7 +1558,7 @@ void fb_set_suspend(struct fb_info *info, int state)
 static int __init
 fbmem_init(void)
 {
-        create_proc_read_entry("fb", 0, NULL, fbmem_read_proc, NULL);
+        proc_create("fb", 0, NULL, &fb_proc_fops);
 
         if (register_chrdev(FB_MAJOR,"fb",&fb_fops))
                 printk("unable to get major %d for fb devs\n", FB_MAJOR);
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index d7e24889650e..93dca3e2aa50 100644
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -32,7 +32,6 @@
 static int ffb_setcolreg(unsigned, unsigned, unsigned, unsigned,
                          unsigned, struct fb_info *);
 static int ffb_blank(int, struct fb_info *);
-static void ffb_init_fix(struct fb_info *);
 
 static void ffb_imageblit(struct fb_info *, const struct fb_image *);
 static void ffb_fillrect(struct fb_info *, const struct fb_fillrect *);
@@ -1001,7 +1000,7 @@ static int __devinit ffb_probe(struct of_device *op,
 
         dev_set_drvdata(&op->dev, info);
 
-        printk("%s: %s at %016lx, type %d, "
+        printk(KERN_INFO "%s: %s at %016lx, type %d, "
                "DAC pnum[%x] rev[%d] manuf_rev[%d]\n",
                dp->full_name,
                ((par->flags & FFB_FLAG_AFB) ? "AFB" : "FFB"),
@@ -1062,7 +1061,7 @@ static struct of_platform_driver ffb_driver = {
         .remove         = __devexit_p(ffb_remove),
 };
 
-int __init ffb_init(void)
+static int __init ffb_init(void)
 {
         if (fb_get_options("ffb", NULL))
                 return -ENODEV;
@@ -1070,7 +1069,7 @@ int __init ffb_init(void)
         return of_register_driver(&ffb_driver, &of_bus_type);
 }
 
-void __exit ffb_exit(void)
+static void __exit ffb_exit(void)
 {
         of_unregister_driver(&ffb_driver);
 }
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
new file mode 100644
index 000000000000..b50bb03cb5ab
--- /dev/null
+++ b/drivers/video/fsl-diu-fb.c
@@ -0,0 +1,1721 @@
+/*
+ * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ *  Freescale DIU Frame Buffer device driver
+ *
+ *  Authors: Hongjun Chen <hong-jun.chen@freescale.com>
+ *           Paul Widmer <paul.widmer@freescale.com>
+ *           Srikanth Srinivasan <srikanth.srinivasan@freescale.com>
+ *           York Sun <yorksun@freescale.com>
+ *
+ *   Based on imxfb.c Copyright (C) 2004 S.Hauer, Pengutronix
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/dma-mapping.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/clk.h>
+#include <linux/uaccess.h>
+#include <linux/vmalloc.h>
+
+#include <linux/of_platform.h>
+
+#include <sysdev/fsl_soc.h>
+#include "fsl-diu-fb.h"
+
+/*
+ * These parameters give default parameters
+ * for video output 1024x768,
+ * FIXME - change timing to proper amounts
+ * hsync 31.5kHz, vsync 60Hz
+ */
+static struct fb_videomode __devinitdata fsl_diu_default_mode = {
+        .refresh        = 60,
+        .xres           = 1024,
+        .yres           = 768,
+        .pixclock       = 15385,
+        .left_margin    = 160,
+        .right_margin   = 24,
+        .upper_margin   = 29,
+        .lower_margin   = 3,
+        .hsync_len      = 136,
+        .vsync_len      = 6,
+        .sync           = FB_SYNC_COMP_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+        .vmode          = FB_VMODE_NONINTERLACED
+};
+
+static struct fb_videomode __devinitdata fsl_diu_mode_db[] = {
+        {
+                .name           = "1024x768-60",
+                .refresh        = 60,
+                .xres           = 1024,
+                .yres           = 768,
+                .pixclock       = 15385,
+                .left_margin    = 160,
+                .right_margin   = 24,
+                .upper_margin   = 29,
+                .lower_margin   = 3,
+                .hsync_len      = 136,
+                .vsync_len      = 6,
+                .sync           = FB_SYNC_COMP_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+                .vmode          = FB_VMODE_NONINTERLACED
+        },
+        {
+                .name           = "1024x768-70",
+                .refresh        = 70,
+                .xres           = 1024,
+                .yres           = 768,
+                .pixclock       = 16886,
+                .left_margin    = 3,
+                .right_margin   = 3,
+                .upper_margin   = 2,
+                .lower_margin   = 2,
+                .hsync_len      = 40,
+                .vsync_len      = 18,
+                .sync           = FB_SYNC_COMP_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+                .vmode          = FB_VMODE_NONINTERLACED
+        },
+        {
+                .name           = "1024x768-75",
+                .refresh        = 75,
+                .xres           = 1024,
+                .yres           = 768,
+                .pixclock       = 15009,
+                .left_margin    = 3,
+                .right_margin   = 3,
+                .upper_margin   = 2,
+                .lower_margin   = 2,
+                .hsync_len      = 80,
+                .vsync_len      = 32,
+                .sync           = FB_SYNC_COMP_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+                .vmode          = FB_VMODE_NONINTERLACED
+        },
+        {
+                .name           = "1280x1024-60",
+                .refresh        = 60,
+                .xres           = 1280,
+                .yres           = 1024,
+                .pixclock       = 9375,
+                .left_margin    = 38,
+                .right_margin   = 128,
+                .upper_margin   = 2,
+                .lower_margin   = 7,
+                .hsync_len      = 216,
+                .vsync_len      = 37,
+                .sync           = FB_SYNC_COMP_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+                .vmode          = FB_VMODE_NONINTERLACED
+        },
+        {
+                .name           = "1280x1024-70",
+                .refresh        = 70,
+                .xres           = 1280,
+                .yres           = 1024,
+                .pixclock       = 9380,
+                .left_margin    = 6,
+                .right_margin   = 6,
+                .upper_margin   = 4,
+                .lower_margin   = 4,
+                .hsync_len      = 60,
+                .vsync_len      = 94,
+                .sync           = FB_SYNC_COMP_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+                .vmode          = FB_VMODE_NONINTERLACED
+        },
+        {
+                .name           = "1280x1024-75",
+                .refresh        = 75,
+                .xres           = 1280,
+                .yres           = 1024,
+                .pixclock       = 9380,
+                .left_margin    = 6,
+                .right_margin   = 6,
+                .upper_margin   = 4,
+                .lower_margin   = 4,
+                .hsync_len      = 60,
+                .vsync_len      = 15,
+                .sync           = FB_SYNC_COMP_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+                .vmode          = FB_VMODE_NONINTERLACED
+        },
+        {
+                .name           = "320x240",            /* for AOI only */
+                .refresh        = 60,
+                .xres           = 320,
+                .yres           = 240,
+                .pixclock       = 15385,
+                .left_margin    = 0,
+                .right_margin   = 0,
+                .upper_margin   = 0,
+                .lower_margin   = 0,
+                .hsync_len      = 0,
+                .vsync_len      = 0,
+                .sync           = FB_SYNC_COMP_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+                .vmode          = FB_VMODE_NONINTERLACED
+        },
+        {
+                .name           = "1280x480-60",
+                .refresh        = 60,
+                .xres           = 1280,
+                .yres           = 480,
+                .pixclock       = 18939,
+                .left_margin    = 353,
+                .right_margin   = 47,
+                .upper_margin   = 39,
+                .lower_margin   = 4,
+                .hsync_len      = 8,
+                .vsync_len      = 2,
+                .sync           = FB_SYNC_COMP_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+                .vmode          = FB_VMODE_NONINTERLACED
+        },
+};
+
+static char *fb_mode = "1024x768-32@60";
+static unsigned long default_bpp = 32;
+static int monitor_port;
+
+#if defined(CONFIG_NOT_COHERENT_CACHE)
+static u8 *coherence_data;
+static size_t coherence_data_size;
+static unsigned int d_cache_line_size;
+#endif
+
+static DEFINE_SPINLOCK(diu_lock);
+
+struct fsl_diu_data {
+        struct fb_info *fsl_diu_info[FSL_AOI_NUM - 1];
+                                /*FSL_AOI_NUM has one dummy AOI */
+        struct device_attribute dev_attr;
+        struct diu_ad *dummy_ad;
+        void *dummy_aoi_virt;
+        unsigned int irq;
+        int fb_enabled;
+        int monitor_port;
+};
+
+struct mfb_info {
+        int index;
+        int type;
+        char *id;
+        int registered;
+        int blank;
+        unsigned long pseudo_palette[16];
+        struct diu_ad *ad;
+        int cursor_reset;
+        unsigned char g_alpha;
+        unsigned int count;
+        int x_aoi_d;            /* aoi display x offset to physical screen */
+        int y_aoi_d;            /* aoi display y offset to physical screen */
+        struct fsl_diu_data *parent;
+};
+
+
+static struct mfb_info mfb_template[] = {
+        {               /* AOI 0 for plane 0 */
+        .index = 0,
+        .type = MFB_TYPE_OUTPUT,
+        .id = "Panel0",
+        .registered = 0,
+        .count = 0,
+        .x_aoi_d = 0,
+        .y_aoi_d = 0,
+        },
+        {               /* AOI 0 for plane 1 */
+        .index = 1,
+        .type = MFB_TYPE_OUTPUT,
+        .id = "Panel1 AOI0",
+        .registered = 0,
+        .g_alpha = 0xff,
+        .count = 0,
+        .x_aoi_d = 0,
+        .y_aoi_d = 0,
+        },
+        {               /* AOI 1 for plane 1 */
+        .index = 2,
+        .type = MFB_TYPE_OUTPUT,
+        .id = "Panel1 AOI1",
+        .registered = 0,
+        .g_alpha = 0xff,
+        .count = 0,
+        .x_aoi_d = 0,
+        .y_aoi_d = 480,
+        },
+        {               /* AOI 0 for plane 2 */
+        .index = 3,
+        .type = MFB_TYPE_OUTPUT,
+        .id = "Panel2 AOI0",
+        .registered = 0,
+        .g_alpha = 0xff,
+        .count = 0,
+        .x_aoi_d = 640,
+        .y_aoi_d = 0,
+        },
+        {               /* AOI 1 for plane 2 */
+        .index = 4,
+        .type = MFB_TYPE_OUTPUT,
+        .id = "Panel2 AOI1",
+        .registered = 0,
+        .g_alpha = 0xff,
+        .count = 0,
+        .x_aoi_d = 640,
+        .y_aoi_d = 480,
+        },
+};
+
+static struct diu_hw dr = {
+        .mode = MFB_MODE1,
+        .reg_lock = __SPIN_LOCK_UNLOCKED(diu_hw.reg_lock),
+};
+
+static struct diu_pool pool;
+
+/*      To allocate memory for framebuffer. First try __get_free_pages(). If it
+ *      fails, try rh_alloc. The reason is __get_free_pages() cannot allocate
+ *      very large memory (more than 4MB). We don't want to allocate all memory
+ *      in rheap since small memory allocation/deallocation will fragment the
+ *      rheap and make the furture large allocation fail.
+ */
+
+void *fsl_diu_alloc(unsigned long size, phys_addr_t *phys)
+{
+        void *virt;
+
+        pr_debug("size=%lu\n", size);
+
+        virt = (void *)__get_free_pages(GFP_DMA | __GFP_ZERO, get_order(size));
+        if (virt) {
+                *phys = virt_to_phys(virt);
+                pr_debug("virt %p, phys=%llx\n", virt, (uint64_t) *phys);
+                return virt;
+        }
+        if (!diu_ops.diu_mem) {
+                printk(KERN_INFO "%s: no diu_mem."
+                        " To reserve more memory, put 'diufb=15M' "
+                        "in the command line\n", __func__);
+                return NULL;
+        }
+
+        virt = (void *)rh_alloc(&diu_ops.diu_rh_info, size, "DIU");
+        if (virt) {
+                *phys = virt_to_bus(virt);
+                memset(virt, 0, size);
+        }
+
+        pr_debug("rh virt=%p phys=%lx\n", virt, *phys);
+
+        return virt;
+}
+
+void fsl_diu_free(void *p, unsigned long size)
+{
+        pr_debug("p=%p size=%lu\n", p, size);
+
+        if (!p)
+                return;
+
+        if ((p >= diu_ops.diu_mem) &&
+            (p < (diu_ops.diu_mem + diu_ops.diu_size))) {
+                pr_debug("rh\n");
+                rh_free(&diu_ops.diu_rh_info, (unsigned long) p);
+        } else {
+                pr_debug("dma\n");
+                free_pages((unsigned long)p, get_order(size));
+        }
+}
+
+static int fsl_diu_enable_panel(struct fb_info *info)
+{
+        struct mfb_info *pmfbi, *cmfbi, *mfbi = info->par;
+        struct diu *hw = dr.diu_reg;
+        struct diu_ad *ad = mfbi->ad;
+        struct fsl_diu_data *machine_data = mfbi->parent;
+        int res = 0;
+
+        pr_debug("enable_panel index %d\n", mfbi->index);
+        if (mfbi->type != MFB_TYPE_OFF) {
+                switch (mfbi->index) {
+                case 0:                         /* plane 0 */
+                        if (hw->desc[0] != ad->paddr)
+                                out_be32(&hw->desc[0], ad->paddr);
+                        break;
+                case 1:                         /* plane 1 AOI 0 */
+                        cmfbi = machine_data->fsl_diu_info[2]->par;
+                        if (hw->desc[1] != ad->paddr) { /* AOI0 closed */
+                                if (cmfbi->count > 0)   /* AOI1 open */
+                                        ad->next_ad =
+                                                cpu_to_le32(cmfbi->ad->paddr);
+                                else
+                                        ad->next_ad = 0;
+                                out_be32(&hw->desc[1], ad->paddr);
+                        }
+                        break;
+                case 3:                         /* plane 2 AOI 0 */
+                        cmfbi = machine_data->fsl_diu_info[4]->par;
+                        if (hw->desc[2] != ad->paddr) { /* AOI0 closed */
+                                if (cmfbi->count > 0)   /* AOI1 open */
+                                        ad->next_ad =
+                                                cpu_to_le32(cmfbi->ad->paddr);
+                                else
+                                        ad->next_ad = 0;
+                                out_be32(&hw->desc[2], ad->paddr);
+                        }
+                        break;
+                case 2:                         /* plane 1 AOI 1 */
+                        pmfbi = machine_data->fsl_diu_info[1]->par;
+                        ad->next_ad = 0;
+                        if (hw->desc[1] == machine_data->dummy_ad->paddr)
+                                out_be32(&hw->desc[1], ad->paddr);
+                        else                                    /* AOI0 open */
+                                pmfbi->ad->next_ad = cpu_to_le32(ad->paddr);
+                        break;
+                case 4:                         /* plane 2 AOI 1 */
+                        pmfbi = machine_data->fsl_diu_info[3]->par;
+                        ad->next_ad = 0;
+                        if (hw->desc[2] == machine_data->dummy_ad->paddr)
+                                out_be32(&hw->desc[2], ad->paddr);
+                        else                            /* AOI0 was open */
+                                pmfbi->ad->next_ad = cpu_to_le32(ad->paddr);
+                        break;
+                default:
+                        res = -EINVAL;
+                        break;
+                }
+        } else
+                res = -EINVAL;
+        return res;
+}
+
+static int fsl_diu_disable_panel(struct fb_info *info)
+{
+        struct mfb_info *pmfbi, *cmfbi, *mfbi = info->par;
+        struct diu *hw = dr.diu_reg;
+        struct diu_ad *ad = mfbi->ad;
+        struct fsl_diu_data *machine_data = mfbi->parent;
+        int res = 0;
+
+        switch (mfbi->index) {
+        case 0:                                 /* plane 0 */
+                if (hw->desc[0] != machine_data->dummy_ad->paddr)
+                        out_be32(&hw->desc[0],
+                                machine_data->dummy_ad->paddr);
+                break;
+        case 1:                                 /* plane 1 AOI 0 */
+                cmfbi = machine_data->fsl_diu_info[2]->par;
+                if (cmfbi->count > 0)   /* AOI1 is open */
+                        out_be32(&hw->desc[1], cmfbi->ad->paddr);
+                                        /* move AOI1 to the first */
+                else                    /* AOI1 was closed */
+                        out_be32(&hw->desc[1],
+                                machine_data->dummy_ad->paddr);
+                                        /* close AOI 0 */
+                break;
+        case 3:                                 /* plane 2 AOI 0 */
+                cmfbi = machine_data->fsl_diu_info[4]->par;
+                if (cmfbi->count > 0)   /* AOI1 is open */
+                        out_be32(&hw->desc[2], cmfbi->ad->paddr);
+                                        /* move AOI1 to the first */
+                else                    /* AOI1 was closed */
+                        out_be32(&hw->desc[2],
+                                machine_data->dummy_ad->paddr);
+                                        /* close AOI 0 */
+                break;
+        case 2:                                 /* plane 1 AOI 1 */
+                pmfbi = machine_data->fsl_diu_info[1]->par;
+                if (hw->desc[1] != ad->paddr) {
+                                /* AOI1 is not the first in the chain */
+                        if (pmfbi->count > 0)
+                                        /* AOI0 is open, must be the first */
+                                pmfbi->ad->next_ad = 0;
+                } else                  /* AOI1 is the first in the chain */
+                        out_be32(&hw->desc[1], machine_data->dummy_ad->paddr);
+                                        /* close AOI 1 */
+                break;
+        case 4:                                 /* plane 2 AOI 1 */
+                pmfbi = machine_data->fsl_diu_info[3]->par;
+                if (hw->desc[2] != ad->paddr) {
+                                /* AOI1 is not the first in the chain */
+                        if (pmfbi->count > 0)
+                                /* AOI0 is open, must be the first */
+                                pmfbi->ad->next_ad = 0;
+                } else          /* AOI1 is the first in the chain */
+                        out_be32(&hw->desc[2], machine_data->dummy_ad->paddr);
+                                /* close AOI 1 */
+                break;
+        default:
+                res = -EINVAL;
+                break;
+        }
+
+        return res;
+}
+
+static void enable_lcdc(struct fb_info *info)
+{
+        struct diu *hw = dr.diu_reg;
+        struct mfb_info *mfbi = info->par;
+        struct fsl_diu_data *machine_data = mfbi->parent;
+
+        if (!machine_data->fb_enabled) {
+                out_be32(&hw->diu_mode, dr.mode);
+                machine_data->fb_enabled++;
+        }
+}
+
+static void disable_lcdc(struct fb_info *info)
+{
+        struct diu *hw = dr.diu_reg;
+        struct mfb_info *mfbi = info->par;
+        struct fsl_diu_data *machine_data = mfbi->parent;
+
+        if (machine_data->fb_enabled) {
+                out_be32(&hw->diu_mode, 0);
+                machine_data->fb_enabled = 0;
+        }
+}
+
+static void adjust_aoi_size_position(struct fb_var_screeninfo *var,
+                                struct fb_info *info)
+{
+        struct mfb_info *lower_aoi_mfbi, *upper_aoi_mfbi, *mfbi = info->par;
+        struct fsl_diu_data *machine_data = mfbi->parent;
+        int available_height, upper_aoi_bottom, index = mfbi->index;
+        int lower_aoi_is_open, upper_aoi_is_open;
+        __u32 base_plane_width, base_plane_height, upper_aoi_height;
+
+        base_plane_width = machine_data->fsl_diu_info[0]->var.xres;
+        base_plane_height = machine_data->fsl_diu_info[0]->var.yres;
+
+        switch (index) {
+        case 0:
+                if (mfbi->x_aoi_d != 0)
+                        mfbi->x_aoi_d = 0;
+                if (mfbi->y_aoi_d != 0)
+                        mfbi->y_aoi_d = 0;
+                break;
+        case 1:                 /* AOI 0 */
+        case 3:
+                lower_aoi_mfbi = machine_data->fsl_diu_info[index+1]->par;
+                lower_aoi_is_open = lower_aoi_mfbi->count > 0 ? 1 : 0;
+                if (var->xres > base_plane_width)
+                        var->xres = base_plane_width;
+                if ((mfbi->x_aoi_d + var->xres) > base_plane_width)
+                        mfbi->x_aoi_d = base_plane_width - var->xres;
+
+                if (lower_aoi_is_open)
+                        available_height = lower_aoi_mfbi->y_aoi_d;
+                else
+                        available_height = base_plane_height;
+                if (var->yres > available_height)
+                        var->yres = available_height;
+                if ((mfbi->y_aoi_d + var->yres) > available_height)
+                        mfbi->y_aoi_d = available_height - var->yres;
+                break;
+        case 2:                 /* AOI 1 */
+        case 4:
+                upper_aoi_mfbi = machine_data->fsl_diu_info[index-1]->par;
+                upper_aoi_height =
+                                machine_data->fsl_diu_info[index-1]->var.yres;
+                upper_aoi_bottom = upper_aoi_mfbi->y_aoi_d + upper_aoi_height;
+                upper_aoi_is_open = upper_aoi_mfbi->count > 0 ? 1 : 0;
+                if (var->xres > base_plane_width)
+                        var->xres = base_plane_width;
+                if ((mfbi->x_aoi_d + var->xres) > base_plane_width)
+                        mfbi->x_aoi_d = base_plane_width - var->xres;
+                if (mfbi->y_aoi_d < 0)
+                        mfbi->y_aoi_d = 0;
+                if (upper_aoi_is_open) {
+                        if (mfbi->y_aoi_d < upper_aoi_bottom)
+                                mfbi->y_aoi_d = upper_aoi_bottom;
+                        available_height = base_plane_height
+                                                - upper_aoi_bottom;
+                } else
+                        available_height = base_plane_height;
+                if (var->yres > available_height)
+                        var->yres = available_height;
+                if ((mfbi->y_aoi_d + var->yres) > base_plane_height)
+                        mfbi->y_aoi_d = base_plane_height - var->yres;
+                break;
+        }
+}
+/*
+ * Checks to see if the hardware supports the state requested by var passed
+ * in. This function does not alter the hardware state! If the var passed in
+ * is slightly off by what the hardware can support then we alter the var
+ * PASSED in to what we can do. If the hardware doesn't support mode change
+ * a -EINVAL will be returned by the upper layers.
+ */
+static int fsl_diu_check_var(struct fb_var_screeninfo *var,
+                                struct fb_info *info)
+{
+        unsigned long htotal, vtotal;
+
+        pr_debug("check_var xres: %d\n", var->xres);
+        pr_debug("check_var yres: %d\n", var->yres);
+
+        if (var->xres_virtual < var->xres)
+                var->xres_virtual = var->xres;
+        if (var->yres_virtual < var->yres)
+                var->yres_virtual = var->yres;
+
+        if (var->xoffset < 0)
+                var->xoffset = 0;
+
+        if (var->yoffset < 0)
+                var->yoffset = 0;
+
+        if (var->xoffset + info->var.xres > info->var.xres_virtual)
+                var->xoffset = info->var.xres_virtual - info->var.xres;
+
+        if (var->yoffset + info->var.yres > info->var.yres_virtual)
+                var->yoffset = info->var.yres_virtual - info->var.yres;
+
+        if ((var->bits_per_pixel != 32) && (var->bits_per_pixel != 24) &&
+            (var->bits_per_pixel != 16))
+                var->bits_per_pixel = default_bpp;
+
+        switch (var->bits_per_pixel) {
+        case 16:
+                var->red.length = 5;
+                var->red.offset = 11;
+                var->red.msb_right = 0;
+
+                var->green.length = 6;
+                var->green.offset = 5;
+                var->green.msb_right = 0;
+
+                var->blue.length = 5;
+                var->blue.offset = 0;
+                var->blue.msb_right = 0;
+
+                var->transp.length = 0;
+                var->transp.offset = 0;
+                var->transp.msb_right = 0;
+                break;
+        case 24:
+                var->red.length = 8;
+                var->red.offset = 0;
+                var->red.msb_right = 0;
+
+                var->green.length = 8;
+                var->green.offset = 8;
+                var->green.msb_right = 0;
+
+                var->blue.length = 8;
+                var->blue.offset = 16;
+                var->blue.msb_right = 0;
+
+                var->transp.length = 0;
+                var->transp.offset = 0;
+                var->transp.msb_right = 0;
+                break;
+        case 32:
+                var->red.length = 8;
+                var->red.offset = 16;
+                var->red.msb_right = 0;
+
+                var->green.length = 8;
+                var->green.offset = 8;
+                var->green.msb_right = 0;
+
+                var->blue.length = 8;
+                var->blue.offset = 0;
+                var->blue.msb_right = 0;
+
+                var->transp.length = 8;
+                var->transp.offset = 24;
+                var->transp.msb_right = 0;
+
+                break;
+        }
+        /* If the pixclock is below the minimum spec'd value then set to
+         * refresh rate for 60Hz since this is supported by most monitors.
+         * Refer to Documentation/fb/ for calculations.
+         */
+        if ((var->pixclock < MIN_PIX_CLK) || (var->pixclock > MAX_PIX_CLK)) {
+                htotal = var->xres + var->right_margin + var->hsync_len +
+                    var->left_margin;
+                vtotal = var->yres + var->lower_margin + var->vsync_len +
+                    var->upper_margin;
+                var->pixclock = (vtotal * htotal * 6UL) / 100UL;
+                var->pixclock = KHZ2PICOS(var->pixclock);
+                pr_debug("pixclock set for 60Hz refresh = %u ps\n",
+                        var->pixclock);
+        }
+
+        var->height = -1;
+        var->width = -1;
+        var->grayscale = 0;
+
+        /* Copy nonstd field to/from sync for fbset usage */
+        var->sync |= var->nonstd;
+        var->nonstd |= var->sync;
+
+        adjust_aoi_size_position(var, info);
+        return 0;
+}
+
+static void set_fix(struct fb_info *info)
+{
+        struct fb_fix_screeninfo *fix = &info->fix;
+        struct fb_var_screeninfo *var = &info->var;
+        struct mfb_info *mfbi = info->par;
+
+        strncpy(fix->id, mfbi->id, strlen(mfbi->id));
+        fix->line_length = var->xres_virtual * var->bits_per_pixel / 8;
+        fix->type = FB_TYPE_PACKED_PIXELS;
+        fix->accel = FB_ACCEL_NONE;
+        fix->visual = FB_VISUAL_TRUECOLOR;
+        fix->xpanstep = 1;
+        fix->ypanstep = 1;
+}
+
+static void update_lcdc(struct fb_info *info)
+{
+        struct fb_var_screeninfo *var = &info->var;
+        struct mfb_info *mfbi = info->par;
+        struct fsl_diu_data *machine_data = mfbi->parent;
+        struct diu *hw;
+        int i, j;
+        char __iomem *cursor_base, *gamma_table_base;
+
+        u32 temp;
+
+        hw = dr.diu_reg;
+
+        if (mfbi->type == MFB_TYPE_OFF) {
+                fsl_diu_disable_panel(info);
+                return;
+        }
+
+        diu_ops.set_monitor_port(machine_data->monitor_port);
+        gamma_table_base = pool.gamma.vaddr;
+        cursor_base = pool.cursor.vaddr;
+        /* Prep for DIU init  - gamma table, cursor table */
+
+        for (i = 0; i <= 2; i++)
+           for (j = 0; j <= 255; j++)
+              *gamma_table_base++ = j;
+
+        diu_ops.set_gamma_table(machine_data->monitor_port, pool.gamma.vaddr);
+
+        pr_debug("update-lcdc: HW - %p\n Disabling DIU\n", hw);
+        disable_lcdc(info);
+
+        /* Program DIU registers */
+
+        out_be32(&hw->gamma, pool.gamma.paddr);
+        out_be32(&hw->cursor, pool.cursor.paddr);
+
+        out_be32(&hw->bgnd, 0x007F7F7F);        /* BGND */
+        out_be32(&hw->bgnd_wb, 0);              /* BGND_WB */
+        out_be32(&hw->disp_size, (var->yres << 16 | var->xres));
+                                                /* DISP SIZE */
+        pr_debug("DIU xres: %d\n", var->xres);
+        pr_debug("DIU yres: %d\n", var->yres);
+
+        out_be32(&hw->wb_size, 0); /* WB SIZE */
+        out_be32(&hw->wb_mem_addr, 0); /* WB MEM ADDR */
+
+        /* Horizontal and vertical configuration register */
+        temp = var->left_margin << 22 | /* BP_H */
+               var->hsync_len << 11 |   /* PW_H */
+               var->right_margin;       /* FP_H */
+
+        out_be32(&hw->hsyn_para, temp);
+
+        temp = var->upper_margin << 22 | /* BP_V */
+               var->vsync_len << 11 |    /* PW_V  */
+               var->lower_margin;        /* FP_V  */
+
+        out_be32(&hw->vsyn_para, temp);
+
+        pr_debug("DIU right_margin - %d\n", var->right_margin);
+        pr_debug("DIU left_margin - %d\n", var->left_margin);
+        pr_debug("DIU hsync_len - %d\n", var->hsync_len);
+        pr_debug("DIU upper_margin - %d\n", var->upper_margin);
+        pr_debug("DIU lower_margin - %d\n", var->lower_margin);
+        pr_debug("DIU vsync_len - %d\n", var->vsync_len);
+        pr_debug("DIU HSYNC - 0x%08x\n", hw->hsyn_para);
+        pr_debug("DIU VSYNC - 0x%08x\n", hw->vsyn_para);
+
+        diu_ops.set_pixel_clock(var->pixclock);
+
+        out_be32(&hw->syn_pol, 0);      /* SYNC SIGNALS POLARITY */
+        out_be32(&hw->thresholds, 0x00037800); /* The Thresholds */
+        out_be32(&hw->int_status, 0);   /* INTERRUPT STATUS */
+        out_be32(&hw->plut, 0x01F5F666);
+
+        /* Enable the DIU */
+        enable_lcdc(info);
+}
+
+static int map_video_memory(struct fb_info *info)
+{
+        phys_addr_t phys;
+
+        pr_debug("info->var.xres_virtual = %d\n", info->var.xres_virtual);
+        pr_debug("info->var.yres_virtual = %d\n", info->var.yres_virtual);
+        pr_debug("info->fix.line_length  = %d\n", info->fix.line_length);
+
+        info->fix.smem_len = info->fix.line_length * info->var.yres_virtual;
+        pr_debug("MAP_VIDEO_MEMORY: smem_len = %d\n", info->fix.smem_len);
+        info->screen_base = fsl_diu_alloc(info->fix.smem_len, &phys);
+        if (info->screen_base == 0) {
+                printk(KERN_ERR "Unable to allocate fb memory\n");
+                return -ENOMEM;
+        }
+        info->fix.smem_start = (unsigned long) phys;
+        info->screen_size = info->fix.smem_len;
+
+        pr_debug("Allocated fb @ paddr=0x%08lx, size=%d.\n",
+                                info->fix.smem_start,
+                info->fix.smem_len);
+        pr_debug("screen base %p\n", info->screen_base);
+
+        return 0;
+}
+
+static void unmap_video_memory(struct fb_info *info)
+{
+        fsl_diu_free(info->screen_base, info->fix.smem_len);
+        info->screen_base = 0;
+        info->fix.smem_start = 0;
+        info->fix.smem_len = 0;
+}
+
+/*
+ * Using the fb_var_screeninfo in fb_info we set the resolution of this
+ * particular framebuffer. This function alters the fb_fix_screeninfo stored
+ * in fb_info. It does not alter var in fb_info since we are using that
+ * data. This means we depend on the data in var inside fb_info to be
+ * supported by the hardware. fsl_diu_check_var is always called before
+ * fsl_diu_set_par to ensure this.
+ */
+static int fsl_diu_set_par(struct fb_info *info)
+{
+        unsigned long len;
+        struct fb_var_screeninfo *var = &info->var;
+        struct mfb_info *mfbi = info->par;
+        struct fsl_diu_data *machine_data = mfbi->parent;
+        struct diu_ad *ad = mfbi->ad;
+        struct diu *hw;
+
+        hw = dr.diu_reg;
+
+        set_fix(info);
+        mfbi->cursor_reset = 1;
+
+        len = info->var.yres_virtual * info->fix.line_length;
+        /* Alloc & dealloc each time resolution/bpp change */
+        if (len != info->fix.smem_len) {
+                if (info->fix.smem_start)
+                        unmap_video_memory(info);
+                pr_debug("SET PAR: smem_len = %d\n", info->fix.smem_len);
+
+                /* Memory allocation for framebuffer */
+                if (map_video_memory(info)) {
+                        printk(KERN_ERR "Unable to allocate fb memory 1\n");
+                        return -ENOMEM;
+                }
+        }
+
+        ad->pix_fmt =
+                diu_ops.get_pixel_format(var->bits_per_pixel,
+                                         machine_data->monitor_port);
+        ad->addr    = cpu_to_le32(info->fix.smem_start);
+        ad->src_size_g_alpha = cpu_to_le32((var->yres << 12) |
+                                var->xres) | mfbi->g_alpha;
+        /* fix me. AOI should not be greater than display size */
+        ad->aoi_size    = cpu_to_le32((var->yres << 16) | var->xres);
+        ad->offset_xyi = 0;
+        ad->offset_xyd = cpu_to_le32((mfbi->y_aoi_d << 16) | mfbi->x_aoi_d);
+
+        /* Disable chroma keying function */
+        ad->ckmax_r = 0;
+        ad->ckmax_g = 0;
+        ad->ckmax_b = 0;
+
+        ad->ckmin_r = 255;
+        ad->ckmin_g = 255;
+        ad->ckmin_b = 255;
+
+        if (mfbi->index == 0)
+                update_lcdc(info);
+        return 0;
+}
+
+static inline __u32 CNVT_TOHW(__u32 val, __u32 width)
+{
+        return ((val<<width) + 0x7FFF - val)>>16;
+}
+
+/*
+ * Set a single color register. The values supplied have a 16 bit magnitude
+ * which needs to be scaled in this function for the hardware. Things to take
+ * into consideration are how many color registers, if any, are supported with
+ * the current color visual. With truecolor mode no color palettes are
+ * supported. Here a psuedo palette is created which we store the value in
+ * pseudo_palette in struct fb_info. For pseudocolor mode we have a limited
+ * color palette.
+ */
+static int fsl_diu_setcolreg(unsigned regno, unsigned red, unsigned green,
+                           unsigned blue, unsigned transp, struct fb_info *info)
+{
+        int ret = 1;
+
+        /*
+         * If greyscale is true, then we convert the RGB value
+         * to greyscale no matter what visual we are using.
+         */
+        if (info->var.grayscale)
+                red = green = blue = (19595 * red + 38470 * green +
+                                      7471 * blue) >> 16;
+        switch (info->fix.visual) {
+        case FB_VISUAL_TRUECOLOR:
+                /*
+                 * 16-bit True Colour.  We encode the RGB value
+                 * according to the RGB bitfield information.
+                 */
+                if (regno < 16) {
+                        u32 *pal = info->pseudo_palette;
+                        u32 v;
+
+                        red = CNVT_TOHW(red, info->var.red.length);
+                        green = CNVT_TOHW(green, info->var.green.length);
+                        blue = CNVT_TOHW(blue, info->var.blue.length);
+                        transp = CNVT_TOHW(transp, info->var.transp.length);
+
+                        v = (red << info->var.red.offset) |
+                            (green << info->var.green.offset) |
+                            (blue << info->var.blue.offset) |
+                            (transp << info->var.transp.offset);
+
+                        pal[regno] = v;
+                        ret = 0;
+                }
+                break;
+        case FB_VISUAL_STATIC_PSEUDOCOLOR:
+        case FB_VISUAL_PSEUDOCOLOR:
+                break;
+        }
+
+        return ret;
+}
+
+/*
+ * Pan (or wrap, depending on the `vmode' field) the display using the
+ * 'xoffset' and 'yoffset' fields of the 'var' structure. If the values
+ * don't fit, return -EINVAL.
+ */
+static int fsl_diu_pan_display(struct fb_var_screeninfo *var,
+                             struct fb_info *info)
+{
+        if ((info->var.xoffset == var->xoffset) &&
+            (info->var.yoffset == var->yoffset))
+                return 0;       /* No change, do nothing */
+
+        if (var->xoffset < 0 || var->yoffset < 0
+            || var->xoffset + info->var.xres > info->var.xres_virtual
+            || var->yoffset + info->var.yres > info->var.yres_virtual)
+                return -EINVAL;
+
+        info->var.xoffset = var->xoffset;
+        info->var.yoffset = var->yoffset;
+
+        if (var->vmode & FB_VMODE_YWRAP)
+                info->var.vmode |= FB_VMODE_YWRAP;
+        else
+                info->var.vmode &= ~FB_VMODE_YWRAP;
+
+        return 0;
+}
+
+/*
+ * Blank the screen if blank_mode != 0, else unblank. Return 0 if blanking
+ * succeeded, != 0 if un-/blanking failed.
+ * blank_mode == 2: suspend vsync
+ * blank_mode == 3: suspend hsync
+ * blank_mode == 4: powerdown
+ */
+static int fsl_diu_blank(int blank_mode, struct fb_info *info)
+{
+        struct mfb_info *mfbi = info->par;
+
+        mfbi->blank = blank_mode;
+
+        switch (blank_mode) {
+        case FB_BLANK_VSYNC_SUSPEND:
+        case FB_BLANK_HSYNC_SUSPEND:
+        /* FIXME: fixes to enable_panel and enable lcdc needed */
+        case FB_BLANK_NORMAL:
+        /*      fsl_diu_disable_panel(info);*/
+                break;
+        case FB_BLANK_POWERDOWN:
+        /*      disable_lcdc(info);     */
+                break;
+        case FB_BLANK_UNBLANK:
+        /*      fsl_diu_enable_panel(info);*/
+                break;
+        }
+
+        return 0;
+}
+
+static int fsl_diu_ioctl(struct fb_info *info, unsigned int cmd,
+                       unsigned long arg)
+{
+        struct mfb_info *mfbi = info->par;
+        struct diu_ad *ad = mfbi->ad;
+        struct mfb_chroma_key ck;
+        unsigned char global_alpha;
+        struct aoi_display_offset aoi_d;
+        __u32 pix_fmt;
+        void __user *buf = (void __user *)arg;
+
+        if (!arg)
+                return -EINVAL;
+        switch (cmd) {
+        case MFB_SET_PIXFMT:
+                if (copy_from_user(&pix_fmt, buf, sizeof(pix_fmt)))
+                        return -EFAULT;
+                ad->pix_fmt = pix_fmt;
+                pr_debug("Set pixel format to 0x%08x\n", ad->pix_fmt);
+                break;
+        case MFB_GET_PIXFMT:
+                pix_fmt = ad->pix_fmt;
+                if (copy_to_user(buf, &pix_fmt, sizeof(pix_fmt)))
+                        return -EFAULT;
+                pr_debug("get pixel format 0x%08x\n", ad->pix_fmt);
+                break;
+        case MFB_SET_AOID:
+                if (copy_from_user(&aoi_d, buf, sizeof(aoi_d)))
+                        return -EFAULT;
+                mfbi->x_aoi_d = aoi_d.x_aoi_d;
+                mfbi->y_aoi_d = aoi_d.y_aoi_d;
+                pr_debug("set AOI display offset of index %d to (%d,%d)\n",
+                                 mfbi->index, aoi_d.x_aoi_d, aoi_d.y_aoi_d);
+                fsl_diu_check_var(&info->var, info);
+                fsl_diu_set_par(info);
+                break;
+        case MFB_GET_AOID:
+                aoi_d.x_aoi_d = mfbi->x_aoi_d;
+                aoi_d.y_aoi_d = mfbi->y_aoi_d;
+                if (copy_to_user(buf, &aoi_d, sizeof(aoi_d)))
+                        return -EFAULT;
+                pr_debug("get AOI display offset of index %d (%d,%d)\n",
+                                mfbi->index, aoi_d.x_aoi_d, aoi_d.y_aoi_d);
+                break;
+        case MFB_GET_ALPHA:
+                global_alpha = mfbi->g_alpha;
+                if (copy_to_user(buf, &global_alpha, sizeof(global_alpha)))
+                        return -EFAULT;
+                pr_debug("get global alpha of index %d\n", mfbi->index);
+                break;
+        case MFB_SET_ALPHA:
+                /* set panel information */
+                if (copy_from_user(&global_alpha, buf, sizeof(global_alpha)))
+                        return -EFAULT;
+                ad->src_size_g_alpha = (ad->src_size_g_alpha & (~0xff)) |
+                                                        (global_alpha & 0xff);
+                mfbi->g_alpha = global_alpha;
+                pr_debug("set global alpha for index %d\n", mfbi->index);
+                break;
+        case MFB_SET_CHROMA_KEY:
+                /* set panel winformation */
+                if (copy_from_user(&ck, buf, sizeof(ck)))
+                        return -EFAULT;
+
+                if (ck.enable &&
+                   (ck.red_max < ck.red_min ||
+                    ck.green_max < ck.green_min ||
+                    ck.blue_max < ck.blue_min))
+                        return -EINVAL;
+
+                if (!ck.enable) {
+                        ad->ckmax_r = 0;
+                        ad->ckmax_g = 0;
+                        ad->ckmax_b = 0;
+                        ad->ckmin_r = 255;
+                        ad->ckmin_g = 255;
+                        ad->ckmin_b = 255;
+                } else {
+                        ad->ckmax_r = ck.red_max;
+                        ad->ckmax_g = ck.green_max;
+                        ad->ckmax_b = ck.blue_max;
+                        ad->ckmin_r = ck.red_min;
+                        ad->ckmin_g = ck.green_min;
+                        ad->ckmin_b = ck.blue_min;
+                }
+                pr_debug("set chroma key\n");
+                break;
+        case FBIOGET_GWINFO:
+                if (mfbi->type == MFB_TYPE_OFF)
+                        return -ENODEV;
+                /* get graphic window information */
+                if (copy_to_user(buf, ad, sizeof(*ad)))
+                        return -EFAULT;
+                break;
+        case FBIOGET_HWCINFO:
+                pr_debug("FBIOGET_HWCINFO:0x%08x\n", FBIOGET_HWCINFO);
+                break;
+        case FBIOPUT_MODEINFO:
+                pr_debug("FBIOPUT_MODEINFO:0x%08x\n", FBIOPUT_MODEINFO);
+                break;
+        case FBIOGET_DISPINFO:
+                pr_debug("FBIOGET_DISPINFO:0x%08x\n", FBIOGET_DISPINFO);
+                break;
+
+        default:
+                printk(KERN_ERR "Unknown ioctl command (0x%08X)\n", cmd);
+                return -ENOIOCTLCMD;
+        }
+
+        return 0;
+}
+
+/* turn on fb if count == 1
+ */
+static int fsl_diu_open(struct fb_info *info, int user)
+{
+        struct mfb_info *mfbi = info->par;
+        int res = 0;
+
+        spin_lock(&diu_lock);
+        mfbi->count++;
+        if (mfbi->count == 1) {
+                pr_debug("open plane index %d\n", mfbi->index);
+                fsl_diu_check_var(&info->var, info);
+                res = fsl_diu_set_par(info);
+                if (res < 0)
+                        mfbi->count--;
+                else {
+                        res = fsl_diu_enable_panel(info);
+                        if (res < 0)
+                                mfbi->count--;
+                }
+        }
+
+        spin_unlock(&diu_lock);
+        return res;
+}
+
+/* turn off fb if count == 0
+ */
+static int fsl_diu_release(struct fb_info *info, int user)
+{
+        struct mfb_info *mfbi = info->par;
+        int res = 0;
+
+        spin_lock(&diu_lock);
+        mfbi->count--;
+        if (mfbi->count == 0) {
+                pr_debug("release plane index %d\n", mfbi->index);
+                res = fsl_diu_disable_panel(info);
+                if (res < 0)
+                        mfbi->count++;
+        }
+        spin_unlock(&diu_lock);
+        return res;
+}
+
+static struct fb_ops fsl_diu_ops = {
+        .owner = THIS_MODULE,
+        .fb_check_var = fsl_diu_check_var,
+        .fb_set_par = fsl_diu_set_par,
+        .fb_setcolreg = fsl_diu_setcolreg,
+        .fb_blank = fsl_diu_blank,
+        .fb_pan_display = fsl_diu_pan_display,
+        .fb_fillrect = cfb_fillrect,
+        .fb_copyarea = cfb_copyarea,
+        .fb_imageblit = cfb_imageblit,
+        .fb_ioctl = fsl_diu_ioctl,
+        .fb_open = fsl_diu_open,
+        .fb_release = fsl_diu_release,
+};
+
+static int init_fbinfo(struct fb_info *info)
+{
+        struct mfb_info *mfbi = info->par;
+
+        info->device = NULL;
+        info->var.activate = FB_ACTIVATE_NOW;
+        info->fbops = &fsl_diu_ops;
+        info->flags = FBINFO_FLAG_DEFAULT;
+        info->pseudo_palette = &mfbi->pseudo_palette;
+
+        /* Allocate colormap */
+        fb_alloc_cmap(&info->cmap, 16, 0);
+        return 0;
+}
+
+static int install_fb(struct fb_info *info)
+{
+        int rc;
+        struct mfb_info *mfbi = info->par;
+        const char *aoi_mode, *init_aoi_mode = "320x240";
+
+        if (init_fbinfo(info))
+                return -EINVAL;
+
+        if (mfbi->index == 0)   /* plane 0 */
+                aoi_mode = fb_mode;
+        else
+                aoi_mode = init_aoi_mode;
+        pr_debug("mode used = %s\n", aoi_mode);
+        rc = fb_find_mode(&info->var, info, aoi_mode, fsl_diu_mode_db,
+             ARRAY_SIZE(fsl_diu_mode_db), &fsl_diu_default_mode, default_bpp);
+
+        switch (rc) {
+        case 1:
+                pr_debug("using mode specified in @mode\n");
+                break;
+        case 2:
+                pr_debug("using mode specified in @mode "
+                        "with ignored refresh rate\n");
+                break;
+        case 3:
+                pr_debug("using mode default mode\n");
+                break;
+        case 4:
+                pr_debug("using mode from list\n");
+                break;
+        default:
+                pr_debug("rc = %d\n", rc);
+                pr_debug("failed to find mode\n");
+                return -EINVAL;
+                break;
+        }
+
+        pr_debug("xres_virtual %d\n", info->var.xres_virtual);
+        pr_debug("bits_per_pixel %d\n", info->var.bits_per_pixel);
+
+        pr_debug("info->var.yres_virtual = %d\n", info->var.yres_virtual);
+        pr_debug("info->fix.line_length = %d\n", info->fix.line_length);
+
+        if (mfbi->type == MFB_TYPE_OFF)
+                mfbi->blank = FB_BLANK_NORMAL;
+        else
+                mfbi->blank = FB_BLANK_UNBLANK;
+
+        if (fsl_diu_check_var(&info->var, info)) {
+                printk(KERN_ERR "fb_check_var failed");
+                fb_dealloc_cmap(&info->cmap);
+                return -EINVAL;
+        }
+
+        if (fsl_diu_set_par(info)) {
+                printk(KERN_ERR "fb_set_par failed");
+                fb_dealloc_cmap(&info->cmap);
+                return -EINVAL;
+        }
+
+        if (register_framebuffer(info) < 0) {
+                printk(KERN_ERR "register_framebuffer failed");
+                unmap_video_memory(info);
+                fb_dealloc_cmap(&info->cmap);
+                return -EINVAL;
+        }
+
+        mfbi->registered = 1;
+        printk(KERN_INFO "fb%d: %s fb device registered successfully.\n",
+                 info->node, info->fix.id);
+
+        return 0;
+}
+
+static void __exit uninstall_fb(struct fb_info *info)
+{
+        struct mfb_info *mfbi = info->par;
+
+        if (!mfbi->registered)
+                return;
+
+        unregister_framebuffer(info);
+        unmap_video_memory(info);
+        if (&info->cmap)
+                fb_dealloc_cmap(&info->cmap);
+
+        mfbi->registered = 0;
+}
+
+static irqreturn_t fsl_diu_isr(int irq, void *dev_id)
+{
+        struct diu *hw = dr.diu_reg;
+        unsigned int status = in_be32(&hw->int_status);
+
+        if (status) {
+                /* This is the workaround for underrun */
+                if (status & INT_UNDRUN) {
+                        out_be32(&hw->diu_mode, 0);
+                        pr_debug("Err: DIU occurs underrun!\n");
+                        udelay(1);
+                        out_be32(&hw->diu_mode, 1);
+                }
+#if defined(CONFIG_NOT_COHERENT_CACHE)
+                else if (status & INT_VSYNC) {
+                        unsigned int i;
+                        for (i = 0; i < coherence_data_size;
+                                i += d_cache_line_size)
+                                __asm__ __volatile__ (
+                                        "dcbz 0, %[input]"
+                                ::[input]"r"(&coherence_data[i]));
+                }
+#endif
+                return IRQ_HANDLED;
+        }
+        return IRQ_NONE;
+}
+
+static int request_irq_local(int irq)
+{
+        unsigned long status, ints;
+        struct diu *hw;
+        int ret;
+
+        hw = dr.diu_reg;
+
+        /* Read to clear the status */
+        status = in_be32(&hw->int_status);
+
+        ret = request_irq(irq, fsl_diu_isr, 0, "diu", 0);
+        if (ret)
+                pr_info("Request diu IRQ failed.\n");
+        else {
+                ints = INT_PARERR | INT_LS_BF_VS;
+#if !defined(CONFIG_NOT_COHERENT_CACHE)
+                ints |= INT_VSYNC;
+#endif
+                if (dr.mode == MFB_MODE2 || dr.mode == MFB_MODE3)
+                        ints |= INT_VSYNC_WB;
+
+                /* Read to clear the status */
+                status = in_be32(&hw->int_status);
+                out_be32(&hw->int_mask, ints);
+        }
+        return ret;
+}
+
+static void free_irq_local(int irq)
+{
+        struct diu *hw = dr.diu_reg;
+
+        /* Disable all LCDC interrupt */
+        out_be32(&hw->int_mask, 0x1f);
+
+        free_irq(irq, 0);
+}
+
+#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 fsl_diu_suspend(struct of_device *dev, pm_message_t state)
+{
+        struct fsl_diu_data *machine_data;
+
+        machine_data = dev_get_drvdata(&ofdev->dev);
+        disable_lcdc(machine_data->fsl_diu_info[0]);
+
+        return 0;
+}
+
+static int fsl_diu_resume(struct of_device *dev)
+{
+        struct fsl_diu_data *machine_data;
+
+        machine_data = dev_get_drvdata(&ofdev->dev);
+        enable_lcdc(machine_data->fsl_diu_info[0]);
+
+        return 0;
+}
+
+#else
+#define fsl_diu_suspend NULL
+#define fsl_diu_resume NULL
+#endif                          /* CONFIG_PM */
+
+/* Align to 64-bit(8-byte), 32-byte, etc. */
+static int allocate_buf(struct diu_addr *buf, u32 size, u32 bytes_align)
+{
+        u32 offset, ssize;
+        u32 mask;
+        dma_addr_t paddr = 0;
+
+        ssize = size + bytes_align;
+        buf->vaddr = dma_alloc_coherent(0, ssize, &paddr, GFP_DMA | __GFP_ZERO);
+        if (!buf->vaddr)
+                return -ENOMEM;
+
+        buf->paddr = (__u32) paddr;
+
+        mask = bytes_align - 1;
+        offset = (u32)buf->paddr & mask;
+        if (offset) {
+                buf->offset = bytes_align - offset;
+                buf->paddr = (u32)buf->paddr + offset;
+        } else
+                buf->offset = 0;
+        return 0;
+}
+
+static void free_buf(struct diu_addr *buf, u32 size, u32 bytes_align)
+{
+        dma_free_coherent(0, size + bytes_align,
+                                buf->vaddr, (buf->paddr - buf->offset));
+        return;
+}
+
+static ssize_t store_monitor(struct device *device,
+        struct device_attribute *attr, const char *buf, size_t count)
+{
+        int old_monitor_port;
+        unsigned long val;
+        struct fsl_diu_data *machine_data =
+                container_of(attr, struct fsl_diu_data, dev_attr);
+
+        if (strict_strtoul(buf, 10, &val))
+                return 0;
+
+        old_monitor_port = machine_data->monitor_port;
+        machine_data->monitor_port = diu_ops.set_sysfs_monitor_port(val);
+
+        if (old_monitor_port != machine_data->monitor_port) {
+                /* All AOIs need adjust pixel format
+                 * fsl_diu_set_par only change the pixsel format here
+                 * unlikely to fail. */
+                fsl_diu_set_par(machine_data->fsl_diu_info[0]);
+                fsl_diu_set_par(machine_data->fsl_diu_info[1]);
+                fsl_diu_set_par(machine_data->fsl_diu_info[2]);
+                fsl_diu_set_par(machine_data->fsl_diu_info[3]);
+                fsl_diu_set_par(machine_data->fsl_diu_info[4]);
+        }
+        return count;
+}
+
+static ssize_t show_monitor(struct device *device,
+        struct device_attribute *attr, char *buf)
+{
+        struct fsl_diu_data *machine_data =
+                container_of(attr, struct fsl_diu_data, dev_attr);
+        return diu_ops.show_monitor_port(machine_data->monitor_port, buf);
+}
+
+static int fsl_diu_probe(struct of_device *ofdev,
+        const struct of_device_id *match)
+{
+        struct device_node *np = ofdev->node;
+        struct mfb_info *mfbi;
+        phys_addr_t dummy_ad_addr;
+        int ret, i, error = 0;
+        struct resource res;
+        struct fsl_diu_data *machine_data;
+
+        machine_data = kzalloc(sizeof(struct fsl_diu_data), GFP_KERNEL);
+        if (!machine_data)
+                return -ENOMEM;
+
+        for (i = 0; i < ARRAY_SIZE(machine_data->fsl_diu_info); i++) {
+                machine_data->fsl_diu_info[i] =
+                        framebuffer_alloc(sizeof(struct mfb_info), &ofdev->dev);
+                if (!machine_data->fsl_diu_info[i]) {
+                        dev_err(&ofdev->dev, "cannot allocate memory\n");
+                        ret = -ENOMEM;
+                        goto error2;
+                }
+                mfbi = machine_data->fsl_diu_info[i]->par;
+                memcpy(mfbi, &mfb_template[i], sizeof(struct mfb_info));
+                mfbi->parent = machine_data;
+        }
+
+        ret = of_address_to_resource(np, 0, &res);
+        if (ret) {
+                dev_err(&ofdev->dev, "could not obtain DIU address\n");
+                goto error;
+        }
+        if (!res.start) {
+                dev_err(&ofdev->dev, "invalid DIU address\n");
+                goto error;
+        }
+        dev_dbg(&ofdev->dev, "%s, res.start: 0x%08x\n", __func__, res.start);
+
+        dr.diu_reg = ioremap(res.start, sizeof(struct diu));
+        if (!dr.diu_reg) {
+                dev_err(&ofdev->dev, "Err: can't map DIU registers!\n");
+                ret = -EFAULT;
+                goto error2;
+        }
+
+        out_be32(&dr.diu_reg->diu_mode, 0);             /* disable DIU anyway*/
+
+        /* Get the IRQ of the DIU */
+        machine_data->irq = irq_of_parse_and_map(np, 0);
+
+        if (!machine_data->irq) {
+                dev_err(&ofdev->dev, "could not get DIU IRQ\n");
+                ret = -EINVAL;
+                goto error;
+        }
+        machine_data->monitor_port = monitor_port;
+
+        /* Area descriptor memory pool aligns to 64-bit boundary */
+        if (allocate_buf(&pool.ad, sizeof(struct diu_ad) * FSL_AOI_NUM, 8))
+                return -ENOMEM;
+
+        /* Get memory for Gamma Table  - 32-byte aligned memory */
+        if (allocate_buf(&pool.gamma, 768, 32)) {
+                ret = -ENOMEM;
+                goto error;
+        }
+
+        /* For performance, cursor bitmap buffer aligns to 32-byte boundary */
+        if (allocate_buf(&pool.cursor, MAX_CURS * MAX_CURS * 2, 32)) {
+                ret = -ENOMEM;
+                goto error;
+        }
+
+        i = ARRAY_SIZE(machine_data->fsl_diu_info);
+        machine_data->dummy_ad = (struct diu_ad *)
+                        ((u32)pool.ad.vaddr + pool.ad.offset) + i;
+        machine_data->dummy_ad->paddr = pool.ad.paddr +
+                        i * sizeof(struct diu_ad);
+        machine_data->dummy_aoi_virt = fsl_diu_alloc(64, &dummy_ad_addr);
+        if (!machine_data->dummy_aoi_virt) {
+                ret = -ENOMEM;
+                goto error;
+        }
+        machine_data->dummy_ad->addr = cpu_to_le32(dummy_ad_addr);
+        machine_data->dummy_ad->pix_fmt = 0x88882317;
+        machine_data->dummy_ad->src_size_g_alpha = cpu_to_le32((4 << 12) | 4);
+        machine_data->dummy_ad->aoi_size = cpu_to_le32((4 << 16) |  2);
+        machine_data->dummy_ad->offset_xyi = 0;
+        machine_data->dummy_ad->offset_xyd = 0;
+        machine_data->dummy_ad->next_ad = 0;
+
+        out_be32(&dr.diu_reg->desc[0], machine_data->dummy_ad->paddr);
+        out_be32(&dr.diu_reg->desc[1], machine_data->dummy_ad->paddr);
+        out_be32(&dr.diu_reg->desc[2], machine_data->dummy_ad->paddr);
+
+        for (i = 0; i < ARRAY_SIZE(machine_data->fsl_diu_info); i++) {
+                machine_data->fsl_diu_info[i]->fix.smem_start = 0;
+                mfbi = machine_data->fsl_diu_info[i]->par;
+                mfbi->ad = (struct diu_ad *)((u32)pool.ad.vaddr
+                                        + pool.ad.offset) + i;
+                mfbi->ad->paddr = pool.ad.paddr + i * sizeof(struct diu_ad);
+                ret = install_fb(machine_data->fsl_diu_info[i]);
+                if (ret) {
+                        dev_err(&ofdev->dev,
+                                "Failed to register framebuffer %d\n",
+                                i);
+                        goto error;
+                }
+        }
+
+        if (request_irq_local(machine_data->irq)) {
+                dev_err(machine_data->fsl_diu_info[0]->dev,
+                        "could not request irq for diu.");
+                goto error;
+        }
+
+        machine_data->dev_attr.attr.name = "monitor";
+        machine_data->dev_attr.attr.mode = S_IRUGO|S_IWUSR;
+        machine_data->dev_attr.show = show_monitor;
+        machine_data->dev_attr.store = store_monitor;
+        error = device_create_file(machine_data->fsl_diu_info[0]->dev,
+                                  &machine_data->dev_attr);
+        if (error) {
+                dev_err(machine_data->fsl_diu_info[0]->dev,
+                        "could not create sysfs %s file\n",
+                        machine_data->dev_attr.attr.name);
+        }
+
+        dev_set_drvdata(&ofdev->dev, machine_data);
+        return 0;
+
+error:
+        for (i = ARRAY_SIZE(machine_data->fsl_diu_info);
+                i > 0; i--)
+                uninstall_fb(machine_data->fsl_diu_info[i - 1]);
+        if (pool.ad.vaddr)
+                free_buf(&pool.ad, sizeof(struct diu_ad) * FSL_AOI_NUM, 8);
+        if (pool.gamma.vaddr)
+                free_buf(&pool.gamma, 768, 32);
+        if (pool.cursor.vaddr)
+                free_buf(&pool.cursor, MAX_CURS * MAX_CURS * 2, 32);
+        if (machine_data->dummy_aoi_virt)
+                fsl_diu_free(machine_data->dummy_aoi_virt, 64);
+        iounmap(dr.diu_reg);
+
+error2:
+        for (i = 0; i < ARRAY_SIZE(machine_data->fsl_diu_info); i++)
+                if (machine_data->fsl_diu_info[i])
+                        framebuffer_release(machine_data->fsl_diu_info[i]);
+        kfree(machine_data);
+
+        return ret;
+}
+
+
+static int fsl_diu_remove(struct of_device *ofdev)
+{
+        struct fsl_diu_data *machine_data;
+        int i;
+
+        machine_data = dev_get_drvdata(&ofdev->dev);
+        disable_lcdc(machine_data->fsl_diu_info[0]);
+        free_irq_local(machine_data->irq);
+        for (i = ARRAY_SIZE(machine_data->fsl_diu_info); i > 0; i--)
+                uninstall_fb(machine_data->fsl_diu_info[i - 1]);
+        if (pool.ad.vaddr)
+                free_buf(&pool.ad, sizeof(struct diu_ad) * FSL_AOI_NUM, 8);
+        if (pool.gamma.vaddr)
+                free_buf(&pool.gamma, 768, 32);
+        if (pool.cursor.vaddr)
+                free_buf(&pool.cursor, MAX_CURS * MAX_CURS * 2, 32);
+        if (machine_data->dummy_aoi_virt)
+                fsl_diu_free(machine_data->dummy_aoi_virt, 64);
+        iounmap(dr.diu_reg);
+        for (i = 0; i < ARRAY_SIZE(machine_data->fsl_diu_info); i++)
+                if (machine_data->fsl_diu_info[i])
+                        framebuffer_release(machine_data->fsl_diu_info[i]);
+        kfree(machine_data);
+
+        return 0;
+}
+
+#ifndef MODULE
+static int __init fsl_diu_setup(char *options)
+{
+        char *opt;
+        unsigned long val;
+
+        if (!options || !*options)
+                return 0;
+
+        while ((opt = strsep(&options, ",")) != NULL) {
+                if (!*opt)
+                        continue;
+                if (!strncmp(opt, "monitor=", 8)) {
+                        if (!strict_strtoul(opt + 8, 10, &val) && (val <= 2))
+                                monitor_port = val;
+                } else if (!strncmp(opt, "bpp=", 4)) {
+                        if (!strict_strtoul(opt + 4, 10, &val))
+                                default_bpp = val;
+                } else
+                        fb_mode = opt;
+        }
+
+        return 0;
+}
+#endif
+
+static struct of_device_id fsl_diu_match[] = {
+        {
+                .compatible = "fsl,diu",
+        },
+        {}
+};
+MODULE_DEVICE_TABLE(of, fsl_diu_match);
+
+static struct of_platform_driver fsl_diu_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "fsl_diu",
+        .match_table    = fsl_diu_match,
+        .probe          = fsl_diu_probe,
+        .remove         = fsl_diu_remove,
+        .suspend        = fsl_diu_suspend,
+        .resume         = fsl_diu_resume,
+};
+
+static int __init fsl_diu_init(void)
+{
+#ifdef CONFIG_NOT_COHERENT_CACHE
+        struct device_node *np;
+        const u32 *prop;
+#endif
+        int ret;
+#ifndef MODULE
+        char *option;
+
+        /*
+         * For kernel boot options (in 'video=xxxfb:<options>' format)
+         */
+        if (fb_get_options("fslfb", &option))
+                return -ENODEV;
+        fsl_diu_setup(option);
+#endif
+        printk(KERN_INFO "Freescale DIU driver\n");
+
+#ifdef CONFIG_NOT_COHERENT_CACHE
+        np = of_find_node_by_type(NULL, "cpu");
+        if (!np) {
+                printk(KERN_ERR "Err: can't find device node 'cpu'\n");
+                return -ENODEV;
+        }
+
+        prop = of_get_property(np, "d-cache-size", NULL);
+        if (prop == NULL)
+                return -ENODEV;
+
+        /* Freescale PLRU requires 13/8 times the cache size to do a proper
+           displacement flush
+         */
+        coherence_data_size = *prop * 13;
+        coherence_data_size /= 8;
+
+        prop = of_get_property(np, "d-cache-line-size", NULL);
+        if (prop == NULL)
+                return -ENODEV;
+        d_cache_line_size = *prop;
+
+        of_node_put(np);
+        coherence_data = vmalloc(coherence_data_size);
+        if (!coherence_data)
+                return -ENOMEM;
+#endif
+        ret = of_register_platform_driver(&fsl_diu_driver);
+        if (ret) {
+                printk(KERN_ERR
+                        "fsl-diu: failed to register platform driver\n");
+#if defined(CONFIG_NOT_COHERENT_CACHE)
+                vfree(coherence_data);
+#endif
+                iounmap(dr.diu_reg);
+        }
+        return ret;
+}
+
+static void __exit fsl_diu_exit(void)
+{
+        of_unregister_platform_driver(&fsl_diu_driver);
+#if defined(CONFIG_NOT_COHERENT_CACHE)
+        vfree(coherence_data);
+#endif
+}
+
+module_init(fsl_diu_init);
+module_exit(fsl_diu_exit);
+
+MODULE_AUTHOR("York Sun <yorksun@freescale.com>");
+MODULE_DESCRIPTION("Freescale DIU framebuffer driver");
+MODULE_LICENSE("GPL");
+
+module_param_named(mode, fb_mode, charp, 0);
+MODULE_PARM_DESC(mode,
+        "Specify resolution as \"<xres>x<yres>[-<bpp>][@<refresh>]\" ");
+module_param_named(bpp, default_bpp, ulong, 0);
+MODULE_PARM_DESC(bpp, "Specify bit-per-pixel if not specified mode");
+module_param_named(monitor, monitor_port, int, 0);
+MODULE_PARM_DESC(monitor,
+        "Specify the monitor port (0, 1 or 2) if supported by the platform");
+
diff --git a/drivers/video/fsl-diu-fb.h b/drivers/video/fsl-diu-fb.h
new file mode 100644
index 000000000000..fc295d7ea463
--- /dev/null
+++ b/drivers/video/fsl-diu-fb.h
@@ -0,0 +1,223 @@
+/*
+ * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ *  Freescale DIU Frame Buffer device driver
+ *
+ *  Authors: Hongjun Chen <hong-jun.chen@freescale.com>
+ *           Paul Widmer <paul.widmer@freescale.com>
+ *           Srikanth Srinivasan <srikanth.srinivasan@freescale.com>
+ *           York Sun <yorksun@freescale.com>
+ *
+ *   Based on imxfb.c Copyright (C) 2004 S.Hauer, Pengutronix
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ */
+
+#ifndef __FSL_DIU_FB_H__
+#define __FSL_DIU_FB_H__
+
+/* Arbitrary threshold to determine the allocation method
+ * See mpc8610fb_set_par(), map_video_memory(), and unmap_video_memory()
+ */
+#define MEM_ALLOC_THRESHOLD (1024*768*4+32)
+/* Minimum value that the pixel clock can be set to in pico seconds
+ * This is determined by platform clock/3 where the minimum platform
+ * clock is 533MHz. This gives 5629 pico seconds.
+ */
+#define MIN_PIX_CLK 5629
+#define MAX_PIX_CLK 96096
+
+#include <linux/types.h>
+
+struct mfb_alpha {
+        int enable;
+        int alpha;
+};
+
+struct mfb_chroma_key {
+        int enable;
+        __u8  red_max;
+        __u8  green_max;
+        __u8  blue_max;
+        __u8  red_min;
+        __u8  green_min;
+        __u8  blue_min;
+};
+
+struct aoi_display_offset {
+        int x_aoi_d;
+        int y_aoi_d;
+};
+
+#define MFB_SET_CHROMA_KEY      _IOW('M', 1, struct mfb_chroma_key)
+#define MFB_WAIT_FOR_VSYNC      _IOW('F', 0x20, u_int32_t)
+#define MFB_SET_BRIGHTNESS      _IOW('M', 3, __u8)
+
+#define MFB_SET_ALPHA           0x80014d00
+#define MFB_GET_ALPHA           0x40014d00
+#define MFB_SET_AOID            0x80084d04
+#define MFB_GET_AOID            0x40084d04
+#define MFB_SET_PIXFMT          0x80014d08
+#define MFB_GET_PIXFMT          0x40014d08
+
+#define FBIOGET_GWINFO          0x46E0
+#define FBIOPUT_GWINFO          0x46E1
+
+#ifdef __KERNEL__
+#include <linux/spinlock.h>
+
+/*
+ * These are the fields of area descriptor(in DDR memory) for every plane
+ */
+struct diu_ad {
+        /* Word 0(32-bit) in DDR memory */
+/*      __u16 comp; */
+/*      __u16 pixel_s:2; */
+/*      __u16 pallete:1; */
+/*      __u16 red_c:2; */
+/*      __u16 green_c:2; */
+/*      __u16 blue_c:2; */
+/*      __u16 alpha_c:3; */
+/*      __u16 byte_f:1; */
+/*      __u16 res0:3; */
+
+        __be32 pix_fmt; /* hard coding pixel format */
+
+        /* Word 1(32-bit) in DDR memory */
+        __le32 addr;
+
+        /* Word 2(32-bit) in DDR memory */
+/*      __u32 delta_xs:11; */
+/*      __u32 res1:1; */
+/*      __u32 delta_ys:11; */
+/*      __u32 res2:1; */
+/*      __u32 g_alpha:8; */
+        __le32 src_size_g_alpha;
+
+        /* Word 3(32-bit) in DDR memory */
+/*      __u32 delta_xi:11; */
+/*      __u32 res3:5; */
+/*      __u32 delta_yi:11; */
+/*      __u32 res4:3; */
+/*      __u32 flip:2; */
+        __le32 aoi_size;
+
+        /* Word 4(32-bit) in DDR memory */
+        /*__u32 offset_xi:11;
+        __u32 res5:5;
+        __u32 offset_yi:11;
+        __u32 res6:5;
+        */
+        __le32 offset_xyi;
+
+        /* Word 5(32-bit) in DDR memory */
+        /*__u32 offset_xd:11;
+        __u32 res7:5;
+        __u32 offset_yd:11;
+        __u32 res8:5; */
+        __le32 offset_xyd;
+
+
+        /* Word 6(32-bit) in DDR memory */
+        __u8 ckmax_r;
+        __u8 ckmax_g;
+        __u8 ckmax_b;
+        __u8 res9;
+
+        /* Word 7(32-bit) in DDR memory */
+        __u8 ckmin_r;
+        __u8 ckmin_g;
+        __u8 ckmin_b;
+        __u8 res10;
+/*      __u32 res10:8; */
+
+        /* Word 8(32-bit) in DDR memory */
+        __le32 next_ad;
+
+        /* Word 9(32-bit) in DDR memory, just for 64-bit aligned */
+        __u32 paddr;
+} __attribute__ ((packed));
+
+/* DIU register map */
+struct diu {
+        __be32 desc[3];
+        __be32 gamma;
+        __be32 pallete;
+        __be32 cursor;
+        __be32 curs_pos;
+        __be32 diu_mode;
+        __be32 bgnd;
+        __be32 bgnd_wb;
+        __be32 disp_size;
+        __be32 wb_size;
+        __be32 wb_mem_addr;
+        __be32 hsyn_para;
+        __be32 vsyn_para;
+        __be32 syn_pol;
+        __be32 thresholds;
+        __be32 int_status;
+        __be32 int_mask;
+        __be32 colorbar[8];
+        __be32 filling;
+        __be32 plut;
+} __attribute__ ((packed));
+
+struct diu_hw {
+        struct diu *diu_reg;
+        spinlock_t reg_lock;
+
+        __u32 mode;             /* DIU operation mode */
+};
+
+struct diu_addr {
+        __u8 __iomem *vaddr;    /* Virtual address */
+        dma_addr_t paddr;       /* Physical address */
+        __u32      offset;
+};
+
+struct diu_pool {
+        struct diu_addr ad;
+        struct diu_addr gamma;
+        struct diu_addr pallete;
+        struct diu_addr cursor;
+};
+
+#define FSL_DIU_BASE_OFFSET     0x2C000 /* Offset of DIU */
+#define INT_LCDC                64      /* DIU interrupt number */
+
+#define FSL_AOI_NUM     6       /* 5 AOIs and one dummy AOI */
+                                /* 1 for plane 0, 2 for plane 1&2 each */
+
+/* Minimum X and Y resolutions */
+#define MIN_XRES        64
+#define MIN_YRES        64
+
+/* HW cursor parameters */
+#define MAX_CURS                32
+
+/* Modes of operation of DIU */
+#define MFB_MODE0       0       /* DIU off */
+#define MFB_MODE1       1       /* All three planes output to display */
+#define MFB_MODE2       2       /* Plane 1 to display, planes 2+3 written back*/
+#define MFB_MODE3       3       /* All three planes written back to memory */
+#define MFB_MODE4       4       /* Color bar generation */
+
+/* INT_STATUS/INT_MASK field descriptions */
+#define INT_VSYNC       0x01    /* Vsync interrupt  */
+#define INT_VSYNC_WB    0x02    /* Vsync interrupt for write back operation */
+#define INT_UNDRUN      0x04    /* Under run exception interrupt */
+#define INT_PARERR      0x08    /* Display parameters error interrupt */
+#define INT_LS_BF_VS    0x10    /* Lines before vsync. interrupt */
+
+/* Panels'operation modes */
+#define MFB_TYPE_OUTPUT 0       /* Panel output to display */
+#define MFB_TYPE_OFF    1       /* Panel off */
+#define MFB_TYPE_WB     2       /* Panel written back to memory */
+#define MFB_TYPE_TEST   3       /* Panel generate color bar */
+
+#endif /* __KERNEL__ */
+#endif /* __FSL_DIU_FB_H__ */
diff --git a/drivers/video/geode/Kconfig b/drivers/video/geode/Kconfig
index 7608429b3943..c5d8ba4b9fc3 100644
--- a/drivers/video/geode/Kconfig
+++ b/drivers/video/geode/Kconfig
@@ -38,26 +38,6 @@ config FB_GEODE_GX
 
           If unsure, say N.
 
-config FB_GEODE_GX_SET_FBSIZE
-        bool "Manually specify the Geode GX framebuffer size"
-        depends on FB_GEODE_GX
-        default n
-        ---help---
-          If you want to manually specify the size of your GX framebuffer,
-          say Y here, otherwise say N to dynamically probe it.
-
-          Say N unless you know what you are doing.
-
-config FB_GEODE_GX_FBSIZE
-        hex "Size of the GX framebuffer, in bytes"
-        depends on FB_GEODE_GX_SET_FBSIZE
-        default "0x1600000"
-        ---help---
-          Specify the size of the GX framebuffer.  Normally, you will
-          want this to be MB aligned.  Common values are 0x80000 (8MB)
-          and 0x1600000 (16MB).  Don't change this unless you know what
-          you are doing
-
 config FB_GEODE_GX1
         tristate "AMD Geode GX1 framebuffer support (EXPERIMENTAL)"
         depends on FB && FB_GEODE && EXPERIMENTAL
diff --git a/drivers/video/geode/Makefile b/drivers/video/geode/Makefile
index 957304b45fba..5c98da126883 100644
--- a/drivers/video/geode/Makefile
+++ b/drivers/video/geode/Makefile
@@ -5,5 +5,5 @@ obj-$(CONFIG_FB_GEODE_GX)  += gxfb.o
 obj-$(CONFIG_FB_GEODE_LX)  += lxfb.o
 
 gx1fb-objs := gx1fb_core.o display_gx1.o video_cs5530.o
-gxfb-objs  := gxfb_core.o display_gx.o video_gx.o
+gxfb-objs  := gxfb_core.o display_gx.o video_gx.o suspend_gx.o
 lxfb-objs  := lxfb_core.o lxfb_ops.o
diff --git a/drivers/video/geode/display_gx.c b/drivers/video/geode/display_gx.c
index 0f16e4bffc6c..e759895bf3d3 100644
--- a/drivers/video/geode/display_gx.c
+++ b/drivers/video/geode/display_gx.c
@@ -17,31 +17,40 @@
 #include <asm/io.h>
 #include <asm/div64.h>
 #include <asm/delay.h>
+#include <asm/geode.h>
 
-#include "geodefb.h"
-#include "display_gx.h"
+#include "gxfb.h"
 
-#ifdef CONFIG_FB_GEODE_GX_SET_FBSIZE
-unsigned int gx_frame_buffer_size(void)
-{
-        return CONFIG_FB_GEODE_GX_FBSIZE;
-}
-#else
 unsigned int gx_frame_buffer_size(void)
 {
         unsigned int val;
 
-        /* FB size is reported by a virtual register */
+        if (!geode_has_vsa2()) {
+                uint32_t hi, lo;
+
+                /* The number of pages is (PMAX - PMIN)+1 */
+                rdmsr(MSR_GLIU_P2D_RO0, lo, hi);
+
+                /* PMAX */
+                val = ((hi & 0xff) << 12) | ((lo & 0xfff00000) >> 20);
+                /* PMIN */
+                val -= (lo & 0x000fffff);
+                val += 1;
+
+                /* The page size is 4k */
+                return (val << 12);
+        }
+
+        /* FB size can be obtained from the VSA II */
         /* Virtual register class = 0x02 */
         /* VG_MEM_SIZE(512Kb units) = 0x00 */
 
-        outw(0xFC53, 0xAC1C);
-        outw(0x0200, 0xAC1C);
+        outw(VSA_VR_UNLOCK, VSA_VRC_INDEX);
+        outw(VSA_VR_MEM_SIZE, VSA_VRC_INDEX);
 
-        val = (unsigned int)(inw(0xAC1E)) & 0xFFl;
+        val = (unsigned int)(inw(VSA_VRC_DATA)) & 0xFFl;
         return (val << 19);
 }
-#endif
 
 int gx_line_delta(int xres, int bpp)
 {
@@ -49,75 +58,76 @@ int gx_line_delta(int xres, int bpp)
         return (xres * (bpp >> 3) + 7) & ~0x7;
 }
 
-static void gx_set_mode(struct fb_info *info)
+void gx_set_mode(struct fb_info *info)
 {
-        struct geodefb_par *par = info->par;
+        struct gxfb_par *par = info->par;
         u32 gcfg, dcfg;
         int hactive, hblankstart, hsyncstart, hsyncend, hblankend, htotal;
         int vactive, vblankstart, vsyncstart, vsyncend, vblankend, vtotal;
 
         /* Unlock the display controller registers. */
-        readl(par->dc_regs + DC_UNLOCK);
-        writel(DC_UNLOCK_CODE, par->dc_regs + DC_UNLOCK);
+        write_dc(par, DC_UNLOCK, DC_UNLOCK_UNLOCK);
 
-        gcfg = readl(par->dc_regs + DC_GENERAL_CFG);
-        dcfg = readl(par->dc_regs + DC_DISPLAY_CFG);
+        gcfg = read_dc(par, DC_GENERAL_CFG);
+        dcfg = read_dc(par, DC_DISPLAY_CFG);
 
         /* Disable the timing generator. */
-        dcfg &= ~(DC_DCFG_TGEN);
-        writel(dcfg, par->dc_regs + DC_DISPLAY_CFG);
+        dcfg &= ~DC_DISPLAY_CFG_TGEN;
+        write_dc(par, DC_DISPLAY_CFG, dcfg);
 
         /* Wait for pending memory requests before disabling the FIFO load. */
         udelay(100);
 
         /* Disable FIFO load and compression. */
-        gcfg &= ~(DC_GCFG_DFLE | DC_GCFG_CMPE | DC_GCFG_DECE);
-        writel(gcfg, par->dc_regs + DC_GENERAL_CFG);
+        gcfg &= ~(DC_GENERAL_CFG_DFLE | DC_GENERAL_CFG_CMPE |
+                        DC_GENERAL_CFG_DECE);
+        write_dc(par, DC_GENERAL_CFG, gcfg);
 
         /* Setup DCLK and its divisor. */
-        par->vid_ops->set_dclk(info);
+        gx_set_dclk_frequency(info);
 
         /*
          * Setup new mode.
          */
 
         /* Clear all unused feature bits. */
-        gcfg &= DC_GCFG_YUVM | DC_GCFG_VDSE;
+        gcfg &= DC_GENERAL_CFG_YUVM | DC_GENERAL_CFG_VDSE;
         dcfg = 0;
 
         /* Set FIFO priority (default 6/5) and enable. */
         /* FIXME: increase fifo priority for 1280x1024 and higher modes? */
-        gcfg |= (6 << DC_GCFG_DFHPEL_POS) | (5 << DC_GCFG_DFHPSL_POS) | DC_GCFG_DFLE;
+        gcfg |= (6 << DC_GENERAL_CFG_DFHPEL_SHIFT) |
+                (5 << DC_GENERAL_CFG_DFHPSL_SHIFT) | DC_GENERAL_CFG_DFLE;
 
         /* Framebuffer start offset. */
-        writel(0, par->dc_regs + DC_FB_ST_OFFSET);
+        write_dc(par, DC_FB_ST_OFFSET, 0);
 
         /* Line delta and line buffer length. */
-        writel(info->fix.line_length >> 3, par->dc_regs + DC_GFX_PITCH);
-        writel(((info->var.xres * info->var.bits_per_pixel/8) >> 3) + 2,
-               par->dc_regs + DC_LINE_SIZE);
+        write_dc(par, DC_GFX_PITCH, info->fix.line_length >> 3);
+        write_dc(par, DC_LINE_SIZE,
+                ((info->var.xres * info->var.bits_per_pixel/8) >> 3) + 2);
 
 
         /* Enable graphics and video data and unmask address lines. */
-        dcfg |= DC_DCFG_GDEN | DC_DCFG_VDEN | DC_DCFG_A20M | DC_DCFG_A18M;
+        dcfg |= DC_DISPLAY_CFG_GDEN | DC_DISPLAY_CFG_VDEN |
+                DC_DISPLAY_CFG_A20M | DC_DISPLAY_CFG_A18M;
 
         /* Set pixel format. */
         switch (info->var.bits_per_pixel) {
         case 8:
-                dcfg |= DC_DCFG_DISP_MODE_8BPP;
+                dcfg |= DC_DISPLAY_CFG_DISP_MODE_8BPP;
                 break;
         case 16:
-                dcfg |= DC_DCFG_DISP_MODE_16BPP;
-                dcfg |= DC_DCFG_16BPP_MODE_565;
+                dcfg |= DC_DISPLAY_CFG_DISP_MODE_16BPP;
                 break;
         case 32:
-                dcfg |= DC_DCFG_DISP_MODE_24BPP;
-                dcfg |= DC_DCFG_PALB;
+                dcfg |= DC_DISPLAY_CFG_DISP_MODE_24BPP;
+                dcfg |= DC_DISPLAY_CFG_PALB;
                 break;
         }
 
         /* Enable timing generator. */
-        dcfg |= DC_DCFG_TGEN;
+        dcfg |= DC_DISPLAY_CFG_TGEN;
 
         /* Horizontal and vertical timings. */
         hactive = info->var.xres;
@@ -134,28 +144,34 @@ static void gx_set_mode(struct fb_info *info)
         vblankend = vsyncend + info->var.upper_margin;
         vtotal = vblankend;
 
-        writel((hactive - 1)     | ((htotal - 1) << 16),    par->dc_regs + DC_H_ACTIVE_TIMING);
-        writel((hblankstart - 1) | ((hblankend - 1) << 16), par->dc_regs + DC_H_BLANK_TIMING);
-        writel((hsyncstart - 1)  | ((hsyncend - 1) << 16),  par->dc_regs + DC_H_SYNC_TIMING);
+        write_dc(par, DC_H_ACTIVE_TIMING, (hactive - 1)    |
+                        ((htotal - 1) << 16));
+        write_dc(par, DC_H_BLANK_TIMING, (hblankstart - 1) |
+                        ((hblankend - 1) << 16));
+        write_dc(par, DC_H_SYNC_TIMING, (hsyncstart - 1)   |
+                        ((hsyncend - 1) << 16));
 
-        writel((vactive - 1)     | ((vtotal - 1) << 16),    par->dc_regs + DC_V_ACTIVE_TIMING);
-        writel((vblankstart - 1) | ((vblankend - 1) << 16), par->dc_regs + DC_V_BLANK_TIMING);
-        writel((vsyncstart - 1)  | ((vsyncend - 1) << 16),  par->dc_regs + DC_V_SYNC_TIMING);
+        write_dc(par, DC_V_ACTIVE_TIMING, (vactive - 1)    |
+                        ((vtotal - 1) << 16));
+        write_dc(par, DC_V_BLANK_TIMING, (vblankstart - 1) |
+                        ((vblankend - 1) << 16));
+        write_dc(par, DC_V_SYNC_TIMING, (vsyncstart - 1)   |
+                        ((vsyncend - 1) << 16));
 
         /* Write final register values. */
-        writel(dcfg, par->dc_regs + DC_DISPLAY_CFG);
-        writel(gcfg, par->dc_regs + DC_GENERAL_CFG);
+        write_dc(par, DC_DISPLAY_CFG, dcfg);
+        write_dc(par, DC_GENERAL_CFG, gcfg);
 
-        par->vid_ops->configure_display(info);
+        gx_configure_display(info);
 
         /* Relock display controller registers */
-        writel(0, par->dc_regs + DC_UNLOCK);
+        write_dc(par, DC_UNLOCK, DC_UNLOCK_LOCK);
 }
 
-static void gx_set_hw_palette_reg(struct fb_info *info, unsigned regno,
-                                   unsigned red, unsigned green, unsigned blue)
+void gx_set_hw_palette_reg(struct fb_info *info, unsigned regno,
+                unsigned red, unsigned green, unsigned blue)
 {
-        struct geodefb_par *par = info->par;
+        struct gxfb_par *par = info->par;
         int val;
 
         /* Hardware palette is in RGB 8-8-8 format. */
@@ -163,11 +179,6 @@ static void gx_set_hw_palette_reg(struct fb_info *info, unsigned regno,
         val |= (green)      & 0x00ff00;
         val |= (blue  >> 8) & 0x0000ff;
 
-        writel(regno, par->dc_regs + DC_PAL_ADDRESS);
-        writel(val, par->dc_regs + DC_PAL_DATA);
+        write_dc(par, DC_PAL_ADDRESS, regno);
+        write_dc(par, DC_PAL_DATA, val);
 }
-
-struct geode_dc_ops gx_dc_ops = {
-        .set_mode        = gx_set_mode,
-        .set_palette_reg = gx_set_hw_palette_reg,
-};
diff --git a/drivers/video/geode/display_gx.h b/drivers/video/geode/display_gx.h
deleted file mode 100644
index 0af33f329e88..000000000000
--- a/drivers/video/geode/display_gx.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Geode GX display controller
- *
- * Copyright (C) 2006 Arcom Control Systems Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-#ifndef __DISPLAY_GX_H__
-#define __DISPLAY_GX_H__
-
-unsigned int gx_frame_buffer_size(void);
-int gx_line_delta(int xres, int bpp);
-
-extern struct geode_dc_ops gx_dc_ops;
-
-/* MSR that tells us if a TFT or CRT is attached */
-#define GLD_MSR_CONFIG   0xC0002001
-#define GLD_MSR_CONFIG_DM_FP 0x40
-
-/* Display controller registers */
-
-#define DC_UNLOCK 0x00
-#  define DC_UNLOCK_CODE 0x00004758
-
-#define DC_GENERAL_CFG 0x04
-#  define DC_GCFG_DFLE        0x00000001
-#  define DC_GCFG_CURE        0x00000002
-#  define DC_GCFG_ICNE        0x00000004
-#  define DC_GCFG_VIDE        0x00000008
-#  define DC_GCFG_CMPE        0x00000020
-#  define DC_GCFG_DECE        0x00000040
-#  define DC_GCFG_VGAE        0x00000080
-#  define DC_GCFG_DFHPSL_MASK 0x00000F00
-#  define DC_GCFG_DFHPSL_POS           8
-#  define DC_GCFG_DFHPEL_MASK 0x0000F000
-#  define DC_GCFG_DFHPEL_POS          12
-#  define DC_GCFG_STFM        0x00010000
-#  define DC_GCFG_FDTY        0x00020000
-#  define DC_GCFG_VGAFT       0x00040000
-#  define DC_GCFG_VDSE        0x00080000
-#  define DC_GCFG_YUVM        0x00100000
-#  define DC_GCFG_VFSL        0x00800000
-#  define DC_GCFG_SIGE        0x01000000
-#  define DC_GCFG_SGRE        0x02000000
-#  define DC_GCFG_SGFR        0x04000000
-#  define DC_GCFG_CRC_MODE    0x08000000
-#  define DC_GCFG_DIAG        0x10000000
-#  define DC_GCFG_CFRW        0x20000000
-
-#define DC_DISPLAY_CFG 0x08
-#  define DC_DCFG_TGEN            0x00000001
-#  define DC_DCFG_GDEN            0x00000008
-#  define DC_DCFG_VDEN            0x00000010
-#  define DC_DCFG_TRUP            0x00000040
-#  define DC_DCFG_DISP_MODE_MASK  0x00000300
-#  define DC_DCFG_DISP_MODE_8BPP  0x00000000
-#  define DC_DCFG_DISP_MODE_16BPP 0x00000100
-#  define DC_DCFG_DISP_MODE_24BPP 0x00000200
-#  define DC_DCFG_16BPP_MODE_MASK 0x00000c00
-#  define DC_DCFG_16BPP_MODE_565  0x00000000
-#  define DC_DCFG_16BPP_MODE_555  0x00000100
-#  define DC_DCFG_16BPP_MODE_444  0x00000200
-#  define DC_DCFG_DCEN            0x00080000
-#  define DC_DCFG_PALB            0x02000000
-#  define DC_DCFG_FRLK            0x04000000
-#  define DC_DCFG_VISL            0x08000000
-#  define DC_DCFG_FRSL            0x20000000
-#  define DC_DCFG_A18M            0x40000000
-#  define DC_DCFG_A20M            0x80000000
-
-#define DC_FB_ST_OFFSET 0x10
-
-#define DC_LINE_SIZE 0x30
-#  define DC_LINE_SIZE_FB_LINE_SIZE_MASK  0x000007ff
-#  define DC_LINE_SIZE_FB_LINE_SIZE_POS            0
-#  define DC_LINE_SIZE_CB_LINE_SIZE_MASK  0x007f0000
-#  define DC_LINE_SIZE_CB_LINE_SIZE_POS           16
-#  define DC_LINE_SIZE_VID_LINE_SIZE_MASK 0xff000000
-#  define DC_LINE_SIZE_VID_LINE_SIZE_POS          24
-
-#define DC_GFX_PITCH 0x34
-#  define DC_GFX_PITCH_FB_PITCH_MASK 0x0000ffff
-#  define DC_GFX_PITCH_FB_PITCH_POS           0
-#  define DC_GFX_PITCH_CB_PITCH_MASK 0xffff0000
-#  define DC_GFX_PITCH_CB_PITCH_POS          16
-
-#define DC_H_ACTIVE_TIMING 0x40
-#define DC_H_BLANK_TIMING  0x44
-#define DC_H_SYNC_TIMING   0x48
-#define DC_V_ACTIVE_TIMING 0x50
-#define DC_V_BLANK_TIMING  0x54
-#define DC_V_SYNC_TIMING   0x58
-
-#define DC_PAL_ADDRESS 0x70
-#define DC_PAL_DATA    0x74
-
-#define DC_GLIU0_MEM_OFFSET 0x84
-#endif /* !__DISPLAY_GX1_H__ */
diff --git a/drivers/video/geode/gxfb.h b/drivers/video/geode/gxfb.h
new file mode 100644
index 000000000000..16a96f8fd8c5
--- /dev/null
+++ b/drivers/video/geode/gxfb.h
@@ -0,0 +1,358 @@
+/*
+ * Copyright (C) 2008 Andres Salomon <dilinger@debian.org>
+ *
+ * Geode GX2 header information
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+#ifndef _GXFB_H_
+#define _GXFB_H_
+
+#include <linux/io.h>
+
+#define GP_REG_COUNT   (0x50 / 4)
+#define DC_REG_COUNT   (0x90 / 4)
+#define VP_REG_COUNT   (0x138 / 8)
+#define FP_REG_COUNT   (0x68 / 8)
+
+#define DC_PAL_COUNT   0x104
+
+struct gxfb_par {
+        int enable_crt;
+        void __iomem *dc_regs;
+        void __iomem *vid_regs;
+        void __iomem *gp_regs;
+#ifdef CONFIG_PM
+        int powered_down;
+
+        /* register state, for power management functionality */
+        struct {
+                uint64_t padsel;
+                uint64_t dotpll;
+        } msr;
+
+        uint32_t gp[GP_REG_COUNT];
+        uint32_t dc[DC_REG_COUNT];
+        uint64_t vp[VP_REG_COUNT];
+        uint64_t fp[FP_REG_COUNT];
+
+        uint32_t pal[DC_PAL_COUNT];
+#endif
+};
+
+unsigned int gx_frame_buffer_size(void);
+int gx_line_delta(int xres, int bpp);
+void gx_set_mode(struct fb_info *info);
+void gx_set_hw_palette_reg(struct fb_info *info, unsigned regno,
+                unsigned red, unsigned green, unsigned blue);
+
+void gx_set_dclk_frequency(struct fb_info *info);
+void gx_configure_display(struct fb_info *info);
+int gx_blank_display(struct fb_info *info, int blank_mode);
+
+#ifdef CONFIG_PM
+int gx_powerdown(struct fb_info *info);
+int gx_powerup(struct fb_info *info);
+#endif
+
+
+/* Graphics Processor registers (table 6-23 from the data book) */
+enum gp_registers {
+        GP_DST_OFFSET = 0,
+        GP_SRC_OFFSET,
+        GP_STRIDE,
+        GP_WID_HEIGHT,
+
+        GP_SRC_COLOR_FG,
+        GP_SRC_COLOR_BG,
+        GP_PAT_COLOR_0,
+        GP_PAT_COLOR_1,
+
+        GP_PAT_COLOR_2,
+        GP_PAT_COLOR_3,
+        GP_PAT_COLOR_4,
+        GP_PAT_COLOR_5,
+
+        GP_PAT_DATA_0,
+        GP_PAT_DATA_1,
+        GP_RASTER_MODE,
+        GP_VECTOR_MODE,
+
+        GP_BLT_MODE,
+        GP_BLT_STATUS,
+        GP_HST_SRC,
+        GP_BASE_OFFSET, /* 0x4c */
+};
+
+#define GP_BLT_STATUS_BLT_PENDING       (1 << 2)
+#define GP_BLT_STATUS_BLT_BUSY          (1 << 0)
+
+
+/* Display Controller registers (table 6-38 from the data book) */
+enum dc_registers {
+        DC_UNLOCK = 0,
+        DC_GENERAL_CFG,
+        DC_DISPLAY_CFG,
+        DC_RSVD_0,
+
+        DC_FB_ST_OFFSET,
+        DC_CB_ST_OFFSET,
+        DC_CURS_ST_OFFSET,
+        DC_ICON_ST_OFFSET,
+
+        DC_VID_Y_ST_OFFSET,
+        DC_VID_U_ST_OFFSET,
+        DC_VID_V_ST_OFFSET,
+        DC_RSVD_1,
+
+        DC_LINE_SIZE,
+        DC_GFX_PITCH,
+        DC_VID_YUV_PITCH,
+        DC_RSVD_2,
+
+        DC_H_ACTIVE_TIMING,
+        DC_H_BLANK_TIMING,
+        DC_H_SYNC_TIMING,
+        DC_RSVD_3,
+
+        DC_V_ACTIVE_TIMING,
+        DC_V_BLANK_TIMING,
+        DC_V_SYNC_TIMING,
+        DC_RSVD_4,
+
+        DC_CURSOR_X,
+        DC_CURSOR_Y,
+        DC_ICON_X,
+        DC_LINE_CNT,
+
+        DC_PAL_ADDRESS,
+        DC_PAL_DATA,
+        DC_DFIFO_DIAG,
+        DC_CFIFO_DIAG,
+
+        DC_VID_DS_DELTA,
+        DC_GLIU0_MEM_OFFSET,
+        DC_RSVD_5,
+        DC_DV_ACC, /* 0x8c */
+};
+
+#define DC_UNLOCK_LOCK                  0x00000000
+#define DC_UNLOCK_UNLOCK                0x00004758      /* magic value */
+
+#define DC_GENERAL_CFG_YUVM             (1 << 20)
+#define DC_GENERAL_CFG_VDSE             (1 << 19)
+#define DC_GENERAL_CFG_DFHPEL_SHIFT     12
+#define DC_GENERAL_CFG_DFHPSL_SHIFT     8
+#define DC_GENERAL_CFG_DECE             (1 << 6)
+#define DC_GENERAL_CFG_CMPE             (1 << 5)
+#define DC_GENERAL_CFG_VIDE             (1 << 3)
+#define DC_GENERAL_CFG_ICNE             (1 << 2)
+#define DC_GENERAL_CFG_CURE             (1 << 1)
+#define DC_GENERAL_CFG_DFLE             (1 << 0)
+
+#define DC_DISPLAY_CFG_A20M             (1 << 31)
+#define DC_DISPLAY_CFG_A18M             (1 << 30)
+#define DC_DISPLAY_CFG_PALB             (1 << 25)
+#define DC_DISPLAY_CFG_DISP_MODE_24BPP  (1 << 9)
+#define DC_DISPLAY_CFG_DISP_MODE_16BPP  (1 << 8)
+#define DC_DISPLAY_CFG_DISP_MODE_8BPP   (0)
+#define DC_DISPLAY_CFG_VDEN             (1 << 4)
+#define DC_DISPLAY_CFG_GDEN             (1 << 3)
+#define DC_DISPLAY_CFG_TGEN             (1 << 0)
+
+
+/*
+ * Video Processor registers (table 6-54).
+ * There is space for 64 bit values, but we never use more than the
+ * lower 32 bits.  The actual register save/restore code only bothers
+ * to restore those 32 bits.
+ */
+enum vp_registers {
+        VP_VCFG = 0,
+        VP_DCFG,
+
+        VP_VX,
+        VP_VY,
+
+        VP_VS,
+        VP_VCK,
+
+        VP_VCM,
+        VP_GAR,
+
+        VP_GDR,
+        VP_RSVD_0,
+
+        VP_MISC,
+        VP_CCS,
+
+        VP_RSVD_1,
+        VP_RSVD_2,
+
+        VP_RSVD_3,
+        VP_VDC,
+
+        VP_VCO,
+        VP_CRC,
+
+        VP_CRC32,
+        VP_VDE,
+
+        VP_CCK,
+        VP_CCM,
+
+        VP_CC1,
+        VP_CC2,
+
+        VP_A1X,
+        VP_A1Y,
+
+        VP_A1C,
+        VP_A1T,
+
+        VP_A2X,
+        VP_A2Y,
+
+        VP_A2C,
+        VP_A2T,
+
+        VP_A3X,
+        VP_A3Y,
+
+        VP_A3C,
+        VP_A3T,
+
+        VP_VRR,
+        VP_AWT,
+
+        VP_VTM, /* 0x130 */
+};
+
+#define VP_VCFG_VID_EN                  (1 << 0)
+
+#define VP_DCFG_DAC_VREF                (1 << 26)
+#define VP_DCFG_GV_GAM                  (1 << 21)
+#define VP_DCFG_VG_CK                   (1 << 20)
+#define VP_DCFG_CRT_SYNC_SKW_DEFAULT    (1 << 16)
+#define VP_DCFG_CRT_SYNC_SKW            ((1 << 14) | (1 << 15) | (1 << 16))
+#define VP_DCFG_CRT_VSYNC_POL           (1 << 9)
+#define VP_DCFG_CRT_HSYNC_POL           (1 << 8)
+#define VP_DCFG_FP_DATA_EN              (1 << 7)        /* undocumented */
+#define VP_DCFG_FP_PWR_EN               (1 << 6)        /* undocumented */
+#define VP_DCFG_DAC_BL_EN               (1 << 3)
+#define VP_DCFG_VSYNC_EN                (1 << 2)
+#define VP_DCFG_HSYNC_EN                (1 << 1)
+#define VP_DCFG_CRT_EN                  (1 << 0)
+
+#define VP_MISC_GAM_EN                  (1 << 0)
+#define VP_MISC_DACPWRDN                (1 << 10)
+#define VP_MISC_APWRDN                  (1 << 11)
+
+
+/*
+ * Flat Panel registers (table 6-55).
+ * Also 64 bit registers; see above note about 32-bit handling.
+ */
+
+/* we're actually in the VP register space, starting at address 0x400 */
+#define VP_FP_START             0x400
+
+enum fp_registers {
+        FP_PT1 = 0,
+        FP_PT2,
+
+        FP_PM,
+        FP_DFC,
+
+        FP_BLFSR,
+        FP_RLFSR,
+
+        FP_FMI,
+        FP_FMD,
+
+        FP_RSVD_0,
+        FP_DCA,
+
+        FP_DMD,
+        FP_CRC,
+
+        FP_FBB, /* 0x460 */
+};
+
+#define FP_PT1_VSIZE_SHIFT              16              /* undocumented? */
+#define FP_PT1_VSIZE_MASK               0x7FF0000       /* undocumented? */
+
+#define FP_PT2_HSP                      (1 << 22)
+#define FP_PT2_VSP                      (1 << 23)
+
+#define FP_PM_P                         (1 << 24)       /* panel power on */
+#define FP_PM_PANEL_PWR_UP              (1 << 3)        /* r/o */
+#define FP_PM_PANEL_PWR_DOWN            (1 << 2)        /* r/o */
+#define FP_PM_PANEL_OFF                 (1 << 1)        /* r/o */
+#define FP_PM_PANEL_ON                  (1 << 0)        /* r/o */
+
+#define FP_DFC_NFI                      ((1 << 4) | (1 << 5) | (1 << 6))
+
+
+/* register access functions */
+
+static inline uint32_t read_gp(struct gxfb_par *par, int reg)
+{
+        return readl(par->gp_regs + 4*reg);
+}
+
+static inline void write_gp(struct gxfb_par *par, int reg, uint32_t val)
+{
+        writel(val, par->gp_regs + 4*reg);
+}
+
+static inline uint32_t read_dc(struct gxfb_par *par, int reg)
+{
+        return readl(par->dc_regs + 4*reg);
+}
+
+static inline void write_dc(struct gxfb_par *par, int reg, uint32_t val)
+{
+        writel(val, par->dc_regs + 4*reg);
+}
+
+static inline uint32_t read_vp(struct gxfb_par *par, int reg)
+{
+        return readl(par->vid_regs + 8*reg);
+}
+
+static inline void write_vp(struct gxfb_par *par, int reg, uint32_t val)
+{
+        writel(val, par->vid_regs + 8*reg);
+}
+
+static inline uint32_t read_fp(struct gxfb_par *par, int reg)
+{
+        return readl(par->vid_regs + 8*reg + VP_FP_START);
+}
+
+static inline void write_fp(struct gxfb_par *par, int reg, uint32_t val)
+{
+        writel(val, par->vid_regs + 8*reg + VP_FP_START);
+}
+
+
+/* MSRs are defined in asm/geode.h; their bitfields are here */
+
+#define MSR_GLCP_SYS_RSTPLL_DOTPOSTDIV3 (1 << 3)
+#define MSR_GLCP_SYS_RSTPLL_DOTPREMULT2 (1 << 2)
+#define MSR_GLCP_SYS_RSTPLL_DOTPREDIV2  (1 << 1)
+
+#define MSR_GLCP_DOTPLL_LOCK            (1 << 25)       /* r/o */
+#define MSR_GLCP_DOTPLL_BYPASS          (1 << 15)
+#define MSR_GLCP_DOTPLL_DOTRESET        (1 << 0)
+
+#define MSR_GX_MSR_PADSEL_MASK          0x3FFFFFFF      /* undocumented? */
+#define MSR_GX_MSR_PADSEL_TFT           0x1FFFFFFF      /* undocumented? */
+
+#define MSR_GX_GLD_MSR_CONFIG_FP        (1 << 3)
+
+#endif
diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c
index cf841efa229a..de2b8f9876a5 100644
--- a/drivers/video/geode/gxfb_core.c
+++ b/drivers/video/geode/gxfb_core.c
@@ -28,17 +28,20 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
+#include <linux/console.h>
+#include <linux/suspend.h>
 #include <linux/init.h>
 #include <linux/pci.h>
+#include <asm/geode.h>
 
-#include "geodefb.h"
-#include "display_gx.h"
-#include "video_gx.h"
+#include "gxfb.h"
 
 static char *mode_option;
+static int vram;
+static int vt_switch;
 
 /* Modes relevant to the GX (taken from modedb.c) */
-static const struct fb_videomode gx_modedb[] __initdata = {
+static struct fb_videomode gx_modedb[] __initdata = {
         /* 640x480-60 VESA */
         { NULL, 60, 640, 480, 39682,  48, 16, 33, 10, 96, 2,
           0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
@@ -105,6 +108,35 @@ static const struct fb_videomode gx_modedb[] __initdata = {
           FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
 };
 
+#ifdef CONFIG_OLPC
+#include <asm/olpc.h>
+
+static struct fb_videomode gx_dcon_modedb[] __initdata = {
+        /* The only mode the DCON has is 1200x900 */
+        { NULL, 50, 1200, 900, 17460, 24, 8, 4, 5, 8, 3,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, 0 }
+};
+
+static void __init get_modedb(struct fb_videomode **modedb, unsigned int *size)
+{
+        if (olpc_has_dcon()) {
+                *modedb = (struct fb_videomode *) gx_dcon_modedb;
+                *size = ARRAY_SIZE(gx_dcon_modedb);
+        } else {
+                *modedb = (struct fb_videomode *) gx_modedb;
+                *size = ARRAY_SIZE(gx_modedb);
+        }
+}
+
+#else
+static void __init get_modedb(struct fb_videomode **modedb, unsigned int *size)
+{
+        *modedb = (struct fb_videomode *) gx_modedb;
+        *size = ARRAY_SIZE(gx_modedb);
+}
+#endif
+
 static int gxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 {
         if (var->xres > 1600 || var->yres > 1200)
@@ -139,8 +171,6 @@ static int gxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 
 static int gxfb_set_par(struct fb_info *info)
 {
-        struct geodefb_par *par = info->par;
-
         if (info->var.bits_per_pixel > 8) {
                 info->fix.visual = FB_VISUAL_TRUECOLOR;
                 fb_dealloc_cmap(&info->cmap);
@@ -151,7 +181,7 @@ static int gxfb_set_par(struct fb_info *info)
 
         info->fix.line_length = gx_line_delta(info->var.xres, info->var.bits_per_pixel);
 
-        par->dc_ops->set_mode(info);
+        gx_set_mode(info);
 
         return 0;
 }
@@ -167,8 +197,6 @@ static int gxfb_setcolreg(unsigned regno, unsigned red, unsigned green,
                            unsigned blue, unsigned transp,
                            struct fb_info *info)
 {
-        struct geodefb_par *par = info->par;
-
         if (info->var.grayscale) {
                 /* grayscale = 0.30*R + 0.59*G + 0.11*B */
                 red = green = blue = (red * 77 + green * 151 + blue * 28) >> 8;
@@ -191,7 +219,7 @@ static int gxfb_setcolreg(unsigned regno, unsigned red, unsigned green,
                 if (regno >= 256)
                         return -EINVAL;
 
-                par->dc_ops->set_palette_reg(info, regno, red, green, blue);
+                gx_set_hw_palette_reg(info, regno, red, green, blue);
         }
 
         return 0;
@@ -199,15 +227,12 @@ static int gxfb_setcolreg(unsigned regno, unsigned red, unsigned green,
 
 static int gxfb_blank(int blank_mode, struct fb_info *info)
 {
-        struct geodefb_par *par = info->par;
-
-        return par->vid_ops->blank_display(info, blank_mode);
+        return gx_blank_display(info, blank_mode);
 }
 
 static int __init gxfb_map_video_memory(struct fb_info *info, struct pci_dev *dev)
 {
-        struct geodefb_par *par = info->par;
-        int fb_len;
+        struct gxfb_par *par = info->par;
         int ret;
 
         ret = pci_enable_device(dev);
@@ -229,24 +254,31 @@ static int __init gxfb_map_video_memory(struct fb_info *info, struct pci_dev *de
         if (!par->dc_regs)
                 return -ENOMEM;
 
-        ret = pci_request_region(dev, 0, "gxfb (framebuffer)");
+        ret = pci_request_region(dev, 1, "gxfb (graphics processor)");
         if (ret < 0)
                 return ret;
-        if ((fb_len = gx_frame_buffer_size()) < 0)
+        par->gp_regs = ioremap(pci_resource_start(dev, 1),
+        pci_resource_len(dev, 1));
+
+        if (!par->gp_regs)
                 return -ENOMEM;
+
+        ret = pci_request_region(dev, 0, "gxfb (framebuffer)");
+        if (ret < 0)
+                return ret;
+
         info->fix.smem_start = pci_resource_start(dev, 0);
-        info->fix.smem_len = fb_len;
+        info->fix.smem_len = vram ? vram : gx_frame_buffer_size();
         info->screen_base = ioremap(info->fix.smem_start, info->fix.smem_len);
         if (!info->screen_base)
                 return -ENOMEM;
 
-        /* Set the 16MB aligned base address of the graphics memory region
+        /* Set the 16MiB aligned base address of the graphics memory region
          * in the display controller */
 
-        writel(info->fix.smem_start & 0xFF000000,
-                        par->dc_regs + DC_GLIU0_MEM_OFFSET);
+        write_dc(par, DC_GLIU0_MEM_OFFSET, info->fix.smem_start & 0xFF000000);
 
-        dev_info(&dev->dev, "%d Kibyte of video memory at 0x%lx\n",
+        dev_info(&dev->dev, "%d KiB of video memory at 0x%lx\n",
                  info->fix.smem_len / 1024, info->fix.smem_start);
 
         return 0;
@@ -266,11 +298,12 @@ static struct fb_ops gxfb_ops = {
 
 static struct fb_info * __init gxfb_init_fbinfo(struct device *dev)
 {
-        struct geodefb_par *par;
+        struct gxfb_par *par;
         struct fb_info *info;
 
         /* Alloc enough space for the pseudo palette. */
-        info = framebuffer_alloc(sizeof(struct geodefb_par) + sizeof(u32) * 16, dev);
+        info = framebuffer_alloc(sizeof(struct gxfb_par) + sizeof(u32) * 16,
+                        dev);
         if (!info)
                 return NULL;
 
@@ -296,29 +329,64 @@ static struct fb_info * __init gxfb_init_fbinfo(struct device *dev)
         info->flags             = FBINFO_DEFAULT;
         info->node              = -1;
 
-        info->pseudo_palette    = (void *)par + sizeof(struct geodefb_par);
+        info->pseudo_palette    = (void *)par + sizeof(struct gxfb_par);
 
         info->var.grayscale     = 0;
 
         return info;
 }
 
+#ifdef CONFIG_PM
+static int gxfb_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+        struct fb_info *info = pci_get_drvdata(pdev);
+
+        if (state.event == PM_EVENT_SUSPEND) {
+                acquire_console_sem();
+                gx_powerdown(info);
+                fb_set_suspend(info, 1);
+                release_console_sem();
+        }
+
+        /* there's no point in setting PCI states; we emulate PCI, so
+         * we don't end up getting power savings anyways */
+
+        return 0;
+}
+
+static int gxfb_resume(struct pci_dev *pdev)
+{
+        struct fb_info *info = pci_get_drvdata(pdev);
+        int ret;
+
+        acquire_console_sem();
+        ret = gx_powerup(info);
+        if (ret) {
+                printk(KERN_ERR "gxfb:  power up failed!\n");
+                return ret;
+        }
+
+        fb_set_suspend(info, 0);
+        release_console_sem();
+        return 0;
+}
+#endif
+
 static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
-        struct geodefb_par *par;
+        struct gxfb_par *par;
         struct fb_info *info;
         int ret;
         unsigned long val;
 
+        struct fb_videomode *modedb_ptr;
+        unsigned int modedb_size;
+
         info = gxfb_init_fbinfo(&pdev->dev);
         if (!info)
                 return -ENOMEM;
         par = info->par;
 
-        /* GX display controller and GX video device. */
-        par->dc_ops  = &gx_dc_ops;
-        par->vid_ops = &gx_vid_ops;
-
         if ((ret = gxfb_map_video_memory(info, pdev)) < 0) {
                 dev_err(&pdev->dev, "failed to map frame buffer or controller registers\n");
                 goto err;
@@ -326,15 +394,16 @@ static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *i
 
         /* Figure out if this is a TFT or CRT part */
 
-        rdmsrl(GLD_MSR_CONFIG, val);
+        rdmsrl(MSR_GX_GLD_MSR_CONFIG, val);
 
-        if ((val & GLD_MSR_CONFIG_DM_FP) == GLD_MSR_CONFIG_DM_FP)
+        if ((val & MSR_GX_GLD_MSR_CONFIG_FP) == MSR_GX_GLD_MSR_CONFIG_FP)
                 par->enable_crt = 0;
         else
                 par->enable_crt = 1;
 
+        get_modedb(&modedb_ptr, &modedb_size);
         ret = fb_find_mode(&info->var, info, mode_option,
-                           gx_modedb, ARRAY_SIZE(gx_modedb), NULL, 16);
+                           modedb_ptr, modedb_size, NULL, 16);
         if (ret == 0 || ret == 4) {
                 dev_err(&pdev->dev, "could not find valid video mode\n");
                 ret = -EINVAL;
@@ -348,6 +417,8 @@ static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *i
         gxfb_check_var(&info->var, info);
         gxfb_set_par(info);
 
+        pm_set_vt_switch(vt_switch);
+
         if (register_framebuffer(info) < 0) {
                 ret = -EINVAL;
                 goto err;
@@ -369,6 +440,10 @@ static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *i
                 iounmap(par->dc_regs);
                 pci_release_region(pdev, 2);
         }
+        if (par->gp_regs) {
+                iounmap(par->gp_regs);
+                pci_release_region(pdev, 1);
+        }
 
         if (info)
                 framebuffer_release(info);
@@ -378,7 +453,7 @@ static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *i
 static void gxfb_remove(struct pci_dev *pdev)
 {
         struct fb_info *info = pci_get_drvdata(pdev);
-        struct geodefb_par *par = info->par;
+        struct gxfb_par *par = info->par;
 
         unregister_framebuffer(info);
 
@@ -391,15 +466,16 @@ static void gxfb_remove(struct pci_dev *pdev)
         iounmap(par->dc_regs);
         pci_release_region(pdev, 2);
 
+        iounmap(par->gp_regs);
+        pci_release_region(pdev, 1);
+
         pci_set_drvdata(pdev, NULL);
 
         framebuffer_release(info);
 }
 
 static struct pci_device_id gxfb_id_table[] = {
-        { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_GX_VIDEO,
-          PCI_ANY_ID, PCI_ANY_ID, PCI_BASE_CLASS_DISPLAY << 16,
-          0xff0000, 0 },
+        { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_GX_VIDEO) },
         { 0, }
 };
 
@@ -410,6 +486,10 @@ static struct pci_driver gxfb_driver = {
         .id_table       = gxfb_id_table,
         .probe          = gxfb_probe,
         .remove         = gxfb_remove,
+#ifdef CONFIG_PM
+        .suspend        = gxfb_suspend,
+        .resume         = gxfb_resume,
+#endif
 };
 
 #ifndef MODULE
@@ -456,5 +536,11 @@ module_exit(gxfb_cleanup);
 module_param(mode_option, charp, 0);
 MODULE_PARM_DESC(mode_option, "video mode (<x>x<y>[-<bpp>][@<refr>])");
 
+module_param(vram, int, 0);
+MODULE_PARM_DESC(vram, "video memory size");
+
+module_param(vt_switch, int, 0);
+MODULE_PARM_DESC(vt_switch, "enable VT switch during suspend/resume");
+
 MODULE_DESCRIPTION("Framebuffer driver for the AMD Geode GX");
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/geode/lxfb.h b/drivers/video/geode/lxfb.h
index ca13c48d19b0..3b9416f4ee20 100644
--- a/drivers/video/geode/lxfb.h
+++ b/drivers/video/geode/lxfb.h
@@ -3,17 +3,46 @@
 
 #include <linux/fb.h>
 
+#define GP_REG_COUNT    (0x7c / 4)
+#define DC_REG_COUNT    (0xf0 / 4)
+#define VP_REG_COUNT    (0x158 / 8)
+#define FP_REG_COUNT    (0x60 / 8)
+
+#define DC_PAL_COUNT    0x104
+#define DC_HFILT_COUNT  0x100
+#define DC_VFILT_COUNT  0x100
+#define VP_COEFF_SIZE   0x1000
+
 #define OUTPUT_CRT   0x01
 #define OUTPUT_PANEL 0x02
 
 struct lxfb_par {
         int output;
-        int panel_width;
-        int panel_height;
 
         void __iomem *gp_regs;
         void __iomem *dc_regs;
-        void __iomem *df_regs;
+        void __iomem *vp_regs;
+#ifdef CONFIG_PM
+        int powered_down;
+
+        /* register state, for power mgmt functionality */
+        struct {
+                uint64_t padsel;
+                uint64_t dotpll;
+                uint64_t dfglcfg;
+                uint64_t dcspare;
+        } msr;
+
+        uint32_t gp[GP_REG_COUNT];
+        uint32_t dc[DC_REG_COUNT];
+        uint64_t vp[VP_REG_COUNT];
+        uint64_t fp[FP_REG_COUNT];
+
+        uint32_t pal[DC_PAL_COUNT];
+        uint32_t hcoeff[DC_HFILT_COUNT * 2];
+        uint32_t vcoeff[DC_VFILT_COUNT];
+        uint32_t vp_coeff[VP_COEFF_SIZE / 4];
+#endif
 };
 
 static inline unsigned int lx_get_pitch(unsigned int xres, int bpp)
@@ -29,171 +58,383 @@ int lx_blank_display(struct fb_info *, int);
 void lx_set_palette_reg(struct fb_info *, unsigned int, unsigned int,
                         unsigned int, unsigned int);
 
-/* MSRS */
+#ifdef CONFIG_PM
+int lx_powerdown(struct fb_info *info);
+int lx_powerup(struct fb_info *info);
+#endif
+
+
+/* Graphics Processor registers (table 6-29 from the data book) */
+enum gp_registers {
+        GP_DST_OFFSET = 0,
+        GP_SRC_OFFSET,
+        GP_STRIDE,
+        GP_WID_HEIGHT,
+
+        GP_SRC_COLOR_FG,
+        GP_SRC_COLOR_BG,
+        GP_PAT_COLOR_0,
+        GP_PAT_COLOR_1,
+
+        GP_PAT_COLOR_2,
+        GP_PAT_COLOR_3,
+        GP_PAT_COLOR_4,
+        GP_PAT_COLOR_5,
+
+        GP_PAT_DATA_0,
+        GP_PAT_DATA_1,
+        GP_RASTER_MODE,
+        GP_VECTOR_MODE,
+
+        GP_BLT_MODE,
+        GP_BLT_STATUS,
+        GP_HST_SRC,
+        GP_BASE_OFFSET,
+
+        GP_CMD_TOP,
+        GP_CMD_BOT,
+        GP_CMD_READ,
+        GP_CMD_WRITE,
+
+        GP_CH3_OFFSET,
+        GP_CH3_MODE_STR,
+        GP_CH3_WIDHI,
+        GP_CH3_HSRC,
+
+        GP_LUT_INDEX,
+        GP_LUT_DATA,
+        GP_INT_CNTRL, /* 0x78 */
+};
+
+#define GP_BLT_STATUS_CE                (1 << 4)        /* cmd buf empty */
+#define GP_BLT_STATUS_PB                (1 << 0)        /* primative busy */
+
+
+/* Display Controller registers (table 6-47 from the data book) */
+enum dc_registers {
+        DC_UNLOCK = 0,
+        DC_GENERAL_CFG,
+        DC_DISPLAY_CFG,
+        DC_ARB_CFG,
+
+        DC_FB_ST_OFFSET,
+        DC_CB_ST_OFFSET,
+        DC_CURS_ST_OFFSET,
+        DC_RSVD_0,
+
+        DC_VID_Y_ST_OFFSET,
+        DC_VID_U_ST_OFFSET,
+        DC_VID_V_ST_OFFSET,
+        DC_DV_TOP,
+
+        DC_LINE_SIZE,
+        DC_GFX_PITCH,
+        DC_VID_YUV_PITCH,
+        DC_RSVD_1,
+
+        DC_H_ACTIVE_TIMING,
+        DC_H_BLANK_TIMING,
+        DC_H_SYNC_TIMING,
+        DC_RSVD_2,
+
+        DC_V_ACTIVE_TIMING,
+        DC_V_BLANK_TIMING,
+        DC_V_SYNC_TIMING,
+        DC_FB_ACTIVE,
+
+        DC_CURSOR_X,
+        DC_CURSOR_Y,
+        DC_RSVD_3,
+        DC_LINE_CNT,
+
+        DC_PAL_ADDRESS,
+        DC_PAL_DATA,
+        DC_DFIFO_DIAG,
+        DC_CFIFO_DIAG,
+
+        DC_VID_DS_DELTA,
+        DC_GLIU0_MEM_OFFSET,
+        DC_DV_CTL,
+        DC_DV_ACCESS,
+
+        DC_GFX_SCALE,
+        DC_IRQ_FILT_CTL,
+        DC_FILT_COEFF1,
+        DC_FILT_COEFF2,
+
+        DC_VBI_EVEN_CTL,
+        DC_VBI_ODD_CTL,
+        DC_VBI_HOR,
+        DC_VBI_LN_ODD,
+
+        DC_VBI_LN_EVEN,
+        DC_VBI_PITCH,
+        DC_CLR_KEY,
+        DC_CLR_KEY_MASK,
+
+        DC_CLR_KEY_X,
+        DC_CLR_KEY_Y,
+        DC_IRQ,
+        DC_RSVD_4,
+
+        DC_RSVD_5,
+        DC_GENLK_CTL,
+        DC_VID_EVEN_Y_ST_OFFSET,
+        DC_VID_EVEN_U_ST_OFFSET,
+
+        DC_VID_EVEN_V_ST_OFFSET,
+        DC_V_ACTIVE_EVEN_TIMING,
+        DC_V_BLANK_EVEN_TIMING,
+        DC_V_SYNC_EVEN_TIMING,  /* 0xec */
+};
+
+#define DC_UNLOCK_LOCK                  0x00000000
+#define DC_UNLOCK_UNLOCK                0x00004758      /* magic value */
+
+#define DC_GENERAL_CFG_FDTY             (1 << 17)
+#define DC_GENERAL_CFG_DFHPEL_SHIFT     (12)
+#define DC_GENERAL_CFG_DFHPSL_SHIFT     (8)
+#define DC_GENERAL_CFG_VGAE             (1 << 7)
+#define DC_GENERAL_CFG_DECE             (1 << 6)
+#define DC_GENERAL_CFG_CMPE             (1 << 5)
+#define DC_GENERAL_CFG_VIDE             (1 << 3)
+#define DC_GENERAL_CFG_DFLE             (1 << 0)
+
+#define DC_DISPLAY_CFG_VISL             (1 << 27)
+#define DC_DISPLAY_CFG_PALB             (1 << 25)
+#define DC_DISPLAY_CFG_DCEN             (1 << 24)
+#define DC_DISPLAY_CFG_DISP_MODE_24BPP  (1 << 9)
+#define DC_DISPLAY_CFG_DISP_MODE_16BPP  (1 << 8)
+#define DC_DISPLAY_CFG_DISP_MODE_8BPP   (0)
+#define DC_DISPLAY_CFG_TRUP             (1 << 6)
+#define DC_DISPLAY_CFG_VDEN             (1 << 4)
+#define DC_DISPLAY_CFG_GDEN             (1 << 3)
+#define DC_DISPLAY_CFG_TGEN             (1 << 0)
+
+#define DC_DV_TOP_DV_TOP_EN             (1 << 0)
+
+#define DC_DV_CTL_DV_LINE_SIZE          ((1 << 10) | (1 << 11))
+#define DC_DV_CTL_DV_LINE_SIZE_1K       (0)
+#define DC_DV_CTL_DV_LINE_SIZE_2K       (1 << 10)
+#define DC_DV_CTL_DV_LINE_SIZE_4K       (1 << 11)
+#define DC_DV_CTL_DV_LINE_SIZE_8K       ((1 << 10) | (1 << 11))
+#define DC_DV_CTL_CLEAR_DV_RAM          (1 << 0)
+
+#define DC_IRQ_FILT_CTL_H_FILT_SEL      (1 << 10)
+
+#define DC_CLR_KEY_CLR_KEY_EN           (1 << 24)
+
+#define DC_IRQ_VIP_VSYNC_IRQ_STATUS     (1 << 21)       /* undocumented? */
+#define DC_IRQ_STATUS                   (1 << 20)       /* undocumented? */
+#define DC_IRQ_VIP_VSYNC_LOSS_IRQ_MASK  (1 << 1)
+#define DC_IRQ_MASK                     (1 << 0)
 
-#define MSR_LX_GLD_CONFIG    0x48002001
-#define MSR_LX_GLCP_DOTPLL   0x4c000015
-#define MSR_LX_DF_PADSEL     0x48002011
-#define MSR_LX_DC_SPARE      0x80000011
-#define MSR_LX_DF_GLCONFIG   0x48002001
-
-#define MSR_LX_GLIU0_P2D_RO0 0x10000029
-
-#define GLCP_DOTPLL_RESET    (1 << 0)
-#define GLCP_DOTPLL_BYPASS   (1 << 15)
-#define GLCP_DOTPLL_HALFPIX  (1 << 24)
-#define GLCP_DOTPLL_LOCK     (1 << 25)
-
-#define DF_CONFIG_OUTPUT_MASK       0x38
-#define DF_OUTPUT_PANEL             0x08
-#define DF_OUTPUT_CRT               0x00
-#define DF_SIMULTANEOUS_CRT_AND_FP  (1 << 15)
-
-#define DF_DEFAULT_TFT_PAD_SEL_LOW  0xDFFFFFFF
-#define DF_DEFAULT_TFT_PAD_SEL_HIGH 0x0000003F
-
-#define DC_SPARE_DISABLE_CFIFO_HGO         0x00000800
-#define DC_SPARE_VFIFO_ARB_SELECT          0x00000400
-#define DC_SPARE_WM_LPEN_OVRD              0x00000200
-#define DC_SPARE_LOAD_WM_LPEN_MASK         0x00000100
-#define DC_SPARE_DISABLE_INIT_VID_PRI      0x00000080
-#define DC_SPARE_DISABLE_VFIFO_WM          0x00000040
-#define DC_SPARE_DISABLE_CWD_CHECK         0x00000020
-#define DC_SPARE_PIX8_PAN_FIX              0x00000010
-#define DC_SPARE_FIRST_REQ_MASK            0x00000002
-
-/* Registers */
-
-#define DC_UNLOCK         0x00
-#define  DC_UNLOCK_CODE   0x4758
+#define DC_GENLK_CTL_FLICK_SEL_MASK     (0x0F << 28)
+#define DC_GENLK_CTL_ALPHA_FLICK_EN     (1 << 25)
+#define DC_GENLK_CTL_FLICK_EN           (1 << 24)
+#define DC_GENLK_CTL_GENLK_EN           (1 << 18)
 
-#define DC_GENERAL_CFG    0x04
-#define  DC_GCFG_DFLE     (1 << 0)
-#define  DC_GCFG_VIDE     (1 << 3)
-#define  DC_GCFG_VGAE     (1 << 7)
-#define  DC_GCFG_CMPE     (1 << 5)
-#define  DC_GCFG_DECE     (1 << 6)
-#define  DC_GCFG_FDTY     (1 << 17)
 
-#define DC_DISPLAY_CFG    0x08
-#define  DC_DCFG_TGEN     (1 << 0)
-#define  DC_DCFG_GDEN     (1 << 3)
-#define  DC_DCFG_VDEN     (1 << 4)
-#define  DC_DCFG_TRUP     (1 << 6)
-#define  DC_DCFG_DCEN     (1 << 24)
-#define  DC_DCFG_PALB     (1 << 25)
-#define  DC_DCFG_VISL     (1 << 27)
+/*
+ * Video Processor registers (table 6-71).
+ * There is space for 64 bit values, but we never use more than the
+ * lower 32 bits.  The actual register save/restore code only bothers
+ * to restore those 32 bits.
+ */
+enum vp_registers {
+        VP_VCFG = 0,
+        VP_DCFG,
 
-#define  DC_DCFG_16BPP           0x0
+        VP_VX,
+        VP_VY,
 
-#define  DC_DCFG_DISP_MODE_MASK  0x00000300
-#define  DC_DCFG_DISP_MODE_8BPP  0x00000000
-#define  DC_DCFG_DISP_MODE_16BPP 0x00000100
-#define  DC_DCFG_DISP_MODE_24BPP 0x00000200
-#define  DC_DCFG_DISP_MODE_32BPP 0x00000300
+        VP_SCL,
+        VP_VCK,
 
+        VP_VCM,
+        VP_PAR,
 
-#define DC_ARB_CFG        0x0C
+        VP_PDR,
+        VP_SLR,
 
-#define DC_FB_START       0x10
-#define DC_CB_START       0x14
-#define DC_CURSOR_START   0x18
+        VP_MISC,
+        VP_CCS,
 
-#define DC_DV_TOP          0x2C
-#define DC_DV_TOP_ENABLE   (1 << 0)
+        VP_VYS,
+        VP_VXS,
 
-#define DC_LINE_SIZE       0x30
-#define DC_GRAPHICS_PITCH  0x34
-#define DC_H_ACTIVE_TIMING 0x40
-#define DC_H_BLANK_TIMING  0x44
-#define DC_H_SYNC_TIMING   0x48
-#define DC_V_ACTIVE_TIMING 0x50
-#define DC_V_BLANK_TIMING  0x54
-#define DC_V_SYNC_TIMING   0x58
-#define DC_FB_ACTIVE       0x5C
+        VP_RSVD_0,
+        VP_VDC,
+
+        VP_RSVD_1,
+        VP_CRC,
+
+        VP_CRC32,
+        VP_VDE,
+
+        VP_CCK,
+        VP_CCM,
+
+        VP_CC1,
+        VP_CC2,
+
+        VP_A1X,
+        VP_A1Y,
+
+        VP_A1C,
+        VP_A1T,
+
+        VP_A2X,
+        VP_A2Y,
+
+        VP_A2C,
+        VP_A2T,
+
+        VP_A3X,
+        VP_A3Y,
+
+        VP_A3C,
+        VP_A3T,
+
+        VP_VRR,
+        VP_AWT,
+
+        VP_VTM,
+        VP_VYE,
+
+        VP_A1YE,
+        VP_A2YE,
+
+        VP_A3YE,        /* 0x150 */
+
+        VP_VCR = 0x1000, /* 0x1000 - 0x1fff */
+};
 
-#define DC_PAL_ADDRESS     0x70
-#define DC_PAL_DATA        0x74
+#define VP_VCFG_VID_EN                  (1 << 0)
 
-#define DC_PHY_MEM_OFFSET  0x84
+#define VP_DCFG_GV_GAM                  (1 << 21)
+#define VP_DCFG_PWR_SEQ_DELAY           ((1 << 17) | (1 << 18) | (1 << 19))
+#define VP_DCFG_PWR_SEQ_DELAY_DEFAULT   (1 << 19)       /* undocumented */
+#define VP_DCFG_CRT_SYNC_SKW            ((1 << 14) | (1 << 15) | (1 << 16))
+#define VP_DCFG_CRT_SYNC_SKW_DEFAULT    (1 << 16)
+#define VP_DCFG_CRT_VSYNC_POL           (1 << 9)
+#define VP_DCFG_CRT_HSYNC_POL           (1 << 8)
+#define VP_DCFG_DAC_BL_EN               (1 << 3)
+#define VP_DCFG_VSYNC_EN                (1 << 2)
+#define VP_DCFG_HSYNC_EN                (1 << 1)
+#define VP_DCFG_CRT_EN                  (1 << 0)
 
-#define DC_DV_CTL          0x88
-#define DC_DV_LINE_SIZE_MASK               0x00000C00
-#define DC_DV_LINE_SIZE_1024               0x00000000
-#define DC_DV_LINE_SIZE_2048               0x00000400
-#define DC_DV_LINE_SIZE_4096               0x00000800
-#define DC_DV_LINE_SIZE_8192               0x00000C00
+#define VP_MISC_APWRDN                  (1 << 11)
+#define VP_MISC_DACPWRDN                (1 << 10)
+#define VP_MISC_BYP_BOTH                (1 << 0)
 
 
-#define DC_GFX_SCALE       0x90
-#define DC_IRQ_FILT_CTL    0x94
+/*
+ * Flat Panel registers (table 6-71).
+ * Also 64 bit registers; see above note about 32-bit handling.
+ */
 
+/* we're actually in the VP register space, starting at address 0x400 */
+#define VP_FP_START     0x400
 
-#define DC_IRQ               0xC8
-#define  DC_IRQ_MASK         (1 << 0)
-#define  DC_VSYNC_IRQ_MASK   (1 << 1)
-#define  DC_IRQ_STATUS       (1 << 20)
-#define  DC_VSYNC_IRQ_STATUS (1 << 21)
-
-#define DC_GENLCK_CTRL      0xD4
-#define  DC_GENLCK_ENABLE   (1 << 18)
-#define  DC_GC_ALPHA_FLICK_ENABLE  (1 << 25)
-#define  DC_GC_FLICKER_FILTER_ENABLE (1 << 24)
-#define  DC_GC_FLICKER_FILTER_MASK (0x0F << 28)
-
-#define DC_COLOR_KEY       0xB8
-#define DC_CLR_KEY_ENABLE (1 << 24)
-
-
-#define DC3_DV_LINE_SIZE_MASK               0x00000C00
-#define DC3_DV_LINE_SIZE_1024               0x00000000
-#define DC3_DV_LINE_SIZE_2048               0x00000400
-#define DC3_DV_LINE_SIZE_4096               0x00000800
-#define DC3_DV_LINE_SIZE_8192               0x00000C00
-
-#define DF_VIDEO_CFG       0x0
-#define  DF_VCFG_VID_EN    (1 << 0)
-
-#define DF_DISPLAY_CFG     0x08
-
-#define DF_DCFG_CRT_EN     (1 << 0)
-#define DF_DCFG_HSYNC_EN   (1 << 1)
-#define DF_DCFG_VSYNC_EN   (1 << 2)
-#define DF_DCFG_DAC_BL_EN  (1 << 3)
-#define DF_DCFG_CRT_HSYNC_POL  (1 << 8)
-#define DF_DCFG_CRT_VSYNC_POL  (1 << 9)
-#define DF_DCFG_GV_PAL_BYP     (1 << 21)
+enum fp_registers {
+        FP_PT1 = 0,
+        FP_PT2,
 
-#define DF_DCFG_CRT_SYNC_SKW_INIT 0x10000
-#define DF_DCFG_CRT_SYNC_SKW_MASK  0x1c000
+        FP_PM,
+        FP_DFC,
 
-#define DF_DCFG_PWR_SEQ_DLY_INIT     0x80000
-#define DF_DCFG_PWR_SEQ_DLY_MASK     0xe0000
+        FP_RSVD_0,
+        FP_RSVD_1,
 
-#define DF_MISC            0x50
+        FP_RSVD_2,
+        FP_RSVD_3,
+
+        FP_RSVD_4,
+        FP_DCA,
+
+        FP_DMD,
+        FP_CRC, /* 0x458 */
+};
+
+#define FP_PT2_SCRC                     (1 << 27)       /* shfclk free */
+
+#define FP_PM_P                         (1 << 24)       /* panel power ctl */
+#define FP_PM_PANEL_PWR_UP              (1 << 3)        /* r/o */
+#define FP_PM_PANEL_PWR_DOWN            (1 << 2)        /* r/o */
+#define FP_PM_PANEL_OFF                 (1 << 1)        /* r/o */
+#define FP_PM_PANEL_ON                  (1 << 0)        /* r/o */
+
+#define FP_DFC_BC                       ((1 << 4) | (1 << 5) | (1 << 6))
+
+
+/* register access functions */
+
+static inline uint32_t read_gp(struct lxfb_par *par, int reg)
+{
+        return readl(par->gp_regs + 4*reg);
+}
+
+static inline void write_gp(struct lxfb_par *par, int reg, uint32_t val)
+{
+        writel(val, par->gp_regs + 4*reg);
+}
+
+static inline uint32_t read_dc(struct lxfb_par *par, int reg)
+{
+        return readl(par->dc_regs + 4*reg);
+}
+
+static inline void write_dc(struct lxfb_par *par, int reg, uint32_t val)
+{
+        writel(val, par->dc_regs + 4*reg);
+}
+
+static inline uint32_t read_vp(struct lxfb_par *par, int reg)
+{
+        return readl(par->vp_regs + 8*reg);
+}
+
+static inline void write_vp(struct lxfb_par *par, int reg, uint32_t val)
+{
+        writel(val, par->vp_regs + 8*reg);
+}
+
+static inline uint32_t read_fp(struct lxfb_par *par, int reg)
+{
+        return readl(par->vp_regs + 8*reg + VP_FP_START);
+}
+
+static inline void write_fp(struct lxfb_par *par, int reg, uint32_t val)
+{
+        writel(val, par->vp_regs + 8*reg + VP_FP_START);
+}
 
-#define  DF_MISC_GAM_BYPASS (1 << 0)
-#define  DF_MISC_DAC_PWRDN  (1 << 10)
-#define  DF_MISC_A_PWRDN    (1 << 11)
 
-#define DF_PAR             0x38
-#define DF_PDR             0x40
-#define DF_ALPHA_CONTROL_1 0xD8
-#define DF_VIDEO_REQUEST   0x120
+/* MSRs are defined in asm/geode.h; their bitfields are here */
 
-#define DF_PANEL_TIM1      0x400
-#define DF_DEFAULT_TFT_PMTIM1 0x0
+#define MSR_GLCP_DOTPLL_LOCK            (1 << 25)       /* r/o */
+#define MSR_GLCP_DOTPLL_HALFPIX         (1 << 24)
+#define MSR_GLCP_DOTPLL_BYPASS          (1 << 15)
+#define MSR_GLCP_DOTPLL_DOTRESET        (1 << 0)
 
-#define DF_PANEL_TIM2      0x408
-#define DF_DEFAULT_TFT_PMTIM2 0x08000000
+/* note: this is actually the VP's GLD_MSR_CONFIG */
+#define MSR_LX_GLD_MSR_CONFIG_FMT       ((1 << 3) | (1 << 4) | (1 << 5))
+#define MSR_LX_GLD_MSR_CONFIG_FMT_FP    (1 << 3)
+#define MSR_LX_GLD_MSR_CONFIG_FMT_CRT   (0)
+#define MSR_LX_GLD_MSR_CONFIG_FPC       (1 << 15)       /* FP *and* CRT */
 
-#define DF_FP_PM             0x410
-#define  DF_FP_PM_P          (1 << 24)
+#define MSR_LX_MSR_PADSEL_TFT_SEL_LOW   0xDFFFFFFF      /* ??? */
+#define MSR_LX_MSR_PADSEL_TFT_SEL_HIGH  0x0000003F      /* ??? */
 
-#define DF_DITHER_CONTROL    0x418
-#define DF_DEFAULT_TFT_DITHCTL                  0x00000070
-#define GP_BLT_STATUS      0x44
-#define  GP_BS_BLT_BUSY    (1 << 0)
-#define  GP_BS_CB_EMPTY    (1 << 4)
+#define MSR_LX_SPARE_MSR_DIS_CFIFO_HGO  (1 << 11)       /* undocumented */
+#define MSR_LX_SPARE_MSR_VFIFO_ARB_SEL  (1 << 10)       /* undocumented */
+#define MSR_LX_SPARE_MSR_WM_LPEN_OVRD   (1 << 9)        /* undocumented */
+#define MSR_LX_SPARE_MSR_LOAD_WM_LPEN_M (1 << 8)        /* undocumented */
+#define MSR_LX_SPARE_MSR_DIS_INIT_V_PRI (1 << 7)        /* undocumented */
+#define MSR_LX_SPARE_MSR_DIS_VIFO_WM    (1 << 6)
+#define MSR_LX_SPARE_MSR_DIS_CWD_CHECK  (1 << 5)        /* undocumented */
+#define MSR_LX_SPARE_MSR_PIX8_PAN_FIX   (1 << 4)        /* undocumented */
+#define MSR_LX_SPARE_MSR_FIRST_REQ_MASK (1 << 1)        /* undocumented */
 
 #endif
diff --git a/drivers/video/geode/lxfb_core.c b/drivers/video/geode/lxfb_core.c
index eb6b88171538..2cd9b74d2225 100644
--- a/drivers/video/geode/lxfb_core.c
+++ b/drivers/video/geode/lxfb_core.c
@@ -17,6 +17,7 @@
 #include <linux/console.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
+#include <linux/suspend.h>
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <linux/init.h>
@@ -27,14 +28,15 @@
 
 static char *mode_option;
 static int noclear, nopanel, nocrt;
-static int fbsize;
+static int vram;
+static int vt_switch;
 
 /* Most of these modes are sorted in ascending order, but
  * since the first entry in this table is the "default" mode,
  * we try to make it something sane - 640x480-60 is sane
  */
 
-static const struct fb_videomode geode_modedb[] __initdata = {
+static struct fb_videomode geode_modedb[] __initdata = {
         /* 640x480-60 */
         { NULL, 60, 640, 480, 39682, 48, 8, 25, 2, 88, 2,
           FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
@@ -215,6 +217,35 @@ static const struct fb_videomode geode_modedb[] __initdata = {
           0, FB_VMODE_NONINTERLACED, 0 },
 };
 
+#ifdef CONFIG_OLPC
+#include <asm/olpc.h>
+
+static struct fb_videomode olpc_dcon_modedb[] __initdata = {
+        /* The only mode the DCON has is 1200x900 */
+        { NULL, 50, 1200, 900, 17460, 24, 8, 4, 5, 8, 3,
+          FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+          FB_VMODE_NONINTERLACED, 0 }
+};
+
+static void __init get_modedb(struct fb_videomode **modedb, unsigned int *size)
+{
+        if (olpc_has_dcon()) {
+                *modedb = (struct fb_videomode *) olpc_dcon_modedb;
+                *size = ARRAY_SIZE(olpc_dcon_modedb);
+        } else {
+                *modedb = (struct fb_videomode *) geode_modedb;
+                *size = ARRAY_SIZE(geode_modedb);
+        }
+}
+
+#else
+static void __init get_modedb(struct fb_videomode **modedb, unsigned int *size)
+{
+        *modedb = (struct fb_videomode *) geode_modedb;
+        *size = ARRAY_SIZE(geode_modedb);
+}
+#endif
+
 static int lxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 {
         if (var->xres > 1920 || var->yres > 1440)
@@ -333,13 +364,13 @@ static int __init lxfb_map_video_memory(struct fb_info *info,
         if (ret)
                 return ret;
 
-        ret = pci_request_region(dev, 3, "lxfb-vip");
+        ret = pci_request_region(dev, 3, "lxfb-vp");
 
         if (ret)
                 return ret;
 
         info->fix.smem_start = pci_resource_start(dev, 0);
-        info->fix.smem_len = fbsize ? fbsize : lx_framebuffer_size();
+        info->fix.smem_len = vram ? vram : lx_framebuffer_size();
 
         info->screen_base = ioremap(info->fix.smem_start, info->fix.smem_len);
 
@@ -360,18 +391,15 @@ static int __init lxfb_map_video_memory(struct fb_info *info,
         if (par->dc_regs == NULL)
                 return ret;
 
-        par->df_regs = ioremap(pci_resource_start(dev, 3),
+        par->vp_regs = ioremap(pci_resource_start(dev, 3),
                                pci_resource_len(dev, 3));
 
-        if (par->df_regs == NULL)
+        if (par->vp_regs == NULL)
                 return ret;
 
-        writel(DC_UNLOCK_CODE, par->dc_regs + DC_UNLOCK);
-
-        writel(info->fix.smem_start & 0xFF000000,
-               par->dc_regs + DC_PHY_MEM_OFFSET);
-
-        writel(0, par->dc_regs + DC_UNLOCK);
+        write_dc(par, DC_UNLOCK, DC_UNLOCK_UNLOCK);
+        write_dc(par, DC_GLIU0_MEM_OFFSET, info->fix.smem_start & 0xFF000000);
+        write_dc(par, DC_UNLOCK, DC_UNLOCK_LOCK);
 
         dev_info(&dev->dev, "%d KB of video memory at 0x%lx\n",
                  info->fix.smem_len / 1024, info->fix.smem_start);
@@ -431,6 +459,45 @@ static struct fb_info * __init lxfb_init_fbinfo(struct device *dev)
         return info;
 }
 
+#ifdef CONFIG_PM
+static int lxfb_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+        struct fb_info *info = pci_get_drvdata(pdev);
+
+        if (state.event == PM_EVENT_SUSPEND) {
+                acquire_console_sem();
+                lx_powerdown(info);
+                fb_set_suspend(info, 1);
+                release_console_sem();
+        }
+
+        /* there's no point in setting PCI states; we emulate PCI, so
+         * we don't end up getting power savings anyways */
+
+        return 0;
+}
+
+static int lxfb_resume(struct pci_dev *pdev)
+{
+        struct fb_info *info = pci_get_drvdata(pdev);
+        int ret;
+
+        acquire_console_sem();
+        ret = lx_powerup(info);
+        if (ret) {
+                printk(KERN_ERR "lxfb:  power up failed!\n");
+                return ret;
+        }
+
+        fb_set_suspend(info, 0);
+        release_console_sem();
+        return 0;
+}
+#else
+#define lxfb_suspend NULL
+#define lxfb_resume NULL
+#endif
+
 static int __init lxfb_probe(struct pci_dev *pdev,
                              const struct pci_device_id *id)
 {
@@ -439,7 +506,7 @@ static int __init lxfb_probe(struct pci_dev *pdev,
         int ret;
 
         struct fb_videomode *modedb_ptr;
-        int modedb_size;
+        unsigned int modedb_size;
 
         info = lxfb_init_fbinfo(&pdev->dev);
 
@@ -464,9 +531,7 @@ static int __init lxfb_probe(struct pci_dev *pdev,
 
         /* Set up the mode database */
 
-        modedb_ptr = (struct fb_videomode *) geode_modedb;
-        modedb_size = ARRAY_SIZE(geode_modedb);
-
+        get_modedb(&modedb_ptr, &modedb_size);
         ret = fb_find_mode(&info->var, info, mode_option,
                            modedb_ptr, modedb_size, NULL, 16);
 
@@ -487,6 +552,8 @@ static int __init lxfb_probe(struct pci_dev *pdev,
         lxfb_check_var(&info->var, info);
         lxfb_set_par(info);
 
+        pm_set_vt_switch(vt_switch);
+
         if (register_framebuffer(info) < 0) {
                 ret = -EINVAL;
                 goto err;
@@ -510,8 +577,8 @@ err:
                 iounmap(par->dc_regs);
                 pci_release_region(pdev, 2);
         }
-        if (par->df_regs) {
-                iounmap(par->df_regs);
+        if (par->vp_regs) {
+                iounmap(par->vp_regs);
                 pci_release_region(pdev, 3);
         }
 
@@ -537,7 +604,7 @@ static void lxfb_remove(struct pci_dev *pdev)
         iounmap(par->dc_regs);
         pci_release_region(pdev, 2);
 
-        iounmap(par->df_regs);
+        iounmap(par->vp_regs);
         pci_release_region(pdev, 3);
 
         pci_set_drvdata(pdev, NULL);
@@ -556,6 +623,8 @@ static struct pci_driver lxfb_driver = {
         .id_table       = lxfb_id_table,
         .probe          = lxfb_probe,
         .remove         = lxfb_remove,
+        .suspend        = lxfb_suspend,
+        .resume         = lxfb_resume,
 };
 
 #ifndef MODULE
@@ -570,9 +639,7 @@ static int __init lxfb_setup(char *options)
                 if (!*opt)
                         continue;
 
-                if (!strncmp(opt, "fbsize:", 7))
-                        fbsize = simple_strtoul(opt+7, NULL, 0);
-                else if (!strcmp(opt, "noclear"))
+                if (!strcmp(opt, "noclear"))
                         noclear = 1;
                 else if (!strcmp(opt, "nopanel"))
                         nopanel = 1;
@@ -609,8 +676,11 @@ module_exit(lxfb_cleanup);
 module_param(mode_option, charp, 0);
 MODULE_PARM_DESC(mode_option, "video mode (<x>x<y>[-<bpp>][@<refr>])");
 
-module_param(fbsize, int, 0);
-MODULE_PARM_DESC(fbsize, "video memory size");
+module_param(vram, int, 0);
+MODULE_PARM_DESC(vram, "video memory size");
+
+module_param(vt_switch, int, 0);
+MODULE_PARM_DESC(vt_switch, "enable VT switch during suspend/resume");
 
 MODULE_DESCRIPTION("Framebuffer driver for the AMD Geode LX");
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/geode/lxfb_ops.c b/drivers/video/geode/lxfb_ops.c
index 4fbc99be96ef..cd9d4cc26954 100644
--- a/drivers/video/geode/lxfb_ops.c
+++ b/drivers/video/geode/lxfb_ops.c
@@ -13,6 +13,7 @@
 #include <linux/fb.h>
 #include <linux/uaccess.h>
 #include <linux/delay.h>
+#include <asm/geode.h>
 
 #include "lxfb.h"
 
@@ -34,35 +35,85 @@ static const struct {
   unsigned int pllval;
   unsigned int freq;
 } pll_table[] = {
-  { 0x000031AC, 24923 },
-  { 0x0000215D, 25175 },
-  { 0x00001087, 27000 },
-  { 0x0000216C, 28322 },
-  { 0x0000218D, 28560 },
-  { 0x000010C9, 31200 },
-  { 0x00003147, 31500 },
-  { 0x000010A7, 33032 },
-  { 0x00002159, 35112 },
-  { 0x00004249, 35500 },
-  { 0x00000057, 36000 },
-  { 0x0000219A, 37889 },
-  { 0x00002158, 39168 },
-  { 0x00000045, 40000 },
-  { 0x00000089, 43163 },
-  { 0x000010E7, 44900 },
-  { 0x00002136, 45720 },
-  { 0x00003207, 49500 },
-  { 0x00002187, 50000 },
-  { 0x00004286, 56250 },
-  { 0x000010E5, 60065 },
-  { 0x00004214, 65000 },
-  { 0x00001105, 68179 },
-  { 0x000031E4, 74250 },
-  { 0x00003183, 75000 },
-  { 0x00004284, 78750 },
-  { 0x00001104, 81600 },
-  { 0x00006363, 94500 },
-  { 0x00005303, 97520 },
+  { 0x000131AC,   6231 },
+  { 0x0001215D,   6294 },
+  { 0x00011087,   6750 },
+  { 0x0001216C,   7081 },
+  { 0x0001218D,   7140 },
+  { 0x000110C9,   7800 },
+  { 0x00013147,   7875 },
+  { 0x000110A7,   8258 },
+  { 0x00012159,   8778 },
+  { 0x00014249,   8875 },
+  { 0x00010057,   9000 },
+  { 0x0001219A,   9472 },
+  { 0x00012158,   9792 },
+  { 0x00010045,  10000 },
+  { 0x00010089,  10791 },
+  { 0x000110E7,  11225 },
+  { 0x00012136,  11430 },
+  { 0x00013207,  12375 },
+  { 0x00012187,  12500 },
+  { 0x00014286,  14063 },
+  { 0x000110E5,  15016 },
+  { 0x00014214,  16250 },
+  { 0x00011105,  17045 },
+  { 0x000131E4,  18563 },
+  { 0x00013183,  18750 },
+  { 0x00014284,  19688 },
+  { 0x00011104,  20400 },
+  { 0x00016363,  23625 },
+  { 0x00015303,  24380 },
+  { 0x000031AC,  24923 },
+  { 0x0000215D,  25175 },
+  { 0x00001087,  27000 },
+  { 0x0000216C,  28322 },
+  { 0x0000218D,  28560 },
+  { 0x00010041,  29913 },
+  { 0x000010C9,  31200 },
+  { 0x00003147,  31500 },
+  { 0x000141A1,  32400 },
+  { 0x000010A7,  33032 },
+  { 0x00012182,  33375 },
+  { 0x000141B1,  33750 },
+  { 0x00002159,  35112 },
+  { 0x00004249,  35500 },
+  { 0x00000057,  36000 },
+  { 0x000141E1,  37125 },
+  { 0x0000219A,  37889 },
+  { 0x00002158,  39168 },
+  { 0x00000045,  40000 },
+  { 0x000131A1,  40500 },
+  { 0x00010061,  42301 },
+  { 0x00000089,  43163 },
+  { 0x00012151,  43875 },
+  { 0x000010E7,  44900 },
+  { 0x00002136,  45720 },
+  { 0x000152E1,  47250 },
+  { 0x00010071,  48000 },
+  { 0x00003207,  49500 },
+  { 0x00002187,  50000 },
+  { 0x00014291,  50625 },
+  { 0x00011101,  51188 },
+  { 0x00017481,  54563 },
+  { 0x00004286,  56250 },
+  { 0x00014170,  57375 },
+  { 0x00016210,  58500 },
+  { 0x000010E5,  60065 },
+  { 0x00013140,  62796 },
+  { 0x00004214,  65000 },
+  { 0x00016250,  65250 },
+  { 0x00001105,  68179 },
+  { 0x000141C0,  69600 },
+  { 0x00015220,  70160 },
+  { 0x00010050,  72000 },
+  { 0x000031E4,  74250 },
+  { 0x00003183,  75000 },
+  { 0x00004284,  78750 },
+  { 0x00012130,  80052 },
+  { 0x00001104,  81600 },
+  { 0x00006363,  94500 },
+  { 0x00005303,  97520 },
   { 0x00002183, 100187 },
   { 0x00002122, 101420 },
   { 0x00001081, 108000 },
@@ -101,16 +152,16 @@ static void lx_set_dotpll(u32 pllval)
         u32 dotpll_lo, dotpll_hi;
         int i;
 
-        rdmsr(MSR_LX_GLCP_DOTPLL, dotpll_lo, dotpll_hi);
+        rdmsr(MSR_GLCP_DOTPLL, dotpll_lo, dotpll_hi);
 
-        if ((dotpll_lo & GLCP_DOTPLL_LOCK) && (dotpll_hi == pllval))
+        if ((dotpll_lo & MSR_GLCP_DOTPLL_LOCK) && (dotpll_hi == pllval))
                 return;
 
         dotpll_hi = pllval;
-        dotpll_lo &= ~(GLCP_DOTPLL_BYPASS | GLCP_DOTPLL_HALFPIX);
-        dotpll_lo |= GLCP_DOTPLL_RESET;
+        dotpll_lo &= ~(MSR_GLCP_DOTPLL_BYPASS | MSR_GLCP_DOTPLL_HALFPIX);
+        dotpll_lo |= MSR_GLCP_DOTPLL_DOTRESET;
 
-        wrmsr(MSR_LX_GLCP_DOTPLL, dotpll_lo, dotpll_hi);
+        wrmsr(MSR_GLCP_DOTPLL, dotpll_lo, dotpll_hi);
 
         /* Wait 100us for the PLL to lock */
 
@@ -119,15 +170,15 @@ static void lx_set_dotpll(u32 pllval)
         /* Now, loop for the lock bit */
 
         for (i = 0; i < 1000; i++) {
-                rdmsr(MSR_LX_GLCP_DOTPLL, dotpll_lo, dotpll_hi);
-                if (dotpll_lo & GLCP_DOTPLL_LOCK)
+                rdmsr(MSR_GLCP_DOTPLL, dotpll_lo, dotpll_hi);
+                if (dotpll_lo & MSR_GLCP_DOTPLL_LOCK)
                         break;
         }
 
         /* Clear the reset bit */
 
-        dotpll_lo &= ~GLCP_DOTPLL_RESET;
-        wrmsr(MSR_LX_GLCP_DOTPLL, dotpll_lo, dotpll_hi);
+        dotpll_lo &= ~MSR_GLCP_DOTPLL_DOTRESET;
+        wrmsr(MSR_GLCP_DOTPLL, dotpll_lo, dotpll_hi);
 }
 
 /* Set the clock based on the frequency specified by the current mode */
@@ -137,7 +188,7 @@ static void lx_set_clock(struct fb_info *info)
         unsigned int diff, min, best = 0;
         unsigned int freq, i;
 
-        freq = (unsigned int) (0x3b9aca00 / info->var.pixclock);
+        freq = (unsigned int) (1000000000 / info->var.pixclock);
 
         min = abs(pll_table[0].freq - freq);
 
@@ -149,7 +200,7 @@ static void lx_set_clock(struct fb_info *info)
                 }
         }
 
-        lx_set_dotpll(pll_table[best].pllval & 0x7FFF);
+        lx_set_dotpll(pll_table[best].pllval & 0x00017FFF);
 }
 
 static void lx_graphics_disable(struct fb_info *info)
@@ -159,63 +210,62 @@ static void lx_graphics_disable(struct fb_info *info)
 
         /* Note:  This assumes that the video is in a quitet state */
 
-        writel(0, par->df_regs + DF_ALPHA_CONTROL_1);
-        writel(0, par->df_regs + DF_ALPHA_CONTROL_1 + 32);
-        writel(0, par->df_regs + DF_ALPHA_CONTROL_1 + 64);
+        write_vp(par, VP_A1T, 0);
+        write_vp(par, VP_A2T, 0);
+        write_vp(par, VP_A3T, 0);
 
         /* Turn off the VGA and video enable */
-        val = readl (par->dc_regs + DC_GENERAL_CFG) &
-                ~(DC_GCFG_VGAE | DC_GCFG_VIDE);
+        val = read_dc(par, DC_GENERAL_CFG) & ~(DC_GENERAL_CFG_VGAE |
+                        DC_GENERAL_CFG_VIDE);
 
-        writel(val, par->dc_regs + DC_GENERAL_CFG);
+        write_dc(par, DC_GENERAL_CFG, val);
 
-        val = readl(par->df_regs + DF_VIDEO_CFG) & ~DF_VCFG_VID_EN;
-        writel(val, par->df_regs + DF_VIDEO_CFG);
+        val = read_vp(par, VP_VCFG) & ~VP_VCFG_VID_EN;
+        write_vp(par, VP_VCFG, val);
 
-        writel( DC_IRQ_MASK | DC_VSYNC_IRQ_MASK |
-                DC_IRQ_STATUS | DC_VSYNC_IRQ_STATUS,
-                par->dc_regs + DC_IRQ);
+        write_dc(par, DC_IRQ, DC_IRQ_MASK | DC_IRQ_VIP_VSYNC_LOSS_IRQ_MASK |
+                        DC_IRQ_STATUS | DC_IRQ_VIP_VSYNC_IRQ_STATUS);
 
-        val = readl(par->dc_regs + DC_GENLCK_CTRL) & ~DC_GENLCK_ENABLE;
-        writel(val, par->dc_regs + DC_GENLCK_CTRL);
+        val = read_dc(par, DC_GENLK_CTL) & ~DC_GENLK_CTL_GENLK_EN;
+        write_dc(par, DC_GENLK_CTL, val);
 
-        val = readl(par->dc_regs + DC_COLOR_KEY) & ~DC_CLR_KEY_ENABLE;
-        writel(val & ~DC_CLR_KEY_ENABLE, par->dc_regs + DC_COLOR_KEY);
+        val = read_dc(par, DC_CLR_KEY);
+        write_dc(par, DC_CLR_KEY, val & ~DC_CLR_KEY_CLR_KEY_EN);
 
-        /* We don't actually blank the panel, due to the long latency
-           involved with bringing it back */
+        /* turn off the panel */
+        write_fp(par, FP_PM, read_fp(par, FP_PM) & ~FP_PM_P);
 
-        val = readl(par->df_regs + DF_MISC) | DF_MISC_DAC_PWRDN;
-        writel(val, par->df_regs + DF_MISC);
+        val = read_vp(par, VP_MISC) | VP_MISC_DACPWRDN;
+        write_vp(par, VP_MISC, val);
 
         /* Turn off the display */
 
-        val = readl(par->df_regs + DF_DISPLAY_CFG);
-        writel(val & ~(DF_DCFG_CRT_EN | DF_DCFG_HSYNC_EN | DF_DCFG_VSYNC_EN |
-                       DF_DCFG_DAC_BL_EN), par->df_regs + DF_DISPLAY_CFG);
+        val = read_vp(par, VP_DCFG);
+        write_vp(par, VP_DCFG, val & ~(VP_DCFG_CRT_EN | VP_DCFG_HSYNC_EN |
+                        VP_DCFG_VSYNC_EN | VP_DCFG_DAC_BL_EN));
 
-        gcfg = readl(par->dc_regs + DC_GENERAL_CFG);
-        gcfg &= ~(DC_GCFG_CMPE | DC_GCFG_DECE);
-        writel(gcfg, par->dc_regs + DC_GENERAL_CFG);
+        gcfg = read_dc(par, DC_GENERAL_CFG);
+        gcfg &= ~(DC_GENERAL_CFG_CMPE | DC_GENERAL_CFG_DECE);
+        write_dc(par, DC_GENERAL_CFG, gcfg);
 
         /* Turn off the TGEN */
-        val = readl(par->dc_regs + DC_DISPLAY_CFG);
-        val &= ~DC_DCFG_TGEN;
-        writel(val, par->dc_regs + DC_DISPLAY_CFG);
+        val = read_dc(par, DC_DISPLAY_CFG);
+        val &= ~DC_DISPLAY_CFG_TGEN;
+        write_dc(par, DC_DISPLAY_CFG, val);
 
         /* Wait 1000 usecs to ensure that the TGEN is clear */
         udelay(1000);
 
         /* Turn off the FIFO loader */
 
-        gcfg &= ~DC_GCFG_DFLE;
-        writel(gcfg, par->dc_regs + DC_GENERAL_CFG);
+        gcfg &= ~DC_GENERAL_CFG_DFLE;
+        write_dc(par, DC_GENERAL_CFG, gcfg);
 
         /* Lastly, wait for the GP to go idle */
 
         do {
-                val = readl(par->gp_regs + GP_BLT_STATUS);
-        } while ((val & GP_BS_BLT_BUSY) || !(val & GP_BS_CB_EMPTY));
+                val = read_gp(par, GP_BLT_STATUS);
+        } while ((val & GP_BLT_STATUS_PB) || !(val & GP_BLT_STATUS_CE));
 }
 
 static void lx_graphics_enable(struct fb_info *info)
@@ -224,80 +274,85 @@ static void lx_graphics_enable(struct fb_info *info)
         u32 temp, config;
 
         /* Set the video request register */
-        writel(0, par->df_regs + DF_VIDEO_REQUEST);
+        write_vp(par, VP_VRR, 0);
 
         /* Set up the polarities */
 
-        config = readl(par->df_regs + DF_DISPLAY_CFG);
+        config = read_vp(par, VP_DCFG);
 
-        config &= ~(DF_DCFG_CRT_SYNC_SKW_MASK | DF_DCFG_PWR_SEQ_DLY_MASK |
-                  DF_DCFG_CRT_HSYNC_POL     | DF_DCFG_CRT_VSYNC_POL);
+        config &= ~(VP_DCFG_CRT_SYNC_SKW | VP_DCFG_PWR_SEQ_DELAY |
+                        VP_DCFG_CRT_HSYNC_POL | VP_DCFG_CRT_VSYNC_POL);
 
-        config |= (DF_DCFG_CRT_SYNC_SKW_INIT | DF_DCFG_PWR_SEQ_DLY_INIT  |
-                   DF_DCFG_GV_PAL_BYP);
+        config |= (VP_DCFG_CRT_SYNC_SKW_DEFAULT | VP_DCFG_PWR_SEQ_DELAY_DEFAULT
+                        | VP_DCFG_GV_GAM);
 
         if (info->var.sync & FB_SYNC_HOR_HIGH_ACT)
-                config |= DF_DCFG_CRT_HSYNC_POL;
+                config |= VP_DCFG_CRT_HSYNC_POL;
 
         if (info->var.sync & FB_SYNC_VERT_HIGH_ACT)
-                config |= DF_DCFG_CRT_VSYNC_POL;
+                config |= VP_DCFG_CRT_VSYNC_POL;
 
         if (par->output & OUTPUT_PANEL) {
                 u32 msrlo, msrhi;
 
-                writel(DF_DEFAULT_TFT_PMTIM1,
-                       par->df_regs + DF_PANEL_TIM1);
-                writel(DF_DEFAULT_TFT_PMTIM2,
-                       par->df_regs + DF_PANEL_TIM2);
-                writel(DF_DEFAULT_TFT_DITHCTL,
-                       par->df_regs + DF_DITHER_CONTROL);
+                write_fp(par, FP_PT1, 0);
+                write_fp(par, FP_PT2, FP_PT2_SCRC);
+                write_fp(par, FP_DFC, FP_DFC_BC);
 
-                msrlo = DF_DEFAULT_TFT_PAD_SEL_LOW;
-                msrhi = DF_DEFAULT_TFT_PAD_SEL_HIGH;
+                msrlo = MSR_LX_MSR_PADSEL_TFT_SEL_LOW;
+                msrhi = MSR_LX_MSR_PADSEL_TFT_SEL_HIGH;
 
-                wrmsr(MSR_LX_DF_PADSEL, msrlo, msrhi);
+                wrmsr(MSR_LX_MSR_PADSEL, msrlo, msrhi);
         }
 
         if (par->output & OUTPUT_CRT) {
-                config |= DF_DCFG_CRT_EN   | DF_DCFG_HSYNC_EN |
-                        DF_DCFG_VSYNC_EN | DF_DCFG_DAC_BL_EN;
+                config |= VP_DCFG_CRT_EN | VP_DCFG_HSYNC_EN |
+                                VP_DCFG_VSYNC_EN | VP_DCFG_DAC_BL_EN;
         }
 
-        writel(config, par->df_regs + DF_DISPLAY_CFG);
+        write_vp(par, VP_DCFG, config);
 
         /* Turn the CRT dacs back on */
 
         if (par->output & OUTPUT_CRT) {
-                temp = readl(par->df_regs + DF_MISC);
-                temp &= ~(DF_MISC_DAC_PWRDN  | DF_MISC_A_PWRDN);
-                writel(temp, par->df_regs + DF_MISC);
+                temp = read_vp(par, VP_MISC);
+                temp &= ~(VP_MISC_DACPWRDN | VP_MISC_APWRDN);
+                write_vp(par, VP_MISC, temp);
         }
 
         /* Turn the panel on (if it isn't already) */
-
-        if (par->output & OUTPUT_PANEL) {
-                temp = readl(par->df_regs + DF_FP_PM);
-
-                if (!(temp & 0x09))
-                        writel(temp | DF_FP_PM_P, par->df_regs + DF_FP_PM);
-        }
-
-        temp = readl(par->df_regs + DF_MISC);
-        temp = readl(par->df_regs + DF_DISPLAY_CFG);
+        if (par->output & OUTPUT_PANEL)
+                write_fp(par, FP_PM, read_fp(par, FP_PM) | FP_PM_P);
 }
 
 unsigned int lx_framebuffer_size(void)
 {
         unsigned int val;
 
+        if (!geode_has_vsa2()) {
+                uint32_t hi, lo;
+
+                /* The number of pages is (PMAX - PMIN)+1 */
+                rdmsr(MSR_GLIU_P2D_RO0, lo, hi);
+
+                /* PMAX */
+                val = ((hi & 0xff) << 12) | ((lo & 0xfff00000) >> 20);
+                /* PMIN */
+                val -= (lo & 0x000fffff);
+                val += 1;
+
+                /* The page size is 4k */
+                return (val << 12);
+        }
+
         /* The frame buffer size is reported by a VSM in VSA II */
         /* Virtual Register Class    = 0x02                     */
         /* VG_MEM_SIZE (1MB units)   = 0x00                     */
 
-        outw(0xFC53, 0xAC1C);
-        outw(0x0200, 0xAC1C);
+        outw(VSA_VR_UNLOCK, VSA_VRC_INDEX);
+        outw(VSA_VR_MEM_SIZE, VSA_VRC_INDEX);
 
-        val = (unsigned int)(inw(0xAC1E)) & 0xFE;
+        val = (unsigned int)(inw(VSA_VRC_DATA)) & 0xFE;
         return (val << 20);
 }
 
@@ -313,7 +368,7 @@ void lx_set_mode(struct fb_info *info)
         int vactive, vblankstart, vsyncstart, vsyncend, vblankend, vtotal;
 
         /* Unlock the DC registers */
-        writel(DC_UNLOCK_CODE, par->dc_regs + DC_UNLOCK);
+        write_dc(par, DC_UNLOCK, DC_UNLOCK_UNLOCK);
 
         lx_graphics_disable(info);
 
@@ -321,102 +376,104 @@ void lx_set_mode(struct fb_info *info)
 
         /* Set output mode */
 
-        rdmsrl(MSR_LX_DF_GLCONFIG, msrval);
-        msrval &= ~DF_CONFIG_OUTPUT_MASK;
+        rdmsrl(MSR_LX_GLD_MSR_CONFIG, msrval);
+        msrval &= ~MSR_LX_GLD_MSR_CONFIG_FMT;
 
         if (par->output & OUTPUT_PANEL) {
-                msrval |= DF_OUTPUT_PANEL;
+                msrval |= MSR_LX_GLD_MSR_CONFIG_FMT_FP;
 
                 if (par->output & OUTPUT_CRT)
-                        msrval |= DF_SIMULTANEOUS_CRT_AND_FP;
+                        msrval |= MSR_LX_GLD_MSR_CONFIG_FPC;
                 else
-                        msrval &= ~DF_SIMULTANEOUS_CRT_AND_FP;
-        } else {
-                msrval |= DF_OUTPUT_CRT;
-        }
+                        msrval &= ~MSR_LX_GLD_MSR_CONFIG_FPC;
+        } else
+                msrval |= MSR_LX_GLD_MSR_CONFIG_FMT_CRT;
 
-        wrmsrl(MSR_LX_DF_GLCONFIG, msrval);
+        wrmsrl(MSR_LX_GLD_MSR_CONFIG, msrval);
 
         /* Clear the various buffers */
         /* FIXME:  Adjust for panning here */
 
-        writel(0, par->dc_regs + DC_FB_START);
-        writel(0, par->dc_regs + DC_CB_START);
-        writel(0, par->dc_regs + DC_CURSOR_START);
+        write_dc(par, DC_FB_ST_OFFSET, 0);
+        write_dc(par, DC_CB_ST_OFFSET, 0);
+        write_dc(par, DC_CURS_ST_OFFSET, 0);
 
         /* FIXME: Add support for interlacing */
         /* FIXME: Add support for scaling */
 
-        val = readl(par->dc_regs + DC_GENLCK_CTRL);
-        val &= ~(DC_GC_ALPHA_FLICK_ENABLE |
-                 DC_GC_FLICKER_FILTER_ENABLE | DC_GC_FLICKER_FILTER_MASK);
+        val = read_dc(par, DC_GENLK_CTL);
+        val &= ~(DC_GENLK_CTL_ALPHA_FLICK_EN | DC_GENLK_CTL_FLICK_EN |
+                        DC_GENLK_CTL_FLICK_SEL_MASK);
 
         /* Default scaling params */
 
-        writel((0x4000 << 16) | 0x4000, par->dc_regs + DC_GFX_SCALE);
-        writel(0, par->dc_regs + DC_IRQ_FILT_CTL);
-        writel(val, par->dc_regs + DC_GENLCK_CTRL);
+        write_dc(par, DC_GFX_SCALE, (0x4000 << 16) | 0x4000);
+        write_dc(par, DC_IRQ_FILT_CTL, 0);
+        write_dc(par, DC_GENLK_CTL, val);
 
         /* FIXME:  Support compression */
 
         if (info->fix.line_length > 4096)
-                dv = DC_DV_LINE_SIZE_8192;
+                dv = DC_DV_CTL_DV_LINE_SIZE_8K;
         else if (info->fix.line_length > 2048)
-                dv = DC_DV_LINE_SIZE_4096;
+                dv = DC_DV_CTL_DV_LINE_SIZE_4K;
         else if (info->fix.line_length > 1024)
-                dv = DC_DV_LINE_SIZE_2048;
+                dv = DC_DV_CTL_DV_LINE_SIZE_2K;
         else
-                dv = DC_DV_LINE_SIZE_1024;
+                dv = DC_DV_CTL_DV_LINE_SIZE_1K;
 
         max = info->fix.line_length * info->var.yres;
         max = (max + 0x3FF) & 0xFFFFFC00;
 
-        writel(max | DC_DV_TOP_ENABLE, par->dc_regs + DC_DV_TOP);
+        write_dc(par, DC_DV_TOP, max | DC_DV_TOP_DV_TOP_EN);
 
-        val = readl(par->dc_regs + DC_DV_CTL) & ~DC_DV_LINE_SIZE_MASK;
-        writel(val | dv, par->dc_regs + DC_DV_CTL);
+        val = read_dc(par, DC_DV_CTL) & ~DC_DV_CTL_DV_LINE_SIZE;
+        write_dc(par, DC_DV_CTL, val | dv);
 
         size = info->var.xres * (info->var.bits_per_pixel >> 3);
 
-        writel(info->fix.line_length >> 3, par->dc_regs + DC_GRAPHICS_PITCH);
-        writel((size + 7) >> 3, par->dc_regs + DC_LINE_SIZE);
+        write_dc(par, DC_GFX_PITCH, info->fix.line_length >> 3);
+        write_dc(par, DC_LINE_SIZE, (size + 7) >> 3);
 
         /* Set default watermark values */
 
-        rdmsrl(MSR_LX_DC_SPARE, msrval);
-
-        msrval &= ~(DC_SPARE_DISABLE_CFIFO_HGO | DC_SPARE_VFIFO_ARB_SELECT |
-                    DC_SPARE_LOAD_WM_LPEN_MASK | DC_SPARE_WM_LPEN_OVRD |
-                    DC_SPARE_DISABLE_INIT_VID_PRI | DC_SPARE_DISABLE_VFIFO_WM);
-        msrval |= DC_SPARE_DISABLE_VFIFO_WM | DC_SPARE_DISABLE_INIT_VID_PRI;
-        wrmsrl(MSR_LX_DC_SPARE, msrval);
-
-        gcfg = DC_GCFG_DFLE;   /* Display fifo enable */
-        gcfg |= 0xB600;         /* Set default priority */
-        gcfg |= DC_GCFG_FDTY;  /* Set the frame dirty mode */
-
-        dcfg  = DC_DCFG_VDEN;  /* Enable video data */
-        dcfg |= DC_DCFG_GDEN;  /* Enable graphics */
-        dcfg |= DC_DCFG_TGEN;  /* Turn on the timing generator */
-        dcfg |= DC_DCFG_TRUP;  /* Update timings immediately */
-        dcfg |= DC_DCFG_PALB;  /* Palette bypass in > 8 bpp modes */
-        dcfg |= DC_DCFG_VISL;
-        dcfg |= DC_DCFG_DCEN;  /* Always center the display */
+        rdmsrl(MSR_LX_SPARE_MSR, msrval);
+
+        msrval &= ~(MSR_LX_SPARE_MSR_DIS_CFIFO_HGO
+                        | MSR_LX_SPARE_MSR_VFIFO_ARB_SEL
+                        | MSR_LX_SPARE_MSR_LOAD_WM_LPEN_M
+                        | MSR_LX_SPARE_MSR_WM_LPEN_OVRD);
+        msrval |= MSR_LX_SPARE_MSR_DIS_VIFO_WM |
+                        MSR_LX_SPARE_MSR_DIS_INIT_V_PRI;
+        wrmsrl(MSR_LX_SPARE_MSR, msrval);
+
+        gcfg = DC_GENERAL_CFG_DFLE;   /* Display fifo enable */
+        gcfg |= (0x6 << DC_GENERAL_CFG_DFHPSL_SHIFT) | /* default priority */
+                        (0xb << DC_GENERAL_CFG_DFHPEL_SHIFT);
+        gcfg |= DC_GENERAL_CFG_FDTY;  /* Set the frame dirty mode */
+
+        dcfg  = DC_DISPLAY_CFG_VDEN;  /* Enable video data */
+        dcfg |= DC_DISPLAY_CFG_GDEN;  /* Enable graphics */
+        dcfg |= DC_DISPLAY_CFG_TGEN;  /* Turn on the timing generator */
+        dcfg |= DC_DISPLAY_CFG_TRUP;  /* Update timings immediately */
+        dcfg |= DC_DISPLAY_CFG_PALB;  /* Palette bypass in > 8 bpp modes */
+        dcfg |= DC_DISPLAY_CFG_VISL;
+        dcfg |= DC_DISPLAY_CFG_DCEN;  /* Always center the display */
 
         /* Set the current BPP mode */
 
         switch (info->var.bits_per_pixel) {
         case 8:
-                dcfg |= DC_DCFG_DISP_MODE_8BPP;
+                dcfg |= DC_DISPLAY_CFG_DISP_MODE_8BPP;
                 break;
 
         case 16:
-                dcfg |= DC_DCFG_DISP_MODE_16BPP | DC_DCFG_16BPP;
+                dcfg |= DC_DISPLAY_CFG_DISP_MODE_16BPP;
                 break;
 
         case 32:
         case 24:
-                dcfg |= DC_DCFG_DISP_MODE_24BPP;
+                dcfg |= DC_DISPLAY_CFG_DISP_MODE_24BPP;
                 break;
         }
 
@@ -436,35 +493,31 @@ void lx_set_mode(struct fb_info *info)
         vblankend = vsyncend + info->var.upper_margin;
         vtotal = vblankend;
 
-        writel((hactive - 1) | ((htotal - 1) << 16),
-               par->dc_regs + DC_H_ACTIVE_TIMING);
-        writel((hblankstart - 1) | ((hblankend - 1) << 16),
-               par->dc_regs + DC_H_BLANK_TIMING);
-        writel((hsyncstart - 1) | ((hsyncend - 1) << 16),
-               par->dc_regs + DC_H_SYNC_TIMING);
-
-        writel((vactive - 1) | ((vtotal - 1) << 16),
-               par->dc_regs + DC_V_ACTIVE_TIMING);
+        write_dc(par, DC_H_ACTIVE_TIMING, (hactive - 1) | ((htotal - 1) << 16));
+        write_dc(par, DC_H_BLANK_TIMING,
+                        (hblankstart - 1) | ((hblankend - 1) << 16));
+        write_dc(par, DC_H_SYNC_TIMING,
+                        (hsyncstart - 1) | ((hsyncend - 1) << 16));
 
-        writel((vblankstart - 1) | ((vblankend - 1) << 16),
-               par->dc_regs + DC_V_BLANK_TIMING);
+        write_dc(par, DC_V_ACTIVE_TIMING, (vactive - 1) | ((vtotal - 1) << 16));
+        write_dc(par, DC_V_BLANK_TIMING,
+                        (vblankstart - 1) | ((vblankend - 1) << 16));
+        write_dc(par, DC_V_SYNC_TIMING,
+                        (vsyncstart - 1) | ((vsyncend - 1) << 16));
 
-        writel((vsyncstart - 1)  | ((vsyncend - 1) << 16),
-               par->dc_regs + DC_V_SYNC_TIMING);
-
-        writel( (info->var.xres - 1) << 16 | (info->var.yres - 1),
-                par->dc_regs + DC_FB_ACTIVE);
+        write_dc(par, DC_FB_ACTIVE,
+                        (info->var.xres - 1) << 16 | (info->var.yres - 1));
 
         /* And re-enable the graphics output */
         lx_graphics_enable(info);
 
         /* Write the two main configuration registers */
-        writel(dcfg, par->dc_regs + DC_DISPLAY_CFG);
-        writel(0, par->dc_regs + DC_ARB_CFG);
-        writel(gcfg, par->dc_regs + DC_GENERAL_CFG);
+        write_dc(par, DC_DISPLAY_CFG, dcfg);
+        write_dc(par, DC_ARB_CFG, 0);
+        write_dc(par, DC_GENERAL_CFG, gcfg);
 
         /* Lock the DC registers */
-        writel(0, par->dc_regs + DC_UNLOCK);
+        write_dc(par, DC_UNLOCK, DC_UNLOCK_LOCK);
 }
 
 void lx_set_palette_reg(struct fb_info *info, unsigned regno,
@@ -479,58 +532,310 @@ void lx_set_palette_reg(struct fb_info *info, unsigned regno,
         val |= (green)      & 0x00ff00;
         val |= (blue  >> 8) & 0x0000ff;
 
-        writel(regno, par->dc_regs + DC_PAL_ADDRESS);
-        writel(val, par->dc_regs + DC_PAL_DATA);
+        write_dc(par, DC_PAL_ADDRESS, regno);
+        write_dc(par, DC_PAL_DATA, val);
 }
 
 int lx_blank_display(struct fb_info *info, int blank_mode)
 {
         struct lxfb_par *par = info->par;
         u32 dcfg, fp_pm;
-        int blank, hsync, vsync;
+        int blank, hsync, vsync, crt;
 
         /* CRT power saving modes. */
         switch (blank_mode) {
         case FB_BLANK_UNBLANK:
-                blank = 0; hsync = 1; vsync = 1;
+                blank = 0; hsync = 1; vsync = 1; crt = 1;
                 break;
         case FB_BLANK_NORMAL:
-                blank = 1; hsync = 1; vsync = 1;
+                blank = 1; hsync = 1; vsync = 1; crt = 1;
                 break;
         case FB_BLANK_VSYNC_SUSPEND:
-                blank = 1; hsync = 1; vsync = 0;
+                blank = 1; hsync = 1; vsync = 0; crt = 1;
                 break;
         case FB_BLANK_HSYNC_SUSPEND:
-                blank = 1; hsync = 0; vsync = 1;
+                blank = 1; hsync = 0; vsync = 1; crt = 1;
                 break;
         case FB_BLANK_POWERDOWN:
-                blank = 1; hsync = 0; vsync = 0;
+                blank = 1; hsync = 0; vsync = 0; crt = 0;
                 break;
         default:
                 return -EINVAL;
         }
 
-        dcfg = readl(par->df_regs + DF_DISPLAY_CFG);
-        dcfg &= ~(DF_DCFG_DAC_BL_EN
-                  | DF_DCFG_HSYNC_EN | DF_DCFG_VSYNC_EN);
+        dcfg = read_vp(par, VP_DCFG);
+        dcfg &= ~(VP_DCFG_DAC_BL_EN | VP_DCFG_HSYNC_EN | VP_DCFG_VSYNC_EN |
+                        VP_DCFG_CRT_EN);
         if (!blank)
-                dcfg |= DF_DCFG_DAC_BL_EN;
+                dcfg |= VP_DCFG_DAC_BL_EN;
         if (hsync)
-                dcfg |= DF_DCFG_HSYNC_EN;
+                dcfg |= VP_DCFG_HSYNC_EN;
         if (vsync)
-                dcfg |= DF_DCFG_VSYNC_EN;
-        writel(dcfg, par->df_regs + DF_DISPLAY_CFG);
+                dcfg |= VP_DCFG_VSYNC_EN;
+        if (crt)
+                dcfg |= VP_DCFG_CRT_EN;
+        write_vp(par, VP_DCFG, dcfg);
 
         /* Power on/off flat panel */
 
         if (par->output & OUTPUT_PANEL) {
-                fp_pm = readl(par->df_regs + DF_FP_PM);
+                fp_pm = read_fp(par, FP_PM);
                 if (blank_mode == FB_BLANK_POWERDOWN)
-                        fp_pm &= ~DF_FP_PM_P;
+                        fp_pm &= ~FP_PM_P;
                 else
-                        fp_pm |= DF_FP_PM_P;
-                writel(fp_pm, par->df_regs + DF_FP_PM);
+                        fp_pm |= FP_PM_P;
+                write_fp(par, FP_PM, fp_pm);
         }
 
         return 0;
 }
+
+#ifdef CONFIG_PM
+
+static void lx_save_regs(struct lxfb_par *par)
+{
+        uint32_t filt;
+        int i;
+
+        /* wait for the BLT engine to stop being busy */
+        do {
+                i = read_gp(par, GP_BLT_STATUS);
+        } while ((i & GP_BLT_STATUS_PB) || !(i & GP_BLT_STATUS_CE));
+
+        /* save MSRs */
+        rdmsrl(MSR_LX_MSR_PADSEL, par->msr.padsel);
+        rdmsrl(MSR_GLCP_DOTPLL, par->msr.dotpll);
+        rdmsrl(MSR_LX_GLD_MSR_CONFIG, par->msr.dfglcfg);
+        rdmsrl(MSR_LX_SPARE_MSR, par->msr.dcspare);
+
+        write_dc(par, DC_UNLOCK, DC_UNLOCK_UNLOCK);
+
+        /* save registers */
+        memcpy(par->gp, par->gp_regs, sizeof(par->gp));
+        memcpy(par->dc, par->dc_regs, sizeof(par->dc));
+        memcpy(par->vp, par->vp_regs, sizeof(par->vp));
+        memcpy(par->fp, par->vp_regs + VP_FP_START, sizeof(par->fp));
+
+        /* save the palette */
+        write_dc(par, DC_PAL_ADDRESS, 0);
+        for (i = 0; i < ARRAY_SIZE(par->pal); i++)
+                par->pal[i] = read_dc(par, DC_PAL_DATA);
+
+        /* save the horizontal filter coefficients */
+        filt = par->dc[DC_IRQ_FILT_CTL] | DC_IRQ_FILT_CTL_H_FILT_SEL;
+        for (i = 0; i < ARRAY_SIZE(par->hcoeff); i += 2) {
+                write_dc(par, DC_IRQ_FILT_CTL, (filt & 0xffffff00) | i);
+                par->hcoeff[i] = read_dc(par, DC_FILT_COEFF1);
+                par->hcoeff[i + 1] = read_dc(par, DC_FILT_COEFF2);
+        }
+
+        /* save the vertical filter coefficients */
+        filt &= ~DC_IRQ_FILT_CTL_H_FILT_SEL;
+        for (i = 0; i < ARRAY_SIZE(par->vcoeff); i++) {
+                write_dc(par, DC_IRQ_FILT_CTL, (filt & 0xffffff00) | i);
+                par->vcoeff[i] = read_dc(par, DC_FILT_COEFF1);
+        }
+
+        /* save video coeff ram */
+        memcpy(par->vp_coeff, par->vp_regs + VP_VCR, sizeof(par->vp_coeff));
+}
+
+static void lx_restore_gfx_proc(struct lxfb_par *par)
+{
+        int i;
+
+        /* a bunch of registers require GP_RASTER_MODE to be set first */
+        write_gp(par, GP_RASTER_MODE, par->gp[GP_RASTER_MODE]);
+
+        for (i = 0; i < ARRAY_SIZE(par->gp); i++) {
+                switch (i) {
+                case GP_RASTER_MODE:
+                case GP_VECTOR_MODE:
+                case GP_BLT_MODE:
+                case GP_BLT_STATUS:
+                case GP_HST_SRC:
+                        /* FIXME: restore LUT data */
+                case GP_LUT_INDEX:
+                case GP_LUT_DATA:
+                        /* don't restore these registers */
+                        break;
+
+                default:
+                        write_gp(par, i, par->gp[i]);
+                }
+        }
+}
+
+static void lx_restore_display_ctlr(struct lxfb_par *par)
+{
+        uint32_t filt;
+        int i;
+
+        wrmsrl(MSR_LX_SPARE_MSR, par->msr.dcspare);
+
+        for (i = 0; i < ARRAY_SIZE(par->dc); i++) {
+                switch (i) {
+                case DC_UNLOCK:
+                        /* unlock the DC; runs first */
+                        write_dc(par, DC_UNLOCK, DC_UNLOCK_UNLOCK);
+                        break;
+
+                case DC_GENERAL_CFG:
+                case DC_DISPLAY_CFG:
+                        /* disable all while restoring */
+                        write_dc(par, i, 0);
+                        break;
+
+                case DC_DV_CTL:
+                        /* set all ram to dirty */
+                        write_dc(par, i, par->dc[i] | DC_DV_CTL_CLEAR_DV_RAM);
+
+                case DC_RSVD_1:
+                case DC_RSVD_2:
+                case DC_RSVD_3:
+                case DC_LINE_CNT:
+                case DC_PAL_ADDRESS:
+                case DC_PAL_DATA:
+                case DC_DFIFO_DIAG:
+                case DC_CFIFO_DIAG:
+                case DC_FILT_COEFF1:
+                case DC_FILT_COEFF2:
+                case DC_RSVD_4:
+                case DC_RSVD_5:
+                        /* don't restore these registers */
+                        break;
+
+                default:
+                        write_dc(par, i, par->dc[i]);
+                }
+        }
+
+        /* restore the palette */
+        write_dc(par, DC_PAL_ADDRESS, 0);
+        for (i = 0; i < ARRAY_SIZE(par->pal); i++)
+                write_dc(par, DC_PAL_DATA, par->pal[i]);
+
+        /* restore the horizontal filter coefficients */
+        filt = par->dc[DC_IRQ_FILT_CTL] | DC_IRQ_FILT_CTL_H_FILT_SEL;
+        for (i = 0; i < ARRAY_SIZE(par->hcoeff); i += 2) {
+                write_dc(par, DC_IRQ_FILT_CTL, (filt & 0xffffff00) | i);
+                write_dc(par, DC_FILT_COEFF1, par->hcoeff[i]);
+                write_dc(par, DC_FILT_COEFF2, par->hcoeff[i + 1]);
+        }
+
+        /* restore the vertical filter coefficients */
+        filt &= ~DC_IRQ_FILT_CTL_H_FILT_SEL;
+        for (i = 0; i < ARRAY_SIZE(par->vcoeff); i++) {
+                write_dc(par, DC_IRQ_FILT_CTL, (filt & 0xffffff00) | i);
+                write_dc(par, DC_FILT_COEFF1, par->vcoeff[i]);
+        }
+}
+
+static void lx_restore_video_proc(struct lxfb_par *par)
+{
+        int i;
+
+        wrmsrl(MSR_LX_GLD_MSR_CONFIG, par->msr.dfglcfg);
+        wrmsrl(MSR_LX_MSR_PADSEL, par->msr.padsel);
+
+        for (i = 0; i < ARRAY_SIZE(par->vp); i++) {
+                switch (i) {
+                case VP_VCFG:
+                case VP_DCFG:
+                case VP_PAR:
+                case VP_PDR:
+                case VP_CCS:
+                case VP_RSVD_0:
+                /* case VP_VDC: */ /* why should this not be restored? */
+                case VP_RSVD_1:
+                case VP_CRC32:
+                        /* don't restore these registers */
+                        break;
+
+                default:
+                        write_vp(par, i, par->vp[i]);
+                }
+        }
+
+        /* restore video coeff ram */
+        memcpy(par->vp_regs + VP_VCR, par->vp_coeff, sizeof(par->vp_coeff));
+}
+
+static void lx_restore_regs(struct lxfb_par *par)
+{
+        int i;
+
+        lx_set_dotpll((u32) (par->msr.dotpll >> 32));
+        lx_restore_gfx_proc(par);
+        lx_restore_display_ctlr(par);
+        lx_restore_video_proc(par);
+
+        /* Flat Panel */
+        for (i = 0; i < ARRAY_SIZE(par->fp); i++) {
+                switch (i) {
+                case FP_PM:
+                case FP_RSVD_0:
+                case FP_RSVD_1:
+                case FP_RSVD_2:
+                case FP_RSVD_3:
+                case FP_RSVD_4:
+                        /* don't restore these registers */
+                        break;
+
+                default:
+                        write_fp(par, i, par->fp[i]);
+                }
+        }
+
+        /* control the panel */
+        if (par->fp[FP_PM] & FP_PM_P) {
+                /* power on the panel if not already power{ed,ing} on */
+                if (!(read_fp(par, FP_PM) &
+                                (FP_PM_PANEL_ON|FP_PM_PANEL_PWR_UP)))
+                        write_fp(par, FP_PM, par->fp[FP_PM]);
+        } else {
+                /* power down the panel if not already power{ed,ing} down */
+                if (!(read_fp(par, FP_PM) &
+                                (FP_PM_PANEL_OFF|FP_PM_PANEL_PWR_DOWN)))
+                        write_fp(par, FP_PM, par->fp[FP_PM]);
+        }
+
+        /* turn everything on */
+        write_vp(par, VP_VCFG, par->vp[VP_VCFG]);
+        write_vp(par, VP_DCFG, par->vp[VP_DCFG]);
+        write_dc(par, DC_DISPLAY_CFG, par->dc[DC_DISPLAY_CFG]);
+        /* do this last; it will enable the FIFO load */
+        write_dc(par, DC_GENERAL_CFG, par->dc[DC_GENERAL_CFG]);
+
+        /* lock the door behind us */
+        write_dc(par, DC_UNLOCK, DC_UNLOCK_LOCK);
+}
+
+int lx_powerdown(struct fb_info *info)
+{
+        struct lxfb_par *par = info->par;
+
+        if (par->powered_down)
+                return 0;
+
+        lx_save_regs(par);
+        lx_graphics_disable(info);
+
+        par->powered_down = 1;
+        return 0;
+}
+
+int lx_powerup(struct fb_info *info)
+{
+        struct lxfb_par *par = info->par;
+
+        if (!par->powered_down)
+                return 0;
+
+        lx_restore_regs(par);
+
+        par->powered_down = 0;
+        return 0;
+}
+
+#endif
diff --git a/drivers/video/geode/suspend_gx.c b/drivers/video/geode/suspend_gx.c
new file mode 100644
index 000000000000..9aff32ef8bb6
--- /dev/null
+++ b/drivers/video/geode/suspend_gx.c
@@ -0,0 +1,267 @@
+/*
+ *   Copyright (C) 2007 Advanced Micro Devices, Inc.
+ *   Copyright (C) 2008 Andres Salomon <dilinger@debian.org>
+ *
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License as published by the
+ *   Free Software Foundation; either version 2 of the License, or (at your
+ *   option) any later version.
+ */
+#include <linux/fb.h>
+#include <asm/io.h>
+#include <asm/msr.h>
+#include <asm/geode.h>
+#include <asm/delay.h>
+
+#include "gxfb.h"
+
+#ifdef CONFIG_PM
+
+static void gx_save_regs(struct gxfb_par *par)
+{
+        int i;
+
+        /* wait for the BLT engine to stop being busy */
+        do {
+                i = read_gp(par, GP_BLT_STATUS);
+        } while (i & (GP_BLT_STATUS_BLT_PENDING | GP_BLT_STATUS_BLT_BUSY));
+
+        /* save MSRs */
+        rdmsrl(MSR_GX_MSR_PADSEL, par->msr.padsel);
+        rdmsrl(MSR_GLCP_DOTPLL, par->msr.dotpll);
+
+        write_dc(par, DC_UNLOCK, DC_UNLOCK_UNLOCK);
+
+        /* save registers */
+        memcpy(par->gp, par->gp_regs, sizeof(par->gp));
+        memcpy(par->dc, par->dc_regs, sizeof(par->dc));
+        memcpy(par->vp, par->vid_regs, sizeof(par->vp));
+        memcpy(par->fp, par->vid_regs + VP_FP_START, sizeof(par->fp));
+
+        /* save the palette */
+        write_dc(par, DC_PAL_ADDRESS, 0);
+        for (i = 0; i < ARRAY_SIZE(par->pal); i++)
+                par->pal[i] = read_dc(par, DC_PAL_DATA);
+}
+
+static void gx_set_dotpll(uint32_t dotpll_hi)
+{
+        uint32_t dotpll_lo;
+        int i;
+
+        rdmsrl(MSR_GLCP_DOTPLL, dotpll_lo);
+        dotpll_lo |= MSR_GLCP_DOTPLL_DOTRESET;
+        dotpll_lo &= ~MSR_GLCP_DOTPLL_BYPASS;
+        wrmsr(MSR_GLCP_DOTPLL, dotpll_lo, dotpll_hi);
+
+        /* wait for the PLL to lock */
+        for (i = 0; i < 200; i++) {
+                rdmsrl(MSR_GLCP_DOTPLL, dotpll_lo);
+                if (dotpll_lo & MSR_GLCP_DOTPLL_LOCK)
+                        break;
+                udelay(1);
+        }
+
+        /* PLL set, unlock */
+        dotpll_lo &= ~MSR_GLCP_DOTPLL_DOTRESET;
+        wrmsr(MSR_GLCP_DOTPLL, dotpll_lo, dotpll_hi);
+}
+
+static void gx_restore_gfx_proc(struct gxfb_par *par)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(par->gp); i++) {
+                switch (i) {
+                case GP_VECTOR_MODE:
+                case GP_BLT_MODE:
+                case GP_BLT_STATUS:
+                case GP_HST_SRC:
+                        /* don't restore these registers */
+                        break;
+                default:
+                        write_gp(par, i, par->gp[i]);
+                }
+        }
+}
+
+static void gx_restore_display_ctlr(struct gxfb_par *par)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(par->dc); i++) {
+                switch (i) {
+                case DC_UNLOCK:
+                        /* unlock the DC; runs first */
+                        write_dc(par, DC_UNLOCK, DC_UNLOCK_UNLOCK);
+                        break;
+
+                case DC_GENERAL_CFG:
+                        /* write without the enables */
+                        write_dc(par, i, par->dc[i] & ~(DC_GENERAL_CFG_VIDE |
+                                        DC_GENERAL_CFG_ICNE |
+                                        DC_GENERAL_CFG_CURE |
+                                        DC_GENERAL_CFG_DFLE));
+                        break;
+
+                case DC_DISPLAY_CFG:
+                        /* write without the enables */
+                        write_dc(par, i, par->dc[i] & ~(DC_DISPLAY_CFG_VDEN |
+                                        DC_DISPLAY_CFG_GDEN |
+                                        DC_DISPLAY_CFG_TGEN));
+                        break;
+
+                case DC_RSVD_0:
+                case DC_RSVD_1:
+                case DC_RSVD_2:
+                case DC_RSVD_3:
+                case DC_RSVD_4:
+                case DC_LINE_CNT:
+                case DC_PAL_ADDRESS:
+                case DC_PAL_DATA:
+                case DC_DFIFO_DIAG:
+                case DC_CFIFO_DIAG:
+                case DC_RSVD_5:
+                        /* don't restore these registers */
+                        break;
+                default:
+                        write_dc(par, i, par->dc[i]);
+                }
+        }
+
+        /* restore the palette */
+        write_dc(par, DC_PAL_ADDRESS, 0);
+        for (i = 0; i < ARRAY_SIZE(par->pal); i++)
+                write_dc(par, DC_PAL_DATA, par->pal[i]);
+}
+
+static void gx_restore_video_proc(struct gxfb_par *par)
+{
+        int i;
+
+        wrmsrl(MSR_GX_MSR_PADSEL, par->msr.padsel);
+
+        for (i = 0; i < ARRAY_SIZE(par->vp); i++) {
+                switch (i) {
+                case VP_VCFG:
+                        /* don't enable video yet */
+                        write_vp(par, i, par->vp[i] & ~VP_VCFG_VID_EN);
+                        break;
+
+                case VP_DCFG:
+                        /* don't enable CRT yet */
+                        write_vp(par, i, par->vp[i] &
+                                        ~(VP_DCFG_DAC_BL_EN | VP_DCFG_VSYNC_EN |
+                                        VP_DCFG_HSYNC_EN | VP_DCFG_CRT_EN));
+                        break;
+
+                case VP_GAR:
+                case VP_GDR:
+                case VP_RSVD_0:
+                case VP_RSVD_1:
+                case VP_RSVD_2:
+                case VP_RSVD_3:
+                case VP_CRC32:
+                case VP_AWT:
+                case VP_VTM:
+                        /* don't restore these registers */
+                        break;
+                default:
+                        write_vp(par, i, par->vp[i]);
+                }
+        }
+}
+
+static void gx_restore_regs(struct gxfb_par *par)
+{
+        int i;
+
+        gx_set_dotpll((uint32_t) (par->msr.dotpll >> 32));
+        gx_restore_gfx_proc(par);
+        gx_restore_display_ctlr(par);
+        gx_restore_video_proc(par);
+
+        /* Flat Panel */
+        for (i = 0; i < ARRAY_SIZE(par->fp); i++) {
+                if (i != FP_PM && i != FP_RSVD_0)
+                        write_fp(par, i, par->fp[i]);
+        }
+}
+
+static void gx_disable_graphics(struct gxfb_par *par)
+{
+        /* shut down the engine */
+        write_vp(par, VP_VCFG, par->vp[VP_VCFG] & ~VP_VCFG_VID_EN);
+        write_vp(par, VP_DCFG, par->vp[VP_DCFG] & ~(VP_DCFG_DAC_BL_EN |
+                        VP_DCFG_VSYNC_EN | VP_DCFG_HSYNC_EN | VP_DCFG_CRT_EN));
+
+        /* turn off the flat panel */
+        write_fp(par, FP_PM, par->fp[FP_PM] & ~FP_PM_P);
+
+
+        /* turn off display */
+        write_dc(par, DC_UNLOCK, DC_UNLOCK_UNLOCK);
+        write_dc(par, DC_GENERAL_CFG, par->dc[DC_GENERAL_CFG] &
+                        ~(DC_GENERAL_CFG_VIDE | DC_GENERAL_CFG_ICNE |
+                        DC_GENERAL_CFG_CURE | DC_GENERAL_CFG_DFLE));
+        write_dc(par, DC_DISPLAY_CFG, par->dc[DC_DISPLAY_CFG] &
+                        ~(DC_DISPLAY_CFG_VDEN | DC_DISPLAY_CFG_GDEN |
+                        DC_DISPLAY_CFG_TGEN));
+        write_dc(par, DC_UNLOCK, DC_UNLOCK_LOCK);
+}
+
+static void gx_enable_graphics(struct gxfb_par *par)
+{
+        uint32_t fp;
+
+        fp = read_fp(par, FP_PM);
+        if (par->fp[FP_PM] & FP_PM_P) {
+                /* power on the panel if not already power{ed,ing} on */
+                if (!(fp & (FP_PM_PANEL_ON|FP_PM_PANEL_PWR_UP)))
+                        write_fp(par, FP_PM, par->fp[FP_PM]);
+        } else {
+                /* power down the panel if not already power{ed,ing} down */
+                if (!(fp & (FP_PM_PANEL_OFF|FP_PM_PANEL_PWR_DOWN)))
+                        write_fp(par, FP_PM, par->fp[FP_PM]);
+        }
+
+        /* turn everything on */
+        write_vp(par, VP_VCFG, par->vp[VP_VCFG]);
+        write_vp(par, VP_DCFG, par->vp[VP_DCFG]);
+        write_dc(par, DC_DISPLAY_CFG, par->dc[DC_DISPLAY_CFG]);
+        /* do this last; it will enable the FIFO load */
+        write_dc(par, DC_GENERAL_CFG, par->dc[DC_GENERAL_CFG]);
+
+        /* lock the door behind us */
+        write_dc(par, DC_UNLOCK, DC_UNLOCK_LOCK);
+}
+
+int gx_powerdown(struct fb_info *info)
+{
+        struct gxfb_par *par = info->par;
+
+        if (par->powered_down)
+                return 0;
+
+        gx_save_regs(par);
+        gx_disable_graphics(par);
+
+        par->powered_down = 1;
+        return 0;
+}
+
+int gx_powerup(struct fb_info *info)
+{
+        struct gxfb_par *par = info->par;
+
+        if (!par->powered_down)
+                return 0;
+
+        gx_restore_regs(par);
+        gx_enable_graphics(par);
+
+        par->powered_down  = 0;
+        return 0;
+}
+
+#endif
diff --git a/drivers/video/geode/video_gx.c b/drivers/video/geode/video_gx.c
index febf09c63492..b8d52a8360db 100644
--- a/drivers/video/geode/video_gx.c
+++ b/drivers/video/geode/video_gx.c
@@ -16,9 +16,9 @@
 #include <asm/io.h>
 #include <asm/delay.h>
 #include <asm/msr.h>
+#include <asm/geode.h>
 
-#include "geodefb.h"
-#include "video_gx.h"
+#include "gxfb.h"
 
 
 /*
@@ -117,7 +117,7 @@ static const struct gx_pll_entry gx_pll_table_14MHz[] = {
         {  4357, 0, 0x0000057D },       /* 229.5000 */
 };
 
-static void gx_set_dclk_frequency(struct fb_info *info)
+void gx_set_dclk_frequency(struct fb_info *info)
 {
         const struct gx_pll_entry *pll_table;
         int pll_table_len;
@@ -178,110 +178,116 @@ static void gx_set_dclk_frequency(struct fb_info *info)
 static void
 gx_configure_tft(struct fb_info *info)
 {
-        struct geodefb_par *par = info->par;
+        struct gxfb_par *par = info->par;
         unsigned long val;
         unsigned long fp;
 
         /* Set up the DF pad select MSR */
 
-        rdmsrl(GX_VP_MSR_PAD_SELECT, val);
-        val &= ~GX_VP_PAD_SELECT_MASK;
-        val |= GX_VP_PAD_SELECT_TFT;
-        wrmsrl(GX_VP_MSR_PAD_SELECT, val);
+        rdmsrl(MSR_GX_MSR_PADSEL, val);
+        val &= ~MSR_GX_MSR_PADSEL_MASK;
+        val |= MSR_GX_MSR_PADSEL_TFT;
+        wrmsrl(MSR_GX_MSR_PADSEL, val);
 
         /* Turn off the panel */
 
-        fp = readl(par->vid_regs + GX_FP_PM);
-        fp &= ~GX_FP_PM_P;
-        writel(fp, par->vid_regs + GX_FP_PM);
+        fp = read_fp(par, FP_PM);
+        fp &= ~FP_PM_P;
+        write_fp(par, FP_PM, fp);
 
         /* Set timing 1 */
 
-        fp = readl(par->vid_regs + GX_FP_PT1);
-        fp &= GX_FP_PT1_VSIZE_MASK;
-        fp |= info->var.yres << GX_FP_PT1_VSIZE_SHIFT;
-        writel(fp, par->vid_regs + GX_FP_PT1);
+        fp = read_fp(par, FP_PT1);
+        fp &= FP_PT1_VSIZE_MASK;
+        fp |= info->var.yres << FP_PT1_VSIZE_SHIFT;
+        write_fp(par, FP_PT1, fp);
 
         /* Timing 2 */
         /* Set bits that are always on for TFT */
 
         fp = 0x0F100000;
 
-        /* Add sync polarity */
+        /* Configure sync polarity */
 
         if (!(info->var.sync & FB_SYNC_VERT_HIGH_ACT))
-                fp |= GX_FP_PT2_VSP;
+                fp |= FP_PT2_VSP;
 
         if (!(info->var.sync & FB_SYNC_HOR_HIGH_ACT))
-                fp |= GX_FP_PT2_HSP;
+                fp |= FP_PT2_HSP;
 
-        writel(fp, par->vid_regs + GX_FP_PT2);
+        write_fp(par, FP_PT2, fp);
 
         /*  Set the dither control */
-        writel(0x70, par->vid_regs + GX_FP_DFC);
+        write_fp(par, FP_DFC, FP_DFC_NFI);
 
         /* Enable the FP data and power (in case the BIOS didn't) */
 
-        fp = readl(par->vid_regs + GX_DCFG);
-        fp |= GX_DCFG_FP_PWR_EN | GX_DCFG_FP_DATA_EN;
-        writel(fp, par->vid_regs + GX_DCFG);
+        fp = read_vp(par, VP_DCFG);
+        fp |= VP_DCFG_FP_PWR_EN | VP_DCFG_FP_DATA_EN;
+        write_vp(par, VP_DCFG, fp);
 
         /* Unblank the panel */
 
-        fp = readl(par->vid_regs + GX_FP_PM);
-        fp |= GX_FP_PM_P;
-        writel(fp, par->vid_regs + GX_FP_PM);
+        fp = read_fp(par, FP_PM);
+        fp |= FP_PM_P;
+        write_fp(par, FP_PM, fp);
 }
 
-static void gx_configure_display(struct fb_info *info)
+void gx_configure_display(struct fb_info *info)
 {
-        struct geodefb_par *par = info->par;
+        struct gxfb_par *par = info->par;
         u32 dcfg, misc;
 
-        /* Set up the MISC register */
-
-        misc = readl(par->vid_regs + GX_MISC);
-
-        /* Power up the DAC */
-        misc &= ~(GX_MISC_A_PWRDN | GX_MISC_DAC_PWRDN);
-
-        /* Disable gamma correction */
-        misc |= GX_MISC_GAM_EN;
-
-        writel(misc, par->vid_regs + GX_MISC);
-
         /* Write the display configuration */
-        dcfg = readl(par->vid_regs + GX_DCFG);
+        dcfg = read_vp(par, VP_DCFG);
 
         /* Disable hsync and vsync */
-        dcfg &= ~(GX_DCFG_VSYNC_EN | GX_DCFG_HSYNC_EN);
-        writel(dcfg, par->vid_regs + GX_DCFG);
+        dcfg &= ~(VP_DCFG_VSYNC_EN | VP_DCFG_HSYNC_EN);
+        write_vp(par, VP_DCFG, dcfg);
 
         /* Clear bits from existing mode. */
-        dcfg &= ~(GX_DCFG_CRT_SYNC_SKW_MASK
-                  | GX_DCFG_CRT_HSYNC_POL   | GX_DCFG_CRT_VSYNC_POL
-                  | GX_DCFG_VSYNC_EN        | GX_DCFG_HSYNC_EN);
+        dcfg &= ~(VP_DCFG_CRT_SYNC_SKW
+                  | VP_DCFG_CRT_HSYNC_POL   | VP_DCFG_CRT_VSYNC_POL
+                  | VP_DCFG_VSYNC_EN        | VP_DCFG_HSYNC_EN);
 
         /* Set default sync skew.  */
-        dcfg |= GX_DCFG_CRT_SYNC_SKW_DFLT;
+        dcfg |= VP_DCFG_CRT_SYNC_SKW_DEFAULT;
 
         /* Enable hsync and vsync. */
-        dcfg |= GX_DCFG_HSYNC_EN | GX_DCFG_VSYNC_EN;
+        dcfg |= VP_DCFG_HSYNC_EN | VP_DCFG_VSYNC_EN;
 
-        /* Sync polarities. */
-        if (info->var.sync & FB_SYNC_HOR_HIGH_ACT)
-                dcfg |= GX_DCFG_CRT_HSYNC_POL;
-        if (info->var.sync & FB_SYNC_VERT_HIGH_ACT)
-                dcfg |= GX_DCFG_CRT_VSYNC_POL;
+        misc = read_vp(par, VP_MISC);
+
+        /* Disable gamma correction */
+        misc |= VP_MISC_GAM_EN;
+
+        if (par->enable_crt) {
+
+                /* Power up the CRT DACs */
+                misc &= ~(VP_MISC_APWRDN | VP_MISC_DACPWRDN);
+                write_vp(par, VP_MISC, misc);
+
+                /* Only change the sync polarities if we are running
+                 * in CRT mode.  The FP polarities will be handled in
+                 * gxfb_configure_tft */
+                if (!(info->var.sync & FB_SYNC_HOR_HIGH_ACT))
+                        dcfg |= VP_DCFG_CRT_HSYNC_POL;
+                if (!(info->var.sync & FB_SYNC_VERT_HIGH_ACT))
+                        dcfg |= VP_DCFG_CRT_VSYNC_POL;
+        } else {
+                /* Power down the CRT DACs if in FP mode */
+                misc |= (VP_MISC_APWRDN | VP_MISC_DACPWRDN);
+                write_vp(par, VP_MISC, misc);
+        }
 
         /* Enable the display logic */
         /* Set up the DACS to blank normally */
 
-        dcfg |= GX_DCFG_CRT_EN | GX_DCFG_DAC_BL_EN;
+        dcfg |= VP_DCFG_CRT_EN | VP_DCFG_DAC_BL_EN;
 
         /* Enable the external DAC VREF? */
 
-        writel(dcfg, par->vid_regs + GX_DCFG);
+        write_vp(par, VP_DCFG, dcfg);
 
         /* Set up the flat panel (if it is enabled) */
 
@@ -289,59 +295,55 @@ static void gx_configure_display(struct fb_info *info)
                 gx_configure_tft(info);
 }
 
-static int gx_blank_display(struct fb_info *info, int blank_mode)
+int gx_blank_display(struct fb_info *info, int blank_mode)
 {
-        struct geodefb_par *par = info->par;
+        struct gxfb_par *par = info->par;
         u32 dcfg, fp_pm;
-        int blank, hsync, vsync;
+        int blank, hsync, vsync, crt;
 
         /* CRT power saving modes. */
         switch (blank_mode) {
         case FB_BLANK_UNBLANK:
-                blank = 0; hsync = 1; vsync = 1;
+                blank = 0; hsync = 1; vsync = 1; crt = 1;
                 break;
         case FB_BLANK_NORMAL:
-                blank = 1; hsync = 1; vsync = 1;
+                blank = 1; hsync = 1; vsync = 1; crt = 1;
                 break;
         case FB_BLANK_VSYNC_SUSPEND:
-                blank = 1; hsync = 1; vsync = 0;
+                blank = 1; hsync = 1; vsync = 0; crt = 1;
                 break;
         case FB_BLANK_HSYNC_SUSPEND:
-                blank = 1; hsync = 0; vsync = 1;
+                blank = 1; hsync = 0; vsync = 1; crt = 1;
                 break;
         case FB_BLANK_POWERDOWN:
-                blank = 1; hsync = 0; vsync = 0;
+                blank = 1; hsync = 0; vsync = 0; crt = 0;
                 break;
         default:
                 return -EINVAL;
         }
-        dcfg = readl(par->vid_regs + GX_DCFG);
-        dcfg &= ~(GX_DCFG_DAC_BL_EN
-                  | GX_DCFG_HSYNC_EN | GX_DCFG_VSYNC_EN);
+        dcfg = read_vp(par, VP_DCFG);
+        dcfg &= ~(VP_DCFG_DAC_BL_EN | VP_DCFG_HSYNC_EN | VP_DCFG_VSYNC_EN |
+                        VP_DCFG_CRT_EN);
         if (!blank)
-                dcfg |= GX_DCFG_DAC_BL_EN;
+                dcfg |= VP_DCFG_DAC_BL_EN;
         if (hsync)
-                dcfg |= GX_DCFG_HSYNC_EN;
+                dcfg |= VP_DCFG_HSYNC_EN;
         if (vsync)
-                dcfg |= GX_DCFG_VSYNC_EN;
-        writel(dcfg, par->vid_regs + GX_DCFG);
+                dcfg |= VP_DCFG_VSYNC_EN;
+        if (crt)
+                dcfg |= VP_DCFG_CRT_EN;
+        write_vp(par, VP_DCFG, dcfg);
 
         /* Power on/off flat panel. */
 
         if (par->enable_crt == 0) {
-                fp_pm = readl(par->vid_regs + GX_FP_PM);
+                fp_pm = read_fp(par, FP_PM);
                 if (blank_mode == FB_BLANK_POWERDOWN)
-                        fp_pm &= ~GX_FP_PM_P;
+                        fp_pm &= ~FP_PM_P;
                 else
-                        fp_pm |= GX_FP_PM_P;
-                writel(fp_pm, par->vid_regs + GX_FP_PM);
+                        fp_pm |= FP_PM_P;
+                write_fp(par, FP_PM, fp_pm);
         }
 
         return 0;
 }
-
-struct geode_vid_ops gx_vid_ops = {
-        .set_dclk          = gx_set_dclk_frequency,
-        .configure_display = gx_configure_display,
-        .blank_display     = gx_blank_display,
-};
diff --git a/drivers/video/geode/video_gx.h b/drivers/video/geode/video_gx.h
deleted file mode 100644
index ce28d8f382dc..000000000000
--- a/drivers/video/geode/video_gx.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Geode GX video device
- *
- * Copyright (C) 2006 Arcom Control Systems Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-#ifndef __VIDEO_GX_H__
-#define __VIDEO_GX_H__
-
-extern struct geode_vid_ops gx_vid_ops;
-
-/* GX Flatpanel control MSR */
-#define GX_VP_MSR_PAD_SELECT           0xC0002011
-#define GX_VP_PAD_SELECT_MASK          0x3FFFFFFF
-#define GX_VP_PAD_SELECT_TFT           0x1FFFFFFF
-
-/* Geode GX video processor registers */
-
-#define GX_DCFG         0x0008
-#  define GX_DCFG_CRT_EN                0x00000001
-#  define GX_DCFG_HSYNC_EN              0x00000002
-#  define GX_DCFG_VSYNC_EN              0x00000004
-#  define GX_DCFG_DAC_BL_EN             0x00000008
-#  define GX_DCFG_FP_PWR_EN             0x00000040
-#  define GX_DCFG_FP_DATA_EN            0x00000080
-#  define GX_DCFG_CRT_HSYNC_POL         0x00000100
-#  define GX_DCFG_CRT_VSYNC_POL         0x00000200
-#  define GX_DCFG_CRT_SYNC_SKW_MASK     0x0001C000
-#  define GX_DCFG_CRT_SYNC_SKW_DFLT     0x00010000
-#  define GX_DCFG_VG_CK                 0x00100000
-#  define GX_DCFG_GV_GAM                0x00200000
-#  define GX_DCFG_DAC_VREF              0x04000000
-
-/* Geode GX MISC video configuration */
-
-#define GX_MISC 0x50
-#define GX_MISC_GAM_EN     0x00000001
-#define GX_MISC_DAC_PWRDN  0x00000400
-#define GX_MISC_A_PWRDN    0x00000800
-
-/* Geode GX flat panel display control registers */
-
-#define GX_FP_PT1 0x0400
-#define GX_FP_PT1_VSIZE_MASK 0x7FF0000
-#define GX_FP_PT1_VSIZE_SHIFT 16
-
-#define GX_FP_PT2 0x408
-#define GX_FP_PT2_VSP (1 << 23)
-#define GX_FP_PT2_HSP (1 << 22)
-
-#define GX_FP_PM 0x410
-#  define GX_FP_PM_P 0x01000000
-
-#define GX_FP_DFC 0x418
-
-/* Geode GX clock control MSRs */
-
-#define MSR_GLCP_SYS_RSTPLL     0x4c000014
-#  define MSR_GLCP_SYS_RSTPLL_DOTPREDIV2        (0x0000000000000002ull)
-#  define MSR_GLCP_SYS_RSTPLL_DOTPREMULT2       (0x0000000000000004ull)
-#  define MSR_GLCP_SYS_RSTPLL_DOTPOSTDIV3       (0x0000000000000008ull)
-
-#define MSR_GLCP_DOTPLL         0x4c000015
-#  define MSR_GLCP_DOTPLL_DOTRESET              (0x0000000000000001ull)
-#  define MSR_GLCP_DOTPLL_BYPASS                (0x0000000000008000ull)
-#  define MSR_GLCP_DOTPLL_LOCK                  (0x0000000002000000ull)
-
-#endif /* !__VIDEO_GX_H__ */
diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c
index e92337bef50d..564557792bed 100644
--- a/drivers/video/gxt4500.c
+++ b/drivers/video/gxt4500.c
@@ -238,7 +238,7 @@ static int calc_pll(int period_ps, struct gxt4500_par *par)
         for (pdiv1 = 1; pdiv1 <= 8; ++pdiv1) {
                 for (pdiv2 = 1; pdiv2 <= pdiv1; ++pdiv2) {
                         postdiv = pdiv1 * pdiv2;
-                        pll_period = (period_ps + postdiv - 1) / postdiv;
+                        pll_period = DIV_ROUND_UP(period_ps, postdiv);
                         /* keep pll in range 350..600 MHz */
                         if (pll_period < 1666 || pll_period > 2857)
                                 continue;
diff --git a/drivers/video/hecubafb.c b/drivers/video/hecubafb.c
index 94e0df8a6f60..0b4bffbe67c8 100644
--- a/drivers/video/hecubafb.c
+++ b/drivers/video/hecubafb.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/video/hecubafb.c -- FB driver for Hecuba controller
+ * linux/drivers/video/hecubafb.c -- FB driver for Hecuba/Apollo controller
  *
  * Copyright (C) 2006, Jaya Kumar
  * This work was sponsored by CIS(M) Sdn Bhd
@@ -17,18 +17,13 @@
  * values. There are other commands that the display is capable of,
  * beyond the 5 used here but they are more complex.
  *
- * This driver is written to be used with the Hecuba display controller
- * board, and tested with the EInk 800x600 display in 1 bit mode.
- * The interface between Hecuba and the host is TTL based GPIO. The
- * GPIO requirements are 8 writable data lines and 6 lines for control.
- * Only 4 of the controls are actually used here but 6 for future use.
- * The driver requires the IO addresses for data and control GPIO at
- * load time. It is also possible to use this display with a standard
- * PC parallel port.
+ * This driver is written to be used with the Hecuba display architecture.
+ * The actual display chip is called Apollo and the interface electronics
+ * it needs is called Hecuba.
  *
- * General notes:
- * - User must set hecubafb_enable=1 to enable it
- * - User must set dio_addr=0xIOADDR cio_addr=0xIOADDR c2io_addr=0xIOADDR
+ * It is intended to be architecture independent. A board specific driver
+ * must be used to perform all the physical IO interactions. An example
+ * is provided as n411.c
  *
  */
 
@@ -47,34 +42,12 @@
 #include <linux/list.h>
 #include <linux/uaccess.h>
 
-/* Apollo controller specific defines */
-#define APOLLO_START_NEW_IMG    0xA0
-#define APOLLO_STOP_IMG_DATA    0xA1
-#define APOLLO_DISPLAY_IMG      0xA2
-#define APOLLO_ERASE_DISPLAY    0xA3
-#define APOLLO_INIT_DISPLAY     0xA4
-
-/* Hecuba interface specific defines */
-/* WUP is inverted, CD is inverted, DS is inverted */
-#define HCB_NWUP_BIT    0x01
-#define HCB_NDS_BIT     0x02
-#define HCB_RW_BIT      0x04
-#define HCB_NCD_BIT     0x08
-#define HCB_ACK_BIT     0x80
+#include <video/hecubafb.h>
 
 /* Display specific information */
 #define DPY_W 600
 #define DPY_H 800
 
-struct hecubafb_par {
-        unsigned long dio_addr;
-        unsigned long cio_addr;
-        unsigned long c2io_addr;
-        unsigned char ctl;
-        struct fb_info *info;
-        unsigned int irq;
-};
-
 static struct fb_fix_screeninfo hecubafb_fix __devinitdata = {
         .id =           "hecubafb",
         .type =         FB_TYPE_PACKED_PIXELS,
@@ -82,6 +55,7 @@ static struct fb_fix_screeninfo hecubafb_fix __devinitdata = {
         .xpanstep =     0,
         .ypanstep =     0,
         .ywrapstep =    0,
+        .line_length =  DPY_W,
         .accel =        FB_ACCEL_NONE,
 };
 
@@ -94,136 +68,51 @@ static struct fb_var_screeninfo hecubafb_var __devinitdata = {
         .nonstd         = 1,
 };
 
-static unsigned long dio_addr;
-static unsigned long cio_addr;
-static unsigned long c2io_addr;
-static unsigned long splashval;
-static unsigned int nosplash;
-static unsigned int hecubafb_enable;
-static unsigned int irq;
-
-static DECLARE_WAIT_QUEUE_HEAD(hecubafb_waitq);
-
-static void hcb_set_ctl(struct hecubafb_par *par)
-{
-        outb(par->ctl, par->cio_addr);
-}
-
-static unsigned char hcb_get_ctl(struct hecubafb_par *par)
-{
-        return inb(par->c2io_addr);
-}
-
-static void hcb_set_data(struct hecubafb_par *par, unsigned char value)
-{
-        outb(value, par->dio_addr);
-}
-
-static int __devinit apollo_init_control(struct hecubafb_par *par)
-{
-        unsigned char ctl;
-        /* for init, we want the following setup to be set:
-        WUP = lo
-        ACK = hi
-        DS = hi
-        RW = hi
-        CD = lo
-        */
-
-        /* write WUP to lo, DS to hi, RW to hi, CD to lo */
-        par->ctl = HCB_NWUP_BIT | HCB_RW_BIT | HCB_NCD_BIT ;
-        par->ctl &= ~HCB_NDS_BIT;
-        hcb_set_ctl(par);
-
-        /* check ACK is not lo */
-        ctl = hcb_get_ctl(par);
-        if ((ctl & HCB_ACK_BIT)) {
-                printk(KERN_ERR "Fail because ACK is already low\n");
-                return -ENXIO;
-        }
-
-        return 0;
-}
-
-static void hcb_wait_for_ack(struct hecubafb_par *par)
-{
-
-        int timeout;
-        unsigned char ctl;
-
-        timeout=500;
-        do {
-                ctl = hcb_get_ctl(par);
-                if ((ctl & HCB_ACK_BIT))
-                        return;
-                udelay(1);
-        } while (timeout--);
-        printk(KERN_ERR "timed out waiting for ack\n");
-}
-
-static void hcb_wait_for_ack_clear(struct hecubafb_par *par)
-{
-
-        int timeout;
-        unsigned char ctl;
-
-        timeout=500;
-        do {
-                ctl = hcb_get_ctl(par);
-                if (!(ctl & HCB_ACK_BIT))
-                        return;
-                udelay(1);
-        } while (timeout--);
-        printk(KERN_ERR "timed out waiting for clear\n");
-}
+/* main hecubafb functions */
 
 static void apollo_send_data(struct hecubafb_par *par, unsigned char data)
 {
         /* set data */
-        hcb_set_data(par, data);
+        par->board->set_data(par, data);
 
         /* set DS low */
-        par->ctl |= HCB_NDS_BIT;
-        hcb_set_ctl(par);
+        par->board->set_ctl(par, HCB_DS_BIT, 0);
 
-        hcb_wait_for_ack(par);
+        /* wait for ack */
+        par->board->wait_for_ack(par, 0);
 
         /* set DS hi */
-        par->ctl &= ~(HCB_NDS_BIT);
-        hcb_set_ctl(par);
+        par->board->set_ctl(par, HCB_DS_BIT, 1);
 
-        hcb_wait_for_ack_clear(par);
+        /* wait for ack to clear */
+        par->board->wait_for_ack(par, 1);
 }
 
 static void apollo_send_command(struct hecubafb_par *par, unsigned char data)
 {
         /* command so set CD to high */
-        par->ctl &= ~(HCB_NCD_BIT);
-        hcb_set_ctl(par);
+        par->board->set_ctl(par, HCB_CD_BIT, 1);
 
         /* actually strobe with command */
         apollo_send_data(par, data);
 
         /* clear CD back to low */
-        par->ctl |= (HCB_NCD_BIT);
-        hcb_set_ctl(par);
+        par->board->set_ctl(par, HCB_CD_BIT, 0);
 }
 
-/* main hecubafb functions */
-
 static void hecubafb_dpy_update(struct hecubafb_par *par)
 {
         int i;
         unsigned char *buf = (unsigned char __force *)par->info->screen_base;
 
-        apollo_send_command(par, 0xA0);
+        apollo_send_command(par, APOLLO_START_NEW_IMG);
 
         for (i=0; i < (DPY_W*DPY_H/8); i++) {
                 apollo_send_data(par, *(buf++));
         }
 
-        apollo_send_command(par, 0xA1);
-        apollo_send_command(par, 0xA2);
+        apollo_send_command(par, APOLLO_STOP_IMG_DATA);
+        apollo_send_command(par, APOLLO_DISPLAY_IMG);
 }
 
 /* this is called back from the deferred io workqueue */
@@ -270,41 +159,43 @@ static void hecubafb_imageblit(struct fb_info *info,
 static ssize_t hecubafb_write(struct fb_info *info, const char __user *buf,
                                 size_t count, loff_t *ppos)
 {
-        unsigned long p;
-        int err=-EINVAL;
-        struct hecubafb_par *par;
-        unsigned int xres;
-        unsigned int fbmemlength;
+        struct hecubafb_par *par = info->par;
+        unsigned long p = *ppos;
+        void *dst;
+        int err = 0;
+        unsigned long total_size;
 
-        p = *ppos;
-        par = info->par;
-        xres = info->var.xres;
-        fbmemlength = (xres * info->var.yres)/8;
+        if (info->state != FBINFO_STATE_RUNNING)
+                return -EPERM;
 
-        if (p > fbmemlength)
-                return -ENOSPC;
+        total_size = info->fix.smem_len;
 
-        err = 0;
-        if ((count + p) > fbmemlength) {
-                count = fbmemlength - p;
-                err = -ENOSPC;
+        if (p > total_size)
+                return -EFBIG;
+
+        if (count > total_size) {
+                err = -EFBIG;
+                count = total_size;
         }
 
-        if (count) {
-                char *base_addr;
+        if (count + p > total_size) {
+                if (!err)
+                        err = -ENOSPC;
 
-                base_addr = (char __force *)info->screen_base;
-                count -= copy_from_user(base_addr + p, buf, count);
-                *ppos += count;
-                err = -EFAULT;
+                count = total_size - p;
         }
 
-        hecubafb_dpy_update(par);
+        dst = (void __force *) (info->screen_base + p);
+
+        if (copy_from_user(dst, buf, count))
+                err = -EFAULT;
 
-        if (count)
-                return count;
+        if  (!err)
+                *ppos += count;
 
-        return err;
+        hecubafb_dpy_update(par);
+
+        return (err) ? err : count;
 }
 
 static struct fb_ops hecubafb_ops = {
@@ -324,11 +215,21 @@ static struct fb_deferred_io hecubafb_defio = {
 static int __devinit hecubafb_probe(struct platform_device *dev)
 {
         struct fb_info *info;
+        struct hecuba_board *board;
         int retval = -ENOMEM;
         int videomemorysize;
         unsigned char *videomemory;
         struct hecubafb_par *par;
 
+        /* pick up board specific routines */
+        board = dev->dev.platform_data;
+        if (!board)
+                return -EINVAL;
+
+        /* try to count device specific driver, if can't, platform recalls */
+        if (!try_module_get(board->owner))
+                return -ENODEV;
+
         videomemorysize = (DPY_W*DPY_H)/8;
 
         if (!(videomemory = vmalloc(videomemorysize)))
@@ -338,9 +239,9 @@ static int __devinit hecubafb_probe(struct platform_device *dev)
 
         info = framebuffer_alloc(sizeof(struct hecubafb_par), &dev->dev);
         if (!info)
-                goto err;
+                goto err_fballoc;
 
-        info->screen_base = (char __iomem *) videomemory;
+        info->screen_base = (char __force __iomem *)videomemory;
         info->fbops = &hecubafb_ops;
 
         info->var = hecubafb_var;
@@ -348,14 +249,10 @@ static int __devinit hecubafb_probe(struct platform_device *dev)
         info->fix.smem_len = videomemorysize;
         par = info->par;
         par->info = info;
+        par->board = board;
+        par->send_command = apollo_send_command;
+        par->send_data = apollo_send_data;
 
-        if (!dio_addr || !cio_addr || !c2io_addr) {
-                printk(KERN_WARNING "no IO addresses supplied\n");
-                goto err1;
-        }
-        par->dio_addr = dio_addr;
-        par->cio_addr = cio_addr;
-        par->c2io_addr = c2io_addr;
         info->flags = FBINFO_FLAG_DEFAULT;
 
         info->fbdefio = &hecubafb_defio;
@@ -363,7 +260,7 @@ static int __devinit hecubafb_probe(struct platform_device *dev)
 
         retval = register_framebuffer(info);
         if (retval < 0)
-                goto err1;
+                goto err_fbreg;
         platform_set_drvdata(dev, info);
 
         printk(KERN_INFO
@@ -371,25 +268,16 @@ static int __devinit hecubafb_probe(struct platform_device *dev)
                info->node, videomemorysize >> 10);
 
         /* this inits the dpy */
-        apollo_init_control(par);
-
-        apollo_send_command(par, APOLLO_INIT_DISPLAY);
-        apollo_send_data(par, 0x81);
-
-        /* have to wait while display resets */
-        udelay(1000);
-
-        /* if we were told to splash the screen, we just clear it */
-        if (!nosplash) {
-                apollo_send_command(par, APOLLO_ERASE_DISPLAY);
-                apollo_send_data(par, splashval);
-        }
+        retval = par->board->init(par);
+        if (retval < 0)
+                goto err_fbreg;
 
         return 0;
-err1:
+err_fbreg:
         framebuffer_release(info);
-err:
+err_fballoc:
         vfree(videomemory);
+        module_put(board->owner);
         return retval;
 }
 
@@ -398,9 +286,13 @@ static int __devexit hecubafb_remove(struct platform_device *dev)
         struct fb_info *info = platform_get_drvdata(dev);
 
         if (info) {
+                struct hecubafb_par *par = info->par;
                 fb_deferred_io_cleanup(info);
                 unregister_framebuffer(info);
                 vfree((void __force *)info->screen_base);
+                if (par->board->remove)
+                        par->board->remove(par);
+                module_put(par->board->owner);
                 framebuffer_release(info);
         }
         return 0;
@@ -410,62 +302,24 @@ static struct platform_driver hecubafb_driver = {
         .probe  = hecubafb_probe,
         .remove = hecubafb_remove,
         .driver = {
+                .owner  = THIS_MODULE,
                 .name   = "hecubafb",
         },
 };
 
-static struct platform_device *hecubafb_device;
-
 static int __init hecubafb_init(void)
 {
-        int ret;
-
-        if (!hecubafb_enable) {
-                printk(KERN_ERR "Use hecubafb_enable to enable the device\n");
-                return -ENXIO;
-        }
-
-        ret = platform_driver_register(&hecubafb_driver);
-        if (!ret) {
-                hecubafb_device = platform_device_alloc("hecubafb", 0);
-                if (hecubafb_device)
-                        ret = platform_device_add(hecubafb_device);
-                else
-                        ret = -ENOMEM;
-
-                if (ret) {
-                        platform_device_put(hecubafb_device);
-                        platform_driver_unregister(&hecubafb_driver);
-                }
-        }
-        return ret;
-
+        return platform_driver_register(&hecubafb_driver);
 }
 
 static void __exit hecubafb_exit(void)
 {
-        platform_device_unregister(hecubafb_device);
         platform_driver_unregister(&hecubafb_driver);
 }
 
-module_param(nosplash, uint, 0);
-MODULE_PARM_DESC(nosplash, "Disable doing the splash screen");
-module_param(hecubafb_enable, uint, 0);
-MODULE_PARM_DESC(hecubafb_enable, "Enable communication with Hecuba board");
-module_param(dio_addr, ulong, 0);
-MODULE_PARM_DESC(dio_addr, "IO address for data, eg: 0x480");
-module_param(cio_addr, ulong, 0);
-MODULE_PARM_DESC(cio_addr, "IO address for control, eg: 0x400");
-module_param(c2io_addr, ulong, 0);
-MODULE_PARM_DESC(c2io_addr, "IO address for secondary control, eg: 0x408");
-module_param(splashval, ulong, 0);
-MODULE_PARM_DESC(splashval, "Splash pattern: 0x00 is black, 0x01 is white");
-module_param(irq, uint, 0);
-MODULE_PARM_DESC(irq, "IRQ for the Hecuba board");
-
 module_init(hecubafb_init);
 module_exit(hecubafb_exit);
 
-MODULE_DESCRIPTION("fbdev driver for Hecuba board");
+MODULE_DESCRIPTION("fbdev driver for Hecuba/Apollo controller");
 MODULE_AUTHOR("Jaya Kumar");
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/imsttfb.c b/drivers/video/imsttfb.c
index 3ab91bf21576..15d50b9906ce 100644
--- a/drivers/video/imsttfb.c
+++ b/drivers/video/imsttfb.c
@@ -1151,8 +1151,10 @@ imsttfb_load_cursor_image(struct imstt_par *par, int width, int height, __u8 fgc
                                 par->cmap_regs[TVPCRDAT] = 0xff;                eieio();
                         }
                 par->cmap_regs[TVPCADRW] = 0x00;        eieio();
-                for (x = 0; x < 12; x++)
-                        par->cmap_regs[TVPCDATA] = fgc; eieio();
+                for (x = 0; x < 12; x++) {
+                        par->cmap_regs[TVPCDATA] = fgc;
+                        eieio();
+                }
         }
         return 1;
 }
@@ -1476,7 +1478,7 @@ imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         
         dp = pci_device_to_OF_node(pdev);
         if(dp)
-                printk(KERN_INFO "%s: OF name %s\n",__FUNCTION__, dp->name);
+                printk(KERN_INFO "%s: OF name %s\n",__func__, dp->name);
         else
                 printk(KERN_ERR "imsttfb: no OF node for pci device\n");
 #endif /* CONFIG_PPC_OF */
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index 11609552a387..94e4d3ac1a05 100644
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@@ -415,7 +415,7 @@ static void imxfb_setup_gpio(struct imxfb_info *fbi)
 static int imxfb_suspend(struct platform_device *dev, pm_message_t state)
 {
         struct imxfb_info *fbi = platform_get_drvdata(dev);
-        pr_debug("%s\n",__FUNCTION__);
+        pr_debug("%s\n",__func__);
 
         imxfb_disable_controller(fbi);
         return 0;
@@ -424,7 +424,7 @@ static int imxfb_suspend(struct platform_device *dev, pm_message_t state)
 static int imxfb_resume(struct platform_device *dev)
 {
         struct imxfb_info *fbi = platform_get_drvdata(dev);
-        pr_debug("%s\n",__FUNCTION__);
+        pr_debug("%s\n",__func__);
 
         imxfb_enable_controller(fbi);
         return 0;
@@ -440,7 +440,7 @@ static int __init imxfb_init_fbinfo(struct device *dev)
         struct fb_info *info = dev_get_drvdata(dev);
         struct imxfb_info *fbi = info->par;
 
-        pr_debug("%s\n",__FUNCTION__);
+        pr_debug("%s\n",__func__);
 
         info->pseudo_palette = kmalloc( sizeof(u32) * 16, GFP_KERNEL);
         if (!info->pseudo_palette)
diff --git a/drivers/video/intelfb/intelfb.h b/drivers/video/intelfb/intelfb.h
index 836796177942..3325fbd68ab3 100644
--- a/drivers/video/intelfb/intelfb.h
+++ b/drivers/video/intelfb/intelfb.h
@@ -12,9 +12,9 @@
 #endif
 
 /*** Version/name ***/
-#define INTELFB_VERSION                 "0.9.4"
+#define INTELFB_VERSION                 "0.9.5"
 #define INTELFB_MODULE_NAME             "intelfb"
-#define SUPPORTED_CHIPSETS              "830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM"
+#define SUPPORTED_CHIPSETS              "830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM"
 
 
 /*** Debug/feature defines ***/
@@ -58,6 +58,8 @@
 #define PCI_DEVICE_ID_INTEL_915GM       0x2592
 #define PCI_DEVICE_ID_INTEL_945G        0x2772
 #define PCI_DEVICE_ID_INTEL_945GM       0x27A2
+#define PCI_DEVICE_ID_INTEL_965G        0x29A2
+#define PCI_DEVICE_ID_INTEL_965GM       0x2A02
 
 /* Size of MMIO region */
 #define INTEL_REG_SIZE                  0x80000
@@ -158,6 +160,8 @@ enum intel_chips {
         INTEL_915GM,
         INTEL_945G,
         INTEL_945GM,
+        INTEL_965G,
+        INTEL_965GM,
 };
 
 struct intelfb_hwstate {
@@ -358,7 +362,9 @@ struct intelfb_info {
 #define IS_I9XX(dinfo) (((dinfo)->chipset == INTEL_915G) ||     \
                         ((dinfo)->chipset == INTEL_915GM) ||    \
                         ((dinfo)->chipset == INTEL_945G) ||     \
-                        ((dinfo)->chipset==INTEL_945GM))
+                        ((dinfo)->chipset == INTEL_945GM) ||    \
+                        ((dinfo)->chipset == INTEL_965G) ||     \
+                        ((dinfo)->chipset == INTEL_965GM))
 
 #ifndef FBIO_WAITFORVSYNC
 #define FBIO_WAITFORVSYNC       _IOW('F', 0x20, __u32)
diff --git a/drivers/video/intelfb/intelfb_i2c.c b/drivers/video/intelfb/intelfb_i2c.c
index 94c08bb5acf1..ca95f09d8b43 100644
--- a/drivers/video/intelfb/intelfb_i2c.c
+++ b/drivers/video/intelfb/intelfb_i2c.c
@@ -169,6 +169,8 @@ void intelfb_create_i2c_busses(struct intelfb_info *dinfo)
                 /* has some LVDS + tv-out */
         case INTEL_945G:
         case INTEL_945GM:
+        case INTEL_965G:
+        case INTEL_965GM:
                 /* SDVO ports have a single control bus - 2 devices */
                 dinfo->output[i].type = INTELFB_OUTPUT_SDVO;
                 intelfb_setup_i2c_bus(dinfo, &dinfo->output[i].i2c_bus,
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index 481d58f7535d..e44303f9bc52 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -2,7 +2,7 @@
  * intelfb
  *
  * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G/915GM/
- * 945G/945GM integrated graphics chips.
+ * 945G/945GM/965G/965GM integrated graphics chips.
  *
  * Copyright © 2002, 2003 David Dawes <dawes@xfree86.org>
  *                   2004 Sylvain Meyer
@@ -99,6 +99,9 @@
  *              Add vram option to reserve more memory than stolen by BIOS
  *              Fix intelfbhw_pan_display typo
  *              Add __initdata annotations
+ *
+ *    04/2008 - Version 0.9.5
+ *              Add support for 965G/965GM. (Maik Broemme <mbroemme@plusserver.de>)
  */
 
 #include <linux/module.h>
@@ -180,6 +183,8 @@ static struct pci_device_id intelfb_pci_table[] __devinitdata = {
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_915GM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_915GM },
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_945G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_945G },
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_945GM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_945GM },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_965G, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_965G },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_965GM, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, INTELFB_CLASS_MASK, INTEL_965GM },
         { 0, }
 };
 
@@ -549,7 +554,10 @@ static int __devinit intelfb_pci_register(struct pci_dev *pdev,
         if ((ent->device == PCI_DEVICE_ID_INTEL_915G) ||
             (ent->device == PCI_DEVICE_ID_INTEL_915GM) ||
             (ent->device == PCI_DEVICE_ID_INTEL_945G)  ||
-            (ent->device == PCI_DEVICE_ID_INTEL_945GM)) {
+            (ent->device == PCI_DEVICE_ID_INTEL_945GM) ||
+            (ent->device == PCI_DEVICE_ID_INTEL_965G) ||
+            (ent->device == PCI_DEVICE_ID_INTEL_965GM)) {
+
                 aperture_bar = 2;
                 mmio_bar = 0;
         }
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c
index fa1fff553565..8e6d6a4db0ad 100644
--- a/drivers/video/intelfb/intelfbhw.c
+++ b/drivers/video/intelfb/intelfbhw.c
@@ -143,6 +143,18 @@ int intelfbhw_get_chipset(struct pci_dev *pdev, struct intelfb_info *dinfo)
                 dinfo->mobile = 1;
                 dinfo->pll_index = PLLS_I9xx;
                 return 0;
+        case PCI_DEVICE_ID_INTEL_965G:
+                dinfo->name = "Intel(R) 965G";
+                dinfo->chipset = INTEL_965G;
+                dinfo->mobile = 0;
+                dinfo->pll_index = PLLS_I9xx;
+                return 0;
+        case PCI_DEVICE_ID_INTEL_965GM:
+                dinfo->name = "Intel(R) 965GM";
+                dinfo->chipset = INTEL_965GM;
+                dinfo->mobile = 1;
+                dinfo->pll_index = PLLS_I9xx;
+                return 0;
         default:
                 return 1;
         }
@@ -174,7 +186,9 @@ int intelfbhw_get_memory(struct pci_dev *pdev, int *aperture_size,
         case PCI_DEVICE_ID_INTEL_915GM:
         case PCI_DEVICE_ID_INTEL_945G:
         case PCI_DEVICE_ID_INTEL_945GM:
-                /* 915 and 945 chipsets support a 256MB aperture.
+        case PCI_DEVICE_ID_INTEL_965G:
+        case PCI_DEVICE_ID_INTEL_965GM:
+                /* 915, 945 and 965 chipsets support a 256MB aperture.
                    Aperture size is determined by inspected the
                    base address of the aperture. */
                 if (pci_resource_start(pdev, 2) & 0x08000000)
diff --git a/drivers/video/leo.c b/drivers/video/leo.c
index 45b9a5d55dec..f3160fc29795 100644
--- a/drivers/video/leo.c
+++ b/drivers/video/leo.c
@@ -614,7 +614,7 @@ static int __devinit leo_probe(struct of_device *op, const struct of_device_id *
 
         dev_set_drvdata(&op->dev, info);
 
-        printk("%s: leo at %lx:%lx\n",
+        printk(KERN_INFO "%s: leo at %lx:%lx\n",
                dp->full_name,
                par->which_io, par->physbase);
 
diff --git a/drivers/video/matrox/matroxfb_DAC1064.c b/drivers/video/matrox/matroxfb_DAC1064.c
index c4b570b4a4df..0ce3b0a89798 100644
--- a/drivers/video/matrox/matroxfb_DAC1064.c
+++ b/drivers/video/matrox/matroxfb_DAC1064.c
@@ -37,7 +37,7 @@ static void DAC1064_calcclock(CPMINFO unsigned int freq, unsigned int fmax, unsi
         unsigned int fvco;
         unsigned int p;
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
         
         /* only for devices older than G450 */
 
@@ -83,7 +83,7 @@ static const unsigned char MGA1064_DAC[] = {
 static void DAC1064_setpclk(WPMINFO unsigned long fout) {
         unsigned int m, n, p;
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         DAC1064_calcclock(PMINFO fout, ACCESS_FBINFO(max_pixel_clock), &m, &n, &p);
         ACCESS_FBINFO(hw).DACclk[0] = m;
@@ -95,7 +95,7 @@ static void DAC1064_setmclk(WPMINFO int oscinfo, unsigned long fmem) {
         u_int32_t mx;
         struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         if (ACCESS_FBINFO(devflags.noinit)) {
                 /* read MCLK and give up... */
@@ -338,7 +338,7 @@ void DAC1064_global_restore(WPMINFO2) {
 static int DAC1064_init_1(WPMINFO struct my_timming* m) {
         struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         memcpy(hw->DACreg, MGA1064_DAC, sizeof(MGA1064_DAC_regs));
         switch (ACCESS_FBINFO(fbcon).var.bits_per_pixel) {
@@ -374,7 +374,7 @@ static int DAC1064_init_1(WPMINFO struct my_timming* m) {
 static int DAC1064_init_2(WPMINFO struct my_timming* m) {
         struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         if (ACCESS_FBINFO(fbcon).var.bits_per_pixel > 16) {     /* 256 entries */
                 int i;
@@ -418,7 +418,7 @@ static void DAC1064_restore_1(WPMINFO2) {
 
         CRITFLAGS
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         CRITBEGIN
 
@@ -448,7 +448,7 @@ static void DAC1064_restore_2(WPMINFO2) {
         unsigned int i;
 #endif
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
 #ifdef DEBUG
         dprintk(KERN_DEBUG "DAC1064regs ");
@@ -521,7 +521,7 @@ static struct matrox_altout g450out = {
 static int MGA1064_init(WPMINFO struct my_timming* m) {
         struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         if (DAC1064_init_1(PMINFO m)) return 1;
         if (matroxfb_vgaHWinit(PMINFO m)) return 1;
@@ -543,7 +543,7 @@ static int MGA1064_init(WPMINFO struct my_timming* m) {
 static int MGAG100_init(WPMINFO struct my_timming* m) {
         struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         if (DAC1064_init_1(PMINFO m)) return 1;
         hw->MXoptionReg &= ~0x2000;
@@ -565,7 +565,7 @@ static int MGAG100_init(WPMINFO struct my_timming* m) {
 #ifdef CONFIG_FB_MATROX_MYSTIQUE
 static void MGA1064_ramdac_init(WPMINFO2) {
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         /* ACCESS_FBINFO(features.DAC1064.vco_freq_min) = 120000; */
         ACCESS_FBINFO(features.pll.vco_freq_min) = 62000;
@@ -594,7 +594,7 @@ static void MGAG100_progPixClock(CPMINFO int flags, int m, int n, int p) {
         int selClk;
         int clk;
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         outDAC1064(PMINFO M1064_XPIXCLKCTRL, inDAC1064(PMINFO M1064_XPIXCLKCTRL) | M1064_XPIXCLKCTRL_DIS |
                    M1064_XPIXCLKCTRL_PLL_UP);
@@ -636,7 +636,7 @@ static void MGAG100_progPixClock(CPMINFO int flags, int m, int n, int p) {
 static void MGAG100_setPixClock(CPMINFO int flags, int freq) {
         unsigned int m, n, p;
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         DAC1064_calcclock(PMINFO freq, ACCESS_FBINFO(max_pixel_clock), &m, &n, &p);
         MGAG100_progPixClock(PMINFO flags, m, n, p);
@@ -650,7 +650,7 @@ static int MGA1064_preinit(WPMINFO2) {
                                              2048,    0};
         struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         /* ACCESS_FBINFO(capable.cfb4) = 0; ... preinitialized by 0 */
         ACCESS_FBINFO(capable.text) = 1;
@@ -683,7 +683,7 @@ static int MGA1064_preinit(WPMINFO2) {
 
 static void MGA1064_reset(WPMINFO2) {
 
-        DBG(__FUNCTION__);
+        DBG(__func__);
 
         MGA1064_ramdac_init(PMINFO2);
 }
@@ -819,7 +819,7 @@ static int MGAG100_preinit(WPMINFO2) {
         u_int32_t q;
 #endif
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         /* there are some instabilities if in_div > 19 && vco < 61000 */
         if (ACCESS_FBINFO(devflags.g450dac)) {
@@ -956,7 +956,7 @@ static void MGAG100_reset(WPMINFO2) {
         u_int8_t b;
         struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         {
 #ifdef G100_BROKEN_IBM_82351
@@ -1015,7 +1015,7 @@ static void MGA1064_restore(WPMINFO2) {
 
         CRITFLAGS
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         CRITBEGIN
 
@@ -1041,7 +1041,7 @@ static void MGAG100_restore(WPMINFO2) {
 
         CRITFLAGS
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         CRITBEGIN
 
diff --git a/drivers/video/matrox/matroxfb_Ti3026.c b/drivers/video/matrox/matroxfb_Ti3026.c
index 9445cdb759b1..13524821e242 100644
--- a/drivers/video/matrox/matroxfb_Ti3026.c
+++ b/drivers/video/matrox/matroxfb_Ti3026.c
@@ -283,7 +283,7 @@ static int Ti3026_calcclock(CPMINFO unsigned int freq, unsigned int fmax, int* i
         unsigned int fvco;
         unsigned int lin, lfeed, lpost;
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         fvco = PLL_calcclock(PMINFO freq, fmax, &lin, &lfeed, &lpost);
         fvco >>= (*post = lpost);
@@ -297,7 +297,7 @@ static int Ti3026_setpclk(WPMINFO int clk) {
         unsigned int pixfeed, pixin, pixpost;
         struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         f_pll = Ti3026_calcclock(PMINFO clk, ACCESS_FBINFO(max_pixel_clock), &pixin, &pixfeed, &pixpost);
 
@@ -365,7 +365,7 @@ static int Ti3026_init(WPMINFO struct my_timming* m) {
         u_int8_t muxctrl = isInterleave(MINFO) ? TVP3026_XMUXCTRL_MEMORY_64BIT : TVP3026_XMUXCTRL_MEMORY_32BIT;
         struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         memcpy(hw->DACreg, MGADACbpp32, sizeof(hw->DACreg));
         switch (ACCESS_FBINFO(fbcon).var.bits_per_pixel) {
@@ -440,7 +440,7 @@ static void ti3026_setMCLK(WPMINFO int fout){
         unsigned int rfhcnt, mclk_ctl;
         int tmout;
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         f_pll = Ti3026_calcclock(PMINFO fout, ACCESS_FBINFO(max_pixel_clock), &mclk_n, &mclk_m, &mclk_p);
 
@@ -534,7 +534,7 @@ static void ti3026_setMCLK(WPMINFO int fout){
 
 static void ti3026_ramdac_init(WPMINFO2) {
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         ACCESS_FBINFO(features.pll.vco_freq_min) = 110000;
         ACCESS_FBINFO(features.pll.ref_freq)     = 114545;
@@ -554,7 +554,7 @@ static void Ti3026_restore(WPMINFO2) {
         struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
         CRITFLAGS
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
 #ifdef DEBUG
         dprintk(KERN_INFO "EXTVGA regs: ");
@@ -662,7 +662,7 @@ static void Ti3026_restore(WPMINFO2) {
 
 static void Ti3026_reset(WPMINFO2) {
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         ti3026_ramdac_init(PMINFO2);
 }
@@ -680,7 +680,7 @@ static int Ti3026_preinit(WPMINFO2) {
                                           2048, 0};
         struct matrox_hw_state* hw = &ACCESS_FBINFO(hw);
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         ACCESS_FBINFO(millenium) = 1;
         ACCESS_FBINFO(milleniumII) = (ACCESS_FBINFO(pcidev)->device != PCI_DEVICE_ID_MATROX_MIL);
diff --git a/drivers/video/matrox/matroxfb_accel.c b/drivers/video/matrox/matroxfb_accel.c
index 3660d2673bdc..9c3aeee1cc4f 100644
--- a/drivers/video/matrox/matroxfb_accel.c
+++ b/drivers/video/matrox/matroxfb_accel.c
@@ -113,7 +113,7 @@ void matrox_cfbX_init(WPMINFO2) {
         u_int32_t mopmode;
         int accel;
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         mpitch = ACCESS_FBINFO(fbcon).var.xres_virtual;
 
@@ -199,7 +199,7 @@ static void matrox_accel_bmove(WPMINFO int vxres, int sy, int sx, int dy, int dx
         int start, end;
         CRITFLAGS
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         CRITBEGIN
 
@@ -235,7 +235,7 @@ static void matrox_accel_bmove_lin(WPMINFO int vxres, int sy, int sx, int dy, in
         int start, end;
         CRITFLAGS
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         CRITBEGIN
 
@@ -287,7 +287,7 @@ static void matroxfb_accel_clear(WPMINFO u_int32_t color, int sy, int sx, int he
                 int width) {
         CRITFLAGS
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         CRITBEGIN
 
@@ -315,7 +315,7 @@ static void matroxfb_cfb4_clear(WPMINFO u_int32_t bgx, int sy, int sx, int heigh
         int whattodo;
         CRITFLAGS
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         CRITBEGIN
 
@@ -388,7 +388,7 @@ static void matroxfb_1bpp_imageblit(WPMINFO u_int32_t fgx, u_int32_t bgx,
         int easy;
         CRITFLAGS
 
-        DBG_HEAVY(__FUNCTION__);
+        DBG_HEAVY(__func__);
 
         step = (width + 7) >> 3;
         charcell = height * step;
@@ -469,7 +469,7 @@ static void matroxfb_1bpp_imageblit(WPMINFO u_int32_t fgx, u_int32_t bgx,
 static void matroxfb_imageblit(struct fb_info* info, const struct fb_image* image) {
         MINFO_FROM_INFO(info);
 
-        DBG_HEAVY(__FUNCTION__);
+        DBG_HEAVY(__func__);
 
         if (image->depth == 1) {
                 u_int32_t fgx, bgx;
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index b25972ac6eeb..54e82f35353d 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -312,7 +312,7 @@ static void matrox_pan_var(WPMINFO struct fb_var_screeninfo *var) {
 
         CRITFLAGS
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         if (ACCESS_FBINFO(dead))
                 return;
@@ -392,7 +392,7 @@ static int matroxfb_open(struct fb_info *info, int user)
 {
         MINFO_FROM_INFO(info);
 
-        DBG_LOOP(__FUNCTION__)
+        DBG_LOOP(__func__)
 
         if (ACCESS_FBINFO(dead)) {
                 return -ENXIO;
@@ -408,7 +408,7 @@ static int matroxfb_release(struct fb_info *info, int user)
 {
         MINFO_FROM_INFO(info);
 
-        DBG_LOOP(__FUNCTION__)
+        DBG_LOOP(__func__)
 
         if (user) {
                 if (0 == --ACCESS_FBINFO(userusecount)) {
@@ -425,7 +425,7 @@ static int matroxfb_pan_display(struct fb_var_screeninfo *var,
                 struct fb_info* info) {
         MINFO_FROM_INFO(info);
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         matrox_pan_var(PMINFO var);
         return 0;
@@ -434,7 +434,7 @@ static int matroxfb_pan_display(struct fb_var_screeninfo *var,
 static int matroxfb_get_final_bppShift(CPMINFO int bpp) {
         int bppshft2;
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         bppshft2 = bpp;
         if (!bppshft2) {
@@ -451,7 +451,7 @@ static int matroxfb_test_and_set_rounding(CPMINFO int xres, int bpp) {
         int over;
         int rounding;
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         switch (bpp) {
                 case 0:         return xres;
@@ -482,7 +482,7 @@ static int matroxfb_pitch_adjust(CPMINFO int xres, int bpp) {
         const int* width;
         int xres_new;
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         if (!bpp) return xres;
 
@@ -504,7 +504,7 @@ static int matroxfb_pitch_adjust(CPMINFO int xres, int bpp) {
 
 static int matroxfb_get_cmap_len(struct fb_var_screeninfo *var) {
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         switch (var->bits_per_pixel) {
                 case 4:
@@ -548,7 +548,7 @@ static int matroxfb_decode_var(CPMINFO struct fb_var_screeninfo *var, int *visua
         unsigned int vramlen;
         unsigned int memlen;
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         switch (bpp) {
                 case 4:  if (!ACCESS_FBINFO(capable.cfb4)) return -EINVAL;
@@ -648,7 +648,7 @@ static int matroxfb_setcolreg(unsigned regno, unsigned red, unsigned green,
         struct matrox_fb_info* minfo = container_of(fb_info, struct matrox_fb_info, fbcon);
 #endif
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         /*
          *  Set a single color register. The values supplied are
@@ -707,7 +707,7 @@ static int matroxfb_setcolreg(unsigned regno, unsigned red, unsigned green,
 static void matroxfb_init_fix(WPMINFO2)
 {
         struct fb_fix_screeninfo *fix = &ACCESS_FBINFO(fbcon).fix;
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         strcpy(fix->id,"MATROX");
 
@@ -722,7 +722,7 @@ static void matroxfb_init_fix(WPMINFO2)
 static void matroxfb_update_fix(WPMINFO2)
 {
         struct fb_fix_screeninfo *fix = &ACCESS_FBINFO(fbcon).fix;
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         fix->smem_start = ACCESS_FBINFO(video.base) + ACCESS_FBINFO(curr.ydstorg.bytes);
         fix->smem_len = ACCESS_FBINFO(video.len_usable) - ACCESS_FBINFO(curr.ydstorg.bytes);
@@ -753,7 +753,7 @@ static int matroxfb_set_par(struct fb_info *info)
         struct fb_var_screeninfo *var;
         MINFO_FROM_INFO(info);
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         if (ACCESS_FBINFO(dead)) {
                 return -ENXIO;
@@ -876,7 +876,7 @@ static int matroxfb_ioctl(struct fb_info *info,
         void __user *argp = (void __user *)arg;
         MINFO_FROM_INFO(info);
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         if (ACCESS_FBINFO(dead)) {
                 return -ENXIO;
@@ -1175,7 +1175,7 @@ static int matroxfb_blank(int blank, struct fb_info *info)
         CRITFLAGS
         MINFO_FROM_INFO(info);
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         if (ACCESS_FBINFO(dead))
                 return 1;
@@ -1287,7 +1287,7 @@ static int matroxfb_getmemory(WPMINFO unsigned int maxSize, unsigned int *realSi
         unsigned char bytes[32];
         unsigned char* tmp;
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         vm = ACCESS_FBINFO(video.vbase);
         maxSize &= ~0x1FFFFF;   /* must be X*2MB (really it must be 2 or X*4MB) */
@@ -1593,7 +1593,7 @@ static int initMatrox2(WPMINFO struct board* b){
                 { },
         };
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         /* set default values... */
         vesafb_defined.accel_flags = FB_ACCELF_TEXT;
@@ -2006,7 +2006,7 @@ static int matroxfb_probe(struct pci_dev* pdev, const struct pci_device_id* dumm
 #ifndef CONFIG_FB_MATROX_MULTIHEAD
         static int registered = 0;
 #endif
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         svid = pdev->subsystem_vendor;
         sid = pdev->subsystem_device;
@@ -2301,7 +2301,7 @@ static void __exit matrox_done(void) {
 static int __init matroxfb_setup(char *options) {
         char *this_opt;
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         if (!options || !*options)
                 return 0;
@@ -2444,7 +2444,7 @@ static int __init matroxfb_init(void)
         char *option = NULL;
         int err = 0;
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         if (fb_get_options("matroxfb", &option))
                 return -ENODEV;
@@ -2556,7 +2556,7 @@ MODULE_PARM_DESC(cmode, "Specify the video depth that should be used (8bit defau
 
 int __init init_module(void){
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         if (disabled)
                 return -ENXIO;
diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c
index a6ab5b6a58d0..7ac4c5f6145d 100644
--- a/drivers/video/matrox/matroxfb_crtc2.c
+++ b/drivers/video/matrox/matroxfb_crtc2.c
@@ -420,7 +420,7 @@ static int matroxfb_dh_ioctl(struct fb_info *info,
 #define m2info (container_of(info, struct matroxfb_dh_fb_info, fbcon))
         MINFO_FROM(m2info->primary_dev);
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         switch (cmd) {
                 case FBIOGET_VBLANK:
diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c
index 0cd58f84fb46..89da27bd5c49 100644
--- a/drivers/video/matrox/matroxfb_maven.c
+++ b/drivers/video/matrox/matroxfb_maven.c
@@ -220,7 +220,7 @@ static int matroxfb_PLL_mavenclock(const struct matrox_pll_features2* pll,
         unsigned int scrlen;
         unsigned int fmax;
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         scrlen = htotal * (vtotal - 1);
         fwant = htotal * vtotal;
diff --git a/drivers/video/matrox/matroxfb_misc.c b/drivers/video/matrox/matroxfb_misc.c
index ab7fb50bc1de..aaa3e538e5da 100644
--- a/drivers/video/matrox/matroxfb_misc.c
+++ b/drivers/video/matrox/matroxfb_misc.c
@@ -90,13 +90,13 @@
 #include <linux/matroxfb.h>
 
 void matroxfb_DAC_out(CPMINFO int reg, int val) {
-        DBG_REG(__FUNCTION__)
+        DBG_REG(__func__)
         mga_outb(M_RAMDAC_BASE+M_X_INDEX, reg);
         mga_outb(M_RAMDAC_BASE+M_X_DATAREG, val);
 }
 
 int matroxfb_DAC_in(CPMINFO int reg) {
-        DBG_REG(__FUNCTION__)
+        DBG_REG(__func__)
         mga_outb(M_RAMDAC_BASE+M_X_INDEX, reg);
         return mga_inb(M_RAMDAC_BASE+M_X_DATAREG);
 }
@@ -104,7 +104,7 @@ int matroxfb_DAC_in(CPMINFO int reg) {
 void matroxfb_var2my(struct fb_var_screeninfo* var, struct my_timming* mt) {
         unsigned int pixclock = var->pixclock;
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         if (!pixclock) pixclock = 10000;        /* 10ns = 100MHz */
         mt->pixclock = 1000000000 / pixclock;
@@ -131,7 +131,7 @@ int matroxfb_PLL_calcclock(const struct matrox_pll_features* pll, unsigned int f
         unsigned int fwant;
         unsigned int p;
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         fwant = freq;
 
@@ -192,7 +192,7 @@ int matroxfb_vgaHWinit(WPMINFO struct my_timming* m) {
         int i;
         struct matrox_hw_state * const hw = &ACCESS_FBINFO(hw);
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         hw->SEQ[0] = 0x00;
         hw->SEQ[1] = 0x01;      /* or 0x09 */
@@ -336,7 +336,7 @@ void matroxfb_vgaHWrestore(WPMINFO2) {
         struct matrox_hw_state * const hw = &ACCESS_FBINFO(hw);
         CRITFLAGS
 
-        DBG(__FUNCTION__)
+        DBG(__func__)
 
         dprintk(KERN_INFO "MiscOutReg: %02X\n", hw->MiscOutReg);
         dprintk(KERN_INFO "SEQ regs:   ");
diff --git a/drivers/video/metronomefb.c b/drivers/video/metronomefb.c
index e9a89fd82757..249791286367 100644
--- a/drivers/video/metronomefb.c
+++ b/drivers/video/metronomefb.c
@@ -13,12 +13,10 @@
  * Corporation. http://support.eink.com/community
  *
  * This driver is written to be used with the Metronome display controller.
- * It was tested with an E-Ink 800x600 Vizplex EPD on a Gumstix Connex board
- * using the Lyre interface board.
+ * It is intended to be architecture independent. A board specific driver
+ * must be used to perform all the physical IO interactions. An example
+ * is provided as am200epd.c
  *
- * General notes:
- * - User must set metronomefb_enable=1 to enable it.
- * - See Documentation/fb/metronomefb.txt for how metronome works.
  */
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -38,9 +36,11 @@
 #include <linux/uaccess.h>
 #include <linux/irq.h>
 
-#include <asm/arch/pxa-regs.h>
+#include <video/metronomefb.h>
+
 #include <asm/unaligned.h>
 
+
 #define DEBUG 1
 #ifdef DEBUG
 #define DPRINTK(f, a...) printk(KERN_DEBUG "%s: " f, __func__ , ## a)
@@ -53,35 +53,6 @@
 #define DPY_W 832
 #define DPY_H 622
 
-struct metromem_desc {
-        u32 mFDADR0;
-        u32 mFSADR0;
-        u32 mFIDR0;
-        u32 mLDCMD0;
-};
-
-struct metromem_cmd {
-        u16 opcode;
-        u16 args[((64-2)/2)];
-        u16 csum;
-};
-
-struct metronomefb_par {
-        unsigned char *metromem;
-        struct metromem_desc *metromem_desc;
-        struct metromem_cmd *metromem_cmd;
-        unsigned char *metromem_wfm;
-        unsigned char *metromem_img;
-        u16 *metromem_img_csum;
-        u16 *csum_table;
-        int metromemsize;
-        dma_addr_t metromem_dma;
-        dma_addr_t metromem_desc_dma;
-        struct fb_info *info;
-        wait_queue_head_t waitq;
-        u8 frame_count;
-};
-
 /* frame differs from image. frame includes non-visible pixels */
 struct epd_frame {
         int fw; /* frame width */
@@ -120,8 +91,7 @@ static struct fb_var_screeninfo metronomefb_var __devinitdata = {
         .transp =       { 0, 0, 0 },
 };
 
-static unsigned int metronomefb_enable;
-
+/* the waveform structure that is coming from userspace firmware */
 struct waveform_hdr {
         u8 stuff[32];
 
@@ -301,165 +271,6 @@ static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
         return 0;
 }
 
-/* register offsets for gpio control */
-#define LED_GPIO_PIN 51
-#define STDBY_GPIO_PIN 48
-#define RST_GPIO_PIN 49
-#define RDY_GPIO_PIN 32
-#define ERR_GPIO_PIN 17
-#define PCBPWR_GPIO_PIN 16
-
-#define AF_SEL_GPIO_N 0x3
-#define GAFR0_U_OFFSET(pin) ((pin - 16) * 2)
-#define GAFR1_L_OFFSET(pin) ((pin - 32) * 2)
-#define GAFR1_U_OFFSET(pin) ((pin - 48) * 2)
-#define GPDR1_OFFSET(pin) (pin - 32)
-#define GPCR1_OFFSET(pin) (pin - 32)
-#define GPSR1_OFFSET(pin) (pin - 32)
-#define GPCR0_OFFSET(pin) (pin)
-#define GPSR0_OFFSET(pin) (pin)
-
-static void metronome_set_gpio_output(int pin, int val)
-{
-        u8 index;
-
-        index = pin >> 4;
-
-        switch (index) {
-        case 1:
-                if (val)
-                        GPSR0 |= (1 << GPSR0_OFFSET(pin));
-                else
-                        GPCR0 |= (1 << GPCR0_OFFSET(pin));
-                break;
-        case 2:
-                break;
-        case 3:
-                if (val)
-                        GPSR1 |= (1 << GPSR1_OFFSET(pin));
-                else
-                        GPCR1 |= (1 << GPCR1_OFFSET(pin));
-                break;
-        default:
-                printk(KERN_ERR "unimplemented\n");
-        }
-}
-
-static void __devinit metronome_init_gpio_pin(int pin, int dir)
-{
-        u8 index;
-        /* dir 0 is output, 1 is input
-        - do 2 things here:
-        - set gpio alternate function to standard gpio
-        - set gpio direction to input or output  */
-
-        index = pin >> 4;
-        switch (index) {
-        case 1:
-                GAFR0_U &= ~(AF_SEL_GPIO_N << GAFR0_U_OFFSET(pin));
-
-                if (dir)
-                        GPDR0 &= ~(1 << pin);
-                else
-                        GPDR0 |= (1 << pin);
-                break;
-        case 2:
-                GAFR1_L &= ~(AF_SEL_GPIO_N << GAFR1_L_OFFSET(pin));
-
-                if (dir)
-                        GPDR1 &= ~(1 << GPDR1_OFFSET(pin));
-                else
-                        GPDR1 |= (1 << GPDR1_OFFSET(pin));
-                break;
-        case 3:
-                GAFR1_U &= ~(AF_SEL_GPIO_N << GAFR1_U_OFFSET(pin));
-
-                if (dir)
-                        GPDR1 &= ~(1 << GPDR1_OFFSET(pin));
-                else
-                        GPDR1 |= (1 << GPDR1_OFFSET(pin));
-                break;
-        default:
-                printk(KERN_ERR "unimplemented\n");
-        }
-}
-
-static void __devinit metronome_init_gpio_regs(void)
-{
-        metronome_init_gpio_pin(LED_GPIO_PIN, 0);
-        metronome_set_gpio_output(LED_GPIO_PIN, 0);
-
-        metronome_init_gpio_pin(STDBY_GPIO_PIN, 0);
-        metronome_set_gpio_output(STDBY_GPIO_PIN, 0);
-
-        metronome_init_gpio_pin(RST_GPIO_PIN, 0);
-        metronome_set_gpio_output(RST_GPIO_PIN, 0);
-
-        metronome_init_gpio_pin(RDY_GPIO_PIN, 1);
-
-        metronome_init_gpio_pin(ERR_GPIO_PIN, 1);
-
-        metronome_init_gpio_pin(PCBPWR_GPIO_PIN, 0);
-        metronome_set_gpio_output(PCBPWR_GPIO_PIN, 0);
-}
-
-static void metronome_disable_lcd_controller(struct metronomefb_par *par)
-{
-        LCSR = 0xffffffff;      /* Clear LCD Status Register */
-        LCCR0 |= LCCR0_DIS;     /* Disable LCD Controller */
-
-        /* we reset and just wait for things to settle */
-        msleep(200);
-}
-
-static void metronome_enable_lcd_controller(struct metronomefb_par *par)
-{
-        LCSR = 0xffffffff;
-        FDADR0 = par->metromem_desc_dma;
-        LCCR0 |= LCCR0_ENB;
-}
-
-static void __devinit metronome_init_lcdc_regs(struct metronomefb_par *par)
-{
-        /* here we do:
-        - disable the lcd controller
-        - setup lcd control registers
-        - setup dma descriptor
-        - reenable lcd controller
-        */
-
-        /* disable the lcd controller */
-        metronome_disable_lcd_controller(par);
-
-        /* setup lcd control registers */
-        LCCR0 = LCCR0_LDM | LCCR0_SFM | LCCR0_IUM | LCCR0_EFM | LCCR0_PAS
-                | LCCR0_QDM | LCCR0_BM | LCCR0_OUM;
-
-        LCCR1 = (epd_frame_table[0].fw/2 - 1) /* pixels per line */
-                | (27 << 10) /* hsync pulse width - 1 */
-                | (33 << 16) /* eol pixel count */
-                | (33 << 24); /* bol pixel count */
-
-        LCCR2 = (epd_frame_table[0].fh - 1) /* lines per panel */
-                | (24 << 10) /* vsync pulse width - 1 */
-                | (2 << 16) /* eof pixel count */
-                | (0 << 24); /* bof pixel count */
-
-        LCCR3 = 2 /* pixel clock divisor */
-                | (24 << 8) /* AC Bias pin freq */
-                | LCCR3_16BPP /* BPP */
-                | LCCR3_PCP;  /* PCP falling edge */
-
-        /* setup dma descriptor */
-        par->metromem_desc->mFDADR0 = par->metromem_desc_dma;
-        par->metromem_desc->mFSADR0 = par->metromem_dma;
-        par->metromem_desc->mFIDR0 = 0;
-        par->metromem_desc->mLDCMD0 = epd_frame_table[0].fw
-                                        * epd_frame_table[0].fh;
-        /* reenable lcd controller */
-        metronome_enable_lcd_controller(par);
-}
-
 static int metronome_display_cmd(struct metronomefb_par *par)
 {
         int i;
@@ -493,8 +304,7 @@ static int metronome_display_cmd(struct metronomefb_par *par)
         par->metromem_cmd->csum = cs;
         par->metromem_cmd->opcode = opcode; /* display cmd */
 
-        i = wait_event_interruptible_timeout(par->waitq, (GPLR1 & 0x01), HZ);
-        return i;
+        return par->board->met_wait_event_intr(par);
 }
 
 static int __devinit metronome_powerup_cmd(struct metronomefb_par *par)
@@ -518,13 +328,12 @@ static int __devinit metronome_powerup_cmd(struct metronomefb_par *par)
         par->metromem_cmd->csum = cs;
 
         msleep(1);
-        metronome_set_gpio_output(RST_GPIO_PIN, 1);
+        par->board->set_rst(par, 1);
 
         msleep(1);
-        metronome_set_gpio_output(STDBY_GPIO_PIN, 1);
+        par->board->set_stdby(par, 1);
 
-        i = wait_event_timeout(par->waitq, (GPLR1 & 0x01), HZ);
-        return i;
+        return par->board->met_wait_event(par);
 }
 
 static int __devinit metronome_config_cmd(struct metronomefb_par *par)
@@ -569,8 +378,7 @@ static int __devinit metronome_config_cmd(struct metronomefb_par *par)
         par->metromem_cmd->csum = cs;
         par->metromem_cmd->opcode = 0xCC10; /* config cmd */
 
-        i = wait_event_timeout(par->waitq, (GPLR1 & 0x01), HZ);
-        return i;
+        return par->board->met_wait_event(par);
 }
 
 static int __devinit metronome_init_cmd(struct metronomefb_par *par)
@@ -596,16 +404,19 @@ static int __devinit metronome_init_cmd(struct metronomefb_par *par)
         par->metromem_cmd->csum = cs;
         par->metromem_cmd->opcode = 0xCC20; /* init cmd */
 
-        i = wait_event_timeout(par->waitq, (GPLR1 & 0x01), HZ);
-        return i;
+        return par->board->met_wait_event(par);
 }
 
 static int __devinit metronome_init_regs(struct metronomefb_par *par)
 {
         int res;
 
-        metronome_init_gpio_regs();
-        metronome_init_lcdc_regs(par);
+        par->board->init_gpio_regs(par);
+
+        par->board->init_lcdc_regs(par);
+
+        /* now that lcd is setup, setup dma descriptor */
+        par->board->post_dma_setup(par);
 
         res = metronome_powerup_cmd(par);
         if (res)
@@ -616,8 +427,6 @@ static int __devinit metronome_init_regs(struct metronomefb_par *par)
                 return res;
 
         res = metronome_init_cmd(par);
-        if (res)
-                return res;
 
         return res;
 }
@@ -632,7 +441,7 @@ static void metronomefb_dpy_update(struct metronomefb_par *par)
 
         cksum = calc_img_cksum((u16 *) par->metromem_img,
                                 (epd_frame_table[0].fw * DPY_H)/2);
-        *((u16 *) (par->metromem_img) +
+        *((u16 *)(par->metromem_img) +
                         (epd_frame_table[0].fw * DPY_H)/2) = cksum;
         metronome_display_cmd(par);
 }
@@ -641,8 +450,8 @@ static u16 metronomefb_dpy_update_page(struct metronomefb_par *par, int index)
 {
         int i;
         u16 csum = 0;
-        u16 *buf = (u16 __force *) (par->info->screen_base + index);
-        u16 *img = (u16 *) (par->metromem_img + index);
+        u16 *buf = (u16 __force *)(par->info->screen_base + index);
+        u16 *img = (u16 *)(par->metromem_img + index);
 
         /* swizzle from vm to metromem and recalc cksum at the same time*/
         for (i = 0; i < PAGE_SIZE/2; i++) {
@@ -678,7 +487,7 @@ static void metronomefb_fillrect(struct fb_info *info,
 {
         struct metronomefb_par *par = info->par;
 
-        cfb_fillrect(info, rect);
+        sys_fillrect(info, rect);
         metronomefb_dpy_update(par);
 }
 
@@ -687,7 +496,7 @@ static void metronomefb_copyarea(struct fb_info *info,
 {
         struct metronomefb_par *par = info->par;
 
-        cfb_copyarea(info, area);
+        sys_copyarea(info, area);
         metronomefb_dpy_update(par);
 }
 
@@ -696,7 +505,7 @@ static void metronomefb_imageblit(struct fb_info *info,
 {
         struct metronomefb_par *par = info->par;
 
-        cfb_imageblit(info, image);
+        sys_imageblit(info, image);
         metronomefb_dpy_update(par);
 }
 
@@ -733,7 +542,7 @@ static ssize_t metronomefb_write(struct fb_info *info, const char __user *buf,
                 count = total_size - p;
         }
 
-        dst = (void __force *) (info->screen_base + p);
+        dst = (void __force *)(info->screen_base + p);
 
         if (copy_from_user(dst, buf, count))
                 err = -EFAULT;
@@ -759,18 +568,10 @@ static struct fb_deferred_io metronomefb_defio = {
         .deferred_io    = metronomefb_dpy_deferred_io,
 };
 
-static irqreturn_t metronome_handle_irq(int irq, void *dev_id)
-{
-        struct fb_info *info = dev_id;
-        struct metronomefb_par *par = info->par;
-
-        wake_up_interruptible(&par->waitq);
-        return IRQ_HANDLED;
-}
-
 static int __devinit metronomefb_probe(struct platform_device *dev)
 {
         struct fb_info *info;
+        struct metronome_board *board;
         int retval = -ENOMEM;
         int videomemorysize;
         unsigned char *videomemory;
@@ -779,17 +580,26 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
         int cmd_size, wfm_size, img_size, padding_size, totalsize;
         int i;
 
+        /* pick up board specific routines */
+        board = dev->dev.platform_data;
+        if (!board)
+                return -EINVAL;
+
+        /* try to count device specific driver, if can't, platform recalls */
+        if (!try_module_get(board->owner))
+                return -ENODEV;
+
         /* we have two blocks of memory.
         info->screen_base which is vm, and is the fb used by apps.
         par->metromem which is physically contiguous memory and
         contains the display controller commands, waveform,
         processed image data and padding. this is the data pulled
-        by the pxa255's LCD controller and pushed to Metronome */
+        by the device's LCD controller and pushed to Metronome */
 
         videomemorysize = (DPY_W*DPY_H);
         videomemory = vmalloc(videomemorysize);
         if (!videomemory)
-                return retval;
+                return -ENOMEM;
 
         memset(videomemory, 0, videomemorysize);
 
@@ -797,7 +607,7 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
         if (!info)
                 goto err_vfree;
 
-        info->screen_base = (char __iomem *) videomemory;
+        info->screen_base = (char __force __iomem *)videomemory;
         info->fbops = &metronomefb_ops;
 
         info->var = metronomefb_var;
@@ -805,6 +615,7 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
         info->fix.smem_len = videomemorysize;
         par = info->par;
         par->info = info;
+        par->board = board;
         init_waitqueue_head(&par->waitq);
 
         /* this table caches per page csum values. */
@@ -849,11 +660,10 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
         par->metromem_desc_dma = par->metromem_dma + cmd_size + wfm_size
                                  + img_size + padding_size;
 
-        /* load the waveform in. assume mode 3, temp 31 for now */
-        /*      a) request the waveform file from userspace
+        /* load the waveform in. assume mode 3, temp 31 for now
+                a) request the waveform file from userspace
                 b) process waveform and decode into metromem */
-
-        retval = request_firmware(&fw_entry, "waveform.wbf", &dev->dev);
+        retval = request_firmware(&fw_entry, "metronome.wbf", &dev->dev);
         if (retval < 0) {
                 printk(KERN_ERR "metronomefb: couldn't get waveform\n");
                 goto err_dma_free;
@@ -861,19 +671,14 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
 
         retval = load_waveform((u8 *) fw_entry->data, fw_entry->size,
                                 par->metromem_wfm, 3, 31, &par->frame_count);
+        release_firmware(fw_entry);
         if (retval < 0) {
                 printk(KERN_ERR "metronomefb: couldn't process waveform\n");
-                goto err_ld_wfm;
+                goto err_dma_free;
         }
-        release_firmware(fw_entry);
 
-        retval = request_irq(IRQ_GPIO(RDY_GPIO_PIN), metronome_handle_irq,
-                                IRQF_DISABLED, "Metronome", info);
-        if (retval) {
-                dev_err(&dev->dev, "request_irq failed: %d\n", retval);
-                goto err_ld_wfm;
-        }
-        set_irq_type(IRQ_GPIO(RDY_GPIO_PIN), IRQT_FALLING);
+        if (board->setup_irq(info))
+                goto err_dma_free;
 
         retval = metronome_init_regs(par);
         if (retval < 0)
@@ -913,9 +718,7 @@ err_cmap:
 err_fb_rel:
         framebuffer_release(info);
 err_free_irq:
-        free_irq(IRQ_GPIO(RDY_GPIO_PIN), info);
-err_ld_wfm:
-        release_firmware(fw_entry);
+        board->free_irq(info);
 err_dma_free:
         dma_free_writecombine(&dev->dev, par->metromemsize, par->metromem,
                                 par->metromem_dma);
@@ -923,6 +726,7 @@ err_csum_table:
         vfree(par->csum_table);
 err_vfree:
         vfree(videomemory);
+        module_put(board->owner);
         return retval;
 }
 
@@ -939,7 +743,8 @@ static int __devexit metronomefb_remove(struct platform_device *dev)
                 vfree(par->csum_table);
                 unregister_framebuffer(info);
                 vfree((void __force *)info->screen_base);
-                free_irq(IRQ_GPIO(RDY_GPIO_PIN), info);
+                par->board->free_irq(info);
+                module_put(par->board->owner);
                 framebuffer_release(info);
         }
         return 0;
@@ -949,48 +754,21 @@ static struct platform_driver metronomefb_driver = {
         .probe  = metronomefb_probe,
         .remove = metronomefb_remove,
         .driver = {
+                .owner  = THIS_MODULE,
                 .name   = "metronomefb",
         },
 };
 
-static struct platform_device *metronomefb_device;
-
 static int __init metronomefb_init(void)
 {
-        int ret;
-
-        if (!metronomefb_enable) {
-                printk(KERN_ERR
-                        "Use metronomefb_enable to enable the device\n");
-                return -ENXIO;
-        }
-
-        ret = platform_driver_register(&metronomefb_driver);
-        if (!ret) {
-                metronomefb_device = platform_device_alloc("metronomefb", 0);
-                if (metronomefb_device)
-                        ret = platform_device_add(metronomefb_device);
-                else
-                        ret = -ENOMEM;
-
-                if (ret) {
-                        platform_device_put(metronomefb_device);
-                        platform_driver_unregister(&metronomefb_driver);
-                }
-        }
-        return ret;
-
+        return platform_driver_register(&metronomefb_driver);
 }
 
 static void __exit metronomefb_exit(void)
 {
-        platform_device_unregister(metronomefb_device);
         platform_driver_unregister(&metronomefb_driver);
 }
 
-module_param(metronomefb_enable, uint, 0);
-MODULE_PARM_DESC(metronomefb_enable, "Enable communication with Metronome");
-
 module_init(metronomefb_init);
 module_exit(metronomefb_exit);
 
diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index 08d072552233..473562191586 100644
--- a/drivers/video/modedb.c
+++ b/drivers/video/modedb.c
@@ -22,7 +22,7 @@
     ((v).xres == (x) && (v).yres == (y))
 
 #ifdef DEBUG
-#define DPRINTK(fmt, args...)   printk("modedb %s: " fmt, __FUNCTION__ , ## args)
+#define DPRINTK(fmt, args...)   printk("modedb %s: " fmt, __func__ , ## args)
 #else
 #define DPRINTK(fmt, args...)
 #endif
@@ -522,7 +522,7 @@ int fb_find_mode(struct fb_var_screeninfo *var,
         int res_specified = 0, bpp_specified = 0, refresh_specified = 0;
         unsigned int xres = 0, yres = 0, bpp = default_bpp, refresh = 0;
         int yres_specified = 0, cvt = 0, rb = 0, interlace = 0, margins = 0;
-        u32 best, diff;
+        u32 best, diff, tdiff;
 
         for (i = namelen-1; i >= 0; i--) {
             switch (name[i]) {
@@ -651,19 +651,27 @@ done:
                 return (refresh_specified) ? 2 : 1;
         }
 
-        diff = xres + yres;
+        diff = 2 * (xres + yres);
         best = -1;
         DPRINTK("Trying best-fit modes\n");
         for (i = 0; i < dbsize; i++) {
-            if (xres <= db[i].xres && yres <= db[i].yres) {
                 DPRINTK("Trying %ix%i\n", db[i].xres, db[i].yres);
                 if (!fb_try_mode(var, info, &db[i], bpp)) {
-                    if (diff > (db[i].xres - xres) + (db[i].yres - yres)) {
-                        diff = (db[i].xres - xres) + (db[i].yres - yres);
-                        best = i;
-                    }
+                        tdiff = abs(db[i].xres - xres) +
+                                abs(db[i].yres - yres);
+
+                        /*
+                         * Penalize modes with resolutions smaller
+                         * than requested.
+                         */
+                        if (xres > db[i].xres || yres > db[i].yres)
+                                tdiff += xres + yres;
+
+                        if (diff > tdiff) {
+                                diff = tdiff;
+                                best = i;
+                        }
                 }
-            }
         }
         if (best != -1) {
             fb_try_mode(var, info, &db[best], bpp);
diff --git a/drivers/video/n411.c b/drivers/video/n411.c
new file mode 100644
index 000000000000..935830fea7b6
--- /dev/null
+++ b/drivers/video/n411.c
@@ -0,0 +1,202 @@
+/*
+ * linux/drivers/video/n411.c -- Platform device for N411 EPD kit
+ *
+ * Copyright (C) 2008, Jaya Kumar
+ *
+ * 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.
+ *
+ * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven.
+ *
+ * This driver is written to be used with the Hecuba display controller
+ * board, and tested with the EInk 800x600 display in 1 bit mode.
+ * The interface between Hecuba and the host is TTL based GPIO. The
+ * GPIO requirements are 8 writable data lines and 6 lines for control.
+ * Only 4 of the controls are actually used here but 6 for future use.
+ * The driver requires the IO addresses for data and control GPIO at
+ * load time. It is also possible to use this display with a standard
+ * PC parallel port.
+ *
+ * General notes:
+ * - User must set dio_addr=0xIOADDR cio_addr=0xIOADDR c2io_addr=0xIOADDR
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/list.h>
+#include <linux/uaccess.h>
+#include <linux/irq.h>
+
+#include <video/hecubafb.h>
+
+static unsigned long dio_addr;
+static unsigned long cio_addr;
+static unsigned long c2io_addr;
+static unsigned long splashval;
+static unsigned int nosplash;
+static unsigned char ctl;
+
+static void n411_set_ctl(struct hecubafb_par *par, unsigned char bit, unsigned
+                                                        char state)
+{
+        switch (bit) {
+        case HCB_CD_BIT:
+                if (state)
+                        ctl &= ~(HCB_CD_BIT);
+                else
+                        ctl |= HCB_CD_BIT;
+                break;
+        case HCB_DS_BIT:
+                if (state)
+                        ctl &= ~(HCB_DS_BIT);
+                else
+                        ctl |= HCB_DS_BIT;
+                break;
+        }
+        outb(ctl, cio_addr);
+}
+
+static unsigned char n411_get_ctl(struct hecubafb_par *par)
+{
+        return inb(c2io_addr);
+}
+
+static void n411_set_data(struct hecubafb_par *par, unsigned char value)
+{
+        outb(value, dio_addr);
+}
+
+static void n411_wait_for_ack(struct hecubafb_par *par, int clear)
+{
+        int timeout;
+        unsigned char tmp;
+
+        timeout = 500;
+        do {
+                tmp = n411_get_ctl(par);
+                if ((tmp & HCB_ACK_BIT) && (!clear))
+                        return;
+                else if (!(tmp & HCB_ACK_BIT) && (clear))
+                        return;
+                udelay(1);
+        } while (timeout--);
+        printk(KERN_ERR "timed out waiting for ack\n");
+}
+
+static int n411_init_control(struct hecubafb_par *par)
+{
+        unsigned char tmp;
+        /* for init, we want the following setup to be set:
+        WUP = lo
+        ACK = hi
+        DS = hi
+        RW = hi
+        CD = lo
+        */
+
+        /* write WUP to lo, DS to hi, RW to hi, CD to lo */
+        ctl = HCB_WUP_BIT | HCB_RW_BIT | HCB_CD_BIT ;
+        n411_set_ctl(par, HCB_DS_BIT, 1);
+
+        /* check ACK is not lo */
+        tmp = n411_get_ctl(par);
+        if (tmp & HCB_ACK_BIT) {
+                printk(KERN_ERR "Fail because ACK is already low\n");
+                return -ENXIO;
+        }
+
+        return 0;
+}
+
+
+static int n411_init_board(struct hecubafb_par *par)
+{
+        int retval;
+
+        retval = n411_init_control(par);
+        if (retval)
+                return retval;
+
+        par->send_command(par, APOLLO_INIT_DISPLAY);
+        par->send_data(par, 0x81);
+
+        /* have to wait while display resets */
+        udelay(1000);
+
+        /* if we were told to splash the screen, we just clear it */
+        if (!nosplash) {
+                par->send_command(par, APOLLO_ERASE_DISPLAY);
+                par->send_data(par, splashval);
+        }
+
+        return 0;
+}
+
+static struct hecuba_board n411_board = {
+        .owner                  = THIS_MODULE,
+        .init                   = n411_init_board,
+        .set_ctl                = n411_set_ctl,
+        .set_data               = n411_set_data,
+        .wait_for_ack           = n411_wait_for_ack,
+};
+
+static struct platform_device *n411_device;
+static int __init n411_init(void)
+{
+        int ret;
+        if (!dio_addr || !cio_addr || !c2io_addr) {
+                printk(KERN_WARNING "no IO addresses supplied\n");
+                return -EINVAL;
+        }
+
+        /* request our platform independent driver */
+        request_module("hecubafb");
+
+        n411_device = platform_device_alloc("hecubafb", -1);
+        if (!n411_device)
+                return -ENOMEM;
+
+        platform_device_add_data(n411_device, &n411_board, sizeof(n411_board));
+
+        /* this _add binds hecubafb to n411. hecubafb refcounts n411 */
+        ret = platform_device_add(n411_device);
+
+        if (ret)
+                platform_device_put(n411_device);
+
+        return ret;
+
+}
+
+static void __exit n411_exit(void)
+{
+        platform_device_unregister(n411_device);
+}
+
+module_init(n411_init);
+module_exit(n411_exit);
+
+module_param(nosplash, uint, 0);
+MODULE_PARM_DESC(nosplash, "Disable doing the splash screen");
+module_param(dio_addr, ulong, 0);
+MODULE_PARM_DESC(dio_addr, "IO address for data, eg: 0x480");
+module_param(cio_addr, ulong, 0);
+MODULE_PARM_DESC(cio_addr, "IO address for control, eg: 0x400");
+module_param(c2io_addr, ulong, 0);
+MODULE_PARM_DESC(c2io_addr, "IO address for secondary control, eg: 0x408");
+module_param(splashval, ulong, 0);
+MODULE_PARM_DESC(splashval, "Splash pattern: 0x00 is black, 0x01 is white");
+
+MODULE_DESCRIPTION("board driver for n411 hecuba/apollo epd kit");
+MODULE_AUTHOR("Jaya Kumar");
+MODULE_LICENSE("GPL");
+
diff --git a/drivers/video/nvidia/nv_hw.c b/drivers/video/nvidia/nv_hw.c
index d1a10549f543..ed20a9871b33 100644
--- a/drivers/video/nvidia/nv_hw.c
+++ b/drivers/video/nvidia/nv_hw.c
@@ -129,7 +129,7 @@ typedef struct {
         int nvclk_khz;
         char mem_page_miss;
         char mem_latency;
-        int memory_type;
+        u32 memory_type;
         int memory_width;
         char enable_video;
         char gr_during_vid;
@@ -719,7 +719,7 @@ static void nForceUpdateArbitrationSettings(unsigned VClk,
         memctrl >>= 16;
 
         if ((memctrl == 0x1A9) || (memctrl == 0x1AB) || (memctrl == 0x1ED)) {
-                int dimm[3];
+                u32 dimm[3];
 
                 dev = pci_get_bus_and_slot(0, 2);
                 pci_read_config_dword(dev, 0x40, &dimm[0]);
diff --git a/drivers/video/nvidia/nv_setup.c b/drivers/video/nvidia/nv_setup.c
index 82579d3a9970..d9627b57eb4d 100644
--- a/drivers/video/nvidia/nv_setup.c
+++ b/drivers/video/nvidia/nv_setup.c
@@ -265,12 +265,12 @@ static void nv10GetConfig(struct nvidia_par *par)
 
         dev = pci_get_bus_and_slot(0, 1);
         if ((par->Chipset & 0xffff) == 0x01a0) {
-                int amt = 0;
+                u32 amt;
 
                 pci_read_config_dword(dev, 0x7c, &amt);
                 par->RamAmountKBytes = (((amt >> 6) & 31) + 1) * 1024;
         } else if ((par->Chipset & 0xffff) == 0x01f0) {
-                int amt = 0;
+                u32 amt;
 
                 pci_read_config_dword(dev, 0x84, &amt);
                 par->RamAmountKBytes = (((amt >> 4) & 127) + 1) * 1024;
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index 596652d2831f..9dbb5a5a267b 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -43,14 +43,14 @@
 #define NVTRACE          if (0) printk
 #endif
 
-#define NVTRACE_ENTER(...)  NVTRACE("%s START\n", __FUNCTION__)
-#define NVTRACE_LEAVE(...)  NVTRACE("%s END\n", __FUNCTION__)
+#define NVTRACE_ENTER(...)  NVTRACE("%s START\n", __func__)
+#define NVTRACE_LEAVE(...)  NVTRACE("%s END\n", __func__)
 
 #ifdef CONFIG_FB_NVIDIA_DEBUG
 #define assert(expr) \
         if (!(expr)) { \
         printk( "Assertion failed! %s,%s,%s,line=%d\n",\
-        #expr,__FILE__,__FUNCTION__,__LINE__); \
+        #expr,__FILE__,__func__,__LINE__); \
         BUG(); \
         }
 #else
@@ -1559,7 +1559,6 @@ static int __devinit nvidiafb_init(void)
 
 module_init(nvidiafb_init);
 
-#ifdef MODULE
 static void __exit nvidiafb_exit(void)
 {
         pci_unregister_driver(&nvidiafb_driver);
@@ -1615,5 +1614,3 @@ MODULE_PARM_DESC(nomtrr, "Disables MTRR support (0 or 1=disabled) "
 MODULE_AUTHOR("Antonino Daplas");
 MODULE_DESCRIPTION("Framebuffer driver for nVidia graphics chipset");
 MODULE_LICENSE("GPL");
-#endif                          /* MODULE */
-
diff --git a/drivers/video/offb.c b/drivers/video/offb.c
index 452433d46973..d7b3dcc0dc43 100644
--- a/drivers/video/offb.c
+++ b/drivers/video/offb.c
@@ -248,7 +248,7 @@ static void __iomem *offb_map_reg(struct device_node *np, int index,
 static void __init 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)
+                                int foreign_endian, struct device_node *dp)
 {
         unsigned long res_size = pitch * height * (depth + 7) / 8;
         struct offb_par *par = &default_par;
@@ -397,7 +397,7 @@ static void __init offb_init_fb(const char *name, const char *full_name,
         info->screen_base = ioremap(address, fix->smem_len);
         info->par = par;
         info->pseudo_palette = (void *) (info + 1);
-        info->flags = FBINFO_DEFAULT;
+        info->flags = FBINFO_DEFAULT | foreign_endian;
 
         fb_alloc_cmap(&info->cmap, 256, 0);
 
@@ -424,6 +424,15 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node)
         u64 rstart, address = OF_BAD_ADDR;
         const u32 *pp, *addrp, *up;
         u64 asize;
+        int foreign_endian = 0;
+
+#ifdef __BIG_ENDIAN
+        if (of_get_property(dp, "little-endian", NULL))
+                foreign_endian = FBINFO_FOREIGN_ENDIAN;
+#else
+        if (of_get_property(dp, "big-endian", NULL))
+                foreign_endian = FBINFO_FOREIGN_ENDIAN;
+#endif
 
         pp = of_get_property(dp, "linux,bootx-depth", &len);
         if (pp == NULL)
@@ -509,7 +518,7 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node)
                 offb_init_fb(no_real_node ? "bootx" : dp->name,
                              no_real_node ? "display" : dp->full_name,
                              width, height, depth, pitch, address,
-                             no_real_node ? NULL : dp);
+                             foreign_endian, no_real_node ? NULL : dp);
         }
 }
 
diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c
index 58496061142d..c95874fe9076 100644
--- a/drivers/video/p9100.c
+++ b/drivers/video/p9100.c
@@ -310,7 +310,7 @@ static int __devinit p9100_probe(struct of_device *op, const struct of_device_id
 
         dev_set_drvdata(&op->dev, info);
 
-        printk("%s: p9100 at %lx:%lx\n",
+        printk(KERN_INFO "%s: p9100 at %lx:%lx\n",
                dp->full_name,
                par->which_io, par->physbase);
 
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c
index 30181b593829..3f1ca2adda3d 100644
--- a/drivers/video/pm2fb.c
+++ b/drivers/video/pm2fb.c
@@ -56,7 +56,7 @@
 #undef PM2FB_MASTER_DEBUG
 #ifdef PM2FB_MASTER_DEBUG
 #define DPRINTK(a, b...)        \
-        printk(KERN_DEBUG "pm2fb: %s: " a, __FUNCTION__ , ## b)
+        printk(KERN_DEBUG "pm2fb: %s: " a, __func__ , ## b)
 #else
 #define DPRINTK(a, b...)
 #endif
@@ -67,7 +67,7 @@
  * Driver data
  */
 static int hwcursor = 1;
-static char *mode __devinitdata;
+static char *mode_option __devinitdata;
 
 /*
  * The XFree GLINT driver will (I think to implement hardware cursor
@@ -1680,17 +1680,19 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev,
                 info->pixmap.scan_align = 1;
         }
 
-        if (!mode)
-                mode = "640x480@60";
+        if (!mode_option)
+                mode_option = "640x480@60";
 
-        err = fb_find_mode(&info->var, info, mode, NULL, 0, NULL, 8);
+        err = fb_find_mode(&info->var, info, mode_option, NULL, 0, NULL, 8);
         if (!err || err == 4)
                 info->var = pm2fb_var;
 
-        if (fb_alloc_cmap(&info->cmap, 256, 0) < 0)
+        retval = fb_alloc_cmap(&info->cmap, 256, 0);
+        if (retval < 0)
                 goto err_exit_both;
 
-        if (register_framebuffer(info) < 0)
+        retval = register_framebuffer(info);
+        if (retval < 0)
                 goto err_exit_all;
 
         printk(KERN_INFO "fb%d: %s frame buffer device, memory = %dK.\n",
@@ -1797,7 +1799,7 @@ static int __init pm2fb_setup(char *options)
                 else if (!strncmp(this_opt, "noaccel", 7))
                         noaccel = 1;
                 else
-                        mode = this_opt;
+                        mode_option = this_opt;
         }
         return 0;
 }
@@ -1833,8 +1835,10 @@ static void __exit pm2fb_exit(void)
 #ifdef MODULE
 module_exit(pm2fb_exit);
 
-module_param(mode, charp, 0);
-MODULE_PARM_DESC(mode, "Preferred video mode e.g. '648x480-8@60'");
+module_param(mode_option, charp, 0);
+MODULE_PARM_DESC(mode_option, "Initial video mode e.g. '648x480-8@60'");
+module_param_named(mode, mode_option, charp, 0);
+MODULE_PARM_DESC(mode, "Initial video mode e.g. '648x480-8@60' (deprecated)");
 module_param(lowhsync, bool, 0);
 MODULE_PARM_DESC(lowhsync, "Force horizontal sync low regardless of mode");
 module_param(lowvsync, bool, 0);
diff --git a/drivers/video/pm3fb.c b/drivers/video/pm3fb.c
index 5dba8cdd0517..68089d1456c2 100644
--- a/drivers/video/pm3fb.c
+++ b/drivers/video/pm3fb.c
@@ -45,7 +45,7 @@
 #undef PM3FB_MASTER_DEBUG
 #ifdef PM3FB_MASTER_DEBUG
 #define DPRINTK(a, b...)        \
-        printk(KERN_DEBUG "pm3fb: %s: " a, __FUNCTION__ , ## b)
+        printk(KERN_DEBUG "pm3fb: %s: " a, __func__ , ## b)
 #else
 #define DPRINTK(a, b...)
 #endif
@@ -1571,6 +1571,8 @@ module_exit(pm3fb_exit);
 #endif
 module_init(pm3fb_init);
 
+module_param(mode_option, charp, 0);
+MODULE_PARM_DESC(mode_option, "Initial video mode e.g. '648x480-8@60'");
 module_param(noaccel, bool, 0);
 MODULE_PARM_DESC(noaccel, "Disable acceleration");
 module_param(hwcursor, int, 0644);
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index 5c47968e7f21..d94c57ffbdb1 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -56,10 +56,6 @@
 #include "rivafb.h"
 #include "nvreg.h"
 
-#ifndef CONFIG_PCI              /* sanity check */
-#error This driver requires PCI support.
-#endif
-
 /* version number of this driver */
 #define RIVAFB_VERSION "0.9.5b"
 
@@ -74,14 +70,14 @@
 #define NVTRACE          if(0) printk
 #endif
 
-#define NVTRACE_ENTER(...)  NVTRACE("%s START\n", __FUNCTION__)
-#define NVTRACE_LEAVE(...)  NVTRACE("%s END\n", __FUNCTION__)
+#define NVTRACE_ENTER(...)  NVTRACE("%s START\n", __func__)
+#define NVTRACE_LEAVE(...)  NVTRACE("%s END\n", __func__)
 
 #ifdef CONFIG_FB_RIVA_DEBUG
 #define assert(expr) \
         if(!(expr)) { \
         printk( "Assertion failed! %s,%s,%s,line=%d\n",\
-        #expr,__FILE__,__FUNCTION__,__LINE__); \
+        #expr,__FILE__,__func__,__LINE__); \
         BUG(); \
         }
 #else
@@ -2213,14 +2209,12 @@ static int __devinit rivafb_init(void)
 
 module_init(rivafb_init);
 
-#ifdef MODULE
 static void __exit rivafb_exit(void)
 {
         pci_unregister_driver(&rivafb_driver);
 }
 
 module_exit(rivafb_exit);
-#endif /* MODULE */
 
 module_param(noaccel, bool, 0);
 MODULE_PARM_DESC(noaccel, "bool: disable acceleration");
diff --git a/drivers/video/riva/nv_driver.c b/drivers/video/riva/nv_driver.c
index a11026812d1b..f3694cf17e58 100644
--- a/drivers/video/riva/nv_driver.c
+++ b/drivers/video/riva/nv_driver.c
@@ -41,11 +41,6 @@
 #include "rivafb.h"
 #include "nvreg.h"
 
-
-#ifndef CONFIG_PCI              /* sanity check */
-#error This driver requires PCI support.
-#endif
-
 #define PFX "rivafb: "
 
 static inline unsigned char MISCin(struct riva_par *par)
@@ -163,7 +158,7 @@ unsigned long riva_get_memlen(struct riva_par *par)
         unsigned long memlen = 0;
         unsigned int chipset = par->Chipset;
         struct pci_dev* dev;
-        int amt;
+        u32 amt;
 
         switch (chip->Architecture) {
         case NV_ARCH_03:
diff --git a/drivers/video/riva/riva_hw.c b/drivers/video/riva/riva_hw.c
index 13307703a9f0..78fdbf5178d7 100644
--- a/drivers/video/riva/riva_hw.c
+++ b/drivers/video/riva/riva_hw.c
@@ -231,7 +231,7 @@ typedef struct {
   int nvclk_khz;
   char mem_page_miss;
   char mem_latency;
-  int memory_type;
+  u32 memory_type;
   int memory_width;
   char enable_video;
   char gr_during_vid;
@@ -2107,7 +2107,7 @@ static void nv10GetConfig
 )
 {
     struct pci_dev* dev;
-    int amt;
+    u32 amt;
 
 #ifdef __BIG_ENDIAN
     /* turn on big endian register access */
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index 71fa6edb5c47..13b38cbbe4cf 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -430,9 +430,9 @@ static void s3c2410fb_activate_var(struct fb_info *info)
         struct fb_var_screeninfo *var = &info->var;
         int clkdiv = s3c2410fb_calc_pixclk(fbi, var->pixclock) / 2;
 
-        dprintk("%s: var->xres  = %d\n", __FUNCTION__, var->xres);
-        dprintk("%s: var->yres  = %d\n", __FUNCTION__, var->yres);
-        dprintk("%s: var->bpp   = %d\n", __FUNCTION__, var->bits_per_pixel);
+        dprintk("%s: var->xres  = %d\n", __func__, var->xres);
+        dprintk("%s: var->yres  = %d\n", __func__, var->yres);
+        dprintk("%s: var->bpp   = %d\n", __func__, var->bits_per_pixel);
 
         if (type == S3C2410_LCDCON1_TFT) {
                 s3c2410fb_calculate_tft_lcd_regs(info, &fbi->regs);
diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index 7d53bc23b9c7..2972f112dbed 100644
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -132,10 +132,10 @@ static const struct svga_timing_regs s3_timing_regs     = {
 /* Module parameters */
 
 
-static char *mode = "640x480-8@60";
+static char *mode_option __devinitdata = "640x480-8@60";
 
 #ifdef CONFIG_MTRR
-static int mtrr = 1;
+static int mtrr __devinitdata = 1;
 #endif
 
 static int fasttext = 1;
@@ -145,8 +145,10 @@ MODULE_AUTHOR("(c) 2006-2007 Ondrej Zajicek <santiago@crfreenet.org>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("fbdev driver for S3 Trio/Virge");
 
-module_param(mode, charp, 0444);
-MODULE_PARM_DESC(mode, "Default video mode ('640x480-8@60', etc)");
+module_param(mode_option, charp, 0444);
+MODULE_PARM_DESC(mode_option, "Default video mode ('640x480-8@60', etc)");
+module_param_named(mode, mode_option, charp, 0444);
+MODULE_PARM_DESC(mode, "Default video mode ('640x480-8@60', etc) (deprecated)");
 
 #ifdef CONFIG_MTRR
 module_param(mtrr, int, 0444);
@@ -886,7 +888,7 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i
         }
 
         /* Allocate and fill driver data structure */
-        info = framebuffer_alloc(sizeof(struct s3fb_info), NULL);
+        info = framebuffer_alloc(sizeof(struct s3fb_info), &(dev->dev));
         if (!info) {
                 dev_err(&(dev->dev), "cannot allocate memory\n");
                 return -ENOMEM;
@@ -901,13 +903,13 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i
         /* Prepare PCI device */
         rc = pci_enable_device(dev);
         if (rc < 0) {
-                dev_err(&(dev->dev), "cannot enable PCI device\n");
+                dev_err(info->dev, "cannot enable PCI device\n");
                 goto err_enable_device;
         }
 
         rc = pci_request_regions(dev, "s3fb");
         if (rc < 0) {
-                dev_err(&(dev->dev), "cannot reserve framebuffer region\n");
+                dev_err(info->dev, "cannot reserve framebuffer region\n");
                 goto err_request_regions;
         }
 
@@ -919,7 +921,7 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i
         info->screen_base = pci_iomap(dev, 0, 0);
         if (! info->screen_base) {
                 rc = -ENOMEM;
-                dev_err(&(dev->dev), "iomap for framebuffer failed\n");
+                dev_err(info->dev, "iomap for framebuffer failed\n");
                 goto err_iomap;
         }
 
@@ -960,22 +962,22 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i
         info->pseudo_palette = (void*) (par->pseudo_palette);
 
         /* Prepare startup mode */
-        rc = fb_find_mode(&(info->var), info, mode, NULL, 0, NULL, 8);
+        rc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8);
         if (! ((rc == 1) || (rc == 2))) {
                 rc = -EINVAL;
-                dev_err(&(dev->dev), "mode %s not found\n", mode);
+                dev_err(info->dev, "mode %s not found\n", mode_option);
                 goto err_find_mode;
         }
 
         rc = fb_alloc_cmap(&info->cmap, 256, 0);
         if (rc < 0) {
-                dev_err(&(dev->dev), "cannot allocate colormap\n");
+                dev_err(info->dev, "cannot allocate colormap\n");
                 goto err_alloc_cmap;
         }
 
         rc = register_framebuffer(info);
         if (rc < 0) {
-                dev_err(&(dev->dev), "cannot register framebuffer\n");
+                dev_err(info->dev, "cannot register framebuffer\n");
                 goto err_reg_fb;
         }
 
@@ -1051,7 +1053,7 @@ static int s3_pci_suspend(struct pci_dev* dev, pm_message_t state)
         struct fb_info *info = pci_get_drvdata(dev);
         struct s3fb_info *par = info->par;
 
-        dev_info(&(dev->dev), "suspend\n");
+        dev_info(info->dev, "suspend\n");
 
         acquire_console_sem();
         mutex_lock(&(par->open_lock));
@@ -1083,7 +1085,7 @@ static int s3_pci_resume(struct pci_dev* dev)
         struct s3fb_info *par = info->par;
         int err;
 
-        dev_info(&(dev->dev), "resume\n");
+        dev_info(info->dev, "resume\n");
 
         acquire_console_sem();
         mutex_lock(&(par->open_lock));
@@ -1100,7 +1102,7 @@ static int s3_pci_resume(struct pci_dev* dev)
         if (err) {
                 mutex_unlock(&(par->open_lock));
                 release_console_sem();
-                dev_err(&(dev->dev), "error %d enabling device for resume\n", err);
+                dev_err(info->dev, "error %d enabling device for resume\n", err);
                 return err;
         }
         pci_set_master(dev);
@@ -1168,7 +1170,7 @@ static int  __init s3fb_setup(char *options)
                 else if (!strncmp(opt, "fasttext:", 9))
                         fasttext = simple_strtoul(opt + 9, NULL, 0);
                 else
-                        mode = opt;
+                        mode_option = opt;
         }
 
         return 0;
diff --git a/drivers/video/sa1100fb.h b/drivers/video/sa1100fb.h
index 48066ef3af05..f465b27ed860 100644
--- a/drivers/video/sa1100fb.h
+++ b/drivers/video/sa1100fb.h
@@ -132,7 +132,7 @@ struct sa1100fb_info {
  *  Debug macros 
  */
 #if DEBUG
-#  define DPRINTK(fmt, args...) printk("%s: " fmt, __FUNCTION__ , ## args)
+#  define DPRINTK(fmt, args...) printk("%s: " fmt, __func__ , ## args)
 #else
 #  define DPRINTK(fmt, args...)
 #endif
diff --git a/drivers/video/savage/savagefb-i2c.c b/drivers/video/savage/savagefb-i2c.c
index 35c1ce62b216..783d4adffb93 100644
--- a/drivers/video/savage/savagefb-i2c.c
+++ b/drivers/video/savage/savagefb-i2c.c
@@ -140,7 +140,7 @@ static int savage_setup_i2c_bus(struct savagefb_i2c_chan *chan,
                 chan->adapter.id                = I2C_HW_B_SAVAGE;
                 chan->adapter.algo_data         = &chan->algo;
                 chan->adapter.dev.parent        = &chan->par->pcidev->dev;
-                chan->algo.udelay               = 40;
+                chan->algo.udelay               = 10;
                 chan->algo.timeout              = 20;
                 chan->algo.data                 = chan;
 
diff --git a/drivers/video/sis/sis.h b/drivers/video/sis/sis.h
index 9b05da6268f7..a14e82211037 100644
--- a/drivers/video/sis/sis.h
+++ b/drivers/video/sis/sis.h
@@ -55,7 +55,7 @@
 #undef SISFBDEBUG
 
 #ifdef SISFBDEBUG
-#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args)
+#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)
 #define TWDEBUG(x) printk(KERN_INFO x "\n");
 #else
 #define DPRINTK(fmt, args...)
diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c
index 97784f9c184d..5b11a00f49bc 100644
--- a/drivers/video/sstfb.c
+++ b/drivers/video/sstfb.c
@@ -1006,7 +1006,7 @@ static int sst_set_pll_att_ti(struct fb_info *info,
                 break;
         default:
                 dprintk("%s: wrong clock code '%d'\n",
-                        __FUNCTION__, clock);
+                        __func__, clock);
                 return 0;
                 }
         udelay(300);
@@ -1048,7 +1048,7 @@ static int sst_set_pll_ics(struct fb_info *info,
                 break;
         default:
                 dprintk("%s: wrong clock code '%d'\n",
-                        __FUNCTION__, clock);
+                        __func__, clock);
                 return 0;
                 }
         udelay(300);
@@ -1079,7 +1079,7 @@ static void sst_set_vidmod_att_ti(struct fb_info *info, const int bpp)
                 sst_dac_write(DACREG_RMR, (cr0 & 0x0f) | DACREG_CR0_16BPP);
                 break;
         default:
-                dprintk("%s: bad depth '%u'\n", __FUNCTION__, bpp);
+                dprintk("%s: bad depth '%u'\n", __func__, bpp);
                 break;
         }
 }
@@ -1093,7 +1093,7 @@ static void sst_set_vidmod_ics(struct fb_info *info, const int bpp)
                 sst_dac_write(DACREG_ICS_CMD, DACREG_ICS_CMD_16BPP);
                 break;
         default:
-                dprintk("%s: bad depth '%u'\n", __FUNCTION__, bpp);
+                dprintk("%s: bad depth '%u'\n", __func__, bpp);
                 break;
         }
 }
@@ -1133,7 +1133,7 @@ static int __devinit sst_detect_dactype(struct fb_info *info, struct sstfb_par *
         }
         if (!ret)
                 return 0;
-        f_dprintk("%s found %s\n", __FUNCTION__, dacs[i].name);
+        f_dprintk("%s found %s\n", __func__, dacs[i].name);
         par->dac_sw = dacs[i];
         return 1;
 }
diff --git a/drivers/video/stifb.c b/drivers/video/stifb.c
index f98be301140c..598d35eff935 100644
--- a/drivers/video/stifb.c
+++ b/drivers/video/stifb.c
@@ -164,11 +164,11 @@ static int __initdata stifb_bpp_pref[MAX_STI_ROMS];
 # define  DEBUG_ON()  debug_on=1
 # define WRITE_BYTE(value,fb,reg)       do { if (debug_on) \
                                                 printk(KERN_DEBUG "%30s: WRITE_BYTE(0x%06x) = 0x%02x (old=0x%02x)\n", \
-                                                        __FUNCTION__, reg, value, READ_BYTE(fb,reg));             \
+                                                        __func__, reg, value, READ_BYTE(fb,reg));                 \
                                         gsc_writeb((value),(fb)->info.fix.mmio_start + (reg)); } while (0)
 # define WRITE_WORD(value,fb,reg)       do { if (debug_on) \
                                                 printk(KERN_DEBUG "%30s: WRITE_WORD(0x%06x) = 0x%08x (old=0x%08x)\n", \
-                                                        __FUNCTION__, reg, value, READ_WORD(fb,reg));             \
+                                                        __func__, reg, value, READ_WORD(fb,reg));                 \
                                         gsc_writel((value),(fb)->info.fix.mmio_start + (reg)); } while (0)
 #endif /* DEBUG_STIFB_REGS */
 
diff --git a/drivers/video/syscopyarea.c b/drivers/video/syscopyarea.c
index 37af10ab8f52..a352d5f46bbf 100644
--- a/drivers/video/syscopyarea.c
+++ b/drivers/video/syscopyarea.c
@@ -26,15 +26,15 @@
      */
 
 static void
-bitcpy(unsigned long *dst, int dst_idx, const unsigned long *src,
-        int src_idx, int bits, unsigned n)
+bitcpy(struct fb_info *p, unsigned long *dst, int dst_idx,
+                const unsigned long *src, int src_idx, int bits, unsigned n)
 {
         unsigned long first, last;
         int const shift = dst_idx-src_idx;
         int left, right;
 
-        first = FB_SHIFT_HIGH(~0UL, dst_idx);
-        last = ~(FB_SHIFT_HIGH(~0UL, (dst_idx+n) % bits));
+        first = FB_SHIFT_HIGH(p, ~0UL, dst_idx);
+        last = ~(FB_SHIFT_HIGH(p, ~0UL, (dst_idx+n) % bits));
 
         if (!shift) {
                 /* Same alignment for source and dest */
@@ -167,8 +167,8 @@ bitcpy(unsigned long *dst, int dst_idx, const unsigned long *src,
      */
 
 static void
-bitcpy_rev(unsigned long *dst, int dst_idx, const unsigned long *src,
-           int src_idx, int bits, unsigned n)
+bitcpy_rev(struct fb_info *p, unsigned long *dst, int dst_idx,
+                const unsigned long *src, int src_idx, int bits, unsigned n)
 {
         unsigned long first, last;
         int shift;
@@ -186,8 +186,8 @@ bitcpy_rev(unsigned long *dst, int dst_idx, const unsigned long *src,
 
         shift = dst_idx-src_idx;
 
-        first = FB_SHIFT_LOW(~0UL, bits - 1 - dst_idx);
-        last = ~(FB_SHIFT_LOW(~0UL, bits - 1 - ((dst_idx-n) % bits)));
+        first = FB_SHIFT_LOW(p, ~0UL, bits - 1 - dst_idx);
+        last = ~(FB_SHIFT_LOW(p, ~0UL, bits - 1 - ((dst_idx-n) % bits)));
 
         if (!shift) {
                 /* Same alignment for source and dest */
@@ -353,7 +353,7 @@ void sys_copyarea(struct fb_info *p, const struct fb_copyarea *area)
                         dst_idx &= (bytes - 1);
                         src += src_idx >> (ffs(bits) - 1);
                         src_idx &= (bytes - 1);
-                        bitcpy_rev(dst, dst_idx, src, src_idx, bits,
+                        bitcpy_rev(p, dst, dst_idx, src, src_idx, bits,
                                 width*p->var.bits_per_pixel);
                 }
         } else {
@@ -362,7 +362,7 @@ void sys_copyarea(struct fb_info *p, const struct fb_copyarea *area)
                         dst_idx &= (bytes - 1);
                         src += src_idx >> (ffs(bits) - 1);
                         src_idx &= (bytes - 1);
-                        bitcpy(dst, dst_idx, src, src_idx, bits,
+                        bitcpy(p, dst, dst_idx, src, src_idx, bits,
                                 width*p->var.bits_per_pixel);
                         dst_idx += bits_per_line;
                         src_idx += bits_per_line;
diff --git a/drivers/video/sysfillrect.c b/drivers/video/sysfillrect.c
index a261e9e6a675..f94d6b6e29ee 100644
--- a/drivers/video/sysfillrect.c
+++ b/drivers/video/sysfillrect.c
@@ -22,16 +22,16 @@
      */
 
 static void
-bitfill_aligned(unsigned long *dst, int dst_idx, unsigned long pat,
-                unsigned n, int bits)
+bitfill_aligned(struct fb_info *p, unsigned long *dst, int dst_idx,
+                unsigned long pat, unsigned n, int bits)
 {
         unsigned long first, last;
 
         if (!n)
                 return;
 
-        first = FB_SHIFT_HIGH(~0UL, dst_idx);
-        last = ~(FB_SHIFT_HIGH(~0UL, (dst_idx+n) % bits));
+        first = FB_SHIFT_HIGH(p, ~0UL, dst_idx);
+        last = ~(FB_SHIFT_HIGH(p, ~0UL, (dst_idx+n) % bits));
 
         if (dst_idx+n <= bits) {
                 /* Single word */
@@ -78,16 +78,16 @@ bitfill_aligned(unsigned long *dst, int dst_idx, unsigned long pat,
      */
 
 static void
-bitfill_unaligned(unsigned long *dst, int dst_idx, unsigned long pat,
-                  int left, int right, unsigned n, int bits)
+bitfill_unaligned(struct fb_info *p, unsigned long *dst, int dst_idx,
+                  unsigned long pat, int left, int right, unsigned n, int bits)
 {
         unsigned long first, last;
 
         if (!n)
                 return;
 
-        first = FB_SHIFT_HIGH(~0UL, dst_idx);
-        last = ~(FB_SHIFT_HIGH(~0UL, (dst_idx+n) % bits));
+        first = FB_SHIFT_HIGH(p, ~0UL, dst_idx);
+        last = ~(FB_SHIFT_HIGH(p, ~0UL, (dst_idx+n) % bits));
 
         if (dst_idx+n <= bits) {
                 /* Single word */
@@ -132,8 +132,8 @@ bitfill_unaligned(unsigned long *dst, int dst_idx, unsigned long pat,
      *  Aligned pattern invert using 32/64-bit memory accesses
      */
 static void
-bitfill_aligned_rev(unsigned long *dst, int dst_idx, unsigned long pat,
-                    unsigned n, int bits)
+bitfill_aligned_rev(struct fb_info *p, unsigned long *dst, int dst_idx,
+                    unsigned long pat, unsigned n, int bits)
 {
         unsigned long val = pat;
         unsigned long first, last;
@@ -141,8 +141,8 @@ bitfill_aligned_rev(unsigned long *dst, int dst_idx, unsigned long pat,
         if (!n)
                 return;
 
-        first = FB_SHIFT_HIGH(~0UL, dst_idx);
-        last = ~(FB_SHIFT_HIGH(~0UL, (dst_idx+n) % bits));
+        first = FB_SHIFT_HIGH(p, ~0UL, dst_idx);
+        last = ~(FB_SHIFT_HIGH(p, ~0UL, (dst_idx+n) % bits));
 
         if (dst_idx+n <= bits) {
                 /* Single word */
@@ -188,16 +188,17 @@ bitfill_aligned_rev(unsigned long *dst, int dst_idx, unsigned long pat,
      */
 
 static void
-bitfill_unaligned_rev(unsigned long *dst, int dst_idx, unsigned long pat,
-                        int left, int right, unsigned n, int bits)
+bitfill_unaligned_rev(struct fb_info *p, unsigned long *dst, int dst_idx,
+                      unsigned long pat, int left, int right, unsigned n,
+                      int bits)
 {
         unsigned long first, last;
 
         if (!n)
                 return;
 
-        first = FB_SHIFT_HIGH(~0UL, dst_idx);
-        last = ~(FB_SHIFT_HIGH(~0UL, (dst_idx+n) % bits));
+        first = FB_SHIFT_HIGH(p, ~0UL, dst_idx);
+        last = ~(FB_SHIFT_HIGH(p, ~0UL, (dst_idx+n) % bits));
 
         if (dst_idx+n <= bits) {
                 /* Single word */
@@ -267,9 +268,9 @@ void sys_fillrect(struct fb_info *p, const struct fb_fillrect *rect)
         if (p->fbops->fb_sync)
                 p->fbops->fb_sync(p);
         if (!left) {
-                void (*fill_op32)(unsigned long *dst, int dst_idx,
-                                  unsigned long pat, unsigned n, int bits) =
-                        NULL;
+                void (*fill_op32)(struct fb_info *p, unsigned long *dst,
+                                  int dst_idx, unsigned long pat, unsigned n,
+                                  int bits) = NULL;
 
                 switch (rect->rop) {
                 case ROP_XOR:
@@ -287,16 +288,16 @@ void sys_fillrect(struct fb_info *p, const struct fb_fillrect *rect)
                 while (height--) {
                         dst += dst_idx >> (ffs(bits) - 1);
                         dst_idx &= (bits - 1);
-                        fill_op32(dst, dst_idx, pat, width*bpp, bits);
+                        fill_op32(p, dst, dst_idx, pat, width*bpp, bits);
                         dst_idx += p->fix.line_length*8;
                 }
         } else {
                 int right;
                 int r;
                 int rot = (left-dst_idx) % bpp;
-                void (*fill_op)(unsigned long *dst, int dst_idx,
-                                unsigned long pat, int left, int right,
-                                unsigned n, int bits) = NULL;
+                void (*fill_op)(struct fb_info *p, unsigned long *dst,
+                                int dst_idx, unsigned long pat, int left,
+                                int right, unsigned n, int bits) = NULL;
 
                 /* rotate pattern to correct start position */
                 pat = pat << rot | pat >> (bpp-rot);
@@ -318,7 +319,7 @@ void sys_fillrect(struct fb_info *p, const struct fb_fillrect *rect)
                 while (height--) {
                         dst += dst_idx >> (ffs(bits) - 1);
                         dst_idx &= (bits - 1);
-                        fill_op(dst, dst_idx, pat, left, right,
+                        fill_op(p, dst, dst_idx, pat, left, right,
                                 width*bpp, bits);
                         r = (p->fix.line_length*8) % bpp;
                         pat = pat << (bpp-r) | pat >> r;
diff --git a/drivers/video/sysimgblt.c b/drivers/video/sysimgblt.c
index bd7e7e9d155f..186c6f607be2 100644
--- a/drivers/video/sysimgblt.c
+++ b/drivers/video/sysimgblt.c
@@ -18,35 +18,31 @@
 #define DEBUG
 
 #ifdef DEBUG
-#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt,__FUNCTION__,## args)
+#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt,__func__,## args)
 #else
 #define DPRINTK(fmt, args...)
 #endif
 
-static const u32 cfb_tab8[] = {
-#if defined(__BIG_ENDIAN)
+static const u32 cfb_tab8_be[] = {
     0x00000000,0x000000ff,0x0000ff00,0x0000ffff,
     0x00ff0000,0x00ff00ff,0x00ffff00,0x00ffffff,
     0xff000000,0xff0000ff,0xff00ff00,0xff00ffff,
     0xffff0000,0xffff00ff,0xffffff00,0xffffffff
-#elif defined(__LITTLE_ENDIAN)
+};
+
+static const u32 cfb_tab8_le[] = {
     0x00000000,0xff000000,0x00ff0000,0xffff0000,
     0x0000ff00,0xff00ff00,0x00ffff00,0xffffff00,
     0x000000ff,0xff0000ff,0x00ff00ff,0xffff00ff,
     0x0000ffff,0xff00ffff,0x00ffffff,0xffffffff
-#else
-#error FIXME: No endianness??
-#endif
 };
 
-static const u32 cfb_tab16[] = {
-#if defined(__BIG_ENDIAN)
+static const u32 cfb_tab16_be[] = {
     0x00000000, 0x0000ffff, 0xffff0000, 0xffffffff
-#elif defined(__LITTLE_ENDIAN)
+};
+
+static const u32 cfb_tab16_le[] = {
     0x00000000, 0xffff0000, 0x0000ffff, 0xffffffff
-#else
-#error FIXME: No endianness??
-#endif
 };
 
 static const u32 cfb_tab32[] = {
@@ -72,7 +68,7 @@ static void color_imageblit(const struct fb_image *image, struct fb_info *p,
                 val = 0;
 
                 if (start_index) {
-                        u32 start_mask = ~(FB_SHIFT_HIGH(~(u32)0,
+                        u32 start_mask = ~(FB_SHIFT_HIGH(p, ~(u32)0,
                                                          start_index));
                         val = *dst & start_mask;
                         shift = start_index;
@@ -83,20 +79,20 @@ static void color_imageblit(const struct fb_image *image, struct fb_info *p,
                                 color = palette[*src];
                         else
                                 color = *src;
-                        color <<= FB_LEFT_POS(bpp);
-                        val |= FB_SHIFT_HIGH(color, shift);
+                        color <<= FB_LEFT_POS(p, bpp);
+                        val |= FB_SHIFT_HIGH(p, color, shift);
                         if (shift >= null_bits) {
                                 *dst++ = val;
 
                                 val = (shift == null_bits) ? 0 :
-                                        FB_SHIFT_LOW(color, 32 - shift);
+                                        FB_SHIFT_LOW(p, color, 32 - shift);
                         }
                         shift += bpp;
                         shift &= (32 - 1);
                         src++;
                 }
                 if (shift) {
-                        u32 end_mask = FB_SHIFT_HIGH(~(u32)0, shift);
+                        u32 end_mask = FB_SHIFT_HIGH(p, ~(u32)0, shift);
 
                         *dst &= end_mask;
                         *dst |= val;
@@ -125,8 +121,8 @@ static void slow_imageblit(const struct fb_image *image, struct fb_info *p,
         u32 i, j, l;
 
         dst2 = dst1;
-        fgcolor <<= FB_LEFT_POS(bpp);
-        bgcolor <<= FB_LEFT_POS(bpp);
+        fgcolor <<= FB_LEFT_POS(p, bpp);
+        bgcolor <<= FB_LEFT_POS(p, bpp);
 
         for (i = image->height; i--; ) {
                 shift = val = 0;
@@ -137,7 +133,8 @@ static void slow_imageblit(const struct fb_image *image, struct fb_info *p,
 
                 /* write leading bits */
                 if (start_index) {
-                        u32 start_mask = ~(FB_SHIFT_HIGH(~(u32)0,start_index));
+                        u32 start_mask = ~(FB_SHIFT_HIGH(p, ~(u32)0,
+                                                         start_index));
                         val = *dst & start_mask;
                         shift = start_index;
                 }
@@ -145,13 +142,13 @@ static void slow_imageblit(const struct fb_image *image, struct fb_info *p,
                 while (j--) {
                         l--;
                         color = (*s & (1 << l)) ? fgcolor : bgcolor;
-                        val |= FB_SHIFT_HIGH(color, shift);
+                        val |= FB_SHIFT_HIGH(p, color, shift);
 
                         /* Did the bitshift spill bits to the next long? */
                         if (shift >= null_bits) {
                                 *dst++ = val;
                                 val = (shift == null_bits) ? 0 :
-                                        FB_SHIFT_LOW(color,32 - shift);
+                                        FB_SHIFT_LOW(p, color, 32 - shift);
                         }
                         shift += bpp;
                         shift &= (32 - 1);
@@ -160,7 +157,7 @@ static void slow_imageblit(const struct fb_image *image, struct fb_info *p,
 
                 /* write trailing bits */
                 if (shift) {
-                        u32 end_mask = FB_SHIFT_HIGH(~(u32)0, shift);
+                        u32 end_mask = FB_SHIFT_HIGH(p, ~(u32)0, shift);
 
                         *dst &= end_mask;
                         *dst |= val;
@@ -199,10 +196,10 @@ static void fast_imageblit(const struct fb_image *image, struct fb_info *p,
 
         switch (bpp) {
         case 8:
-                tab = cfb_tab8;
+                tab = fb_be_math(p) ? cfb_tab8_be : cfb_tab8_le;
                 break;
         case 16:
-                tab = cfb_tab16;
+                tab = fb_be_math(p) ? cfb_tab16_be : cfb_tab16_le;
                 break;
         case 32:
         default:
diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c
index e5a9ddb3c8be..a71774305772 100644
--- a/drivers/video/tcx.c
+++ b/drivers/video/tcx.c
@@ -419,7 +419,7 @@ static int __devinit tcx_init_one(struct of_device *op)
                 par->mmap_map[6].size = SBUS_MMAP_EMPTY;
         }
 
-        par->physbase = 0;
+        par->physbase = op->resource[0].start;
         par->which_io = op->resource[0].flags & IORESOURCE_BITS;
 
         for (i = 0; i < TCX_MMAP_ENTRIES; i++) {
@@ -470,10 +470,10 @@ static int __devinit tcx_init_one(struct of_device *op)
 
         dev_set_drvdata(&op->dev, info);
 
-        printk("%s: TCX at %lx:%lx, %s\n",
+        printk(KERN_INFO "%s: TCX at %lx:%lx, %s\n",
                dp->full_name,
                par->which_io,
-               op->resource[0].start,
+               par->physbase,
                par->lowdepth ? "8-bit only" : "24-bit depth");
 
         return 0;
@@ -527,7 +527,7 @@ static struct of_platform_driver tcx_driver = {
         .remove         = __devexit_p(tcx_remove),
 };
 
-int __init tcx_init(void)
+static int __init tcx_init(void)
 {
         if (fb_get_options("tcxfb", NULL))
                 return -ENODEV;
@@ -535,7 +535,7 @@ int __init tcx_init(void)
         return of_register_driver(&tcx_driver, &of_bus_type);
 }
 
-void __exit tcx_exit(void)
+static void __exit tcx_exit(void)
 {
         of_unregister_driver(&tcx_driver);
 }
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c
index 71e179ea5f95..ea9f19d25597 100644
--- a/drivers/video/tdfxfb.c
+++ b/drivers/video/tdfxfb.c
@@ -70,7 +70,7 @@
 
 #include <video/tdfx.h>
 
-#define DPRINTK(a, b...) pr_debug("fb: %s: " a, __FUNCTION__ , ## b)
+#define DPRINTK(a, b...) pr_debug("fb: %s: " a, __func__ , ## b)
 
 #ifdef CONFIG_MTRR
 #include <asm/mtrr.h>
diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c
index 0a4e07d43d2d..bd54cd0de39a 100644
--- a/drivers/video/tridentfb.c
+++ b/drivers/video/tridentfb.c
@@ -58,7 +58,7 @@ static int displaytype;
 /* defaults which are normally overriden by user values */
 
 /* video mode */
-static char *mode = "640x480";
+static char *mode_option __devinitdata = "640x480";
 static int bpp = 8;
 
 static int noaccel;
@@ -73,7 +73,10 @@ static int memsize;
 static int memdiff;
 static int nativex;
 
-module_param(mode, charp, 0);
+module_param(mode_option, charp, 0);
+MODULE_PARM_DESC(mode_option, "Initial video mode e.g. '648x480-8@60'");
+module_param_named(mode, mode_option, charp, 0);
+MODULE_PARM_DESC(mode, "Initial video mode e.g. '648x480-8@60' (deprecated)");
 module_param(bpp, int, 0);
 module_param(center, int, 0);
 module_param(stretch, int, 0);
@@ -1297,7 +1300,8 @@ static int __devinit trident_pci_probe(struct pci_dev * dev,
 #endif
         fb_info.pseudo_palette = pseudo_pal;
 
-        if (!fb_find_mode(&default_var, &fb_info, mode, NULL, 0, NULL, bpp)) {
+        if (!fb_find_mode(&default_var, &fb_info,
+                          mode_option, NULL, 0, NULL, bpp)) {
                 err = -EINVAL;
                 goto out_unmap2;
         }
@@ -1385,7 +1389,7 @@ static struct pci_driver tridentfb_pci_driver = {
  *      video=trident:800x600,bpp=16,noaccel
  */
 #ifndef MODULE
-static int tridentfb_setup(char *options)
+static int __init tridentfb_setup(char *options)
 {
         char *opt;
         if (!options || !*options)
@@ -1412,7 +1416,7 @@ static int tridentfb_setup(char *options)
                 else if (!strncmp(opt, "nativex=", 8))
                         nativex = simple_strtoul(opt + 8, NULL, 0);
                 else
-                        mode = opt;
+                        mode_option = opt;
         }
         return 0;
 }
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
index 93361656316c..cdbb56edb6cb 100644
--- a/drivers/video/uvesafb.c
+++ b/drivers/video/uvesafb.c
@@ -181,7 +181,8 @@ static int uvesafb_exec(struct uvesafb_ktask *task)
         /* If all slots are taken -- bail out. */
         if (uvfb_tasks[seq]) {
                 mutex_unlock(&uvfb_lock);
-                return -EBUSY;
+                err = -EBUSY;
+                goto out;
         }
 
         /* Save a pointer to the kernel part of the task struct. */
@@ -205,7 +206,6 @@ static int uvesafb_exec(struct uvesafb_ktask *task)
                         err = cn_netlink_send(m, 0, gfp_any());
                 }
         }
-        kfree(m);
 
         if (!err && !(task->t.flags & TF_EXIT))
                 err = !wait_for_completion_timeout(task->done,
@@ -218,7 +218,8 @@ static int uvesafb_exec(struct uvesafb_ktask *task)
         seq++;
         if (seq >= UVESAFB_TASKS_MAX)
                 seq = 0;
-
+out:
+        kfree(m);
         return err;
 }
 
@@ -885,7 +886,7 @@ static int __devinit uvesafb_vbe_init_mode(struct fb_info *info)
         }
 
         /* fb_find_mode() failed */
-        if (i == 0 || i >= 3) {
+        if (i == 0) {
                 info->var.xres = 640;
                 info->var.yres = 480;
                 mode = (struct fb_videomode *)
diff --git a/drivers/video/vermilion/vermilion.c b/drivers/video/vermilion/vermilion.c
index 2aa71eb67c2b..c18f1884b550 100644
--- a/drivers/video/vermilion/vermilion.c
+++ b/drivers/video/vermilion/vermilion.c
@@ -112,8 +112,9 @@ static int vmlfb_alloc_vram_area(struct vram_area *va, unsigned max_order,
 
         /*
          * It seems like __get_free_pages only ups the usage count
-         * of the first page. This doesn't work with nopage mapping, so
-         * up the usage count once more.
+         * of the first page. This doesn't work with fault mapping, so
+         * up the usage count once more (XXX: should use split_page or
+         * compound page).
          */
 
         memset((void *)va->logical, 0x00, va->size);
diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c
index 4c3a63308df1..536ab11623f0 100644
--- a/drivers/video/vt8623fb.c
+++ b/drivers/video/vt8623fb.c
@@ -100,7 +100,7 @@ static struct svga_timing_regs vt8623_timing_regs     = {
 
 /* Module parameters */
 
-static char *mode = "640x480-8@60";
+static char *mode_option = "640x480-8@60";
 
 #ifdef CONFIG_MTRR
 static int mtrr = 1;
@@ -110,8 +110,10 @@ MODULE_AUTHOR("(c) 2006 Ondrej Zajicek <santiago@crfreenet.org>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("fbdev driver for integrated graphics core in VIA VT8623 [CLE266]");
 
-module_param(mode, charp, 0644);
-MODULE_PARM_DESC(mode, "Default video mode ('640x480-8@60', etc)");
+module_param(mode_option, charp, 0644);
+MODULE_PARM_DESC(mode_option, "Default video mode ('640x480-8@60', etc)");
+module_param_named(mode, mode_option, charp, 0);
+MODULE_PARM_DESC(mode, "Default video mode e.g. '648x480-8@60' (deprecated)");
 
 #ifdef CONFIG_MTRR
 module_param(mtrr, int, 0444);
@@ -434,6 +436,10 @@ static int vt8623fb_set_par(struct fb_info *info)
         svga_wcrt_multi(vt8623_offset_regs, offset_value);
         svga_wseq_multi(vt8623_fetch_count_regs, fetch_value);
 
+        /* Clear H/V Skew */
+        svga_wcrt_mask(0x03, 0x00, 0x60);
+        svga_wcrt_mask(0x05, 0x00, 0x60);
+
         if (info->var.vmode & FB_VMODE_DOUBLE)
                 svga_wcrt_mask(0x09, 0x80, 0x80);
         else
@@ -655,7 +661,7 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
         }
 
         /* Allocate and fill driver data structure */
-        info = framebuffer_alloc(sizeof(struct vt8623fb_info), NULL);
+        info = framebuffer_alloc(sizeof(struct vt8623fb_info), &(dev->dev));
         if (! info) {
                 dev_err(&(dev->dev), "cannot allocate memory\n");
                 return -ENOMEM;
@@ -671,13 +677,13 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
 
         rc = pci_enable_device(dev);
         if (rc < 0) {
-                dev_err(&(dev->dev), "cannot enable PCI device\n");
+                dev_err(info->dev, "cannot enable PCI device\n");
                 goto err_enable_device;
         }
 
         rc = pci_request_regions(dev, "vt8623fb");
         if (rc < 0) {
-                dev_err(&(dev->dev), "cannot reserve framebuffer region\n");
+                dev_err(info->dev, "cannot reserve framebuffer region\n");
                 goto err_request_regions;
         }
 
@@ -690,14 +696,14 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
         info->screen_base = pci_iomap(dev, 0, 0);
         if (! info->screen_base) {
                 rc = -ENOMEM;
-                dev_err(&(dev->dev), "iomap for framebuffer failed\n");
+                dev_err(info->dev, "iomap for framebuffer failed\n");
                 goto err_iomap_1;
         }
 
         par->mmio_base = pci_iomap(dev, 1, 0);
         if (! par->mmio_base) {
                 rc = -ENOMEM;
-                dev_err(&(dev->dev), "iomap for MMIO failed\n");
+                dev_err(info->dev, "iomap for MMIO failed\n");
                 goto err_iomap_2;
         }
 
@@ -708,7 +714,7 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
         if ((16 <= memsize1) && (memsize1 <= 64) && (memsize1 == memsize2))
                 info->screen_size = memsize1 << 20;
         else {
-                dev_err(&(dev->dev), "memory size detection failed (%x %x), suppose 16 MB\n", memsize1, memsize2);
+                dev_err(info->dev, "memory size detection failed (%x %x), suppose 16 MB\n", memsize1, memsize2);
                 info->screen_size = 16 << 20;
         }
 
@@ -722,22 +728,22 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
 
         /* Prepare startup mode */
 
-        rc = fb_find_mode(&(info->var), info, mode, NULL, 0, NULL, 8);
+        rc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8);
         if (! ((rc == 1) || (rc == 2))) {
                 rc = -EINVAL;
-                dev_err(&(dev->dev), "mode %s not found\n", mode);
+                dev_err(info->dev, "mode %s not found\n", mode_option);
                 goto err_find_mode;
         }
 
         rc = fb_alloc_cmap(&info->cmap, 256, 0);
         if (rc < 0) {
-                dev_err(&(dev->dev), "cannot allocate colormap\n");
+                dev_err(info->dev, "cannot allocate colormap\n");
                 goto err_alloc_cmap;
         }
 
         rc = register_framebuffer(info);
         if (rc < 0) {
-                dev_err(&(dev->dev), "cannot register framebugger\n");
+                dev_err(info->dev, "cannot register framebugger\n");
                 goto err_reg_fb;
         }
 
@@ -811,7 +817,7 @@ static int vt8623_pci_suspend(struct pci_dev* dev, pm_message_t state)
         struct fb_info *info = pci_get_drvdata(dev);
         struct vt8623fb_info *par = info->par;
 
-        dev_info(&(dev->dev), "suspend\n");
+        dev_info(info->dev, "suspend\n");
 
         acquire_console_sem();
         mutex_lock(&(par->open_lock));
@@ -842,7 +848,7 @@ static int vt8623_pci_resume(struct pci_dev* dev)
         struct fb_info *info = pci_get_drvdata(dev);
         struct vt8623fb_info *par = info->par;
 
-        dev_info(&(dev->dev), "resume\n");
+        dev_info(info->dev, "resume\n");
 
         acquire_console_sem();
         mutex_lock(&(par->open_lock));
@@ -913,7 +919,7 @@ static int __init vt8623fb_init(void)
                 return -ENODEV;
 
         if (option && *option)
-                mode = option;
+                mode_option = option;
 #endif
 
         pr_debug("vt8623fb: initializing\n");
diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c
index 003c49a490eb..30469bf906e5 100644
--- a/drivers/video/w100fb.c
+++ b/drivers/video/w100fb.c
@@ -765,8 +765,10 @@ int __init w100fb_probe(struct platform_device *pdev)
         printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node, info->fix.id);
         return 0;
 out:
-        fb_dealloc_cmap(&info->cmap);
-        kfree(info->pseudo_palette);
+        if (info) {
+                fb_dealloc_cmap(&info->cmap);
+                kfree(info->pseudo_palette);
+        }
         if (remapped_fbuf != NULL)
                 iounmap(remapped_fbuf);
         if (remapped_regs != NULL)