73 files changed, 1067 insertions, 1135 deletions
diff --git a/arch/mips/au1000/common/Makefile b/arch/mips/au1000/common/Makefile
index 90e2d7a46e8e..dd0e19dacfcf 100644
--- a/arch/mips/au1000/common/Makefile
+++ b/arch/mips/au1000/common/Makefile
@@ -1,9 +1,8 @@
 #
-#  Copyright 2000 MontaVista Software Inc.
+#  Copyright 2000, 2008 MontaVista Software Inc.
-#  Author: MontaVista Software, Inc.
+#  Author: MontaVista Software, Inc. <source@mvista.com>
-#       ppopov@mvista.com or source@mvista.com
 #
-# Makefile for the Alchemy Au1000 CPU, generic files.
+# Makefile for the Alchemy Au1xx0 CPUs, generic files.
 #
 obj-y += prom.o irq.o puts.o time.o reset.o \
diff --git a/arch/mips/au1000/common/au1xxx_irqmap.c b/arch/mips/au1000/common/au1xxx_irqmap.c
index 37a10a01de9d..c7ca1596394c 100644
--- a/arch/mips/au1000/common/au1xxx_irqmap.c
+++ b/arch/mips/au1000/common/au1xxx_irqmap.c
@@ -40,20 +40,20 @@
 struct au1xxx_irqmap __initdata au1xxx_ic0_map[] = {
 #if defined(CONFIG_SOC_AU1000)
-        { AU1000_UART0_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_UART0_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_UART1_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_UART1_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_UART2_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_UART2_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_UART3_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_UART3_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_SSI0_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_SSI0_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_SSI1_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_SSI1_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+1, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+1, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+2, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+2, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+3, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+3, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+4, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+4, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+5, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+5, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+6, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+6, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+7, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+7, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_TOY_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_TOY_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_TOY_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
@@ -62,32 +62,32 @@ struct au1xxx_irqmap __initdata au1xxx_ic0_map[] = {
        { AU1000_RTC_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_RTC_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_RTC_MATCH2_INT, INTC_INT_RISE_EDGE, 0 },
-        { AU1000_IRDA_TX_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_IRDA_TX_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_IRDA_RX_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_IRDA_RX_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_USB_DEV_REQ_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_USB_DEV_SUS_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_USB_HOST_INT, INTC_INT_LOW_LEVEL, 0 },
        { AU1000_ACSYNC_INT, INTC_INT_RISE_EDGE, 0 },
-        { AU1000_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_MAC1_DMA_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_MAC1_DMA_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_AC97C_INT, INTC_INT_RISE_EDGE, 0 },
 #elif defined(CONFIG_SOC_AU1500)
-        { AU1500_UART0_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1500_UART0_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_PCI_INTA, INTC_INT_LOW_LEVEL, 0 },
        { AU1000_PCI_INTB, INTC_INT_LOW_LEVEL, 0 },
-        { AU1500_UART3_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1500_UART3_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_PCI_INTC, INTC_INT_LOW_LEVEL, 0 },
        { AU1000_PCI_INTD, INTC_INT_LOW_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+1, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+1, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+2, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+2, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+3, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+3, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+4, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+4, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+5, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+5, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+6, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+6, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+7, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+7, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_TOY_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_TOY_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_TOY_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
@@ -100,26 +100,26 @@ struct au1xxx_irqmap __initdata au1xxx_ic0_map[] = {
        { AU1000_USB_DEV_SUS_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_USB_HOST_INT, INTC_INT_LOW_LEVEL, 0 },
        { AU1000_ACSYNC_INT, INTC_INT_RISE_EDGE, 0 },
-        { AU1500_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1500_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1500_MAC1_DMA_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1500_MAC1_DMA_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_AC97C_INT, INTC_INT_RISE_EDGE, 0 },
 #elif defined(CONFIG_SOC_AU1100)
-        { AU1100_UART0_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1100_UART0_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1100_UART1_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1100_UART1_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1100_SD_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1100_SD_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1100_UART3_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1100_UART3_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_SSI0_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_SSI0_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_SSI1_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_SSI1_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+1, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+1, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+2, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+2, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+3, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+3, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+4, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+4, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+5, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+5, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+6, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+6, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_DMA_INT_BASE+7, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_DMA_INT_BASE+7, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_TOY_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_TOY_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_TOY_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
@@ -128,33 +128,33 @@ struct au1xxx_irqmap __initdata au1xxx_ic0_map[] = {
        { AU1000_RTC_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_RTC_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_RTC_MATCH2_INT, INTC_INT_RISE_EDGE, 0 },
-        { AU1000_IRDA_TX_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_IRDA_TX_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1000_IRDA_RX_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1000_IRDA_RX_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_USB_DEV_REQ_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_USB_DEV_SUS_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_USB_HOST_INT, INTC_INT_LOW_LEVEL, 0 },
        { AU1000_ACSYNC_INT, INTC_INT_RISE_EDGE, 0 },
-        { AU1100_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1100_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0 },
-        /*{ AU1000_GPIO215_208_INT, INTC_INT_HIGH_LEVEL, 0},*/
+        /* { AU1000_GPIO215_208_INT, INTC_INT_HIGH_LEVEL, 0 }, */
-        { AU1100_LCD_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1100_LCD_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_AC97C_INT, INTC_INT_RISE_EDGE, 0 },
 #elif defined(CONFIG_SOC_AU1550)
-        { AU1550_UART0_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1550_UART0_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1550_PCI_INTA, INTC_INT_LOW_LEVEL, 0 },
        { AU1550_PCI_INTB, INTC_INT_LOW_LEVEL, 0 },
-        { AU1550_DDMA_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1550_DDMA_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1550_CRYPTO_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1550_CRYPTO_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1550_PCI_INTC, INTC_INT_LOW_LEVEL, 0 },
        { AU1550_PCI_INTD, INTC_INT_LOW_LEVEL, 0 },
        { AU1550_PCI_RST_INT, INTC_INT_LOW_LEVEL, 0 },
-        { AU1550_UART1_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1550_UART1_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1550_UART3_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1550_UART3_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1550_PSC0_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1550_PSC0_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1550_PSC1_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1550_PSC1_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1550_PSC2_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1550_PSC2_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1550_PSC3_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1550_PSC3_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_TOY_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_TOY_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_TOY_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
@@ -163,26 +163,26 @@ struct au1xxx_irqmap __initdata au1xxx_ic0_map[] = {
        { AU1000_RTC_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_RTC_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_RTC_MATCH2_INT, INTC_INT_RISE_EDGE, 0 },
-        { AU1550_NAND_INT, INTC_INT_RISE_EDGE, 0},
+        { AU1550_NAND_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1550_USB_DEV_REQ_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1550_USB_DEV_SUS_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1550_USB_HOST_INT, INTC_INT_LOW_LEVEL, 0 },
-        { AU1550_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1550_MAC0_DMA_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1550_MAC1_DMA_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1550_MAC1_DMA_INT, INTC_INT_HIGH_LEVEL, 0 },
 #elif defined(CONFIG_SOC_AU1200)
-        { AU1200_UART0_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1200_UART0_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1200_SWT_INT, INTC_INT_RISE_EDGE, 0 },
-        { AU1200_SD_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1200_SD_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1200_DDMA_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1200_DDMA_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1200_MAE_BE_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1200_UART1_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1200_UART1_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1200_MAE_FE_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1200_PSC0_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1200_PSC0_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1200_PSC1_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1200_PSC1_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1200_AES_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1200_AES_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1200_CAMERA_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1200_CAMERA_INT, INTC_INT_HIGH_LEVEL, 0 },
        { AU1000_TOY_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_TOY_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_TOY_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
@@ -191,10 +191,10 @@ struct au1xxx_irqmap __initdata au1xxx_ic0_map[] = {
        { AU1000_RTC_MATCH0_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_RTC_MATCH1_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1000_RTC_MATCH2_INT, INTC_INT_RISE_EDGE, 0 },
-        { AU1200_NAND_INT, INTC_INT_RISE_EDGE, 0},
+        { AU1200_NAND_INT, INTC_INT_RISE_EDGE, 0 },
        { AU1200_USB_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1200_LCD_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1200_LCD_INT, INTC_INT_HIGH_LEVEL, 0 },
-        { AU1200_MAE_BOTH_INT, INTC_INT_HIGH_LEVEL, 0},
+        { AU1200_MAE_BOTH_INT, INTC_INT_HIGH_LEVEL, 0 },
 #else
 #error "Error: Unknown Alchemy SOC"
@@ -203,4 +203,3 @@ struct au1xxx_irqmap __initdata au1xxx_ic0_map[] = {
 };
 int __initdata au1xxx_ic0_nr_irqs = ARRAY_SIZE(au1xxx_ic0_map);
diff --git a/arch/mips/au1000/common/clocks.c b/arch/mips/au1000/common/clocks.c
index 3ce6cace0eb0..46f8ee0e2657 100644
--- a/arch/mips/au1000/common/clocks.c
+++ b/arch/mips/au1000/common/clocks.c
@@ -1,10 +1,9 @@
 /*
 * BRIEF MODULE DESCRIPTION
- *      Simple Au1000 clocks routines.
+ *      Simple Au1xx0 clocks routines.
 *
- * Copyright 2001 MontaVista Software Inc.
+ * Copyright 2001, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -30,8 +29,8 @@
 #include <linux/module.h>
 #include <asm/mach-au1x00/au1000.h>
-static unsigned int au1x00_clock; // Hz
+static unsigned int au1x00_clock; /*  Hz */
-static unsigned int lcd_clock;    // KHz
+static unsigned int lcd_clock;    /* KHz */
 static unsigned long uart_baud_base;
 /*
@@ -47,8 +46,6 @@ unsigned int get_au1x00_speed(void)
        return au1x00_clock;
 }
 /*
 * The UART baud base is not known at compile time ... if
 * we want to be able to use the same code on different
@@ -73,24 +70,23 @@ void set_au1x00_uart_baud_base(unsigned long new_baud_base)
 void set_au1x00_lcd_clock(void)
 {
        unsigned int static_cfg0;
-        unsigned int sys_busclk =
+        unsigned int sys_busclk = (get_au1x00_speed() / 1000) /
-                (get_au1x00_speed()/1000) /
+                                  ((int)(au_readl(SYS_POWERCTRL) & 0x03) + 2);
-                ((int)(au_readl(SYS_POWERCTRL)&0x03) + 2);
        static_cfg0 = au_readl(MEM_STCFG0);
-        if (static_cfg0 & (1<<11))
+        if (static_cfg0 & (1 << 11))
                lcd_clock = sys_busclk / 5; /* note: BCLK switching fails with D5 */
        else
                lcd_clock = sys_busclk / 4;
        if (lcd_clock > 50000) /* Epson MAX */
-                printk("warning: LCD clock too high (%d KHz)\n", lcd_clock);
+                printk(KERN_WARNING "warning: LCD clock too high (%u KHz)\n",
+                                    lcd_clock);
 }
 unsigned int get_au1x00_lcd_clock(void)
 {
        return lcd_clock;
 }
 EXPORT_SYMBOL(get_au1x00_lcd_clock);
diff --git a/arch/mips/au1000/common/cputable.c b/arch/mips/au1000/common/cputable.c
index 8c93a05d7382..ba6430bc2d03 100644
--- a/arch/mips/au1000/common/cputable.c
+++ b/arch/mips/au1000/common/cputable.c
@@ -14,7 +14,7 @@
 #include <asm/mach-au1x00/au1000.h>
-struct cpu_spec* cur_cpu_spec[NR_CPUS];
+struct cpu_spec *cur_cpu_spec[NR_CPUS];
 /* With some thought, we can probably use the mask to reduce the
 * size of the table.
@@ -39,8 +39,7 @@ struct cpu_spec cpu_specs[] = {
        { 0x00000000, 0x00000000, "Unknown Au1xxx", 1, 0, 0 }
 };
-void
+void set_cpuspec(void)
-set_cpuspec(void)
 {
        struct  cpu_spec *sp;
        u32     prid;
diff --git a/arch/mips/au1000/common/dbdma.c b/arch/mips/au1000/common/dbdma.c
index 53377dfc0640..42d555236de1 100644
--- a/arch/mips/au1000/common/dbdma.c
+++ b/arch/mips/au1000/common/dbdma.c
@@ -53,12 +53,11 @@
 */
 static DEFINE_SPINLOCK(au1xxx_dbdma_spin_lock);
-/* I couldn't find a macro that did this......
+/* I couldn't find a macro that did this... */
-*/
 #define ALIGN_ADDR(x, a)        ((((u32)(x)) + (a-1)) & ~(a-1))
 static dbdma_global_t *dbdma_gptr = (dbdma_global_t *)DDMA_GLOBAL_BASE;
-static int dbdma_initialized=0;
+static int dbdma_initialized;
 static void au1xxx_dbdma_init(void);
 static dbdev_tab_t dbdev_tab[] = {
@@ -149,7 +148,7 @@ static dbdev_tab_t dbdev_tab[] = {
        { DSCR_CMD0_NAND_FLASH, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 },
-#endif // CONFIG_SOC_AU1200
+#endif /* CONFIG_SOC_AU1200 */
        { DSCR_CMD0_THROTTLE, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 },
        { DSCR_CMD0_ALWAYS, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 },
@@ -177,8 +176,7 @@ static dbdev_tab_t dbdev_tab[] = {
 static chan_tab_t *chan_tab_ptr[NUM_DBDMA_CHANS];
-static dbdev_tab_t *
+static dbdev_tab_t *find_dbdev_id(u32 id)
-find_dbdev_id(u32 id)
 {
        int i;
        dbdev_tab_t *p;
@@ -190,29 +188,27 @@ find_dbdev_id(u32 id)
        return NULL;
 }
-void * au1xxx_ddma_get_nextptr_virt(au1x_ddma_desc_t *dp)
+void *au1xxx_ddma_get_nextptr_virt(au1x_ddma_desc_t *dp)
 {
-        return phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
+        return phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
 }
 EXPORT_SYMBOL(au1xxx_ddma_get_nextptr_virt);
-u32
+u32 au1xxx_ddma_add_device(dbdev_tab_t *dev)
-au1xxx_ddma_add_device(dbdev_tab_t *dev)
 {
        u32 ret = 0;
-        dbdev_tab_t *p=NULL;
+        dbdev_tab_t *p;
-        static u16 new_id=0x1000;
+        static u16 new_id = 0x1000;
        p = find_dbdev_id(~0);
-        if ( NULL != p )
+        if (NULL != p) {
-        {
                memcpy(p, dev, sizeof(dbdev_tab_t));
                p->dev_id = DSCR_DEV2CUSTOM_ID(new_id, dev->dev_id);
                ret = p->dev_id;
                new_id++;
 #if 0
-                printk("add_device: id:%x flags:%x padd:%x\n",
+                printk(KERN_DEBUG "add_device: id:%x flags:%x padd:%x\n",
-                                p->dev_id, p->dev_flags, p->dev_physaddr );
+                                  p->dev_id, p->dev_flags, p->dev_physaddr);
 #endif
        }
@@ -220,10 +216,8 @@ au1xxx_ddma_add_device(dbdev_tab_t *dev)
 }
 EXPORT_SYMBOL(au1xxx_ddma_add_device);
-/* Allocate a channel and return a non-zero descriptor if successful.
+/* Allocate a channel and return a non-zero descriptor if successful. */
-*/
+u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
-u32
-au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
       void (*callback)(int, void *), void *callparam)
 {
        unsigned long   flags;
@@ -234,7 +228,8 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
        chan_tab_t      *ctp;
        au1x_dma_chan_t *cp;
-        /* We do the intialization on the first channel allocation.
+        /*
+         * We do the intialization on the first channel allocation.
         * We have to wait because of the interrupt handler initialization
         * which can't be done successfully during board set up.
         */
@@ -242,16 +237,17 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
                au1xxx_dbdma_init();
        dbdma_initialized = 1;
-        if ((stp = find_dbdev_id(srcid)) == NULL)
+        stp = find_dbdev_id(srcid);
+        if (stp == NULL)
                return 0;
-        if ((dtp = find_dbdev_id(destid)) == NULL)
+        dtp = find_dbdev_id(destid);
+        if (dtp == NULL)
                return 0;
        used = 0;
        rv = 0;
-        /* Check to see if we can get both channels.
+        /* Check to see if we can get both channels. */
-        */
        spin_lock_irqsave(&au1xxx_dbdma_spin_lock, flags);
        if (!(stp->dev_flags & DEV_FLAGS_INUSE) ||
             (stp->dev_flags & DEV_FLAGS_ANYUSE)) {
@@ -261,35 +257,30 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
                     (dtp->dev_flags & DEV_FLAGS_ANYUSE)) {
                        /* Got destination */
                        dtp->dev_flags |= DEV_FLAGS_INUSE;
-                }
+                } else {
-                else {
+                        /* Can't get dest.  Release src. */
-                        /* Can't get dest.  Release src.
-                        */
                        stp->dev_flags &= ~DEV_FLAGS_INUSE;
                        used++;
                }
-        }
+        } else
-        else {
                used++;
-        }
        spin_unlock_irqrestore(&au1xxx_dbdma_spin_lock, flags);
        if (!used) {
-                /* Let's see if we can allocate a channel for it.
+                /* Let's see if we can allocate a channel for it. */
-                */
                ctp = NULL;
                chan = 0;
                spin_lock_irqsave(&au1xxx_dbdma_spin_lock, flags);
-                for (i=0; i<NUM_DBDMA_CHANS; i++) {
+                for (i = 0; i < NUM_DBDMA_CHANS; i++)
                        if (chan_tab_ptr[i] == NULL) {
-                                /* If kmalloc fails, it is caught below same
+                                /*
+                                 * If kmalloc fails, it is caught below same
                                 * as a channel not available.
                                 */
                                ctp = kmalloc(sizeof(chan_tab_t), GFP_ATOMIC);
                                chan_tab_ptr[i] = ctp;
                                break;
                        }
-                }
                spin_unlock_irqrestore(&au1xxx_dbdma_spin_lock, flags);
                if (ctp != NULL) {
@@ -304,8 +295,7 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
                        ctp->chan_callback = callback;
                        ctp->chan_callparam = callparam;
-                        /* Initialize channel configuration.
+                        /* Initialize channel configuration. */
-                        */
                        i = 0;
                        if (stp->dev_intlevel)
                                i |= DDMA_CFG_SED;
@@ -326,8 +316,7 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
                         * operations.
                         */
                        rv = (u32)(&chan_tab_ptr[chan]);
-                }
+                } else {
-                else {
                        /* Release devices */
                        stp->dev_flags &= ~DEV_FLAGS_INUSE;
                        dtp->dev_flags &= ~DEV_FLAGS_INUSE;
@@ -337,11 +326,11 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
 }
 EXPORT_SYMBOL(au1xxx_dbdma_chan_alloc);
-/* Set the device width if source or destination is a FIFO.
+/*
+ * Set the device width if source or destination is a FIFO.
 * Should be 8, 16, or 32 bits.
 */
-u32
+u32 au1xxx_dbdma_set_devwidth(u32 chanid, int bits)
-au1xxx_dbdma_set_devwidth(u32 chanid, int bits)
 {
        u32             rv;
        chan_tab_t      *ctp;
@@ -365,10 +354,8 @@ au1xxx_dbdma_set_devwidth(u32 chanid, int bits)
 }
 EXPORT_SYMBOL(au1xxx_dbdma_set_devwidth);
-/* Allocate a descriptor ring, initializing as much as possible.
+/* Allocate a descriptor ring, initializing as much as possible. */
-*/
+u32 au1xxx_dbdma_ring_alloc(u32 chanid, int entries)
-u32
-au1xxx_dbdma_ring_alloc(u32 chanid, int entries)
 {
        int                     i;
        u32                     desc_base, srcid, destid;
@@ -378,43 +365,45 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int entries)
        dbdev_tab_t             *stp, *dtp;
        au1x_ddma_desc_t        *dp;
-        /* I guess we could check this to be within the
+        /*
+         * I guess we could check this to be within the
         * range of the table......
         */
        ctp = *((chan_tab_t **)chanid);
        stp = ctp->chan_src;
        dtp = ctp->chan_dest;
-        /* The descriptors must be 32-byte aligned.  There is a
+        /*
+         * The descriptors must be 32-byte aligned.  There is a
         * possibility the allocation will give us such an address,
         * and if we try that first we are likely to not waste larger
         * slabs of memory.
         */
        desc_base = (u32)kmalloc(entries * sizeof(au1x_ddma_desc_t),
-                        GFP_KERNEL|GFP_DMA);
+                                 GFP_KERNEL|GFP_DMA);
        if (desc_base == 0)
                return 0;
        if (desc_base & 0x1f) {
-                /* Lost....do it again, allocate extra, and round
+                /*
+                 * Lost....do it again, allocate extra, and round
                 * the address base.
                 */
                kfree((const void *)desc_base);
                i = entries * sizeof(au1x_ddma_desc_t);
                i += (sizeof(au1x_ddma_desc_t) - 1);
-                if ((desc_base = (u32)kmalloc(i, GFP_KERNEL|GFP_DMA)) == 0)
+                desc_base = (u32)kmalloc(i, GFP_KERNEL|GFP_DMA);
+                if (desc_base == 0)
                        return 0;
                desc_base = ALIGN_ADDR(desc_base, sizeof(au1x_ddma_desc_t));
        }
        dp = (au1x_ddma_desc_t *)desc_base;
-        /* Keep track of the base descriptor.
+        /* Keep track of the base descriptor. */
-        */
        ctp->chan_desc_base = dp;
-        /* Initialize the rings with as much information as we know.
+        /* Initialize the rings with as much information as we know. */
-         */
        srcid = stp->dev_id;
        destid = dtp->dev_id;
@@ -426,11 +415,12 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int entries)
        cmd0 |= DSCR_CMD0_IE | DSCR_CMD0_CV;
        cmd0 |= DSCR_CMD0_ST(DSCR_CMD0_ST_NOCHANGE);
-        /* is it mem to mem transfer? */
+        /* Is it mem to mem transfer? */
-        if(((DSCR_CUSTOM2DEV_ID(srcid) == DSCR_CMD0_THROTTLE) || (DSCR_CUSTOM2DEV_ID(srcid) == DSCR_CMD0_ALWAYS)) &&
+        if (((DSCR_CUSTOM2DEV_ID(srcid) == DSCR_CMD0_THROTTLE) ||
-           ((DSCR_CUSTOM2DEV_ID(destid) == DSCR_CMD0_THROTTLE) || (DSCR_CUSTOM2DEV_ID(destid) == DSCR_CMD0_ALWAYS))) {
+             (DSCR_CUSTOM2DEV_ID(srcid) == DSCR_CMD0_ALWAYS)) &&
-               cmd0 |= DSCR_CMD0_MEM;
+            ((DSCR_CUSTOM2DEV_ID(destid) == DSCR_CMD0_THROTTLE) ||
-        }
+             (DSCR_CUSTOM2DEV_ID(destid) == DSCR_CMD0_ALWAYS)))
+                cmd0 |= DSCR_CMD0_MEM;
        switch (stp->dev_devwidth) {
        case 8:
@@ -458,15 +448,17 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int entries)
                break;
        }
-        /* If the device is marked as an in/out FIFO, ensure it is
+        /*
+         * If the device is marked as an in/out FIFO, ensure it is
         * set non-coherent.
         */
        if (stp->dev_flags & DEV_FLAGS_IN)
-                cmd0 |= DSCR_CMD0_SN;           /* Source in fifo */
+                cmd0 |= DSCR_CMD0_SN;           /* Source in FIFO */
        if (dtp->dev_flags & DEV_FLAGS_OUT)
-                cmd0 |= DSCR_CMD0_DN;           /* Destination out fifo */
+                cmd0 |= DSCR_CMD0_DN;           /* Destination out FIFO */
-        /* Set up source1.  For now, assume no stride and increment.
+        /*
+         * Set up source1.  For now, assume no stride and increment.
         * A channel attribute update can change this later.
         */
        switch (stp->dev_tsize) {
@@ -485,19 +477,19 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int entries)
                break;
        }
-        /* If source input is fifo, set static address.
+        /* If source input is FIFO, set static address. */
-        */
        if (stp->dev_flags & DEV_FLAGS_IN) {
-                if ( stp->dev_flags & DEV_FLAGS_BURSTABLE )
+                if (stp->dev_flags & DEV_FLAGS_BURSTABLE)
                        src1 |= DSCR_SRC1_SAM(DSCR_xAM_BURST);
                else
-                src1 |= DSCR_SRC1_SAM(DSCR_xAM_STATIC);
+                        src1 |= DSCR_SRC1_SAM(DSCR_xAM_STATIC);
        }
        if (stp->dev_physaddr)
                src0 = stp->dev_physaddr;
-        /* Set up dest1.  For now, assume no stride and increment.
+        /*
+         * Set up dest1.  For now, assume no stride and increment.
         * A channel attribute update can change this later.
         */
        switch (dtp->dev_tsize) {
@@ -516,22 +508,24 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int entries)
                break;
        }
-        /* If destination output is fifo, set static address.
+        /* If destination output is FIFO, set static address. */
-        */
        if (dtp->dev_flags & DEV_FLAGS_OUT) {
-                if ( dtp->dev_flags & DEV_FLAGS_BURSTABLE )
+                if (dtp->dev_flags & DEV_FLAGS_BURSTABLE)
-                        dest1 |= DSCR_DEST1_DAM(DSCR_xAM_BURST);
+                        dest1 |= DSCR_DEST1_DAM(DSCR_xAM_BURST);
-                                else
+                else
-                dest1 |= DSCR_DEST1_DAM(DSCR_xAM_STATIC);
+                        dest1 |= DSCR_DEST1_DAM(DSCR_xAM_STATIC);
        }
        if (dtp->dev_physaddr)
                dest0 = dtp->dev_physaddr;
 #if 0
-                printk("did:%x sid:%x cmd0:%x cmd1:%x source0:%x source1:%x dest0:%x dest1:%x\n",
+                printk(KERN_DEBUG "did:%x sid:%x cmd0:%x cmd1:%x source0:%x "
-                        dtp->dev_id, stp->dev_id, cmd0, cmd1, src0, src1, dest0, dest1 );
+                                  "source1:%x dest0:%x dest1:%x\n",
+                                  dtp->dev_id, stp->dev_id, cmd0, cmd1, src0,
+                                  src1, dest0, dest1);
 #endif
-        for (i=0; i<entries; i++) {
+        for (i = 0; i < entries; i++) {
                dp->dscr_cmd0 = cmd0;
                dp->dscr_cmd1 = cmd1;
                dp->dscr_source0 = src0;
@@ -545,49 +539,49 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int entries)
                dp++;
        }
-        /* Make last descrptor point to the first.
+        /* Make last descrptor point to the first. */
-        */
        dp--;
        dp->dscr_nxtptr = DSCR_NXTPTR(virt_to_phys(ctp->chan_desc_base));
        ctp->get_ptr = ctp->put_ptr = ctp->cur_ptr = ctp->chan_desc_base;
-        return (u32)(ctp->chan_desc_base);
+        return (u32)ctp->chan_desc_base;
 }
 EXPORT_SYMBOL(au1xxx_dbdma_ring_alloc);
-/* Put a source buffer into the DMA ring.
+/*
+ * Put a source buffer into the DMA ring.
 * This updates the source pointer and byte count.  Normally used
 * for memory to fifo transfers.
 */
-u32
+u32 _au1xxx_dbdma_put_source(u32 chanid, void *buf, int nbytes, u32 flags)
-_au1xxx_dbdma_put_source(u32 chanid, void *buf, int nbytes, u32 flags)
 {
        chan_tab_t              *ctp;
        au1x_ddma_desc_t        *dp;
-        /* I guess we could check this to be within the
+        /*
+         * I guess we could check this to be within the
         * range of the table......
         */
-        ctp = *((chan_tab_t **)chanid);
+        ctp = *(chan_tab_t **)chanid;
-        /* We should have multiple callers for a particular channel,
+        /*
+         * We should have multiple callers for a particular channel,
         * an interrupt doesn't affect this pointer nor the descriptor,
         * so no locking should be needed.
         */
        dp = ctp->put_ptr;
-        /* If the descriptor is valid, we are way ahead of the DMA
+        /*
+         * If the descriptor is valid, we are way ahead of the DMA
         * engine, so just return an error condition.
         */
-        if (dp->dscr_cmd0 & DSCR_CMD0_V) {
+        if (dp->dscr_cmd0 & DSCR_CMD0_V)
                return 0;
-        }
-        /* Load up buffer address and byte count.
+        /* Load up buffer address and byte count. */
-        */
        dp->dscr_source0 = virt_to_phys(buf);
        dp->dscr_cmd1 = nbytes;
-        /* Check flags  */
+        /* Check flags */
        if (flags & DDMA_FLAGS_IE)
                dp->dscr_cmd0 |= DSCR_CMD0_IE;
        if (flags & DDMA_FLAGS_NOIE)
@@ -595,23 +589,21 @@ _au1xxx_dbdma_put_source(u32 chanid, void *buf, int nbytes, u32 flags)
        /*
         * There is an errata on the Au1200/Au1550 parts that could result
-         * in "stale" data being DMA'd. It has to do with the snoop logic on
+         * in "stale" data being DMA'ed. It has to do with the snoop logic on
-         * the dache eviction buffer.  NONCOHERENT_IO is on by default for
+         * the cache eviction buffer.  DMA_NONCOHERENT is on by default for
-         * these parts. If it is fixedin the future, these dma_cache_inv will
+         * these parts. If it is fixed in the future, these dma_cache_inv will
         * just be nothing more than empty macros. See io.h.
-         * */
+         */
        dma_cache_wback_inv((unsigned long)buf, nbytes);
-        dp->dscr_cmd0 |= DSCR_CMD0_V;        /* Let it rip */
+        dp->dscr_cmd0 |= DSCR_CMD0_V;   /* Let it rip */
        au_sync();
        dma_cache_wback_inv((unsigned long)dp, sizeof(dp));
-        ctp->chan_ptr->ddma_dbell = 0;
+        ctp->chan_ptr->ddma_dbell = 0;
-        /* Get next descriptor pointer.
+        /* Get next descriptor pointer. */
-        */
        ctp->put_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
-        /* return something not zero.
+        /* Return something non-zero. */
-        */
        return nbytes;
 }
 EXPORT_SYMBOL(_au1xxx_dbdma_put_source);
@@ -654,81 +646,77 @@ _au1xxx_dbdma_put_dest(u32 chanid, void *buf, int nbytes, u32 flags)
        dp->dscr_dest0 = virt_to_phys(buf);
        dp->dscr_cmd1 = nbytes;
 #if 0
-        printk("cmd0:%x cmd1:%x source0:%x source1:%x dest0:%x dest1:%x\n",
+        printk(KERN_DEBUG "cmd0:%x cmd1:%x source0:%x source1:%x dest0:%x dest1:%x\n",
-                        dp->dscr_cmd0, dp->dscr_cmd1, dp->dscr_source0,
+                          dp->dscr_cmd0, dp->dscr_cmd1, dp->dscr_source0,
-                        dp->dscr_source1, dp->dscr_dest0, dp->dscr_dest1 );
+                          dp->dscr_source1, dp->dscr_dest0, dp->dscr_dest1);
 #endif
        /*
         * There is an errata on the Au1200/Au1550 parts that could result in
-         * "stale" data being DMA'd. It has to do with the snoop logic on the
+         * "stale" data being DMA'ed. It has to do with the snoop logic on the
-         * dache eviction buffer. NONCOHERENT_IO is on by default for these
+         * cache eviction buffer.  DMA_NONCOHERENT is on by default for these
-         * parts. If it is fixedin the future, these dma_cache_inv will just
+         * parts. If it is fixed in the future, these dma_cache_inv will just
         * be nothing more than empty macros. See io.h.
-         * */
+         */
        dma_cache_inv((unsigned long)buf, nbytes);
        dp->dscr_cmd0 |= DSCR_CMD0_V;   /* Let it rip */
        au_sync();
        dma_cache_wback_inv((unsigned long)dp, sizeof(dp));
-        ctp->chan_ptr->ddma_dbell = 0;
+        ctp->chan_ptr->ddma_dbell = 0;
-        /* Get next descriptor pointer.
+        /* Get next descriptor pointer. */
-        */
        ctp->put_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
-        /* return something not zero.
+        /* Return something non-zero. */
-        */
        return nbytes;
 }
 EXPORT_SYMBOL(_au1xxx_dbdma_put_dest);
-/* Get a destination buffer into the DMA ring.
+/*
+ * Get a destination buffer into the DMA ring.
 * Normally used to get a full buffer from the ring during fifo
 * to memory transfers.  This does not set the valid bit, you will
 * have to put another destination buffer to keep the DMA going.
 */
-u32
+u32 au1xxx_dbdma_get_dest(u32 chanid, void **buf, int *nbytes)
-au1xxx_dbdma_get_dest(u32 chanid, void **buf, int *nbytes)
 {
        chan_tab_t              *ctp;
        au1x_ddma_desc_t        *dp;
        u32                     rv;
-        /* I guess we could check this to be within the
+        /*
+         * I guess we could check this to be within the
         * range of the table......
         */
        ctp = *((chan_tab_t **)chanid);
-        /* We should have multiple callers for a particular channel,
+        /*
+         * We should have multiple callers for a particular channel,
         * an interrupt doesn't affect this pointer nor the descriptor,
         * so no locking should be needed.
         */
        dp = ctp->get_ptr;
-        /* If the descriptor is valid, we are way ahead of the DMA
+        /*
+         * If the descriptor is valid, we are way ahead of the DMA
         * engine, so just return an error condition.
         */
        if (dp->dscr_cmd0 & DSCR_CMD0_V)
                return 0;
-        /* Return buffer address and byte count.
+        /* Return buffer address and byte count. */
-        */
        *buf = (void *)(phys_to_virt(dp->dscr_dest0));
        *nbytes = dp->dscr_cmd1;
        rv = dp->dscr_stat;
-        /* Get next descriptor pointer.
+        /* Get next descriptor pointer. */
-        */
        ctp->get_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
-        /* return something not zero.
+        /* Return something non-zero. */
-        */
        return rv;
 }
 EXPORT_SYMBOL_GPL(au1xxx_dbdma_get_dest);
-void
+void au1xxx_dbdma_stop(u32 chanid)
-au1xxx_dbdma_stop(u32 chanid)
 {
        chan_tab_t      *ctp;
        au1x_dma_chan_t *cp;
@@ -743,7 +731,7 @@ au1xxx_dbdma_stop(u32 chanid)
                udelay(1);
                halt_timeout++;
                if (halt_timeout > 100) {
-                        printk("warning: DMA channel won't halt\n");
+                        printk(KERN_WARNING "warning: DMA channel won't halt\n");
                        break;
                }
        }
@@ -753,12 +741,12 @@ au1xxx_dbdma_stop(u32 chanid)
 }
 EXPORT_SYMBOL(au1xxx_dbdma_stop);
-/* Start using the current descriptor pointer.  If the dbdma encounters
+/*
- * a not valid descriptor, it will stop.  In this case, we can just
+ * Start using the current descriptor pointer.  If the DBDMA encounters
+ * a non-valid descriptor, it will stop.  In this case, we can just
 * continue by adding a buffer to the list and starting again.
 */
-void
+void au1xxx_dbdma_start(u32 chanid)
-au1xxx_dbdma_start(u32 chanid)
 {
        chan_tab_t      *ctp;
        au1x_dma_chan_t *cp;
@@ -773,8 +761,7 @@ au1xxx_dbdma_start(u32 chanid)
 }
 EXPORT_SYMBOL(au1xxx_dbdma_start);
-void
+void au1xxx_dbdma_reset(u32 chanid)
-au1xxx_dbdma_reset(u32 chanid)
 {
        chan_tab_t              *ctp;
        au1x_ddma_desc_t        *dp;
@@ -784,14 +771,14 @@ au1xxx_dbdma_reset(u32 chanid)
        ctp = *((chan_tab_t **)chanid);
        ctp->get_ptr = ctp->put_ptr = ctp->cur_ptr = ctp->chan_desc_base;
-        /* Run through the descriptors and reset the valid indicator.
+        /* Run through the descriptors and reset the valid indicator. */
-        */
        dp = ctp->chan_desc_base;
        do {
                dp->dscr_cmd0 &= ~DSCR_CMD0_V;
-                /* reset our SW status -- this is used to determine
+                /*
-                 * if a descriptor is in use by upper level SW. Since
+                 * Reset our software status -- this is used to determine
+                 * if a descriptor is in use by upper level software. Since
                 * posting can reset 'V' bit.
                 */
                dp->sw_status = 0;
@@ -800,8 +787,7 @@ au1xxx_dbdma_reset(u32 chanid)
 }
 EXPORT_SYMBOL(au1xxx_dbdma_reset);
-u32
+u32 au1xxx_get_dma_residue(u32 chanid)
-au1xxx_get_dma_residue(u32 chanid)
 {
        chan_tab_t      *ctp;
        au1x_dma_chan_t *cp;
@@ -810,18 +796,15 @@ au1xxx_get_dma_residue(u32 chanid)
        ctp = *((chan_tab_t **)chanid);
        cp = ctp->chan_ptr;
-        /* This is only valid if the channel is stopped.
+        /* This is only valid if the channel is stopped. */
-        */
        rv = cp->ddma_bytecnt;
        au_sync();
        return rv;
 }
 EXPORT_SYMBOL_GPL(au1xxx_get_dma_residue);
-void
+void au1xxx_dbdma_chan_free(u32 chanid)
-au1xxx_dbdma_chan_free(u32 chanid)
 {
        chan_tab_t      *ctp;
        dbdev_tab_t     *stp, *dtp;
@@ -842,8 +825,7 @@ au1xxx_dbdma_chan_free(u32 chanid)
 }
 EXPORT_SYMBOL(au1xxx_dbdma_chan_free);
-static irqreturn_t
+static irqreturn_t dbdma_interrupt(int irq, void *dev_id)
-dbdma_interrupt(int irq, void *dev_id)
 {
        u32 intstat;
        u32 chan_index;
@@ -859,13 +841,12 @@ dbdma_interrupt(int irq, void *dev_id)
        cp = ctp->chan_ptr;
        dp = ctp->cur_ptr;
-        /* Reset interrupt.
+        /* Reset interrupt. */
-        */
        cp->ddma_irq = 0;
        au_sync();
        if (ctp->chan_callback)
-                (ctp->chan_callback)(irq, ctp->chan_callparam);
+                ctp->chan_callback(irq, ctp->chan_callparam);
        ctp->cur_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
        return IRQ_RETVAL(1);
@@ -890,47 +871,47 @@ static void au1xxx_dbdma_init(void)
        if (request_irq(irq_nr, dbdma_interrupt, IRQF_DISABLED,
                        "Au1xxx dbdma", (void *)dbdma_gptr))
-                printk("Can't get 1550 dbdma irq");
+                printk(KERN_ERR "Can't get 1550 dbdma irq");
 }
-void
+void au1xxx_dbdma_dump(u32 chanid)
-au1xxx_dbdma_dump(u32 chanid)
 {
-        chan_tab_t              *ctp;
+        chan_tab_t       *ctp;
-        au1x_ddma_desc_t        *dp;
+        au1x_ddma_desc_t *dp;
-        dbdev_tab_t             *stp, *dtp;
+        dbdev_tab_t      *stp, *dtp;
-        au1x_dma_chan_t *cp;
+        au1x_dma_chan_t  *cp;
-                u32                     i = 0;
+        u32 i            = 0;
        ctp = *((chan_tab_t **)chanid);
        stp = ctp->chan_src;
        dtp = ctp->chan_dest;
        cp = ctp->chan_ptr;
-        printk("Chan %x, stp %x (dev %d)  dtp %x (dev %d) \n",
+        printk(KERN_DEBUG "Chan %x, stp %x (dev %d)  dtp %x (dev %d) \n",
-                (u32)ctp, (u32)stp, stp - dbdev_tab, (u32)dtp, dtp - dbdev_tab);
+                          (u32)ctp, (u32)stp, stp - dbdev_tab, (u32)dtp,
-        printk("desc base %x, get %x, put %x, cur %x\n",
+                          dtp - dbdev_tab);
-                (u32)(ctp->chan_desc_base), (u32)(ctp->get_ptr),
+        printk(KERN_DEBUG "desc base %x, get %x, put %x, cur %x\n",
-                (u32)(ctp->put_ptr), (u32)(ctp->cur_ptr));
+                          (u32)(ctp->chan_desc_base), (u32)(ctp->get_ptr),
+                          (u32)(ctp->put_ptr), (u32)(ctp->cur_ptr));
-        printk("dbdma chan %x\n", (u32)cp);
-        printk("cfg %08x, desptr %08x, statptr %08x\n",
+        printk(KERN_DEBUG "dbdma chan %x\n", (u32)cp);
-                cp->ddma_cfg, cp->ddma_desptr, cp->ddma_statptr);
+        printk(KERN_DEBUG "cfg %08x, desptr %08x, statptr %08x\n",
-        printk("dbell %08x, irq %08x, stat %08x, bytecnt %08x\n",
+                          cp->ddma_cfg, cp->ddma_desptr, cp->ddma_statptr);
-                cp->ddma_dbell, cp->ddma_irq, cp->ddma_stat, cp->ddma_bytecnt);
+        printk(KERN_DEBUG "dbell %08x, irq %08x, stat %08x, bytecnt %08x\n",
+                          cp->ddma_dbell, cp->ddma_irq, cp->ddma_stat,
+                          cp->ddma_bytecnt);
-        /* Run through the descriptors
-        */
+        /* Run through the descriptors */
        dp = ctp->chan_desc_base;
        do {
-                printk("Dp[%d]= %08x, cmd0 %08x, cmd1 %08x\n",
+                printk(KERN_DEBUG "Dp[%d]= %08x, cmd0 %08x, cmd1 %08x\n",
-                        i++, (u32)dp, dp->dscr_cmd0, dp->dscr_cmd1);
+                                  i++, (u32)dp, dp->dscr_cmd0, dp->dscr_cmd1);
-                printk("src0 %08x, src1 %08x, dest0 %08x, dest1 %08x\n",
+                printk(KERN_DEBUG "src0 %08x, src1 %08x, dest0 %08x, dest1 %08x\n",
-                        dp->dscr_source0, dp->dscr_source1, dp->dscr_dest0, dp->dscr_dest1);
+                                  dp->dscr_source0, dp->dscr_source1,
-                printk("stat %08x, nxtptr %08x\n",
+                                  dp->dscr_dest0, dp->dscr_dest1);
-                        dp->dscr_stat, dp->dscr_nxtptr);
+                printk(KERN_DEBUG "stat %08x, nxtptr %08x\n",
+                                  dp->dscr_stat, dp->dscr_nxtptr);
                dp = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
        } while (dp != ctp->chan_desc_base);
 }
@@ -938,32 +919,33 @@ au1xxx_dbdma_dump(u32 chanid)
 /* Put a descriptor into the DMA ring.
 * This updates the source/destination pointers and byte count.
 */
-u32
+u32 au1xxx_dbdma_put_dscr(u32 chanid, au1x_ddma_desc_t *dscr)
-au1xxx_dbdma_put_dscr(u32 chanid, au1x_ddma_desc_t *dscr )
 {
        chan_tab_t *ctp;
        au1x_ddma_desc_t *dp;
-        u32 nbytes=0;
+        u32 nbytes = 0;
-        /* I guess we could check this to be within the
+        /*
-        * range of the table......
+         * I guess we could check this to be within the
-        */
+         * range of the table......
+         */
        ctp = *((chan_tab_t **)chanid);
-        /* We should have multiple callers for a particular channel,
+        /*
-        * an interrupt doesn't affect this pointer nor the descriptor,
+         * We should have multiple callers for a particular channel,
-        * so no locking should be needed.
+         * an interrupt doesn't affect this pointer nor the descriptor,
-        */
+         * so no locking should be needed.
+         */
        dp = ctp->put_ptr;
-        /* If the descriptor is valid, we are way ahead of the DMA
+        /*
-        * engine, so just return an error condition.
+         * If the descriptor is valid, we are way ahead of the DMA
-        */
+         * engine, so just return an error condition.
+         */
        if (dp->dscr_cmd0 & DSCR_CMD0_V)
                return 0;
-        /* Load up buffer addresses and byte count.
+        /* Load up buffer addresses and byte count. */
-        */
        dp->dscr_dest0 = dscr->dscr_dest0;
        dp->dscr_source0 = dscr->dscr_source0;
        dp->dscr_dest1 = dscr->dscr_dest1;
@@ -975,14 +957,11 @@ au1xxx_dbdma_put_dscr(u32 chanid, au1x_ddma_desc_t *dscr )
        dp->dscr_cmd0 |= dscr->dscr_cmd0 | DSCR_CMD0_V;
        ctp->chan_ptr->ddma_dbell = 0;
-        /* Get next descriptor pointer.
+        /* Get next descriptor pointer. */
-        */
        ctp->put_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
-        /* return something not zero.
+        /* Return something non-zero. */
-        */
        return nbytes;
 }
 #endif /* defined(CONFIG_SOC_AU1550) || defined(CONFIG_SOC_AU1200) */
diff --git a/arch/mips/au1000/common/dbg_io.c b/arch/mips/au1000/common/dbg_io.c
index eae1bb2ca26e..af5be7df2f2a 100644
--- a/arch/mips/au1000/common/dbg_io.c
+++ b/arch/mips/au1000/common/dbg_io.c
@@ -1,3 +1,4 @@
+#include <linux/types.h>
 #include <asm/mach-au1x00/au1000.h>
@@ -8,12 +9,6 @@
 * uart to be used for debugging.
 */
 #define DEBUG_BASE  UART_DEBUG_BASE
-/**/
-/* we need uint32 uint8 */
-/* #include "types.h" */
-typedef         unsigned char uint8;
-typedef         unsigned int  uint32;
 #define         UART16550_BAUD_2400             2400
 #define         UART16550_BAUD_4800             4800
@@ -51,17 +46,15 @@ typedef         unsigned int  uint32;
 #define UART_MOD_CNTRL  0x100   /* Module Control */
 /* memory-mapped read/write of the port */
-#define UART16550_READ(y)    (au_readl(DEBUG_BASE + y) & 0xff)
+#define UART16550_READ(y)     (au_readl(DEBUG_BASE + y) & 0xff)
-#define UART16550_WRITE(y, z) (au_writel(z&0xff, DEBUG_BASE + y))
+#define UART16550_WRITE(y, z) (au_writel(z & 0xff, DEBUG_BASE + y))
 extern unsigned long calc_clock(void);
-void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)
+void debugInit(u32 baud, u8 data, u8 parity, u8 stop)
 {
+        if (UART16550_READ(UART_MOD_CNTRL) != 0x3)
-        if (UART16550_READ(UART_MOD_CNTRL) != 0x3) {
                UART16550_WRITE(UART_MOD_CNTRL, 3);
-        }
        calc_clock();
        /* disable interrupts */
@@ -69,7 +62,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)
        /* set up baud rate */
        {
-                uint32 divisor;
+                u32 divisor;
                /* set divisor */
                divisor = get_au1x00_uart_baud_base() / baud;
@@ -80,9 +73,9 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)
        UART16550_WRITE(UART_LCR, (data | parity | stop));
 }
-static int remoteDebugInitialized = 0;
+static int remoteDebugInitialized;
-uint8 getDebugChar(void)
+u8 getDebugChar(void)
 {
        if (!remoteDebugInitialized) {
                remoteDebugInitialized = 1;
@@ -92,15 +85,13 @@ uint8 getDebugChar(void)
                          UART16550_STOP_1BIT);
        }
-        while((UART16550_READ(UART_LSR) & 0x1) == 0);
+        while ((UART16550_READ(UART_LSR) & 0x1) == 0);
        return UART16550_READ(UART_RX);
 }
-int putDebugChar(uint8 byte)
+int putDebugChar(u8 byte)
 {
-//      int i;
        if (!remoteDebugInitialized) {
                remoteDebugInitialized = 1;
                debugInit(UART16550_BAUD_115200,
@@ -109,9 +100,8 @@ int putDebugChar(uint8 byte)
                          UART16550_STOP_1BIT);
        }
-        while ((UART16550_READ(UART_LSR)&0x40) == 0);
+        while ((UART16550_READ(UART_LSR) & 0x40) == 0);
        UART16550_WRITE(UART_TX, byte);
-        //for (i=0;i<0xfff;i++);
        return 1;
 }
diff --git a/arch/mips/au1000/common/dma.c b/arch/mips/au1000/common/dma.c
index 95f69ea146e9..d6fbda232e6a 100644
--- a/arch/mips/au1000/common/dma.c
+++ b/arch/mips/au1000/common/dma.c
@@ -1,12 +1,11 @@
 /*
 *
 * BRIEF MODULE DESCRIPTION
- *      A DMA channel allocator for Au1000. API is modeled loosely off of
+ *      A DMA channel allocator for Au1x00. API is modeled loosely off of
 *      linux/kernel/dma.c.
 *
- * Copyright 2000 MontaVista Software Inc.
+ * Copyright 2000, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              stevel@mvista.com or source@mvista.com
 * Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org)
 *
 *  This program is free software; you can redistribute  it and/or modify it
@@ -39,7 +38,8 @@
 #include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-au1x00/au1000_dma.h>
-#if defined(CONFIG_SOC_AU1000) || defined(CONFIG_SOC_AU1500) || defined(CONFIG_SOC_AU1100)
+#if defined(CONFIG_SOC_AU1000) || defined(CONFIG_SOC_AU1500) || \
+    defined(CONFIG_SOC_AU1100)
 /*
 * A note on resource allocation:
 *
@@ -56,7 +56,6 @@
 * returned from request_dma.
 */
 DEFINE_SPINLOCK(au1000_dma_spin_lock);
 struct dma_chan au1000_dma_table[NUM_AU1000_DMA_CHANNELS] = {
@@ -71,7 +70,7 @@ struct dma_chan au1000_dma_table[NUM_AU1000_DMA_CHANNELS] = {
 };
 EXPORT_SYMBOL(au1000_dma_table);
-// Device FIFO addresses and default DMA modes
+/* Device FIFO addresses and default DMA modes */
 static const struct dma_dev {
        unsigned int fifo_addr;
        unsigned int dma_mode;
@@ -80,8 +79,8 @@ static const struct dma_dev {
        {UART0_ADDR + UART_RX, 0},
        {0, 0},
        {0, 0},
-        {AC97C_DATA, DMA_DW16 },          // coherent
+        {AC97C_DATA, DMA_DW16 },          /* coherent */
-        {AC97C_DATA, DMA_DR | DMA_DW16 }, // coherent
+        {AC97C_DATA, DMA_DR | DMA_DW16 }, /* coherent */
        {UART3_ADDR + UART_TX, DMA_DW8 | DMA_NC},
        {UART3_ADDR + UART_RX, DMA_DR | DMA_DW8 | DMA_NC},
        {USBD_EP0RD, DMA_DR | DMA_DW8 | DMA_NC},
@@ -101,10 +100,10 @@ int au1000_dma_read_proc(char *buf, char **start, off_t fpos,
        struct dma_chan *chan;
        for (i = 0; i < NUM_AU1000_DMA_CHANNELS; i++) {
-                if ((chan = get_dma_chan(i)) != NULL) {
+                chan = get_dma_chan(i);
+                if (chan != NULL)
                        len += sprintf(buf + len, "%2d: %s\n",
                                       i, chan->dev_str);
-                }
        }
        if (fpos >= len) {
@@ -113,18 +112,19 @@ int au1000_dma_read_proc(char *buf, char **start, off_t fpos,
                return 0;
        }
        *start = buf + fpos;
-        if ((len -= fpos) > length)
+        len -= fpos;
+        if (len > length)
                return length;
        *eof = 1;
        return len;
 }
-// Device FIFO addresses and default DMA modes - 2nd bank
+/* Device FIFO addresses and default DMA modes - 2nd bank */
 static const struct dma_dev dma_dev_table_bank2[DMA_NUM_DEV_BANK2] = {
-        {SD0_XMIT_FIFO, DMA_DS | DMA_DW8},              // coherent
+        { SD0_XMIT_FIFO, DMA_DS | DMA_DW8 },            /* coherent */
-        {SD0_RECV_FIFO, DMA_DS | DMA_DR | DMA_DW8},     // coherent
+        { SD0_RECV_FIFO, DMA_DS | DMA_DR | DMA_DW8 },   /* coherent */
-        {SD1_XMIT_FIFO, DMA_DS | DMA_DW8},              // coherent
+        { SD1_XMIT_FIFO, DMA_DS | DMA_DW8 },            /* coherent */
-        {SD1_RECV_FIFO, DMA_DS | DMA_DR | DMA_DW8}      // coherent
+        { SD1_RECV_FIFO, DMA_DS | DMA_DR | DMA_DW8 }    /* coherent */
 };
 void dump_au1000_dma_channel(unsigned int dmanr)
@@ -150,7 +150,6 @@ void dump_au1000_dma_channel(unsigned int dmanr)
               au_readl(chan->io + DMA_BUFFER1_COUNT));
 }
 /*
 * Finds a free channel, and binds the requested device to it.
 * Returns the allocated channel number, or negative on error.
@@ -169,14 +168,14 @@ int request_au1000_dma(int dev_id, const char *dev_str,
        if (dev_id < 0 || dev_id >= (DMA_NUM_DEV + DMA_NUM_DEV_BANK2))
                return -EINVAL;
 #else
-        if (dev_id < 0 || dev_id >= DMA_NUM_DEV)
+        if (dev_id < 0 || dev_id >= DMA_NUM_DEV)
                return -EINVAL;
 #endif
-        for (i = 0; i < NUM_AU1000_DMA_CHANNELS; i++) {
+        for (i = 0; i < NUM_AU1000_DMA_CHANNELS; i++)
                if (au1000_dma_table[i].dev_id < 0)
                        break;
-        }
        if (i == NUM_AU1000_DMA_CHANNELS)
                return -ENODEV;
@@ -185,15 +184,15 @@ int request_au1000_dma(int dev_id, const char *dev_str,
        if (dev_id >= DMA_NUM_DEV) {
                dev_id -= DMA_NUM_DEV;
                dev = &dma_dev_table_bank2[dev_id];
-        } else {
+        } else
                dev = &dma_dev_table[dev_id];
-        }
        if (irqhandler) {
                chan->irq = AU1000_DMA_INT_BASE + i;
                chan->irq_dev = irq_dev_id;
-                if ((ret = request_irq(chan->irq, irqhandler, irqflags,
+                ret = request_irq(chan->irq, irqhandler, irqflags, dev_str,
-                                       dev_str, chan->irq_dev))) {
+                                  chan->irq_dev);
+                if (ret) {
                        chan->irq = 0;
                        chan->irq_dev = NULL;
                        return ret;
@@ -203,7 +202,7 @@ int request_au1000_dma(int dev_id, const char *dev_str,
                chan->irq_dev = NULL;
        }
-        // fill it in
+        /* fill it in */
        chan->io = DMA_CHANNEL_BASE + i * DMA_CHANNEL_LEN;
        chan->dev_id = dev_id;
        chan->dev_str = dev_str;
@@ -220,8 +219,9 @@ EXPORT_SYMBOL(request_au1000_dma);
 void free_au1000_dma(unsigned int dmanr)
 {
        struct dma_chan *chan = get_dma_chan(dmanr);
        if (!chan) {
-                printk("Trying to free DMA%d\n", dmanr);
+                printk(KERN_ERR "Error trying to free DMA%d\n", dmanr);
                return;
        }
@@ -235,4 +235,4 @@ void free_au1000_dma(unsigned int dmanr)
 }
 EXPORT_SYMBOL(free_au1000_dma);
-#endif // AU1000 AU1500 AU1100
+#endif /* AU1000 AU1500 AU1100 */
diff --git a/arch/mips/au1000/common/gpio.c b/arch/mips/au1000/common/gpio.c
index 525452589971..b485d94ce8a5 100644
--- a/arch/mips/au1000/common/gpio.c
+++ b/arch/mips/au1000/common/gpio.c
@@ -69,7 +69,7 @@ static int au1xxx_gpio2_direction_output(unsigned gpio, int value)
 static int au1xxx_gpio1_read(unsigned gpio)
 {
-        return ((gpio1->pinstaterd >> gpio) & 0x01);
+        return (gpio1->pinstaterd >> gpio) & 0x01;
 }
 static void au1xxx_gpio1_write(unsigned gpio, int value)
@@ -104,7 +104,6 @@ int au1xxx_gpio_get_value(unsigned gpio)
        else
                return au1xxx_gpio1_read(gpio);
 }
 EXPORT_SYMBOL(au1xxx_gpio_get_value);
 void au1xxx_gpio_set_value(unsigned gpio, int value)
@@ -118,7 +117,6 @@ void au1xxx_gpio_set_value(unsigned gpio, int value)
        else
                au1xxx_gpio1_write(gpio, value);
 }
 EXPORT_SYMBOL(au1xxx_gpio_set_value);
 int au1xxx_gpio_direction_input(unsigned gpio)
@@ -132,7 +130,6 @@ int au1xxx_gpio_direction_input(unsigned gpio)
        return au1xxx_gpio1_direction_input(gpio);
 }
 EXPORT_SYMBOL(au1xxx_gpio_direction_input);
 int au1xxx_gpio_direction_output(unsigned gpio, int value)
@@ -146,5 +143,4 @@ int au1xxx_gpio_direction_output(unsigned gpio, int value)
        return au1xxx_gpio1_direction_output(gpio, value);
 }
 EXPORT_SYMBOL(au1xxx_gpio_direction_output);
diff --git a/arch/mips/au1000/common/irq.c b/arch/mips/au1000/common/irq.c
index f0626992fd75..40c6ceceb5f9 100644
--- a/arch/mips/au1000/common/irq.c
+++ b/arch/mips/au1000/common/irq.c
@@ -210,10 +210,8 @@ static inline void mask_and_ack_either_edge_irq(unsigned int irq_nr)
        au_sync();
 }
 static inline void mask_and_ack_level_irq(unsigned int irq_nr)
 {
        local_disable_irq(irq_nr);
        au_sync();
 #if defined(CONFIG_MIPS_PB1000)
@@ -263,14 +261,14 @@ void restore_local_and_enable(int controller, unsigned long mask)
        unsigned long flags, new_mask;
        spin_lock_irqsave(&irq_lock, flags);
-        for (i = 0; i < 32; i++) {
+        for (i = 0; i < 32; i++)
                if (mask & (1 << i)) {
                        if (controller)
                                local_enable_irq(i + 32);
                        else
                                local_enable_irq(i);
                }
-        }
        if (controller)
                new_mask = au_readl(IC1_MASKSET);
        else
diff --git a/arch/mips/au1000/common/pci.c b/arch/mips/au1000/common/pci.c
index 7e966b31e3e1..7866cf50cf99 100644
--- a/arch/mips/au1000/common/pci.c
+++ b/arch/mips/au1000/common/pci.c
@@ -2,9 +2,8 @@
 * BRIEF MODULE DESCRIPTION
 *      Alchemy/AMD Au1x00 PCI support.
 *
- * Copyright 2001-2003, 2007 MontaVista Software Inc.
+ * Copyright 2001-2003, 2007-2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org)
 *
@@ -86,9 +85,9 @@ static int __init au1x_pci_setup(void)
                u32 prid = read_c0_prid();
                if ((prid & 0xFF000000) == 0x01000000 && prid < 0x01030202) {
-                       au_writel((1 << 16) | au_readl(Au1500_PCI_CFG),
+                        au_writel((1 << 16) | au_readl(Au1500_PCI_CFG),
-                                 Au1500_PCI_CFG);
+                                  Au1500_PCI_CFG);
-                       printk("Non-coherent PCI accesses enabled\n");
+                        printk(KERN_INFO "Non-coherent PCI accesses enabled\n");
                }
        }
 #endif
diff --git a/arch/mips/au1000/common/platform.c b/arch/mips/au1000/common/platform.c
index 31d2a2270878..8cae7753ef79 100644
--- a/arch/mips/au1000/common/platform.c
+++ b/arch/mips/au1000/common/platform.c
@@ -269,8 +269,8 @@ static struct platform_device au1x00_pcmcia_device = {
 #ifdef SMBUS_PSC_BASE
 static struct resource pbdb_smbus_resources[] = {
        {
-                .start  = SMBUS_PSC_BASE,
+                .start  = CPHYSADDR(SMBUS_PSC_BASE),
-                .end    = SMBUS_PSC_BASE + 0x24 - 1,
+                .end    = CPHYSADDR(SMBUS_PSC_BASE + 0xfffff),
                .flags  = IORESOURCE_MEM,
        },
 };
@@ -302,16 +302,17 @@ static struct platform_device *au1xxx_platform_devices[] __initdata = {
 #endif
 };
-int __init au1xxx_platform_init(void)
+static int __init au1xxx_platform_init(void)
 {
        unsigned int uartclk = get_au1x00_uart_baud_base() * 16;
        int i;
        /* Fill up uartclk. */
-        for (i = 0; au1x00_uart_data[i].flags ; i++)
+        for (i = 0; au1x00_uart_data[i].flags; i++)
                au1x00_uart_data[i].uartclk = uartclk;
-        return platform_add_devices(au1xxx_platform_devices, ARRAY_SIZE(au1xxx_platform_devices));
+        return platform_add_devices(au1xxx_platform_devices,
+                                    ARRAY_SIZE(au1xxx_platform_devices));
 }
 arch_initcall(au1xxx_platform_init);
diff --git a/arch/mips/au1000/common/power.c b/arch/mips/au1000/common/power.c
index a8cd2c1b9e1b..2166b9e1e80c 100644
--- a/arch/mips/au1000/common/power.c
+++ b/arch/mips/au1000/common/power.c
@@ -1,10 +1,9 @@
 /*
 * BRIEF MODULE DESCRIPTION
- *      Au1000 Power Management routines.
+ *      Au1xx0 Power Management routines.
 *
- * Copyright 2001 MontaVista Software Inc.
+ * Copyright 2001, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  Some of the routines are right out of init/main.c, whose
 *  copyrights apply here.
@@ -43,10 +42,10 @@
 #ifdef CONFIG_PM
 #define DEBUG 1
-#ifdef DEBUG
+#ifdef  DEBUG
-#  define DPRINTK(fmt, args...) printk("%s: " fmt, __func__, ## args)
+#define DPRINTK(fmt, args...)   printk(KERN_DEBUG "%s: " fmt, __func__, ## args)
 #else
-#  define DPRINTK(fmt, args...)
+#define DPRINTK(fmt, args...)
 #endif
 static void au1000_calibrate_delay(void);
@@ -57,7 +56,8 @@ extern void local_enable_irq(unsigned int irq_nr);
 static DEFINE_SPINLOCK(pm_lock);
-/* We need to save/restore a bunch of core registers that are
+/*
+ * We need to save/restore a bunch of core registers that are
 * either volatile or reset to some state across a processor sleep.
 * If reading a register doesn't provide a proper result for a
 * later restore, we have to provide a function for loading that
@@ -78,24 +78,25 @@ static unsigned int	sleep_usbhost_enable;
 static unsigned int     sleep_usbdev_enable;
 static unsigned int     sleep_static_memctlr[4][3];
-/* Define this to cause the value you write to /proc/sys/pm/sleep to
+/*
+ * Define this to cause the value you write to /proc/sys/pm/sleep to
 * set the TOY timer for the amount of time you want to sleep.
 * This is done mainly for testing, but may be useful in other cases.
 * The value is number of 32KHz ticks to sleep.
 */
 #define SLEEP_TEST_TIMEOUT 1
-#ifdef SLEEP_TEST_TIMEOUT
+#ifdef  SLEEP_TEST_TIMEOUT
-static  int     sleep_ticks;
+static int sleep_ticks;
 void wakeup_counter0_set(int ticks);
 #endif
-static void
+static void save_core_regs(void)
-save_core_regs(void)
 {
        extern void save_au1xxx_intctl(void);
        extern void pm_eth0_shutdown(void);
-        /* Do the serial ports.....these really should be a pm_*
+        /*
+         * Do the serial ports.....these really should be a pm_*
         * registered function by the driver......but of course the
         * standard serial driver doesn't understand our Au1xxx
         * unique registers.
@@ -106,27 +107,24 @@ save_core_regs(void)
        sleep_uart0_clkdiv = au_readl(UART0_ADDR + UART_CLK);
        sleep_uart0_enable = au_readl(UART0_ADDR + UART_MOD_CNTRL);
-        /* Shutdown USB host/device.
+        /* Shutdown USB host/device. */
-        */
        sleep_usbhost_enable = au_readl(USB_HOST_CONFIG);
-        /* There appears to be some undocumented reset register....
+        /* There appears to be some undocumented reset register.... */
-        */
        au_writel(0, 0xb0100004); au_sync();
        au_writel(0, USB_HOST_CONFIG); au_sync();
        sleep_usbdev_enable = au_readl(USBD_ENABLE);
        au_writel(0, USBD_ENABLE); au_sync();
-        /* Save interrupt controller state.
+        /* Save interrupt controller state. */
-        */
        save_au1xxx_intctl();
-        /* Clocks and PLLs.
+        /* Clocks and PLLs. */
-        */
        sleep_aux_pll_cntrl = au_readl(SYS_AUXPLL);
-        /* We don't really need to do this one, but unless we
+        /*
+         * We don't really need to do this one, but unless we
         * write it again it won't have a valid value if we
         * happen to read it.
         */
@@ -134,8 +132,7 @@ save_core_regs(void)
        sleep_pin_function = au_readl(SYS_PINFUNC);
-        /* Save the static memory controller configuration.
+        /* Save the static memory controller configuration. */
-        */
        sleep_static_memctlr[0][0] = au_readl(MEM_STCFG0);
        sleep_static_memctlr[0][1] = au_readl(MEM_STTIME0);
        sleep_static_memctlr[0][2] = au_readl(MEM_STADDR0);
@@ -150,8 +147,7 @@ save_core_regs(void)
        sleep_static_memctlr[3][2] = au_readl(MEM_STADDR3);
 }
-static void
+static void restore_core_regs(void)
-restore_core_regs(void)
 {
        extern void restore_au1xxx_intctl(void);
        extern void wakeup_counter0_adjust(void);
@@ -160,8 +156,7 @@ restore_core_regs(void)
        au_writel(sleep_cpu_pll_cntrl, SYS_CPUPLL); au_sync();
        au_writel(sleep_pin_function, SYS_PINFUNC); au_sync();
-        /* Restore the static memory controller configuration.
+        /* Restore the static memory controller configuration. */
-        */
        au_writel(sleep_static_memctlr[0][0], MEM_STCFG0);
        au_writel(sleep_static_memctlr[0][1], MEM_STTIME0);
        au_writel(sleep_static_memctlr[0][2], MEM_STADDR0);
@@ -175,7 +170,8 @@ restore_core_regs(void)
        au_writel(sleep_static_memctlr[3][1], MEM_STTIME3);
        au_writel(sleep_static_memctlr[3][2], MEM_STADDR3);
-        /* Enable the UART if it was enabled before sleep.
+        /*
+         * Enable the UART if it was enabled before sleep.
         * I guess I should define module control bits........
         */
        if (sleep_uart0_enable & 0x02) {
@@ -202,7 +198,7 @@ void wakeup_from_suspend(void)
 int au_sleep(void)
 {
        unsigned long wakeup, flags;
-        extern  void    save_and_sleep(void);
+        extern void save_and_sleep(void);
        spin_lock_irqsave(&pm_lock, flags);
@@ -210,23 +206,22 @@ int au_sleep(void)
        flush_cache_all();
-        /** The code below is all system dependent and we should probably
+        /**
+         ** The code below is all system dependent and we should probably
         ** have a function call out of here to set this up.  You need
         ** to configure the GPIO or timer interrupts that will bring
         ** you out of sleep.
         ** For testing, the TOY counter wakeup is useful.
         **/
 #if 0
        au_writel(au_readl(SYS_PINSTATERD) & ~(1 << 11), SYS_PINSTATERD);
-        /* gpio 6 can cause a wake up event */
+        /* GPIO 6 can cause a wake up event */
        wakeup = au_readl(SYS_WAKEMSK);
        wakeup &= ~(1 << 8);    /* turn off match20 wakeup */
-        wakeup |= 1 << 6;       /* turn on gpio 6 wakeup   */
+        wakeup |= 1 << 6;       /* turn on  GPIO  6 wakeup */
 #else
-        /* For testing, allow match20 to wake us up.
+        /* For testing, allow match20 to wake us up. */
-        */
 #ifdef SLEEP_TEST_TIMEOUT
        wakeup_counter0_set(sleep_ticks);
 #endif
@@ -240,7 +235,8 @@ int au_sleep(void)
        save_and_sleep();
-        /* after a wakeup, the cpu vectors back to 0x1fc00000 so
+        /*
+         * After a wakeup, the cpu vectors back to 0x1fc00000, so
         * it's up to the boot code to get us back here.
         */
        restore_core_regs();
@@ -248,24 +244,22 @@ int au_sleep(void)
        return 0;
 }
-static int pm_do_sleep(ctl_table * ctl, int write, struct file *file,
+static int pm_do_sleep(ctl_table *ctl, int write, struct file *file,
-                       void __user *buffer, size_t * len, loff_t *ppos)
+                       void __user *buffer, size_t *len, loff_t *ppos)
 {
 #ifdef SLEEP_TEST_TIMEOUT
 #define TMPBUFLEN2 16
        char buf[TMPBUFLEN2], *p;
 #endif
-        if (!write) {
+        if (!write)
                *len = 0;
-        } else {
+        else {
 #ifdef SLEEP_TEST_TIMEOUT
-                if (*len > TMPBUFLEN2 - 1) {
+                if (*len > TMPBUFLEN2 - 1)
                        return -EFAULT;
-                }
+                if (copy_from_user(buf, buffer, *len))
-                if (copy_from_user(buf, buffer, *len)) {
                        return -EFAULT;
-                }
                buf[*len] = 0;
                p = buf;
                sleep_ticks = simple_strtoul(p, &p, 0);
@@ -276,8 +270,8 @@ static int pm_do_sleep(ctl_table * ctl, int write, struct file *file,
        return 0;
 }
-static int pm_do_freq(ctl_table * ctl, int write, struct file *file,
+static int pm_do_freq(ctl_table *ctl, int write, struct file *file,
-                      void __user *buffer, size_t * len, loff_t *ppos)
+                      void __user *buffer, size_t *len, loff_t *ppos)
 {
        int retval = 0, i;
        unsigned long val, pll;
@@ -285,14 +279,14 @@ static int pm_do_freq(ctl_table * ctl, int write, struct file *file,
 #define MAX_CPU_FREQ 396
        char buf[TMPBUFLEN], *p;
        unsigned long flags, intc0_mask, intc1_mask;
-        unsigned long old_baud_base, old_cpu_freq, baud_rate, old_clk,
+        unsigned long old_baud_base, old_cpu_freq, old_clk, old_refresh;
-            old_refresh;
        unsigned long new_baud_base, new_cpu_freq, new_clk, new_refresh;
+        unsigned long baud_rate;
        spin_lock_irqsave(&pm_lock, flags);
-        if (!write) {
+        if (!write)
                *len = 0;
-        } else {
+        else {
                /* Parse the new frequency */
                if (*len > TMPBUFLEN - 1) {
                        spin_unlock_irqrestore(&pm_lock, flags);
@@ -312,7 +306,7 @@ static int pm_do_freq(ctl_table * ctl, int write, struct file *file,
                pll = val / 12;
                if ((pll > 33) || (pll < 7)) {  /* 396 MHz max, 84 MHz min */
-                        /* revisit this for higher speed cpus */
+                        /* Revisit this for higher speed CPUs */
                        spin_unlock_irqrestore(&pm_lock, flags);
                        return -EFAULT;
                }
@@ -321,30 +315,28 @@ static int pm_do_freq(ctl_table * ctl, int write, struct file *file,
                old_cpu_freq = get_au1x00_speed();
                new_cpu_freq = pll * 12 * 1000000;
-                new_baud_base =  (new_cpu_freq / (2 * ((int)(au_readl(SYS_POWERCTRL)&0x03) + 2) * 16));
+                new_baud_base = (new_cpu_freq / (2 * ((int)(au_readl(SYS_POWERCTRL)
+                                                            & 0x03) + 2) * 16));
                set_au1x00_speed(new_cpu_freq);
                set_au1x00_uart_baud_base(new_baud_base);
                old_refresh = au_readl(MEM_SDREFCFG) & 0x1ffffff;
-                new_refresh =
+                new_refresh = ((old_refresh * new_cpu_freq) / old_cpu_freq) |
-                    ((old_refresh * new_cpu_freq) /
+                              (au_readl(MEM_SDREFCFG) & ~0x1ffffff);
-                     old_cpu_freq) | (au_readl(MEM_SDREFCFG) & ~0x1ffffff);
                au_writel(pll, SYS_CPUPLL);
                au_sync_delay(1);
                au_writel(new_refresh, MEM_SDREFCFG);
                au_sync_delay(1);
-                for (i = 0; i < 4; i++) {
+                for (i = 0; i < 4; i++)
-                        if (au_readl
+                        if (au_readl(UART_BASE + UART_MOD_CNTRL +
-                            (UART_BASE + UART_MOD_CNTRL +
+                                     i * 0x00100000) == 3) {
-                             i * 0x00100000) == 3) {
+                                old_clk = au_readl(UART_BASE + UART_CLK +
-                                old_clk =
+                                                   i * 0x00100000);
-                                    au_readl(UART_BASE + UART_CLK +
-                                          i * 0x00100000);
-                                // baud_rate = baud_base/clk
                                baud_rate = old_baud_base / old_clk;
-                                /* we won't get an exact baud rate and the error
+                                /*
+                                 * We won't get an exact baud rate and the error
                                 * could be significant enough that our new
                                 * calculation will result in a clock that will
                                 * give us a baud rate that's too far off from
@@ -359,18 +351,14 @@ static int pm_do_freq(ctl_table * ctl, int write, struct file *file,
                                else if (baud_rate > 17000)
                                        baud_rate = 19200;
                                else
-                                        (baud_rate = 9600);
+                                        baud_rate = 9600;
-                                // new_clk = new_baud_base/baud_rate
                                new_clk = new_baud_base / baud_rate;
-                                au_writel(new_clk,
+                                au_writel(new_clk, UART_BASE + UART_CLK +
-                                       UART_BASE + UART_CLK +
+                                          i * 0x00100000);
-                                       i * 0x00100000);
                                au_sync_delay(10);
                        }
-                }
        }
        /*
         * We don't want _any_ interrupts other than match20. Otherwise our
         * au1000_calibrate_delay() calculation will be off, potentially a lot.
@@ -428,14 +416,15 @@ static int __init pm_init(void)
 __initcall(pm_init);
 /*
 * This is right out of init/main.c
 */
-/* This is the number of bits of precision for the loops_per_jiffy.  Each
+/*
-   bit takes on average 1.5/HZ seconds.  This (like the original) is a little
+ * This is the number of bits of precision for the loops_per_jiffy.
-   better than 1% */
+ * Each bit takes on average 1.5/HZ seconds.  This (like the original)
+ * is a little better than 1%.
+ */
 #define LPS_PREC 8
 static void au1000_calibrate_delay(void)
@@ -443,14 +432,14 @@ static void au1000_calibrate_delay(void)
        unsigned long ticks, loopbit;
        int lps_precision = LPS_PREC;
-        loops_per_jiffy = (1 << 12);
+        loops_per_jiffy = 1 << 12;
        while (loops_per_jiffy <<= 1) {
-                /* wait for "start of" clock tick */
+                /* Wait for "start of" clock tick */
                ticks = jiffies;
                while (ticks == jiffies)
                        /* nothing */ ;
-                /* Go .. */
+                /* Go ... */
                ticks = jiffies;
                __delay(loops_per_jiffy);
                ticks = jiffies - ticks;
@@ -458,8 +447,10 @@ static void au1000_calibrate_delay(void)
                        break;
        }
-/* Do a binary approximation to get loops_per_jiffy set to equal one clock
+        /*
-   (up to lps_precision bits) */
+         * Do a binary approximation to get loops_per_jiffy set to be equal
+         * one clock (up to lps_precision bits)
+         */
        loops_per_jiffy >>= 1;
        loopbit = loops_per_jiffy;
        while (lps_precision-- && (loopbit >>= 1)) {
@@ -472,4 +463,4 @@ static void au1000_calibrate_delay(void)
                        loops_per_jiffy &= ~loopbit;
        }
 }
-#endif                          /* CONFIG_PM */
+#endif  /* CONFIG_PM */
diff --git a/arch/mips/au1000/common/prom.c b/arch/mips/au1000/common/prom.c
index f10af829e4ec..18b310b475ca 100644
--- a/arch/mips/au1000/common/prom.c
+++ b/arch/mips/au1000/common/prom.c
@@ -3,9 +3,8 @@
 * BRIEF MODULE DESCRIPTION
 *    PROM library initialisation code, supports YAMON and U-Boot.
 *
- * Copyright 2000, 2001, 2006 MontaVista Software Inc.
+ * Copyright 2000-2001, 2006, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 * This file was derived from Carsten Langgaard's
 * arch/mips/mips-boards/xx files.
@@ -57,7 +56,7 @@ void prom_init_cmdline(void)
        actr = 1; /* Always ignore argv[0] */
        cp = &(arcs_cmdline[0]);
-        while(actr < prom_argc) {
+        while (actr < prom_argc) {
                strcpy(cp, prom_argv[actr]);
                cp += strlen(prom_argv[actr]);
                *cp++ = ' ';
@@ -84,10 +83,8 @@ char *prom_getenv(char *envname)
                if (yamon) {
                        if (strcmp(envname, *env++) == 0)
                                return *env;
-                } else {
+                } else if (strncmp(envname, *env, i) == 0 && (*env)[i] == '=')
-                        if (strncmp(envname, *env, i) == 0 && (*env)[i] == '=')
+                        return *env + i + 1;
-                                return *env + i + 1;
-                }
                env++;
        }
@@ -110,13 +107,13 @@ static inline void str2eaddr(unsigned char *ea, unsigned char *str)
 {
        int i;
-        for(i = 0; i < 6; i++) {
+        for (i = 0; i < 6; i++) {
                unsigned char num;
-                if((*str == '.') || (*str == ':'))
+                if ((*str == '.') || (*str == ':'))
                        str++;
-                num = str2hexnum(*str++) << 4;
+                num  = str2hexnum(*str++) << 4;
-                num |= (str2hexnum(*str++));
+                num |= str2hexnum(*str++);
                ea[i] = num;
        }
 }
diff --git a/arch/mips/au1000/common/puts.c b/arch/mips/au1000/common/puts.c
index e34c67e89293..55bbe24d45b6 100644
--- a/arch/mips/au1000/common/puts.c
+++ b/arch/mips/au1000/common/puts.c
@@ -1,11 +1,10 @@
 /*
 *
 * BRIEF MODULE DESCRIPTION
- *      Low level uart routines to directly access a 16550 uart.
+ *      Low level UART routines to directly access Alchemy UART.
 *
- * Copyright 2001 MontaVista Software Inc.
+ * Copyright 2001, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -40,12 +39,12 @@
 static volatile unsigned long * const com1 = (unsigned long *)SERIAL_BASE;
 #ifdef SLOW_DOWN
 static inline void slow_down(void)
 {
-    int k;
+        int k;
-    for (k=0; k<10000; k++);
+        for (k = 0; k < 10000; k++);
 }
 #else
 #define slow_down()
@@ -54,16 +53,16 @@ static inline void slow_down(void)
 void
 prom_putchar(const unsigned char c)
 {
-    unsigned char ch;
+        unsigned char ch;
-    int i = 0;
+        int i = 0;
+        do {
+                ch = com1[SER_CMD];
+                slow_down();
+                i++;
+                if (i > TIMEOUT)
+                        break;
+        } while (0 == (ch & TX_BUSY));
-    do {
+        com1[SER_DATA] = c;
-        ch = com1[SER_CMD];
-        slow_down();
-        i++;
-        if (i>TIMEOUT) {
-            break;
-        }
-    } while (0 == (ch & TX_BUSY));
-    com1[SER_DATA] = c;
 }
diff --git a/arch/mips/au1000/common/reset.c b/arch/mips/au1000/common/reset.c
index 60cec537c745..d555429c8d6f 100644
--- a/arch/mips/au1000/common/reset.c
+++ b/arch/mips/au1000/common/reset.c
@@ -1,11 +1,10 @@
 /*
 *
 * BRIEF MODULE DESCRIPTION
- *      Au1000 reset routines.
+ *      Au1xx0 reset routines.
 *
- * Copyright 2001 MontaVista Software Inc.
+ * Copyright 2001, 2006, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -28,10 +27,11 @@
 *  675 Mass Ave, Cambridge, MA 02139, USA.
 */
+#include <asm/cacheflush.h>
 #include <asm/mach-au1x00/au1000.h>
 extern int au_sleep(void);
-extern void (*flush_cache_all)(void);
 void au1000_restart(char *command)
 {
@@ -40,8 +40,8 @@ void au1000_restart(char *command)
        u32 prid = read_c0_prid();
        printk(KERN_NOTICE "\n** Resetting Integrated Peripherals\n");
-        switch (prid & 0xFF000000)
-        {
+        switch (prid & 0xFF000000) {
        case 0x00000000: /* Au1000 */
                au_writel(0x02, 0xb0000010); /* ac97_enable */
                au_writel(0x08, 0xb017fffc); /* usbh_enable - early errata */
@@ -138,9 +138,6 @@ void au1000_restart(char *command)
                au_writel(0x00, 0xb1900064); /* sys_auxpll */
                au_writel(0x00, 0xb1900100); /* sys_pininputen */
                break;
-        default:
-                break;
        }
        set_c0_status(ST0_BEV | ST0_ERL);
@@ -158,25 +155,25 @@ void au1000_restart(char *command)
 void au1000_halt(void)
 {
 #if defined(CONFIG_MIPS_PB1550) || defined(CONFIG_MIPS_DB1550)
-        /* power off system */
+        /* Power off system */
-        printk("\n** Powering off...\n");
+        printk(KERN_NOTICE "\n** Powering off...\n");
-        au_writew(au_readw(0xAF00001C) | (3<<14), 0xAF00001C);
+        au_writew(au_readw(0xAF00001C) | (3 << 14), 0xAF00001C);
        au_sync();
-        while(1); /* should not get here */
+        while (1); /* should not get here */
 #else
        printk(KERN_NOTICE "\n** You can safely turn off the power\n");
 #ifdef CONFIG_MIPS_MIRAGE
        au_writel((1 << 26) | (1 << 10), GPIO2_OUTPUT);
 #endif
 #ifdef CONFIG_MIPS_DB1200
-        au_writew(au_readw(0xB980001C) | (1<<14), 0xB980001C);
+        au_writew(au_readw(0xB980001C) | (1 << 14), 0xB980001C);
 #endif
 #ifdef CONFIG_PM
        au_sleep();
-        /* should not get here */
+        /* Should not get here */
-        printk(KERN_ERR "Unable to put cpu in sleep mode\n");
+        printk(KERN_ERR "Unable to put CPU in sleep mode\n");
-        while(1);
+        while (1);
 #else
        while (1)
                __asm__(".set\tmips3\n\t"
diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c
index 0e86f7a6b4a7..1ac6b06f42a3 100644
--- a/arch/mips/au1000/common/setup.c
+++ b/arch/mips/au1000/common/setup.c
@@ -1,7 +1,6 @@
 /*
- * Copyright 2000 MontaVista Software Inc.
+ * Copyright 2000, 2007-2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com
- *              ppopov@mvista.com or source@mvista.com
 *
 * Updates to 2.6, Pete Popov, Embedded Alley Solutions, Inc.
 *
@@ -48,7 +47,7 @@ void __init plat_mem_setup(void)
 {
        struct  cpu_spec *sp;
        char *argptr;
-        unsigned long prid, cpufreq, bclk = 1;
+        unsigned long prid, cpufreq, bclk;
        set_cpuspec();
        sp = cur_cpu_spec[0];
@@ -66,42 +65,39 @@ void __init plat_mem_setup(void)
                cpufreq = (au_readl(SYS_CPUPLL) & 0x3F) * 12;
        printk(KERN_INFO "(PRID %08lx) @ %ld MHz\n", prid, cpufreq);
-        bclk = sp->cpu_bclk;
+        if (sp->cpu_bclk) {
-        if (bclk)
-        {
                /* Enable BCLK switching */
-                bclk = au_readl(0xB190003C);
+                bclk = au_readl(SYS_POWERCTRL);
-                au_writel(bclk | 0x60, 0xB190003C);
+                au_writel(bclk | 0x60, SYS_POWERCTRL);
-                printk("BCLK switching enabled!\n");
+                printk(KERN_INFO "BCLK switching enabled!\n");
        }
-        if (sp->cpu_od) {
+        if (sp->cpu_od)
-                /* Various early Au1000 Errata corrected by this */
+                /* Various early Au1xx0 errata corrected by this */
-                set_c0_config(1<<19); /* Set Config[OD] */
+                set_c0_config(1 << 19); /* Set Config[OD] */
-        }
+        else
-        else {
                /* Clear to obtain best system bus performance */
-                clear_c0_config(1<<19); /* Clear Config[OD] */
+                clear_c0_config(1 << 19); /* Clear Config[OD] */
-        }
        argptr = prom_getcmdline();
 #ifdef CONFIG_SERIAL_8250_CONSOLE
-        if ((argptr = strstr(argptr, "console=")) == NULL) {
+        argptr = strstr(argptr, "console=");
+        if (argptr == NULL) {
                argptr = prom_getcmdline();
                strcat(argptr, " console=ttyS0,115200");
        }
 #endif
 #ifdef CONFIG_FB_AU1100
-    if ((argptr = strstr(argptr, "video=")) == NULL) {
+        argptr = strstr(argptr, "video=");
-        argptr = prom_getcmdline();
+        if (argptr == NULL) {
-        /* default panel */
+                argptr = prom_getcmdline();
-        /*strcat(argptr, " video=au1100fb:panel:Sharp_320x240_16");*/
+                /* default panel */
-    }
+                /*strcat(argptr, " video=au1100fb:panel:Sharp_320x240_16");*/
+        }
 #endif
 #if defined(CONFIG_SOUND_AU1X00) && !defined(CONFIG_SOC_AU1000)
        /* au1000 does not support vra, au1500 and au1100 do */
        strcat(argptr, " au1000_audio=vra");
@@ -129,7 +125,7 @@ void __init plat_mem_setup(void)
 /* This routine should be valid for all Au1x based boards */
 phys_t __fixup_bigphys_addr(phys_t phys_addr, phys_t size)
 {
-        /* Don't fixup 36 bit addresses */
+        /* Don't fixup 36-bit addresses */
        if ((phys_addr >> 32) != 0)
                return phys_addr;
@@ -145,17 +141,17 @@ phys_t __fixup_bigphys_addr(phys_t phys_addr, phys_t size)
        }
 #endif
-        /* All Au1x SOCs have a pcmcia controller */
+        /*
-        /* We setup our 32 bit pseudo addresses to be equal to the
+         * All Au1xx0 SOCs have a PCMCIA controller.
-         * 36 bit addr >> 4, to make it easier to check the address
+         * We setup our 32-bit pseudo addresses to be equal to the
+         * 36-bit addr >> 4, to make it easier to check the address
         * and fix it.
-         * The Au1x socket 0 phys attribute address is 0xF 4000 0000.
+         * The PCMCIA socket 0 physical attribute address is 0xF 4000 0000.
         * The pseudo address we use is 0xF400 0000. Any address over
-         * 0xF400 0000 is a pcmcia pseudo address.
+         * 0xF400 0000 is a PCMCIA pseudo address.
         */
-        if ((phys_addr >= 0xF4000000) && (phys_addr < 0xFFFFFFFF)) {
+        if ((phys_addr >= 0xF4000000) && (phys_addr < 0xFFFFFFFF))
                return (phys_t)(phys_addr << 4);
-        }
        /* default nop */
        return phys_addr;
diff --git a/arch/mips/au1000/common/time.c b/arch/mips/au1000/common/time.c
index bdb6d73b26fb..563d9390a872 100644
--- a/arch/mips/au1000/common/time.c
+++ b/arch/mips/au1000/common/time.c
@@ -25,11 +25,9 @@
 *
 * Setting up the clock on the MIPS boards.
 *
- * Update.  Always configure the kernel with CONFIG_NEW_TIME_C.  This
+ * We provide the clock interrupt processing and the timer offset compute
- * will use the user interface gettimeofday() functions from the
+ * functions.  If CONFIG_PM is selected, we also ensure the 32KHz timer is
- * arch/mips/kernel/time.c, and we provide the clock interrupt processing
+ * available.  -- Dan
- * and the timer offset compute functions.  If CONFIG_PM is selected,
- * we also ensure the 32KHz timer is available.   -- Dan
 */
 #include <linux/types.h>
@@ -47,8 +45,7 @@ extern int allow_au1k_wait; /* default off for CP0 Counter */
 #if HZ < 100 || HZ > 1000
 #error "unsupported HZ value! Must be in [100,1000]"
 #endif
-#define MATCH20_INC (328*100/HZ) /* magic number 328 is for HZ=100... */
+#define MATCH20_INC (328 * 100 / HZ) /* magic number 328 is for HZ=100... */
-extern void startup_match20_interrupt(irq_handler_t handler);
 static unsigned long last_pc0, last_match20;
 #endif
@@ -61,7 +58,7 @@ static irqreturn_t counter0_irq(int irq, void *dev_id)
 {
        unsigned long pc0;
        int time_elapsed;
-        static int jiffie_drift = 0;
+        static int jiffie_drift;
        if (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_M20) {
                /* should never happen! */
@@ -70,13 +67,11 @@ static irqreturn_t counter0_irq(int irq, void *dev_id)
        }
        pc0 = au_readl(SYS_TOYREAD);
-        if (pc0 < last_match20) {
+        if (pc0 < last_match20)
                /* counter overflowed */
                time_elapsed = (0xffffffff - last_match20) + pc0;
-        }
+        else
-        else {
                time_elapsed = pc0 - last_match20;
-        }
        while (time_elapsed > 0) {
                do_timer(1);
@@ -92,8 +87,9 @@ static irqreturn_t counter0_irq(int irq, void *dev_id)
        au_writel(last_match20 + MATCH20_INC, SYS_TOYMATCH2);
        au_sync();
-        /* our counter ticks at 10.009765625 ms/tick, we we're running
+        /*
-         * almost 10uS too slow per tick.
+         * Our counter ticks at 10.009765625 ms/tick, we we're running
+         * almost 10 uS too slow per tick.
         */
        if (jiffie_drift >= 999) {
@@ -117,20 +113,17 @@ struct irqaction counter0_action = {
 /* When we wakeup from sleep, we have to "catch up" on all of the
 * timer ticks we have missed.
 */
-void
+void wakeup_counter0_adjust(void)
-wakeup_counter0_adjust(void)
 {
        unsigned long pc0;
        int time_elapsed;
        pc0 = au_readl(SYS_TOYREAD);
-        if (pc0 < last_match20) {
+        if (pc0 < last_match20)
                /* counter overflowed */
                time_elapsed = (0xffffffff - last_match20) + pc0;
-        }
+        else
-        else {
                time_elapsed = pc0 - last_match20;
-        }
        while (time_elapsed > 0) {
                time_elapsed -= MATCH20_INC;
@@ -143,10 +136,8 @@ wakeup_counter0_adjust(void)
 }
-/* This is just for debugging to set the timer for a sleep delay.
+/* This is just for debugging to set the timer for a sleep delay. */
-*/
+void wakeup_counter0_set(int ticks)
-void
-wakeup_counter0_set(int ticks)
 {
        unsigned long pc0;
@@ -157,21 +148,22 @@ wakeup_counter0_set(int ticks)
 }
 #endif
-/* I haven't found anyone that doesn't use a 12 MHz source clock,
+/*
+ * I haven't found anyone that doesn't use a 12 MHz source clock,
 * but just in case.....
 */
 #define AU1000_SRC_CLK  12000000
 /*
 * We read the real processor speed from the PLL.  This is important
- * because it is more accurate than computing it from the 32KHz
+ * because it is more accurate than computing it from the 32 KHz
 * counter, if it exists.  If we don't have an accurate processor
 * speed, all of the peripherals that derive their clocks based on
 * this advertised speed will introduce error and sometimes not work
 * properly.  This function is futher convoluted to still allow configurations
 * to do that in case they have really, really old silicon with a
- * write-only PLL register, that we need the 32KHz when power management
+ * write-only PLL register, that we need the 32 KHz when power management
- * "wait" is enabled, and we need to detect if the 32KHz isn't present
+ * "wait" is enabled, and we need to detect if the 32 KHz isn't present
 * but requested......got it? :-)               -- Dan
 */
 unsigned long calc_clock(void)
@@ -182,8 +174,7 @@ unsigned long calc_clock(void)
        spin_lock_irqsave(&time_lock, flags);
-        /* Power management cares if we don't have a 32KHz counter.
+        /* Power management cares if we don't have a 32 KHz counter. */
-        */
        no_au1xxx_32khz = 0;
        counter = au_readl(SYS_COUNTER_CNTRL);
        if (counter & SYS_CNTRL_E0) {
@@ -193,7 +184,7 @@ unsigned long calc_clock(void)
                while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_T1S);
                /* RTC now ticks at 32.768/16 kHz */
-                au_writel(trim_divide-1, SYS_RTCTRIM);
+                au_writel(trim_divide - 1, SYS_RTCTRIM);
                while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_T1S);
                while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S);
@@ -215,9 +206,11 @@ unsigned long calc_clock(void)
 #endif
        else
                cpu_speed = (au_readl(SYS_CPUPLL) & 0x0000003f) * AU1000_SRC_CLK;
+        /* On Alchemy CPU:counter ratio is 1:1 */
        mips_hpt_frequency = cpu_speed;
-        // Equation: Baudrate = CPU / (SD * 2 * CLKDIV * 16)
+        /* Equation: Baudrate = CPU / (SD * 2 * CLKDIV * 16) */
-        set_au1x00_uart_baud_base(cpu_speed / (2 * ((int)(au_readl(SYS_POWERCTRL)&0x03) + 2) * 16));
+        set_au1x00_uart_baud_base(cpu_speed / (2 * ((int)(au_readl(SYS_POWERCTRL)
+                                                          & 0x03) + 2) * 16));
        spin_unlock_irqrestore(&time_lock, flags);
        return cpu_speed;
 }
@@ -228,10 +221,10 @@ void __init plat_time_init(void)
        est_freq += 5000;    /* round */
        est_freq -= est_freq%10000;
-        printk("CPU frequency %d.%02d MHz\n", est_freq/1000000,
+        printk(KERN_INFO "CPU frequency %u.%02u MHz\n",
-               (est_freq%1000000)*100/1000000);
+               est_freq / 1000000, ((est_freq % 1000000) * 100) / 1000000);
-        set_au1x00_speed(est_freq);
+        set_au1x00_speed(est_freq);
-        set_au1x00_lcd_clock(); // program the LCD clock
+        set_au1x00_lcd_clock(); /* program the LCD clock */
 #ifdef CONFIG_PM
        /*
@@ -243,30 +236,29 @@ void __init plat_time_init(void)
         * counter 0 interrupt as a special irq and it doesn't show
         * up under /proc/interrupts.
         *
-         * Check to ensure we really have a 32KHz oscillator before
+         * Check to ensure we really have a 32 KHz oscillator before
         * we do this.
         */
        if (no_au1xxx_32khz)
-                printk("WARNING: no 32KHz clock found.\n");
+                printk(KERN_WARNING "WARNING: no 32KHz clock found.\n");
        else {
                while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C0S);
                au_writel(0, SYS_TOYWRITE);
                while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C0S);
-                au_writel(au_readl(SYS_WAKEMSK) | (1<<8), SYS_WAKEMSK);
+                au_writel(au_readl(SYS_WAKEMSK) | (1 << 8), SYS_WAKEMSK);
                au_writel(~0, SYS_WAKESRC);
                au_sync();
                while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_M20);
-                /* setup match20 to interrupt once every HZ */
+                /* Setup match20 to interrupt once every HZ */
                last_pc0 = last_match20 = au_readl(SYS_TOYREAD);
                au_writel(last_match20 + MATCH20_INC, SYS_TOYMATCH2);
                au_sync();
                while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_M20);
                setup_irq(AU1000_TOY_MATCH2_INT, &counter0_action);
-                /* We can use the real 'wait' instruction.
+                /* We can use the real 'wait' instruction. */
-                */
                allow_au1k_wait = 1;
        }
diff --git a/arch/mips/au1000/db1x00/Makefile b/arch/mips/au1000/db1x00/Makefile
index 51d62bd5d900..274db3b55d82 100644
--- a/arch/mips/au1000/db1x00/Makefile
+++ b/arch/mips/au1000/db1x00/Makefile
@@ -1,8 +1,8 @@
 #
-#  Copyright 2000 MontaVista Software Inc.
+#  Copyright 2000, 2008 MontaVista Software Inc.
-#  Author: MontaVista Software, Inc.
+#  Author: MontaVista Software, Inc. <source@mvista.com>
-#       ppopov@mvista.com or source@mvista.com
+#
+# Makefile for the Alchemy Semiconductor DBAu1xx0 boards.
 #
-# Makefile for the Alchemy Semiconductor Db1x00 board.
 lib-y := init.o board_setup.o irqmap.o
diff --git a/arch/mips/au1000/db1x00/board_setup.c b/arch/mips/au1000/db1x00/board_setup.c
index b7dcbad5c586..9e5ccbbfcedd 100644
--- a/arch/mips/au1000/db1x00/board_setup.c
+++ b/arch/mips/au1000/db1x00/board_setup.c
@@ -3,9 +3,8 @@
 * BRIEF MODULE DESCRIPTION
 *      Alchemy Db1x00 board setup.
 *
- * Copyright 2000 MontaVista Software Inc.
+ * Copyright 2000, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -37,49 +36,49 @@ static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR;
 void board_reset(void)
 {
-        /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
+        /* Hit BCSR.SW_RESET[RESET] */
        bcsr->swreset = 0x0000;
 }
 void __init board_setup(void)
 {
-        u32 pin_func;
+        u32 pin_func = 0;
-        pin_func = 0;
+        /* Not valid for Au1550 */
-        /* not valid for 1550 */
+#if defined(CONFIG_IRDA) && \
+   (defined(CONFIG_SOC_AU1000) || defined(CONFIG_SOC_AU1100))
-#if defined(CONFIG_IRDA) && (defined(CONFIG_SOC_AU1000) || defined(CONFIG_SOC_AU1100))
+        /* Set IRFIRSEL instead of GPIO15 */
-        /* set IRFIRSEL instead of GPIO15 */
+        pin_func = au_readl(SYS_PINFUNC) | SYS_PF_IRF;
-        pin_func = au_readl(SYS_PINFUNC) | (u32)((1<<8));
        au_writel(pin_func, SYS_PINFUNC);
-        /* power off until the driver is in use */
+        /* Power off until the driver is in use */
        bcsr->resets &= ~BCSR_RESETS_IRDA_MODE_MASK;
-        bcsr->resets |= BCSR_RESETS_IRDA_MODE_OFF;
+        bcsr->resets |=  BCSR_RESETS_IRDA_MODE_OFF;
        au_sync();
 #endif
        bcsr->pcmcia = 0x0000; /* turn off PCMCIA power */
 #ifdef CONFIG_MIPS_MIRAGE
-        /* enable GPIO[31:0] inputs */
+        /* Enable GPIO[31:0] inputs */
        au_writel(0, SYS_PININPUTEN);
-        /* GPIO[20] is output, tristate the other input primary GPIO's */
+        /* GPIO[20] is output, tristate the other input primary GPIOs */
-        au_writel((u32)(~(1<<20)), SYS_TRIOUTCLR);
+        au_writel(~(1 << 20), SYS_TRIOUTCLR);
-        /* set GPIO[210:208] instead of SSI_0 */
+        /* Set GPIO[210:208] instead of SSI_0 */
-        pin_func = au_readl(SYS_PINFUNC) | (u32)(1);
+        pin_func = au_readl(SYS_PINFUNC) | SYS_PF_S0;
-        /* set GPIO[215:211] for LED's */
+        /* Set GPIO[215:211] for LEDs */
-        pin_func |= (u32)((5<<2));
+        pin_func |= 5 << 2;
-        /* set GPIO[214:213] for more LED's */
+        /* Set GPIO[214:213] for more LEDs */
-        pin_func |= (u32)((5<<12));
+        pin_func |= 5 << 12;
-        /* set GPIO[207:200] instead of PCMCIA/LCD */
+        /* Set GPIO[207:200] instead of PCMCIA/LCD */
-        pin_func |= (u32)((3<<17));
+        pin_func |= SYS_PF_LCD | SYS_PF_PC;
        au_writel(pin_func, SYS_PINFUNC);
-        /* Enable speaker amplifier.  This should
+        /*
+         * Enable speaker amplifier.  This should
         * be part of the audio driver.
         */
        au_writel(au_readl(GPIO2_DIR) | 0x200, GPIO2_DIR);
@@ -89,21 +88,21 @@ void __init board_setup(void)
        au_sync();
 #ifdef CONFIG_MIPS_DB1000
-    printk("AMD Alchemy Au1000/Db1000 Board\n");
+        printk(KERN_INFO "AMD Alchemy Au1000/Db1000 Board\n");
 #endif
 #ifdef CONFIG_MIPS_DB1500
-    printk("AMD Alchemy Au1500/Db1500 Board\n");
+        printk(KERN_INFO "AMD Alchemy Au1500/Db1500 Board\n");
 #endif
 #ifdef CONFIG_MIPS_DB1100
-    printk("AMD Alchemy Au1100/Db1100 Board\n");
+        printk(KERN_INFO "AMD Alchemy Au1100/Db1100 Board\n");
 #endif
 #ifdef CONFIG_MIPS_BOSPORUS
-    printk("AMD Alchemy Bosporus Board\n");
+        printk(KERN_INFO "AMD Alchemy Bosporus Board\n");
 #endif
 #ifdef CONFIG_MIPS_MIRAGE
-    printk("AMD Alchemy Mirage Board\n");
+        printk(KERN_INFO "AMD Alchemy Mirage Board\n");
 #endif
 #ifdef CONFIG_MIPS_DB1550
-    printk("AMD Alchemy Au1550/Db1550 Board\n");
+        printk(KERN_INFO "AMD Alchemy Au1550/Db1550 Board\n");
 #endif
 }
diff --git a/arch/mips/au1000/db1x00/init.c b/arch/mips/au1000/db1x00/init.c
index d3b967caf70c..5ebe0de5e459 100644
--- a/arch/mips/au1000/db1x00/init.c
+++ b/arch/mips/au1000/db1x00/init.c
@@ -2,9 +2,8 @@
 * BRIEF MODULE DESCRIPTION
 *      PB1000 board setup
 *
- * Copyright 2001 MontaVista Software Inc.
+ * Copyright 2001, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -49,8 +48,8 @@ void __init prom_init(void)
        unsigned long memsize;
        prom_argc = fw_arg0;
-        prom_argv = (char **) fw_arg1;
+        prom_argv = (char **)fw_arg1;
-        prom_envp = (char **) fw_arg2;
+        prom_envp = (char **)fw_arg2;
        prom_init_cmdline();
@@ -58,6 +57,6 @@ void __init prom_init(void)
        if (!memsize_str)
                memsize = 0x04000000;
        else
-                memsize = simple_strtol(memsize_str, NULL, 0);
+                memsize = strict_strtol(memsize_str, 0, NULL);
        add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
diff --git a/arch/mips/au1000/db1x00/irqmap.c b/arch/mips/au1000/db1x00/irqmap.c
index eaa50c7b6341..94c090e8bf7a 100644
--- a/arch/mips/au1000/db1x00/irqmap.c
+++ b/arch/mips/au1000/db1x00/irqmap.c
@@ -32,32 +32,32 @@
 #ifdef CONFIG_MIPS_DB1500
 char irq_tab_alchemy[][5] __initdata = {
- [12] = { -1, INTA, INTX, INTX, INTX},   /* IDSEL 12 - HPT371   */
+        [12] = { -1, INTA, INTX, INTX, INTX }, /* IDSEL 12 - HPT371   */
- [13] = { -1, INTA, INTB, INTC, INTD},   /* IDSEL 13 - PCI slot */
+        [13] = { -1, INTA, INTB, INTC, INTD }, /* IDSEL 13 - PCI slot */
 };
 #endif
 #ifdef CONFIG_MIPS_BOSPORUS
 char irq_tab_alchemy[][5] __initdata = {
- [11] = { -1, INTA, INTB, INTX, INTX},   /* IDSEL 11 - miniPCI  */
+        [11] = { -1, INTA, INTB, INTX, INTX }, /* IDSEL 11 - miniPCI  */
- [12] = { -1, INTA, INTX, INTX, INTX},   /* IDSEL 12 - SN1741   */
+        [12] = { -1, INTA, INTX, INTX, INTX }, /* IDSEL 12 - SN1741   */
- [13] = { -1, INTA, INTB, INTC, INTD},   /* IDSEL 13 - PCI slot */
+        [13] = { -1, INTA, INTB, INTC, INTD }, /* IDSEL 13 - PCI slot */
 };
 #endif
 #ifdef CONFIG_MIPS_MIRAGE
 char irq_tab_alchemy[][5] __initdata = {
- [11] = { -1, INTD, INTX, INTX, INTX},   /* IDSEL 11 - SMI VGX */
+        [11] = { -1, INTD, INTX, INTX, INTX }, /* IDSEL 11 - SMI VGX */
- [12] = { -1, INTX, INTX, INTC, INTX},   /* IDSEL 12 - PNX1300 */
+        [12] = { -1, INTX, INTX, INTC, INTX }, /* IDSEL 12 - PNX1300 */
- [13] = { -1, INTA, INTB, INTX, INTX},   /* IDSEL 13 - miniPCI */
+        [13] = { -1, INTA, INTB, INTX, INTX }, /* IDSEL 13 - miniPCI */
 };
 #endif
 #ifdef CONFIG_MIPS_DB1550
 char irq_tab_alchemy[][5] __initdata = {
- [11] = { -1, INTC, INTX, INTX, INTX},   /* IDSEL 11 - on-board HPT371    */
+        [11] = { -1, INTC, INTX, INTX, INTX }, /* IDSEL 11 - on-board HPT371 */
- [12] = { -1, INTB, INTC, INTD, INTA},   /* IDSEL 12 - PCI slot 2 (left)  */
+        [12] = { -1, INTB, INTC, INTD, INTA }, /* IDSEL 12 - PCI slot 2 (left) */
- [13] = { -1, INTA, INTB, INTC, INTD},   /* IDSEL 13 - PCI slot 1 (right) */
+        [13] = { -1, INTA, INTB, INTC, INTD }, /* IDSEL 13 - PCI slot 1 (right) */
 };
 #endif
diff --git a/arch/mips/au1000/mtx-1/Makefile b/arch/mips/au1000/mtx-1/Makefile
index 85a90941de4f..7c67b3d33bec 100644
--- a/arch/mips/au1000/mtx-1/Makefile
+++ b/arch/mips/au1000/mtx-1/Makefile
@@ -1,7 +1,6 @@
 #
 #  Copyright 2003 MontaVista Software Inc.
-#  Author: MontaVista Software, Inc.
+#  Author: MontaVista Software, Inc. <source@mvista.com>
-#       ppopov@mvista.com or source@mvista.com
 #       Bruno Randolf <bruno.randolf@4g-systems.biz>
 #
 # Makefile for 4G Systems MTX-1 board.
diff --git a/arch/mips/au1000/mtx-1/board_setup.c b/arch/mips/au1000/mtx-1/board_setup.c
index 5736354829c6..3f8079186cf2 100644
--- a/arch/mips/au1000/mtx-1/board_setup.c
+++ b/arch/mips/au1000/mtx-1/board_setup.c
@@ -3,9 +3,8 @@
 * BRIEF MODULE DESCRIPTION
 *      4G Systems MTX-1 board setup.
 *
- * Copyright 2003 MontaVista Software Inc.
+ * Copyright 2003, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *         Bruno Randolf <bruno.randolf@4g-systems.biz>
 *
 *  This program is free software; you can redistribute  it and/or modify it
@@ -34,7 +33,7 @@
 #include <asm/mach-au1x00/au1000.h>
 extern int (*board_pci_idsel)(unsigned int devsel, int assert);
-int    mtx1_pci_idsel(unsigned int devsel, int assert);
+int mtx1_pci_idsel(unsigned int devsel, int assert);
 void board_reset(void)
 {
@@ -45,36 +44,36 @@ void board_reset(void)
 void __init board_setup(void)
 {
 #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
-        // enable USB power switch
+        /* Enable USB power switch */
-        au_writel( au_readl(GPIO2_DIR) | 0x10, GPIO2_DIR );
+        au_writel(au_readl(GPIO2_DIR) | 0x10, GPIO2_DIR);
-        au_writel( 0x100000, GPIO2_OUTPUT );
+        au_writel(0x100000, GPIO2_OUTPUT);
 #endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
 #ifdef CONFIG_PCI
 #if defined(__MIPSEB__)
-        au_writel(0xf | (2<<6) | (1<<4), Au1500_PCI_CFG);
+        au_writel(0xf | (2 << 6) | (1 << 4), Au1500_PCI_CFG);
 #else
        au_writel(0xf, Au1500_PCI_CFG);
 #endif
 #endif
-        // initialize sys_pinfunc:
+        /* Initialize sys_pinfunc */
-        au_writel( SYS_PF_NI2, SYS_PINFUNC );
+        au_writel(SYS_PF_NI2, SYS_PINFUNC);
-        // initialize GPIO
+        /* Initialize GPIO */
-        au_writel( 0xFFFFFFFF, SYS_TRIOUTCLR );
+        au_writel(0xFFFFFFFF, SYS_TRIOUTCLR);
-        au_writel( 0x00000001, SYS_OUTPUTCLR ); // set M66EN (PCI 66MHz) to OFF
+        au_writel(0x00000001, SYS_OUTPUTCLR); /* set M66EN (PCI 66MHz) to OFF */
-        au_writel( 0x00000008, SYS_OUTPUTSET ); // set PCI CLKRUN# to OFF
+        au_writel(0x00000008, SYS_OUTPUTSET); /* set PCI CLKRUN# to OFF */
-        au_writel( 0x00000002, SYS_OUTPUTSET ); // set EXT_IO3 ON
+        au_writel(0x00000002, SYS_OUTPUTSET); /* set EXT_IO3 ON */
-        au_writel( 0x00000020, SYS_OUTPUTCLR ); // set eth PHY TX_ER to OFF
+        au_writel(0x00000020, SYS_OUTPUTCLR); /* set eth PHY TX_ER to OFF */
-        // enable LED and set it to green
+        /* Enable LED and set it to green */
-        au_writel( au_readl(GPIO2_DIR) | 0x1800, GPIO2_DIR );
+        au_writel(au_readl(GPIO2_DIR) | 0x1800, GPIO2_DIR);
-        au_writel( 0x18000800, GPIO2_OUTPUT );
+        au_writel(0x18000800, GPIO2_OUTPUT);
        board_pci_idsel = mtx1_pci_idsel;
-        printk("4G Systems MTX-1 Board\n");
+        printk(KERN_INFO "4G Systems MTX-1 Board\n");
 }
 int
@@ -82,20 +81,18 @@ mtx1_pci_idsel(unsigned int devsel, int assert)
 {
 #define MTX_IDSEL_ONLY_0_AND_3 0
 #if MTX_IDSEL_ONLY_0_AND_3
-       if (devsel != 0 && devsel != 3) {
+        if (devsel != 0 && devsel != 3) {
-               printk("*** not 0 or 3\n");
+                printk(KERN_ERR "*** not 0 or 3\n");
-               return 0;
+                return 0;
-       }
+        }
 #endif
-       if (assert && devsel != 0) {
+        if (assert && devsel != 0)
-               // suppress signal to cardbus
+                /* Suppress signal to Cardbus */
-               au_writel( 0x00000002, SYS_OUTPUTCLR ); // set EXT_IO3 OFF
+                au_writel(0x00000002, SYS_OUTPUTCLR); /* set EXT_IO3 OFF */
-       }
+        else
-       else {
+                au_writel(0x00000002, SYS_OUTPUTSET); /* set EXT_IO3 ON */
-               au_writel( 0x00000002, SYS_OUTPUTSET ); // set EXT_IO3 ON
+        au_sync_udelay(1);
-       }
+        return 1;
-       au_sync_udelay(1);
-       return 1;
 }
diff --git a/arch/mips/au1000/mtx-1/init.c b/arch/mips/au1000/mtx-1/init.c
index c015cbce1cca..33a4aebe0cba 100644
--- a/arch/mips/au1000/mtx-1/init.c
+++ b/arch/mips/au1000/mtx-1/init.c
@@ -3,9 +3,8 @@
 * BRIEF MODULE DESCRIPTION
 *      4G Systems MTX-1 board setup
 *
- * Copyright 2003 MontaVista Software Inc.
+ * Copyright 2003, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *         Bruno Randolf <bruno.randolf@4g-systems.biz>
 *
 *  This program is free software; you can redistribute  it and/or modify it
@@ -47,8 +46,8 @@ void __init prom_init(void)
        unsigned long memsize;
        prom_argc = fw_arg0;
-        prom_argv = (char **) fw_arg1;
+        prom_argv = (char **)fw_arg1;
-        prom_envp = (char **) fw_arg2;
+        prom_envp = (char **)fw_arg2;
        prom_init_cmdline();
@@ -56,6 +55,6 @@ void __init prom_init(void)
        if (!memsize_str)
                memsize = 0x04000000;
        else
-                memsize = simple_strtol(memsize_str, NULL, 0);
+                memsize = strict_strtol(memsize_str, 0, NULL);
        add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
diff --git a/arch/mips/au1000/mtx-1/irqmap.c b/arch/mips/au1000/mtx-1/irqmap.c
index 78d70c42c9db..f2bf02951e9c 100644
--- a/arch/mips/au1000/mtx-1/irqmap.c
+++ b/arch/mips/au1000/mtx-1/irqmap.c
@@ -31,18 +31,18 @@
 #include <asm/mach-au1x00/au1000.h>
 char irq_tab_alchemy[][5] __initdata = {
- [0] = { -1, INTA, INTA, INTX, INTX},   /* IDSEL 00 - AdapterA-Slot0 (top)    */
+        [0] = { -1, INTA, INTA, INTX, INTX }, /* IDSEL 00 - AdapterA-Slot0 (top) */
- [1] = { -1, INTB, INTA, INTX, INTX},   /* IDSEL 01 - AdapterA-Slot1 (bottom) */
+        [1] = { -1, INTB, INTA, INTX, INTX }, /* IDSEL 01 - AdapterA-Slot1 (bottom) */
- [2] = { -1, INTC, INTD, INTX, INTX},   /* IDSEL 02 - AdapterB-Slot0 (top)    */
+        [2] = { -1, INTC, INTD, INTX, INTX }, /* IDSEL 02 - AdapterB-Slot0 (top) */
- [3] = { -1, INTD, INTC, INTX, INTX},   /* IDSEL 03 - AdapterB-Slot1 (bottom) */
+        [3] = { -1, INTD, INTC, INTX, INTX }, /* IDSEL 03 - AdapterB-Slot1 (bottom) */
- [4] = { -1, INTA, INTB, INTX, INTX},   /* IDSEL 04 - AdapterC-Slot0 (top)    */
+        [4] = { -1, INTA, INTB, INTX, INTX }, /* IDSEL 04 - AdapterC-Slot0 (top) */
- [5] = { -1, INTB, INTA, INTX, INTX},   /* IDSEL 05 - AdapterC-Slot1 (bottom) */
+        [5] = { -1, INTB, INTA, INTX, INTX }, /* IDSEL 05 - AdapterC-Slot1 (bottom) */
- [6] = { -1, INTC, INTD, INTX, INTX},   /* IDSEL 06 - AdapterD-Slot0 (top)    */
+        [6] = { -1, INTC, INTD, INTX, INTX }, /* IDSEL 06 - AdapterD-Slot0 (top) */
- [7] = { -1, INTD, INTC, INTX, INTX},   /* IDSEL 07 - AdapterD-Slot1 (bottom) */
+        [7] = { -1, INTD, INTC, INTX, INTX }, /* IDSEL 07 - AdapterD-Slot1 (bottom) */
 };
 struct au1xxx_irqmap __initdata au1xxx_irq_map[] = {
-       { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0},
+       { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0 },
       { AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 },
       { AU1500_GPIO_202, INTC_INT_LOW_LEVEL, 0 },
       { AU1500_GPIO_203, INTC_INT_LOW_LEVEL, 0 },
diff --git a/arch/mips/au1000/mtx-1/platform.c b/arch/mips/au1000/mtx-1/platform.c
index a7edbf0829ac..9807be37c32f 100644
--- a/arch/mips/au1000/mtx-1/platform.c
+++ b/arch/mips/au1000/mtx-1/platform.c
@@ -21,11 +21,10 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/leds.h>
+#include <linux/gpio.h>
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
-#include <asm/gpio.h>
 static struct gpio_keys_button mtx1_gpio_button[] = {
        {
                .gpio = 207,
diff --git a/arch/mips/au1000/pb1000/Makefile b/arch/mips/au1000/pb1000/Makefile
index daa1a507e72f..99bbec0ca41b 100644
--- a/arch/mips/au1000/pb1000/Makefile
+++ b/arch/mips/au1000/pb1000/Makefile
@@ -1,8 +1,8 @@
 #
-#  Copyright 2000 MontaVista Software Inc.
+#  Copyright 2000, 2008 MontaVista Software Inc.
-#  Author: MontaVista Software, Inc.
+#  Author: MontaVista Software, Inc. <source@mvista.com>
-#       ppopov@mvista.com or source@mvista.com
+#
+# Makefile for the Alchemy Semiconductor Pb1000 board.
 #
-# Makefile for the Alchemy Semiconductor PB1000 board.
 lib-y := init.o board_setup.o irqmap.o
diff --git a/arch/mips/au1000/pb1000/board_setup.c b/arch/mips/au1000/pb1000/board_setup.c
index 33f15acc1b17..25df167a95b3 100644
--- a/arch/mips/au1000/pb1000/board_setup.c
+++ b/arch/mips/au1000/pb1000/board_setup.c
@@ -1,7 +1,6 @@
 /*
- * Copyright 2000 MontaVista Software Inc.
+ * Copyright 2000, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -40,128 +39,126 @@ void __init board_setup(void)
        u32 sys_freqctrl, sys_clksrc;
        u32 prid = read_c0_prid();
-        // set AUX clock to 12MHz * 8 = 96 MHz
+        /* Set AUX clock to 12 MHz * 8 = 96 MHz */
        au_writel(8, SYS_AUXPLL);
        au_writel(0, SYS_PINSTATERD);
        udelay(100);
 #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
-        /* zero and disable FREQ2 */
+        /* Zero and disable FREQ2 */
        sys_freqctrl = au_readl(SYS_FREQCTRL0);
        sys_freqctrl &= ~0xFFF00000;
        au_writel(sys_freqctrl, SYS_FREQCTRL0);
-        /* zero and disable USBH/USBD clocks */
+        /* Zero and disable USBH/USBD clocks */
        sys_clksrc = au_readl(SYS_CLKSRC);
-        sys_clksrc &= ~0x00007FE0;
+        sys_clksrc &= ~(SYS_CS_CUD | SYS_CS_DUD | SYS_CS_MUD_MASK |
+                        SYS_CS_CUH | SYS_CS_DUH | SYS_CS_MUH_MASK);
        au_writel(sys_clksrc, SYS_CLKSRC);
        sys_freqctrl = au_readl(SYS_FREQCTRL0);
        sys_freqctrl &= ~0xFFF00000;
        sys_clksrc = au_readl(SYS_CLKSRC);
-        sys_clksrc &= ~0x00007FE0;
+        sys_clksrc &= ~(SYS_CS_CUD | SYS_CS_DUD | SYS_CS_MUD_MASK |
+                        SYS_CS_CUH | SYS_CS_DUH | SYS_CS_MUH_MASK);
-        switch (prid & 0x000000FF)
+        switch (prid & 0x000000FF) {
-        {
        case 0x00: /* DA */
        case 0x01: /* HA */
        case 0x02: /* HB */
-        /* CPU core freq to 48MHz to slow it way down... */
+                /* CPU core freq to 48 MHz to slow it way down... */
-        au_writel(4, SYS_CPUPLL);
+                au_writel(4, SYS_CPUPLL);
-        /*
+                /*
-         * Setup 48MHz FREQ2 from CPUPLL for USB Host
+                 * Setup 48 MHz FREQ2 from CPUPLL for USB Host
-         */
+                 * FRDIV2 = 3 -> div by 8 of 384 MHz -> 48 MHz
-        /* FRDIV2=3 -> div by 8 of 384MHz -> 48MHz */
+                 */
-        sys_freqctrl |= ((3<<22) | (1<<21) | (0<<20));
+                sys_freqctrl |= (3 << SYS_FC_FRDIV2_BIT) | SYS_FC_FE2;
-        au_writel(sys_freqctrl, SYS_FREQCTRL0);
+                au_writel(sys_freqctrl, SYS_FREQCTRL0);
-        /* CPU core freq to 384MHz */
+                /* CPU core freq to 384 MHz */
-        au_writel(0x20, SYS_CPUPLL);
+                au_writel(0x20, SYS_CPUPLL);
-        printk("Au1000: 48MHz OHCI workaround enabled\n");
+                printk(KERN_INFO "Au1000: 48 MHz OHCI workaround enabled\n");
                break;
-        default:  /* HC and newer */
+        default: /* HC and newer */
-        // FREQ2 = aux/2 = 48 MHz
+                /* FREQ2 = aux / 2 = 48 MHz */
-        sys_freqctrl |= ((0<<22) | (1<<21) | (1<<20));
+                sys_freqctrl |= (0 << SYS_FC_FRDIV2_BIT) |
-        au_writel(sys_freqctrl, SYS_FREQCTRL0);
+                                 SYS_FC_FE2 | SYS_FC_FS2;
+                au_writel(sys_freqctrl, SYS_FREQCTRL0);
                break;
        }
        /*
-         * Route 48MHz FREQ2 into USB Host and/or Device
+         * Route 48 MHz FREQ2 into USB Host and/or Device
         */
-#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
+        sys_clksrc |= SYS_CS_MUX_FQ2 << SYS_CS_MUH_BIT;
-        sys_clksrc |= ((4<<12) | (0<<11) | (0<<10));
-#endif
        au_writel(sys_clksrc, SYS_CLKSRC);
-        // configure pins GPIO[14:9] as GPIO
+        /* Configure pins GPIO[14:9] as GPIO */
-        pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x8080);
+        pin_func = au_readl(SYS_PINFUNC) & ~(SYS_PF_UR3 | SYS_PF_USB);
-        // 2nd USB port is USB host
+        /* 2nd USB port is USB host */
-        pin_func |= 0x8000;
+        pin_func |= SYS_PF_USB;
        au_writel(pin_func, SYS_PINFUNC);
        au_writel(0x2800, SYS_TRIOUTCLR);
        au_writel(0x0030, SYS_OUTPUTCLR);
 #endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
-        // make gpio 15 an input (for interrupt line)
+        /* Make GPIO 15 an input (for interrupt line) */
-        pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x100);
+        pin_func = au_readl(SYS_PINFUNC) & ~SYS_PF_IRF;
-        // we don't need I2S, so make it available for GPIO[31:29]
+        /* We don't need I2S, so make it available for GPIO[31:29] */
-        pin_func |= (1<<5);
+        pin_func |= SYS_PF_I2S;
        au_writel(pin_func, SYS_PINFUNC);
        au_writel(0x8000, SYS_TRIOUTCLR);
-        static_cfg0 = au_readl(MEM_STCFG0) & (u32)(~0xc00);
+        static_cfg0 = au_readl(MEM_STCFG0) & ~0xc00;
        au_writel(static_cfg0, MEM_STCFG0);
-        // configure RCE2* for LCD
+        /* configure RCE2* for LCD */
        au_writel(0x00000004, MEM_STCFG2);
-        // MEM_STTIME2
+        /* MEM_STTIME2 */
        au_writel(0x09000000, MEM_STTIME2);
-        // Set 32-bit base address decoding for RCE2*
+        /* Set 32-bit base address decoding for RCE2* */
        au_writel(0x10003ff0, MEM_STADDR2);
-        // PCI CPLD setup
+        /*
-        // expand CE0 to cover PCI
+         * PCI CPLD setup
+         * Expand CE0 to cover PCI
+         */
        au_writel(0x11803e40, MEM_STADDR1);
-        // burst visibility on
+        /* Burst visibility on */
        au_writel(au_readl(MEM_STCFG0) | 0x1000, MEM_STCFG0);
-        au_writel(0x83, MEM_STCFG1);         // ewait enabled, flash timing
+        au_writel(0x83, MEM_STCFG1);         /* ewait enabled, flash timing */
-        au_writel(0x33030a10, MEM_STTIME1);   // slower timing for FPGA
+        au_writel(0x33030a10, MEM_STTIME1);  /* slower timing for FPGA */
-        /* setup the static bus controller */
+        /* Setup the static bus controller */
        au_writel(0x00000002, MEM_STCFG3);  /* type = PCMCIA */
        au_writel(0x280E3D07, MEM_STTIME3); /* 250ns cycle time */
        au_writel(0x10000000, MEM_STADDR3); /* any PCMCIA select */
-#ifdef CONFIG_PCI
+        /*
-        au_writel(0, PCI_BRIDGE_CONFIG); // set extend byte to 0
+         * Enable Au1000 BCLK switching - note: sed1356 must not use
-        au_writel(0, SDRAM_MBAR);        // set mbar to 0
+         * its BCLK (Au1000 LCLK) for any timings
-        au_writel(0x2, SDRAM_CMD);       // enable memory accesses
+         */
-        au_sync_delay(1);
+        switch (prid & 0x000000FF) {
-#endif
-        /* Enable Au1000 BCLK switching - note: sed1356 must not use
-         * its BCLK (Au1000 LCLK) for any timings */
-        switch (prid & 0x000000FF)
-        {
        case 0x00: /* DA */
        case 0x01: /* HA */
        case 0x02: /* HB */
                break;
        default:  /* HC and newer */
-                /* Enable sys bus clock divider when IDLE state or no bus
+                /*
-                   activity. */
+                 * Enable sys bus clock divider when IDLE state or no bus
+                 * activity.
+                 */
                au_writel(au_readl(SYS_POWERCTRL) | (0x3 << 5), SYS_POWERCTRL);
                break;
        }
diff --git a/arch/mips/au1000/pb1000/init.c b/arch/mips/au1000/pb1000/init.c
index 549447df71d6..3837365d613d 100644
--- a/arch/mips/au1000/pb1000/init.c
+++ b/arch/mips/au1000/pb1000/init.c
@@ -1,10 +1,9 @@
 /*
 * BRIEF MODULE DESCRIPTION
- *      PB1000 board setup
+ *      Pb1000 board setup
 *
- * Copyright 2001 MontaVista Software Inc.
+ * Copyright 2001, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -44,16 +43,15 @@ void __init prom_init(void)
        unsigned char *memsize_str;
        unsigned long memsize;
-        prom_argc = (int) fw_arg0;
+        prom_argc = (int)fw_arg0;
-        prom_argv = (char **) fw_arg1;
+        prom_argv = (char **)fw_arg1;
-        prom_envp = (char **) fw_arg2;
+        prom_envp = (char **)fw_arg2;
        prom_init_cmdline();
        memsize_str = prom_getenv("memsize");
-        if (!memsize_str) {
+        if (!memsize_str)
                memsize = 0x04000000;
-        } else {
+        else
-                memsize = simple_strtol(memsize_str, NULL, 0);
+                memsize = strict_strtol(memsize_str, 0, NULL);
-        }
        add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
diff --git a/arch/mips/au1000/pb1100/Makefile b/arch/mips/au1000/pb1100/Makefile
index 996236df6375..793e97c49e46 100644
--- a/arch/mips/au1000/pb1100/Makefile
+++ b/arch/mips/au1000/pb1100/Makefile
@@ -1,8 +1,8 @@
 #
-#  Copyright 2000,2001 MontaVista Software Inc.
+#  Copyright 2000, 2001, 2008 MontaVista Software Inc.
-#  Author: MontaVista Software, Inc.
+#  Author: MontaVista Software, Inc. <source@mvista.com>
-#       ppopov@mvista.com or source@mvista.com
 #
 # Makefile for the Alchemy Semiconductor Pb1100 board.
+#
 lib-y := init.o board_setup.o irqmap.o
diff --git a/arch/mips/au1000/pb1100/board_setup.c b/arch/mips/au1000/pb1100/board_setup.c
index 656164c8e9ca..c0bfd59a7a36 100644
--- a/arch/mips/au1000/pb1100/board_setup.c
+++ b/arch/mips/au1000/pb1100/board_setup.c
@@ -1,7 +1,6 @@
 /*
- * Copyright 2002 MontaVista Software Inc.
+ * Copyright 2002, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -32,15 +31,15 @@
 void board_reset(void)
 {
-    /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
+        /* Hit BCSR.RST_VDDI[SOFT_RESET] */
-    au_writel(0x00000000, 0xAE00001C);
+        au_writel(0x00000000, PB1100_RST_VDDI);
 }
 void __init board_setup(void)
 {
-        volatile void __iomem * base = (volatile void __iomem *) 0xac000000UL;
+        volatile void __iomem *base = (volatile void __iomem *)0xac000000UL;
-        // set AUX clock to 12MHz * 8 = 96 MHz
+        /* Set AUX clock to 12 MHz * 8 = 96 MHz */
        au_writel(8, SYS_AUXPLL);
        au_writel(0, SYS_PININPUTEN);
        udelay(100);
@@ -49,44 +48,47 @@ void __init board_setup(void)
        {
                u32 pin_func, sys_freqctrl, sys_clksrc;
-                // configure pins GPIO[14:9] as GPIO
+                /* Configure pins GPIO[14:9] as GPIO */
-                pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x80);
+                pin_func = au_readl(SYS_PINFUNC) & ~SYS_PF_UR3;
-                /* zero and disable FREQ2 */
+                /* Zero and disable FREQ2 */
                sys_freqctrl = au_readl(SYS_FREQCTRL0);
                sys_freqctrl &= ~0xFFF00000;
                au_writel(sys_freqctrl, SYS_FREQCTRL0);
-                /* zero and disable USBH/USBD/IrDA clock */
+                /* Zero and disable USBH/USBD/IrDA clock */
                sys_clksrc = au_readl(SYS_CLKSRC);
-                sys_clksrc &= ~0x0000001F;
+                sys_clksrc &= ~(SYS_CS_CIR | SYS_CS_DIR | SYS_CS_MIR_MASK);
                au_writel(sys_clksrc, SYS_CLKSRC);
                sys_freqctrl = au_readl(SYS_FREQCTRL0);
                sys_freqctrl &= ~0xFFF00000;
                sys_clksrc = au_readl(SYS_CLKSRC);
-                sys_clksrc &= ~0x0000001F;
+                sys_clksrc &= ~(SYS_CS_CIR | SYS_CS_DIR | SYS_CS_MIR_MASK);
-                // FREQ2 = aux/2 = 48 MHz
+                /* FREQ2 = aux / 2 = 48 MHz */
-                sys_freqctrl |= ((0<<22) | (1<<21) | (1<<20));
+                sys_freqctrl |= (0 << SYS_FC_FRDIV2_BIT) |
+                                SYS_FC_FE2 | SYS_FC_FS2;
                au_writel(sys_freqctrl, SYS_FREQCTRL0);
                /*
-                 * Route 48MHz FREQ2 into USBH/USBD/IrDA
+                 * Route 48 MHz FREQ2 into USBH/USBD/IrDA
                 */
-                sys_clksrc |= ((4<<2) | (0<<1) | 0 );
+                sys_clksrc |= SYS_CS_MUX_FQ2 << SYS_CS_MIR_BIT;
                au_writel(sys_clksrc, SYS_CLKSRC);
-                /* setup the static bus controller */
+                /* Setup the static bus controller */
                au_writel(0x00000002, MEM_STCFG3);  /* type = PCMCIA */
                au_writel(0x280E3D07, MEM_STTIME3); /* 250ns cycle time */
                au_writel(0x10000000, MEM_STADDR3); /* any PCMCIA select */
-                // get USB Functionality pin state (device vs host drive pins)
+                /*
-                pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x8000);
+                 * Get USB Functionality pin state (device vs host drive pins).
-                // 2nd USB port is USB host
+                 */
-                pin_func |= 0x8000;
+                pin_func = au_readl(SYS_PINFUNC) & ~SYS_PF_USB;
+                /* 2nd USB port is USB host. */
+                pin_func |= SYS_PF_USB;
                au_writel(pin_func, SYS_PINFUNC);
        }
 #endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
@@ -94,12 +96,12 @@ void __init board_setup(void)
        /* Enable sys bus clock divider when IDLE state or no bus activity. */
        au_writel(au_readl(SYS_POWERCTRL) | (0x3 << 5), SYS_POWERCTRL);
-        // Enable the RTC if not already enabled
+        /* Enable the RTC if not already enabled. */
        if (!(readb(base + 0x28) & 0x20)) {
                writeb(readb(base + 0x28) | 0x20, base + 0x28);
                au_sync();
        }
-        // Put the clock in BCD mode
+        /* Put the clock in BCD mode. */
        if (readb(base + 0x2C) & 0x4) { /* reg B */
                writeb(readb(base + 0x2c) & ~0x4, base + 0x2c);
                au_sync();
diff --git a/arch/mips/au1000/pb1100/init.c b/arch/mips/au1000/pb1100/init.c
index c91344648ed3..8355483f3de2 100644
--- a/arch/mips/au1000/pb1100/init.c
+++ b/arch/mips/au1000/pb1100/init.c
@@ -3,9 +3,8 @@
 * BRIEF MODULE DESCRIPTION
 *      Pb1100 board setup
 *
- * Copyright 2002 MontaVista Software Inc.
+ * Copyright 2002, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -46,8 +45,8 @@ void __init prom_init(void)
        unsigned long memsize;
        prom_argc = fw_arg0;
-        prom_argv = (char **) fw_arg1;
+        prom_argv = (char **)fw_arg1;
-        prom_envp = (char **) fw_arg3;
+        prom_envp = (char **)fw_arg3;
        prom_init_cmdline();
@@ -55,7 +54,7 @@ void __init prom_init(void)
        if (!memsize_str)
                memsize = 0x04000000;
        else
-                memsize = simple_strtol(memsize_str, NULL, 0);
+                memsize = strict_strtol(memsize_str, 0, NULL);
        add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
diff --git a/arch/mips/au1000/pb1100/irqmap.c b/arch/mips/au1000/pb1100/irqmap.c
index b5021e3d477f..9b7dd8b41283 100644
--- a/arch/mips/au1000/pb1100/irqmap.c
+++ b/arch/mips/au1000/pb1100/irqmap.c
@@ -1,6 +1,6 @@
 /*
 * BRIEF MODULE DESCRIPTION
- *      Au1xxx irq map table
+ *      Au1xx0 IRQ map table
 *
 * Copyright 2003 Embedded Edge, LLC
 *              dan@embeddededge.com
@@ -31,10 +31,10 @@
 #include <asm/mach-au1x00/au1000.h>
 struct au1xxx_irqmap __initdata au1xxx_irq_map[] = {
-        { AU1000_GPIO_9, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card Fully_Interted#
+        { AU1000_GPIO_9,  INTC_INT_LOW_LEVEL, 0 }, /* PCMCIA Card Fully_Inserted# */
-        { AU1000_GPIO_10, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card STSCHG#
+        { AU1000_GPIO_10, INTC_INT_LOW_LEVEL, 0 }, /* PCMCIA Card STSCHG# */
-        { AU1000_GPIO_11, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card IRQ#
+        { AU1000_GPIO_11, INTC_INT_LOW_LEVEL, 0 }, /* PCMCIA Card IRQ# */
-        { AU1000_GPIO_13, INTC_INT_LOW_LEVEL, 0 }, // DC_IRQ#
+        { AU1000_GPIO_13, INTC_INT_LOW_LEVEL, 0 }, /* DC_IRQ# */
 };
 int __initdata au1xxx_nr_irqs = ARRAY_SIZE(au1xxx_irq_map);
diff --git a/arch/mips/au1000/pb1200/Makefile b/arch/mips/au1000/pb1200/Makefile
index 4fe02ea65a60..d678adf7ce85 100644
--- a/arch/mips/au1000/pb1200/Makefile
+++ b/arch/mips/au1000/pb1200/Makefile
@@ -1,5 +1,5 @@
 #
-# Makefile for the Alchemy Semiconductor PB1200 board.
+# Makefile for the Alchemy Semiconductor Pb1200/DBAu1200 boards.
 #
 lib-y := init.o board_setup.o irqmap.o
diff --git a/arch/mips/au1000/pb1200/board_setup.c b/arch/mips/au1000/pb1200/board_setup.c
index 4493a792cc4c..6cb2115059ad 100644
--- a/arch/mips/au1000/pb1200/board_setup.c
+++ b/arch/mips/au1000/pb1200/board_setup.c
@@ -27,16 +27,8 @@
 #include <linux/init.h>
 #include <linux/sched.h>
-#include <au1000.h>
 #include <prom.h>
+#include <au1xxx.h>
-#ifdef CONFIG_MIPS_PB1200
-#include <asm/mach-pb1x00/pb1200.h>
-#endif
-#ifdef CONFIG_MIPS_DB1200
-#include <asm/mach-db1x00/db1200.h>
-#endif
 extern void _board_init_irq(void);
 extern void (*board_init_irq)(void);
@@ -53,56 +45,57 @@ void __init board_setup(void)
 #if 0
        {
-        u32 pin_func;
+                u32 pin_func;
-        /* Enable PSC1 SYNC for AC97.  Normaly done in audio driver,
+                /*
-         * but it is board specific code, so put it here.
+                 * Enable PSC1 SYNC for AC97.  Normaly done in audio driver,
-         */
+                 * but it is board specific code, so put it here.
-        pin_func = au_readl(SYS_PINFUNC);
+                 */
-        au_sync();
+                pin_func = au_readl(SYS_PINFUNC);
-        pin_func |= SYS_PF_MUST_BE_SET | SYS_PF_PSC1_S1;
+                au_sync();
-        au_writel(pin_func, SYS_PINFUNC);
+                pin_func |= SYS_PF_MUST_BE_SET | SYS_PF_PSC1_S1;
+                au_writel(pin_func, SYS_PINFUNC);
-        au_writel(0, (u32)bcsr|0x10); /* turn off pcmcia power */
-        au_sync();
+                au_writel(0, (u32)bcsr | 0x10); /* turn off PCMCIA power */
+                au_sync();
        }
 #endif
 #if defined(CONFIG_I2C_AU1550)
        {
-        u32 freq0, clksrc;
+                u32 freq0, clksrc;
-        u32 pin_func;
+                u32 pin_func;
-        /* Select SMBUS in CPLD */
+                /* Select SMBus in CPLD */
-        bcsr->resets &= ~(BCSR_RESETS_PCS0MUX);
+                bcsr->resets &= ~BCSR_RESETS_PCS0MUX;
-        pin_func = au_readl(SYS_PINFUNC);
+                pin_func = au_readl(SYS_PINFUNC);
-        au_sync();
+                au_sync();
-        pin_func &= ~(3<<17 | 1<<4);
+                pin_func &= ~(SYS_PINFUNC_P0A | SYS_PINFUNC_P0B);
-        /* Set GPIOs correctly */
+                /* Set GPIOs correctly */
-        pin_func |= 2<<17;
+                pin_func |= 2 << 17;
-        au_writel(pin_func, SYS_PINFUNC);
+                au_writel(pin_func, SYS_PINFUNC);
-        au_sync();
+                au_sync();
-        /* The i2c driver depends on 50Mhz clock */
+                /* The I2C driver depends on 50 MHz clock */
-        freq0 = au_readl(SYS_FREQCTRL0);
+                freq0 = au_readl(SYS_FREQCTRL0);
-        au_sync();
+                au_sync();
-        freq0 &= ~(SYS_FC_FRDIV1_MASK | SYS_FC_FS1 | SYS_FC_FE1);
+                freq0 &= ~(SYS_FC_FRDIV1_MASK | SYS_FC_FS1 | SYS_FC_FE1);
-        freq0 |= (3<<SYS_FC_FRDIV1_BIT);
+                freq0 |= 3 << SYS_FC_FRDIV1_BIT;
-        /* 396Mhz / (3+1)*2 == 49.5Mhz */
+                /* 396 MHz / (3 + 1) * 2 == 49.5 MHz */
-        au_writel(freq0, SYS_FREQCTRL0);
+                au_writel(freq0, SYS_FREQCTRL0);
-        au_sync();
+                au_sync();
-        freq0 |= SYS_FC_FE1;
+                freq0 |= SYS_FC_FE1;
-        au_writel(freq0, SYS_FREQCTRL0);
+                au_writel(freq0, SYS_FREQCTRL0);
-        au_sync();
+                au_sync();
-        clksrc = au_readl(SYS_CLKSRC);
+                clksrc = au_readl(SYS_CLKSRC);
-        au_sync();
+                au_sync();
-        clksrc &= ~0x01f00000;
+                clksrc &= ~(SYS_CS_CE0 | SYS_CS_DE0 | SYS_CS_ME0_MASK);
-        /* bit 22 is EXTCLK0 for PSC0 */
+                /* Bit 22 is EXTCLK0 for PSC0 */
-        clksrc |= (0x3 << 22);
+                clksrc |= SYS_CS_MUX_FQ1 << SYS_CS_ME0_BIT;
-        au_writel(clksrc, SYS_CLKSRC);
+                au_writel(clksrc, SYS_CLKSRC);
-        au_sync();
+                au_sync();
        }
 #endif
@@ -116,27 +109,27 @@ void __init board_setup(void)
 #endif
 #endif
-        /* The Pb1200 development board uses external MUX for PSC0 to
+        /*
-        support SMB/SPI. bcsr->resets bit 12: 0=SMB 1=SPI
+         * The Pb1200 development board uses external MUX for PSC0 to
-        */
+         * support SMB/SPI. bcsr->resets bit 12: 0=SMB 1=SPI
+         */
 #ifdef CONFIG_I2C_AU1550
-        bcsr->resets &= (~BCSR_RESETS_PCS0MUX);
+        bcsr->resets &= ~BCSR_RESETS_PCS0MUX;
 #endif
        au_sync();
 #ifdef CONFIG_MIPS_PB1200
-        printk("AMD Alchemy Pb1200 Board\n");
+        printk(KERN_INFO "AMD Alchemy Pb1200 Board\n");
 #endif
 #ifdef CONFIG_MIPS_DB1200
-        printk("AMD Alchemy Db1200 Board\n");
+        printk(KERN_INFO "AMD Alchemy Db1200 Board\n");
 #endif
        /* Setup Pb1200 External Interrupt Controller */
        board_init_irq = _board_init_irq;
 }
-int
+int board_au1200fb_panel(void)
-board_au1200fb_panel(void)
 {
        BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR;
        int p;
@@ -147,23 +140,23 @@ board_au1200fb_panel(void)
        return p;
 }
-int
+int board_au1200fb_panel_init(void)
-board_au1200fb_panel_init(void)
 {
        /* Apply power */
-    BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR;
+        BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR;
-        bcsr->board |= (BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD | BCSR_BOARD_LCDBL);
-        /*printk("board_au1200fb_panel_init()\n"); */
+        bcsr->board |= BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD | BCSR_BOARD_LCDBL;
+        /* printk(KERN_DEBUG "board_au1200fb_panel_init()\n"); */
        return 0;
 }
-int
+int board_au1200fb_panel_shutdown(void)
-board_au1200fb_panel_shutdown(void)
 {
        /* Remove power */
-    BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR;
+        BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR;
-        bcsr->board &= ~(BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD | BCSR_BOARD_LCDBL);
-        /*printk("board_au1200fb_panel_shutdown()\n"); */
+        bcsr->board &= ~(BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD |
+                         BCSR_BOARD_LCDBL);
+        /* printk(KERN_DEBUG "board_au1200fb_panel_shutdown()\n"); */
        return 0;
 }
diff --git a/arch/mips/au1000/pb1200/init.c b/arch/mips/au1000/pb1200/init.c
index 72af5500660b..09fd63b86062 100644
--- a/arch/mips/au1000/pb1200/init.c
+++ b/arch/mips/au1000/pb1200/init.c
@@ -3,9 +3,8 @@
 * BRIEF MODULE DESCRIPTION
 *      PB1200 board setup
 *
- * Copyright 2001 MontaVista Software Inc.
+ * Copyright 2001, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -45,16 +44,15 @@ void __init prom_init(void)
        unsigned char *memsize_str;
        unsigned long memsize;
-        prom_argc = (int) fw_arg0;
+        prom_argc = (int)fw_arg0;
-        prom_argv = (char **) fw_arg1;
+        prom_argv = (char **)fw_arg1;
-        prom_envp = (char **) fw_arg2;
+        prom_envp = (char **)fw_arg2;
        prom_init_cmdline();
        memsize_str = prom_getenv("memsize");
-        if (!memsize_str) {
+        if (!memsize_str)
                memsize = 0x08000000;
-        } else {
+        else
-                memsize = simple_strtol(memsize_str, NULL, 0);
+                memsize = strict_strtol(memsize_str, 0, NULL);
-        }
        add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
diff --git a/arch/mips/au1000/pb1200/irqmap.c b/arch/mips/au1000/pb1200/irqmap.c
index e61eb8e0b76b..2a505ad8715b 100644
--- a/arch/mips/au1000/pb1200/irqmap.c
+++ b/arch/mips/au1000/pb1200/irqmap.c
@@ -39,25 +39,25 @@
 #endif
 struct au1xxx_irqmap __initdata au1xxx_irq_map[] = {
-        { AU1000_GPIO_7, INTC_INT_LOW_LEVEL, 0 }, // This is exteranl interrupt cascade
+        /* This is external interrupt cascade */
+        { AU1000_GPIO_7, INTC_INT_LOW_LEVEL, 0 },
 };
 int __initdata au1xxx_nr_irqs = ARRAY_SIZE(au1xxx_irq_map);
 /*
- *      Support for External interrupts on the PbAu1200 Development platform.
+ * Support for External interrupts on the Pb1200 Development platform.
 */
-static volatile int pb1200_cascade_en=0;
+static volatile int pb1200_cascade_en;
-irqreturn_t pb1200_cascade_handler( int irq, void *dev_id)
+irqreturn_t pb1200_cascade_handler(int irq, void *dev_id)
 {
        unsigned short bisr = bcsr->int_status;
        int extirq_nr = 0;
-        /* Clear all the edge interrupts. This has no effect on level */
+        /* Clear all the edge interrupts. This has no effect on level. */
        bcsr->int_status = bisr;
-        for( ; bisr; bisr &= (bisr-1) )
+        for ( ; bisr; bisr &= bisr - 1) {
-        {
                extirq_nr = PB1200_INT_BEGIN + __ffs(bisr);
                /* Ack and dispatch IRQ */
                do_IRQ(extirq_nr);
@@ -68,26 +68,20 @@ irqreturn_t pb1200_cascade_handler( int irq, void *dev_id)
 inline void pb1200_enable_irq(unsigned int irq_nr)
 {
-        bcsr->intset_mask = 1<<(irq_nr - PB1200_INT_BEGIN);
+        bcsr->intset_mask = 1 << (irq_nr - PB1200_INT_BEGIN);
-        bcsr->intset = 1<<(irq_nr - PB1200_INT_BEGIN);
+        bcsr->intset = 1 << (irq_nr - PB1200_INT_BEGIN);
 }
 inline void pb1200_disable_irq(unsigned int irq_nr)
 {
-        bcsr->intclr_mask = 1<<(irq_nr - PB1200_INT_BEGIN);
+        bcsr->intclr_mask = 1 << (irq_nr - PB1200_INT_BEGIN);
-        bcsr->intclr = 1<<(irq_nr - PB1200_INT_BEGIN);
+        bcsr->intclr = 1 << (irq_nr - PB1200_INT_BEGIN);
 }
 static unsigned int pb1200_setup_cascade(void)
 {
-        int err;
+        return request_irq(AU1000_GPIO_7, &pb1200_cascade_handler,
+                           0, "Pb1200 Cascade", &pb1200_cascade_handler);
-        err = request_irq(AU1000_GPIO_7, &pb1200_cascade_handler,
-                          0, "Pb1200 Cascade", &pb1200_cascade_handler);
-        if (err)
-                return err;
-        return 0;
 }
 static unsigned int pb1200_startup_irq(unsigned int irq)
@@ -132,23 +126,23 @@ void _board_init_irq(void)
        unsigned int irq;
 #ifdef CONFIG_MIPS_PB1200
-        /* We have a problem with CPLD rev3. Enable a workaround */
+        /* We have a problem with CPLD rev 3. */
        if (((bcsr->whoami & BCSR_WHOAMI_CPLD) >> 4) <= 3) {
-                printk("\nWARNING!!!\n");
+                printk(KERN_ERR "WARNING!!!\n");
-                printk("\nWARNING!!!\n");
+                printk(KERN_ERR "WARNING!!!\n");
-                printk("\nWARNING!!!\n");
+                printk(KERN_ERR "WARNING!!!\n");
-                printk("\nWARNING!!!\n");
+                printk(KERN_ERR "WARNING!!!\n");
-                printk("\nWARNING!!!\n");
+                printk(KERN_ERR "WARNING!!!\n");
-                printk("\nWARNING!!!\n");
+                printk(KERN_ERR "WARNING!!!\n");
-                printk("Pb1200 must be at CPLD rev4. Please have Pb1200\n");
+                printk(KERN_ERR "Pb1200 must be at CPLD rev 4. Please have Pb1200\n");
-                printk("updated to latest revision. This software will not\n");
+                printk(KERN_ERR "updated to latest revision. This software will\n");
-                printk("work on anything less than CPLD rev4\n");
+                printk(KERN_ERR "not work on anything less than CPLD rev 4.\n");
-                printk("\nWARNING!!!\n");
+                printk(KERN_ERR "WARNING!!!\n");
-                printk("\nWARNING!!!\n");
+                printk(KERN_ERR "WARNING!!!\n");
-                printk("\nWARNING!!!\n");
+                printk(KERN_ERR "WARNING!!!\n");
-                printk("\nWARNING!!!\n");
+                printk(KERN_ERR "WARNING!!!\n");
-                printk("\nWARNING!!!\n");
+                printk(KERN_ERR "WARNING!!!\n");
-                printk("\nWARNING!!!\n");
+                printk(KERN_ERR "WARNING!!!\n");
                panic("Game over.  Your score is 0.");
        }
 #endif
@@ -161,6 +155,6 @@ void _board_init_irq(void)
        /*
         * GPIO_7 can not be hooked here, so it is hooked upon first
-         * request of any source attached to the cascade
+         * request of any source attached to the cascade.
         */
 }
diff --git a/arch/mips/au1000/pb1500/Makefile b/arch/mips/au1000/pb1500/Makefile
index 97a730813cd3..602f38df20bb 100644
--- a/arch/mips/au1000/pb1500/Makefile
+++ b/arch/mips/au1000/pb1500/Makefile
@@ -1,8 +1,8 @@
 #
-#  Copyright 2000,2001 MontaVista Software Inc.
+#  Copyright 2000, 2001, 2008 MontaVista Software Inc.
-#  Author: MontaVista Software, Inc.
+#  Author: MontaVista Software, Inc. <source@mvista.com>
-#       ppopov@mvista.com or source@mvista.com
 #
 # Makefile for the Alchemy Semiconductor Pb1500 board.
+#
 lib-y := init.o board_setup.o irqmap.o
diff --git a/arch/mips/au1000/pb1500/board_setup.c b/arch/mips/au1000/pb1500/board_setup.c
index 24c652e8ec4b..035771c6e5b8 100644
--- a/arch/mips/au1000/pb1500/board_setup.c
+++ b/arch/mips/au1000/pb1500/board_setup.c
@@ -1,7 +1,6 @@
 /*
- * Copyright 2000 MontaVista Software Inc.
+ * Copyright 2000, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -32,8 +31,8 @@
 void board_reset(void)
 {
-    /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
+        /* Hit BCSR.RST_VDDI[SOFT_RESET] */
-    au_writel(0x00000000, 0xAE00001C);
+        au_writel(0x00000000, PB1500_RST_VDDI);
 }
 void __init board_setup(void)
@@ -42,7 +41,7 @@ void __init board_setup(void)
        u32 sys_freqctrl, sys_clksrc;
        sys_clksrc = sys_freqctrl = pin_func = 0;
-        // set AUX clock to 12MHz * 8 = 96 MHz
+        /* Set AUX clock to 12 MHz * 8 = 96 MHz */
        au_writel(8, SYS_AUXPLL);
        au_writel(0, SYS_PINSTATERD);
        udelay(100);
@@ -51,51 +50,48 @@ void __init board_setup(void)
        /* GPIO201 is input for PCMCIA card detect */
        /* GPIO203 is input for PCMCIA interrupt request */
-        au_writel(au_readl(GPIO2_DIR) & (u32)(~((1<<1)|(1<<3))), GPIO2_DIR);
+        au_writel(au_readl(GPIO2_DIR) & ~((1 << 1) | (1 << 3)), GPIO2_DIR);
-        /* zero and disable FREQ2 */
+        /* Zero and disable FREQ2 */
        sys_freqctrl = au_readl(SYS_FREQCTRL0);
        sys_freqctrl &= ~0xFFF00000;
        au_writel(sys_freqctrl, SYS_FREQCTRL0);
        /* zero and disable USBH/USBD clocks */
        sys_clksrc = au_readl(SYS_CLKSRC);
-        sys_clksrc &= ~0x00007FE0;
+        sys_clksrc &= ~(SYS_CS_CUD | SYS_CS_DUD | SYS_CS_MUD_MASK |
+                        SYS_CS_CUH | SYS_CS_DUH | SYS_CS_MUH_MASK);
        au_writel(sys_clksrc, SYS_CLKSRC);
        sys_freqctrl = au_readl(SYS_FREQCTRL0);
        sys_freqctrl &= ~0xFFF00000;
        sys_clksrc = au_readl(SYS_CLKSRC);
-        sys_clksrc &= ~0x00007FE0;
+        sys_clksrc &= ~(SYS_CS_CUD | SYS_CS_DUD | SYS_CS_MUD_MASK |
+                        SYS_CS_CUH | SYS_CS_DUH | SYS_CS_MUH_MASK);
-        // FREQ2 = aux/2 = 48 MHz
+        /* FREQ2 = aux/2 = 48 MHz */
-        sys_freqctrl |= ((0<<22) | (1<<21) | (1<<20));
+        sys_freqctrl |= (0 << SYS_FC_FRDIV2_BIT) | SYS_FC_FE2 | SYS_FC_FS2;
        au_writel(sys_freqctrl, SYS_FREQCTRL0);
        /*
         * Route 48MHz FREQ2 into USB Host and/or Device
         */
-#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
+        sys_clksrc |= SYS_CS_MUX_FQ2 << SYS_CS_MUH_BIT;
-        sys_clksrc |= ((4<<12) | (0<<11) | (0<<10));
-#endif
        au_writel(sys_clksrc, SYS_CLKSRC);
+        pin_func = au_readl(SYS_PINFUNC) & ~SYS_PF_USB;
-        pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x8000);
+        /* 2nd USB port is USB host */
-        // 2nd USB port is USB host
+        pin_func |= SYS_PF_USB;
-        pin_func |= 0x8000;
        au_writel(pin_func, SYS_PINFUNC);
 #endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
 #ifdef CONFIG_PCI
-        // Setup PCI bus controller
+        /* Setup PCI bus controller */
        au_writel(0, Au1500_PCI_CMEM);
        au_writel(0x00003fff, Au1500_CFG_BASE);
 #if defined(__MIPSEB__)
-        au_writel(0xf | (2<<6) | (1<<4), Au1500_PCI_CFG);
+        au_writel(0xf | (2 << 6) | (1 << 4), Au1500_PCI_CFG);
 #else
        au_writel(0xf, Au1500_PCI_CFG);
 #endif
@@ -112,11 +108,11 @@ void __init board_setup(void)
        /* Enable the RTC if not already enabled */
        if (!(au_readl(0xac000028) & 0x20)) {
-                printk("enabling clock ...\n");
+                printk(KERN_INFO "enabling clock ...\n");
                au_writel((au_readl(0xac000028) | 0x20), 0xac000028);
        }
        /* Put the clock in BCD mode */
-        if (au_readl(0xac00002C) & 0x4) { /* reg B */
+        if (au_readl(0xac00002c) & 0x4) { /* reg B */
                au_writel(au_readl(0xac00002c) & ~0x4, 0xac00002c);
                au_sync();
        }
diff --git a/arch/mips/au1000/pb1500/init.c b/arch/mips/au1000/pb1500/init.c
index 488507c07db9..49f51e165863 100644
--- a/arch/mips/au1000/pb1500/init.c
+++ b/arch/mips/au1000/pb1500/init.c
@@ -1,11 +1,10 @@
 /*
 *
 * BRIEF MODULE DESCRIPTION
- *      PB1500 board setup
+ *      Pb1500 board setup
 *
- * Copyright 2001 MontaVista Software Inc.
+ * Copyright 2001, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -45,16 +44,15 @@ void __init prom_init(void)
        unsigned char *memsize_str;
        unsigned long memsize;
-        prom_argc = (int) fw_arg0;
+        prom_argc = (int)fw_arg0;
-        prom_argv = (char **) fw_arg1;
+        prom_argv = (char **)fw_arg1;
-        prom_envp = (char **) fw_arg2;
+        prom_envp = (char **)fw_arg2;
        prom_init_cmdline();
        memsize_str = prom_getenv("memsize");
-        if (!memsize_str) {
+        if (!memsize_str)
                memsize = 0x04000000;
-        } else {
+        else
-                memsize = simple_strtol(memsize_str, NULL, 0);
+                memsize = strict_strtol(memsize_str, 0, NULL);
-        }
        add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
diff --git a/arch/mips/au1000/pb1500/irqmap.c b/arch/mips/au1000/pb1500/irqmap.c
index 4817ab44d07f..39c4682766a8 100644
--- a/arch/mips/au1000/pb1500/irqmap.c
+++ b/arch/mips/au1000/pb1500/irqmap.c
@@ -31,12 +31,12 @@
 #include <asm/mach-au1x00/au1000.h>
 char irq_tab_alchemy[][5] __initdata = {
- [12] = { -1, INTA, INTX, INTX, INTX},   /* IDSEL 12 - HPT370   */
+        [12] = { -1, INTA, INTX, INTX, INTX },   /* IDSEL 12 - HPT370   */
- [13] = { -1, INTA, INTB, INTC, INTD},   /* IDSEL 13 - PCI slot */
+        [13] = { -1, INTA, INTB, INTC, INTD },   /* IDSEL 13 - PCI slot */
 };
 struct au1xxx_irqmap __initdata au1xxx_irq_map[] = {
-        { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0},
+        { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0 },
        { AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 },
        { AU1500_GPIO_202, INTC_INT_LOW_LEVEL, 0 },
        { AU1500_GPIO_203, INTC_INT_LOW_LEVEL, 0 },
diff --git a/arch/mips/au1000/pb1550/Makefile b/arch/mips/au1000/pb1550/Makefile
index aa35bc6cb8cf..7d8beca87fa5 100644
--- a/arch/mips/au1000/pb1550/Makefile
+++ b/arch/mips/au1000/pb1550/Makefile
@@ -1,9 +1,8 @@
 #
-#  Copyright 2000 MontaVista Software Inc.
+#  Copyright 2000, 2008 MontaVista Software Inc.
-#  Author: MontaVista Software, Inc.
+#  Author: MontaVista Software, Inc. <source@mvista.com>
-#       ppopov@mvista.com or source@mvista.com
 #
-# Makefile for the Alchemy Semiconductor PB1000 board.
+# Makefile for the Alchemy Semiconductor Pb1550 board.
 #
 lib-y := init.o board_setup.o irqmap.o
diff --git a/arch/mips/au1000/pb1550/board_setup.c b/arch/mips/au1000/pb1550/board_setup.c
index 45d60872b565..0ed76b64b6ab 100644
--- a/arch/mips/au1000/pb1550/board_setup.c
+++ b/arch/mips/au1000/pb1550/board_setup.c
@@ -3,9 +3,8 @@
 * BRIEF MODULE DESCRIPTION
 *      Alchemy Pb1550 board setup.
 *
- * Copyright 2000 MontaVista Software Inc.
+ * Copyright 2000, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -35,15 +34,16 @@
 void board_reset(void)
 {
-    /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
+        /* Hit BCSR.SYSTEM[RESET] */
-        au_writew(au_readw(0xAF00001C) & ~(1<<15), 0xAF00001C);
+        au_writew(au_readw(0xAF00001C) & ~BCSR_SYSTEM_RESET, 0xAF00001C);
 }
 void __init board_setup(void)
 {
        u32 pin_func;
-        /* Enable PSC1 SYNC for AC97.  Normaly done in audio driver,
+        /*
+         * Enable PSC1 SYNC for AC'97.  Normaly done in audio driver,
         * but it is board specific code, so put it here.
         */
        pin_func = au_readl(SYS_PINFUNC);
@@ -51,8 +51,8 @@ void __init board_setup(void)
        pin_func |= SYS_PF_MUST_BE_SET | SYS_PF_PSC1_S1;
        au_writel(pin_func, SYS_PINFUNC);
-        au_writel(0, (u32)bcsr|0x10); /* turn off pcmcia power */
+        au_writel(0, (u32)bcsr | 0x10); /* turn off PCMCIA power */
        au_sync();
-        printk("AMD Alchemy Pb1550 Board\n");
+        printk(KERN_INFO "AMD Alchemy Pb1550 Board\n");
 }
diff --git a/arch/mips/au1000/pb1550/init.c b/arch/mips/au1000/pb1550/init.c
index f6b2fc587980..1b5f58434bb7 100644
--- a/arch/mips/au1000/pb1550/init.c
+++ b/arch/mips/au1000/pb1550/init.c
@@ -1,11 +1,10 @@
 /*
 *
 * BRIEF MODULE DESCRIPTION
- *      PB1550 board setup
+ *      Pb1550 board setup
 *
- * Copyright 2001 MontaVista Software Inc.
+ * Copyright 2001, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -45,16 +44,15 @@ void __init prom_init(void)
        unsigned char *memsize_str;
        unsigned long memsize;
-        prom_argc = (int) fw_arg0;
+        prom_argc = (int)fw_arg0;
-        prom_argv = (char **) fw_arg1;
+        prom_argv = (char **)fw_arg1;
-        prom_envp = (char **) fw_arg2;
+        prom_envp = (char **)fw_arg2;
        prom_init_cmdline();
        memsize_str = prom_getenv("memsize");
-        if (!memsize_str) {
+        if (!memsize_str)
                memsize = 0x08000000;
-        } else {
+        else
-                memsize = simple_strtol(memsize_str, NULL, 0);
+                memsize = strict_strtol(memsize_str, 0, NULL);
-        }
        add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
diff --git a/arch/mips/au1000/pb1550/irqmap.c b/arch/mips/au1000/pb1550/irqmap.c
index e1dac37af08a..a02a4d1fa899 100644
--- a/arch/mips/au1000/pb1550/irqmap.c
+++ b/arch/mips/au1000/pb1550/irqmap.c
@@ -1,6 +1,6 @@
 /*
 * BRIEF MODULE DESCRIPTION
- *      Au1xxx irq map table
+ *      Au1xx0 IRQ map table
 *
 * Copyright 2003 Embedded Edge, LLC
 *              dan@embeddededge.com
@@ -31,8 +31,8 @@
 #include <asm/mach-au1x00/au1000.h>
 char irq_tab_alchemy[][5] __initdata = {
- [12] = { -1, INTB, INTC, INTD, INTA},   /* IDSEL 12 - PCI slot 2 (left)  */
+        [12] = { -1, INTB, INTC, INTD, INTA }, /* IDSEL 12 - PCI slot 2 (left)  */
- [13] = { -1, INTA, INTB, INTC, INTD},   /* IDSEL 13 - PCI slot 1 (right) */
+        [13] = { -1, INTA, INTB, INTC, INTD }, /* IDSEL 13 - PCI slot 1 (right) */
 };
 struct au1xxx_irqmap __initdata au1xxx_irq_map[] = {
diff --git a/arch/mips/au1000/xxs1500/Makefile b/arch/mips/au1000/xxs1500/Makefile
index 44d7f7056ae7..db3c526f64d8 100644
--- a/arch/mips/au1000/xxs1500/Makefile
+++ b/arch/mips/au1000/xxs1500/Makefile
@@ -1,7 +1,6 @@
 #
 #  Copyright 2003 MontaVista Software Inc.
-#  Author: MontaVista Software, Inc.
+#  Author: MontaVista Software, Inc. <source@mvista.com>
-#       ppopov@mvista.com or source@mvista.com
 #
 # Makefile for MyCable XXS1500 board.
 #
diff --git a/arch/mips/au1000/xxs1500/board_setup.c b/arch/mips/au1000/xxs1500/board_setup.c
index 79d1798621bf..4c587acac5c3 100644
--- a/arch/mips/au1000/xxs1500/board_setup.c
+++ b/arch/mips/au1000/xxs1500/board_setup.c
@@ -1,7 +1,6 @@
 /*
- * Copyright 2000-2003 MontaVista Software Inc.
+ * Copyright 2000-2003, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -39,40 +38,40 @@ void __init board_setup(void)
 {
        u32 pin_func;
-        // set multiple use pins (UART3/GPIO) to UART (it's used as UART too)
+        /* Set multiple use pins (UART3/GPIO) to UART (it's used as UART too) */
-        pin_func = au_readl(SYS_PINFUNC) & (u32)(~SYS_PF_UR3);
+        pin_func  = au_readl(SYS_PINFUNC) & ~SYS_PF_UR3;
        pin_func |= SYS_PF_UR3;
        au_writel(pin_func, SYS_PINFUNC);
-        // enable UART
+        /* Enable UART */
-        au_writel(0x01, UART3_ADDR+UART_MOD_CNTRL); // clock enable (CE)
+        au_writel(0x01, UART3_ADDR + UART_MOD_CNTRL); /* clock enable (CE) */
        mdelay(10);
-        au_writel(0x03, UART3_ADDR+UART_MOD_CNTRL); // CE and "enable"
+        au_writel(0x03, UART3_ADDR + UART_MOD_CNTRL); /* CE and "enable" */
        mdelay(10);
-        // enable DTR = USB power up
+        /* Enable DTR = USB power up */
-        au_writel(0x01, UART3_ADDR+UART_MCR); //? UART_MCR_DTR is 0x01???
+        au_writel(0x01, UART3_ADDR + UART_MCR); /* UART_MCR_DTR is 0x01??? */
 #ifdef CONFIG_PCMCIA_XXS1500
-        /* setup pcmcia signals */
+        /* Setup PCMCIA signals */
        au_writel(0, SYS_PININPUTEN);
-        /* gpio 0, 1, and 4 are inputs */
+        /* GPIO 0, 1, and 4 are inputs */
-        au_writel(1 | (1<<1) | (1<<4), SYS_TRIOUTCLR);
+        au_writel(1 | (1 << 1) | (1 << 4), SYS_TRIOUTCLR);
-        /* enable GPIO2 if not already enabled */
+        /* Enable GPIO2 if not already enabled */
        au_writel(1, GPIO2_ENABLE);
-        /* gpio2 208/9/10/11 are inputs */
+        /* GPIO2 208/9/10/11 are inputs */
-        au_writel((1<<8) | (1<<9) | (1<<10) | (1<<11), GPIO2_DIR);
+        au_writel((1 << 8) | (1 << 9) | (1 << 10) | (1 << 11), GPIO2_DIR);
-        /* turn off power */
+        /* Turn off power */
-        au_writel((au_readl(GPIO2_PINSTATE) & ~(1<<14))|(1<<30), GPIO2_OUTPUT);
+        au_writel((au_readl(GPIO2_PINSTATE) & ~(1 << 14)) | (1 << 30),
+                  GPIO2_OUTPUT);
 #endif
 #ifdef CONFIG_PCI
 #if defined(__MIPSEB__)
-        au_writel(0xf | (2<<6) | (1<<4), Au1500_PCI_CFG);
+        au_writel(0xf | (2 << 6) | (1 << 4), Au1500_PCI_CFG);
 #else
        au_writel(0xf, Au1500_PCI_CFG);
 #endif
diff --git a/arch/mips/au1000/xxs1500/init.c b/arch/mips/au1000/xxs1500/init.c
index 24fc6e132dc0..b849bf501c04 100644
--- a/arch/mips/au1000/xxs1500/init.c
+++ b/arch/mips/au1000/xxs1500/init.c
@@ -2,9 +2,8 @@
 * BRIEF MODULE DESCRIPTION
 *      XXS1500 board setup
 *
- * Copyright 2003 MontaVista Software Inc.
+ * Copyright 2003, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
@@ -45,8 +44,8 @@ void __init prom_init(void)
        unsigned long memsize;
        prom_argc = fw_arg0;
-        prom_argv = (char **) fw_arg1;
+        prom_argv = (char **)fw_arg1;
-        prom_envp = (char **) fw_arg2;
+        prom_envp = (char **)fw_arg2;
        prom_init_cmdline();
@@ -54,6 +53,6 @@ void __init prom_init(void)
        if (!memsize_str)
                memsize = 0x04000000;
        else
-                memsize = simple_strtol(memsize_str, NULL, 0);
+                memsize = strict_strtol(memsize_str, 0, NULL);
        add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
diff --git a/arch/mips/au1000/xxs1500/irqmap.c b/arch/mips/au1000/xxs1500/irqmap.c
index dd6e3d1eb4d4..edf06ed11870 100644
--- a/arch/mips/au1000/xxs1500/irqmap.c
+++ b/arch/mips/au1000/xxs1500/irqmap.c
@@ -31,7 +31,7 @@
 #include <asm/mach-au1x00/au1000.h>
 struct au1xxx_irqmap __initdata au1xxx_irq_map[] = {
-        { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0},
+        { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0 },
        { AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 },
        { AU1500_GPIO_202, INTC_INT_LOW_LEVEL, 0 },
        { AU1500_GPIO_203, INTC_INT_LOW_LEVEL, 0 },
diff --git a/arch/mips/emma2rh/markeins/setup.c b/arch/mips/emma2rh/markeins/setup.c
index 82f9e9013e70..62bfb455d1b1 100644
--- a/arch/mips/emma2rh/markeins/setup.c
+++ b/arch/mips/emma2rh/markeins/setup.c
@@ -76,7 +76,9 @@ static void markeins_machine_power_off(void)
        while (1) ;
 }
-static unsigned long clock[4] = { 166500000, 187312500, 199800000, 210600000 };
+static unsigned long __initdata emma2rh_clock[4] = {
+        166500000, 187312500, 199800000, 210600000
+};
 static unsigned int __init detect_bus_frequency(unsigned long rtc_base)
 {
@@ -85,7 +87,8 @@ static unsigned int __init detect_bus_frequency(unsigned long rtc_base)
        /* detect from boot strap */
        reg = emma2rh_in32(EMMA2RH_BHIF_STRAP_0);
        reg = (reg >> 4) & 0x3;
-        return clock[reg];
+        return emma2rh_clock[reg];
 }
 void __init plat_time_init(void)
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 45545be3eb86..cc0244036aec 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -56,9 +56,9 @@ obj-$(CONFIG_MIPS_MT_SMP)	+= smp-mt.o
 obj-$(CONFIG_MIPS_CMP)          += smp-cmp.o
 obj-$(CONFIG_CPU_MIPSR2)        += spram.o
-obj-$(CONFIG_MIPS_APSP_KSPD)    += kspd.o
 obj-$(CONFIG_MIPS_VPE_LOADER)   += vpe.o
 obj-$(CONFIG_MIPS_VPE_APSP_API) += rtlx.o
+obj-$(CONFIG_MIPS_APSP_KSPD)    += kspd.o
 obj-$(CONFIG_I8259)             += i8259.o
 obj-$(CONFIG_IRQ_CPU)           += irq_cpu.o
diff --git a/arch/mips/kernel/cpu-bugs64.c b/arch/mips/kernel/cpu-bugs64.c
index a1b48af0992f..02b7713cf71c 100644
--- a/arch/mips/kernel/cpu-bugs64.c
+++ b/arch/mips/kernel/cpu-bugs64.c
@@ -38,7 +38,7 @@ static inline void align_mod(const int align, const int mod)
                ".endr\n\t"
                ".set   pop"
                :
-                : GCC_IMM_ASM(align), GCC_IMM_ASM(mod));
+                : GCC_IMM_ASM() (align), GCC_IMM_ASM() (mod));
 }
 static inline void mult_sh_align_mod(long *v1, long *v2, long *w,
diff --git a/arch/mips/kernel/irixelf.c b/arch/mips/kernel/irixelf.c
index 290d8e3a664d..469c7237e5ba 100644
--- a/arch/mips/kernel/irixelf.c
+++ b/arch/mips/kernel/irixelf.c
@@ -578,7 +578,7 @@ static inline int map_interpreter(struct elf_phdr *epp, struct elfhdr *ihp,
 * process and the system, here we map the page and fill the
 * structure
 */
-static void irix_map_prda_page(void)
+static int irix_map_prda_page(void)
 {
        unsigned long v;
        struct prda *pp;
@@ -587,8 +587,8 @@ static void irix_map_prda_page(void)
        v =  do_brk(PRDA_ADDRESS, PAGE_SIZE);
        up_write(&current->mm->mmap_sem);
-        if (v < 0)
+        if (v != PRDA_ADDRESS)
-                return;
+                return v;               /* v must be an error code */
        pp = (struct prda *) v;
        pp->prda_sys.t_pid  = task_pid_vnr(current);
@@ -596,6 +596,8 @@ static void irix_map_prda_page(void)
        pp->prda_sys.t_rpid = task_pid_vnr(current);
        /* We leave the rest set to zero */
+        return 0;
 }
@@ -781,7 +783,8 @@ static int load_irix_binary(struct linux_binprm * bprm, struct pt_regs * regs)
         * IRIX maps a page at 0x200000 which holds some system
         * information.  Programs depend on this.
         */
-        irix_map_prda_page();
+        if (irix_map_prda_page())
+                goto out_free_dentry;
        padzero(elf_bss);
diff --git a/arch/mips/kernel/kspd.c b/arch/mips/kernel/kspd.c
index ceb62dce1c9c..b0591ae0ce56 100644
--- a/arch/mips/kernel/kspd.c
+++ b/arch/mips/kernel/kspd.c
@@ -257,7 +257,7 @@ void sp_work_handle_request(void)
                vcwd = vpe_getcwd(tclimit);
-                /* change to the cwd of the process that loaded the SP program */
+                /* change to cwd of the process that loaded the SP program */
                old_fs = get_fs();
                set_fs(KERNEL_DS);
                sys_chdir(vcwd);
@@ -323,6 +323,9 @@ static void sp_cleanup(void)
                        set >>= 1;
                }
        }
+        /* Put daemon cwd back to root to avoid umount problems */
+        sys_chdir("/");
 }
 static int channel_open = 0;
diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c
index 0233798f7155..b88f1c18ff4d 100644
--- a/arch/mips/kernel/rtlx.c
+++ b/arch/mips/kernel/rtlx.c
@@ -72,6 +72,15 @@ static void rtlx_dispatch(void)
 static irqreturn_t rtlx_interrupt(int irq, void *dev_id)
 {
        int i;
+        unsigned int flags, vpeflags;
+        /* Ought not to be strictly necessary for SMTC builds */
+        local_irq_save(flags);
+        vpeflags = dvpe();
+        set_c0_status(0x100 << MIPS_CPU_RTLX_IRQ);
+        irq_enable_hazard();
+        evpe(vpeflags);
+        local_irq_restore(flags);
        for (i = 0; i < RTLX_CHANNELS; i++) {
                        wake_up(&channel_wqs[i].lx_queue);
@@ -108,7 +117,8 @@ static void __used dump_rtlx(void)
 static int rtlx_init(struct rtlx_info *rtlxi)
 {
        if (rtlxi->id != RTLX_ID) {
-                printk(KERN_ERR "no valid RTLX id at 0x%p 0x%lx\n", rtlxi, rtlxi->id);
+                printk(KERN_ERR "no valid RTLX id at 0x%p 0x%lx\n",
+                        rtlxi, rtlxi->id);
                return -ENOEXEC;
        }
@@ -162,18 +172,17 @@ int rtlx_open(int index, int can_sleep)
        if (rtlx == NULL) {
                if( (p = vpe_get_shared(tclimit)) == NULL) {
-                        if (can_sleep) {
+                    if (can_sleep) {
-                                __wait_event_interruptible(channel_wqs[index].lx_queue,
+                        __wait_event_interruptible(channel_wqs[index].lx_queue,
-                                                           (p = vpe_get_shared(tclimit)),
+                                (p = vpe_get_shared(tclimit)), ret);
-                                                           ret);
+                        if (ret)
-                                if (ret)
-                                        goto out_fail;
-                        } else {
-                                printk(KERN_DEBUG "No SP program loaded, and device "
-                                        "opened with O_NONBLOCK\n");
-                                ret = -ENOSYS;
                                goto out_fail;
-                        }
+                    } else {
+                        printk(KERN_DEBUG "No SP program loaded, and device "
+                                        "opened with O_NONBLOCK\n");
+                        ret = -ENOSYS;
+                        goto out_fail;
+                    }
                }
                smp_rmb();
@@ -182,7 +191,9 @@ int rtlx_open(int index, int can_sleep)
                                DEFINE_WAIT(wait);
                                for (;;) {
-                                        prepare_to_wait(&channel_wqs[index].lx_queue, &wait, TASK_INTERRUPTIBLE);
+                                        prepare_to_wait(
+                                                &channel_wqs[index].lx_queue,
+                                                &wait, TASK_INTERRUPTIBLE);
                                        smp_rmb();
                                        if (*p != NULL)
                                                break;
@@ -195,7 +206,7 @@ int rtlx_open(int index, int can_sleep)
                                }
                                finish_wait(&channel_wqs[index].lx_queue, &wait);
                        } else {
-                                printk(" *vpe_get_shared is NULL. "
+                                pr_err(" *vpe_get_shared is NULL. "
                                       "Has an SP program been loaded?\n");
                                ret = -ENOSYS;
                                goto out_fail;
@@ -203,8 +214,9 @@ int rtlx_open(int index, int can_sleep)
                }
                if ((unsigned int)*p < KSEG0) {
-                        printk(KERN_WARNING "vpe_get_shared returned an invalid pointer "
+                        printk(KERN_WARNING "vpe_get_shared returned an "
-                               "maybe an error code %d\n", (int)*p);
+                               "invalid pointer maybe an error code %d\n",
+                               (int)*p);
                        ret = -ENOSYS;
                        goto out_fail;
                }
@@ -232,6 +244,10 @@ out_ret:
 int rtlx_release(int index)
 {
+        if (rtlx == NULL) {
+                pr_err("rtlx_release() with null rtlx\n");
+                return 0;
+        }
        rtlx->channel[index].lx_state = RTLX_STATE_UNUSED;
        return 0;
 }
@@ -251,8 +267,8 @@ unsigned int rtlx_read_poll(int index, int can_sleep)
                        int ret = 0;
                        __wait_event_interruptible(channel_wqs[index].lx_queue,
-                                                   chan->lx_read != chan->lx_write || sp_stopping,
+                                (chan->lx_read != chan->lx_write) ||
-                                                   ret);
+                                sp_stopping, ret);
                        if (ret)
                                return ret;
@@ -282,7 +298,9 @@ static inline int write_spacefree(int read, int write, int size)
 unsigned int rtlx_write_poll(int index)
 {
        struct rtlx_channel *chan = &rtlx->channel[index];
-        return write_spacefree(chan->rt_read, chan->rt_write, chan->buffer_size);
+        return write_spacefree(chan->rt_read, chan->rt_write,
+                                chan->buffer_size);
 }
 ssize_t rtlx_read(int index, void __user *buff, size_t count)
@@ -344,8 +362,8 @@ ssize_t rtlx_write(int index, const void __user *buffer, size_t count)
        rt_read = rt->rt_read;
        /* total number of bytes to copy */
-        count = min(count,
+        count = min(count, (size_t)write_spacefree(rt_read, rt->rt_write,
-                    (size_t)write_spacefree(rt_read, rt->rt_write, rt->buffer_size));
+                                                        rt->buffer_size));
        /* first bit from write pointer to the end of the buffer, or count */
        fl = min(count, (size_t) rt->buffer_size - rt->rt_write);
@@ -514,6 +532,11 @@ static int __init rtlx_module_init(void)
        if (cpu_has_vint)
                set_vi_handler(MIPS_CPU_RTLX_IRQ, rtlx_dispatch);
+        else {
+                pr_err("APRP RTLX init on non-vectored-interrupt processor\n");
+                err = -ENODEV;
+                goto out_chrdev;
+        }
        rtlx_irq.dev_id = rtlx;
        setup_irq(rtlx_irq_num, &rtlx_irq);
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 39f3dfe134fb..c6a063b2a0d9 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -331,6 +331,7 @@ static void __init bootmem_init(void)
        /*
         * Determine low and high memory ranges
         */
+        max_pfn = max_low_pfn;
        if (max_low_pfn > PFN_DOWN(HIGHMEM_START)) {
 #ifdef CONFIG_HIGHMEM
                highstart_pfn = PFN_DOWN(HIGHMEM_START);
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 33780cc61ce9..63370cdd3c90 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -87,8 +87,8 @@ struct plat_smp_ops *mp_ops;
 __cpuinit void register_smp_ops(struct plat_smp_ops *ops)
 {
-        if (ops)
+        if (mp_ops)
-                printk(KERN_WARNING "Overriding previous set SMP ops\n");
+                printk(KERN_WARNING "Overriding previously set SMP ops\n");
        mp_ops = ops;
 }
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index 39804c584edd..2794501ff302 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -269,7 +269,7 @@ static void *alloc_progmem(unsigned long len)
         * This means you must tell Linux to use less memory than you
         * physically have, for example by passing a mem= boot argument.
         */
-        addr = pfn_to_kaddr(max_pfn);
+        addr = pfn_to_kaddr(max_low_pfn);
        memset(addr, 0, len);
 #else
        /* simple grab some mem for now */
@@ -781,10 +781,15 @@ static int vpe_run(struct vpe * v)
        /* take system out of configuration state */
        clear_c0_mvpcontrol(MVPCONTROL_VPC);
+        /*
+         * SMTC/SMVP kernels manage VPE enable independently,
+         * but uniprocessor kernels need to turn it on, even
+         * if that wasn't the pre-dvpe() state.
+         */
 #ifdef CONFIG_SMP
-        evpe(EVPE_ENABLE);
-#else
        evpe(vpeflags);
+#else
+        evpe(EVPE_ENABLE);
 #endif
        emt(dmt_flag);
        local_irq_restore(flags);
@@ -840,7 +845,7 @@ static int vpe_elfload(struct vpe * v)
        /* Sanity checks against insmoding binaries or wrong arch,
           weird elf version */
-        if (memcmp(hdr->e_ident, ELFMAG, 4) != 0
+        if (memcmp(hdr->e_ident, ELFMAG, SELFMAG) != 0
            || (hdr->e_type != ET_REL && hdr->e_type != ET_EXEC)
            || !elf_check_arch(hdr)
            || hdr->e_shentsize != sizeof(*sechdrs)) {
@@ -947,12 +952,14 @@ static int vpe_elfload(struct vpe * v)
                struct elf_phdr *phdr = (struct elf_phdr *) ((char *)hdr + hdr->e_phoff);
                for (i = 0; i < hdr->e_phnum; i++) {
-                        if (phdr->p_type != PT_LOAD)
+                        if (phdr->p_type == PT_LOAD) {
-                                continue;
+                                memcpy((void *)phdr->p_paddr,
+                                       (char *)hdr + phdr->p_offset,
-                        memcpy((void *)phdr->p_paddr, (char *)hdr + phdr->p_offset, phdr->p_filesz);
+                                       phdr->p_filesz);
-                        memset((void *)phdr->p_paddr + phdr->p_filesz, 0, phdr->p_memsz - phdr->p_filesz);
+                                memset((void *)phdr->p_paddr + phdr->p_filesz,
-                        phdr++;
+                                       0, phdr->p_memsz - phdr->p_filesz);
+                    }
+                    phdr++;
                }
                for (i = 0; i < hdr->e_shnum; i++) {
@@ -1107,7 +1114,7 @@ static int vpe_release(struct inode *inode, struct file *filp)
                return -ENODEV;
        hdr = (Elf_Ehdr *) v->pbuffer;
-        if (memcmp(hdr->e_ident, ELFMAG, 4) == 0) {
+        if (memcmp(hdr->e_ident, ELFMAG, SELFMAG) == 0) {
                if (vpe_elfload(v) >= 0) {
                        vpe_run(v);
                } else {
diff --git a/arch/mips/mm/highmem.c b/arch/mips/mm/highmem.c
index 10dd2af2343b..8f2cd8eda741 100644
--- a/arch/mips/mm/highmem.c
+++ b/arch/mips/mm/highmem.c
@@ -116,4 +116,3 @@ EXPORT_SYMBOL(__kmap);
 EXPORT_SYMBOL(__kunmap);
 EXPORT_SYMBOL(__kmap_atomic);
 EXPORT_SYMBOL(__kunmap_atomic);
-EXPORT_SYMBOL(__kmap_atomic_to_page);
diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c
index da8cbb6899dc..b40df7d2cf44 100644
--- a/arch/mips/oprofile/op_model_mipsxx.c
+++ b/arch/mips/oprofile/op_model_mipsxx.c
@@ -281,7 +281,7 @@ static inline int n_counters(void)
 static void reset_counters(void *arg)
 {
-        int counters = (int)arg;
+        int counters = (int)(long)arg;
        switch (counters) {
        case 4:
                w_c0_perfctrl3(0);
@@ -313,7 +313,7 @@ static int __init mipsxx_init(void)
        if (!cpu_has_mipsmt_pertccounters)
                counters = counters_total_to_per_cpu(counters);
 #endif
-        on_each_cpu(reset_counters, (void *)counters, 0, 1);
+        on_each_cpu(reset_counters, (void *)(long)counters, 0, 1);
        op_model_mipsxx_ops.num_counters = counters;
        switch (current_cpu_type()) {
@@ -382,7 +382,7 @@ static void mipsxx_exit(void)
        int counters = op_model_mipsxx_ops.num_counters;
        counters = counters_per_cpu_to_total(counters);
-        on_each_cpu(reset_counters, (void *)counters, 0, 1);
+        on_each_cpu(reset_counters, (void *)(long)counters, 0, 1);
        perf_irq = save_perf_irq;
 }
diff --git a/arch/mips/pci/fixup-au1000.c b/arch/mips/pci/fixup-au1000.c
index 00c36c9dbe0e..e2ddfc49237c 100644
--- a/arch/mips/pci/fixup-au1000.c
+++ b/arch/mips/pci/fixup-au1000.c
@@ -1,10 +1,9 @@
 /*
 * BRIEF MODULE DESCRIPTION
- *      Board specific pci fixups.
+ *      Board specific PCI fixups.
 *
- * Copyright 2001-2003 MontaVista Software Inc.
+ * Copyright 2001-2003, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
diff --git a/arch/mips/pci/ops-au1000.c b/arch/mips/pci/ops-au1000.c
index 1314bd58f036..9a57c5ab91dd 100644
--- a/arch/mips/pci/ops-au1000.c
+++ b/arch/mips/pci/ops-au1000.c
@@ -1,10 +1,9 @@
 /*
 * BRIEF MODULE DESCRIPTION
- *      Alchemy/AMD Au1x00 PCI support.
+ *      Alchemy/AMD Au1xx0 PCI support.
 *
- * Copyright 2001-2003, 2007 MontaVista Software Inc.
+ * Copyright 2001-2003, 2007-2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
- *              ppopov@mvista.com or source@mvista.com
 *
 *  Support for all devices (greater than 16) added by David Gathright.
 *
@@ -28,6 +27,7 @@
 *  with this program; if not, write  to the Free Software Foundation, Inc.,
 *  675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
@@ -36,9 +36,9 @@
 #include <asm/mach-au1x00/au1000.h>
-#undef DEBUG
+#undef  DEBUG
-#ifdef DEBUG
+#ifdef  DEBUG
-#define DBG(x...) printk(x)
+#define DBG(x...) printk(KERN_DEBUG x)
 #else
 #define DBG(x...)
 #endif
@@ -46,7 +46,6 @@
 #define PCI_ACCESS_READ  0
 #define PCI_ACCESS_WRITE 1
 int (*board_pci_idsel)(unsigned int devsel, int assert);
 void mod_wired_entry(int entry, unsigned long entrylo0,
@@ -92,10 +91,9 @@ void __init au1x_pci_cfg_init(void)
 }
 static int config_access(unsigned char access_type, struct pci_bus *bus,
-                         unsigned int dev_fn, unsigned char where,
+                         unsigned int dev_fn, unsigned char where, u32 *data)
-                         u32 * data)
 {
-#if defined( CONFIG_SOC_AU1500 ) || defined( CONFIG_SOC_AU1550 )
+#if defined(CONFIG_SOC_AU1500) || defined(CONFIG_SOC_AU1550)
        unsigned int device = PCI_SLOT(dev_fn);
        unsigned int function = PCI_FUNC(dev_fn);
        unsigned long offset, status;
@@ -114,38 +112,36 @@ static int config_access(unsigned char access_type, struct pci_bus *bus,
                        Au1500_PCI_STATCMD);
        au_sync_udelay(1);
-        /* Allow board vendors to implement their own off-chip idsel.
+        /*
+         * Allow board vendors to implement their own off-chip IDSEL.
         * If it doesn't succeed, may as well bail out at this point.
         */
-        if (board_pci_idsel) {
+        if (board_pci_idsel && board_pci_idsel(device, 1) == 0) {
-                if (board_pci_idsel(device, 1) == 0) {
+                *data = 0xffffffff;
-                        *data = 0xffffffff;
+                local_irq_restore(flags);
-                        local_irq_restore(flags);
+                return -1;
-                        return -1;
-                }
        }
-        /* setup the config window */
+        /* Setup the config window */
-        if (bus->number == 0) {
+        if (bus->number == 0)
-                cfg_base = ((1<<device)<<11);
+                cfg_base = (1 << device) << 11;
-        } else {
+        else
-                cfg_base = 0x80000000 | (bus->number<<16) | (device<<11);
+                cfg_base = 0x80000000 | (bus->number << 16) | (device << 11);
-        }
-        /* setup the lower bits of the 36 bit address */
+        /* Setup the lower bits of the 36-bit address */
-        offset = (function << 8) | (where & ~0x3);
+        offset = (function << 8) | (where & ~0x3);
-        /* pick up any address that falls below the page mask */
+        /* Pick up any address that falls below the page mask */
        offset |= cfg_base & ~PAGE_MASK;
-        /* page boundary */
+        /* Page boundary */
        cfg_base = cfg_base & PAGE_MASK;
        /*
         * To improve performance, if the current device is the same as
         * the last device accessed, we don't touch the TLB.
         */
-        entryLo0 = (6 << 26)  | (cfg_base >> 6) | (2 << 3) | 7;
+        entryLo0 = (6 << 26) | (cfg_base >> 6) | (2 << 3) | 7;
-        entryLo1 = (6 << 26)  | (cfg_base >> 6) | (0x1000 >> 6) | (2 << 3) | 7;
+        entryLo1 = (6 << 26) | (cfg_base >> 6) | (0x1000 >> 6) | (2 << 3) | 7;
        if ((entryLo0 != last_entryLo0) || (entryLo1 != last_entryLo1)) {
                mod_wired_entry(pci_cfg_wired_entry, entryLo0, entryLo1,
                                (unsigned long)pci_cfg_vm->addr, PM_4K);
@@ -153,38 +149,37 @@ static int config_access(unsigned char access_type, struct pci_bus *bus,
                last_entryLo1 = entryLo1;
        }
-        if (access_type == PCI_ACCESS_WRITE) {
+        if (access_type == PCI_ACCESS_WRITE)
                au_writel(*data, (int)(pci_cfg_vm->addr + offset));
-        } else {
+        else
                *data = au_readl((int)(pci_cfg_vm->addr + offset));
-        }
        au_sync_udelay(2);
-        DBG("cfg_access %d bus->number %d dev %d at %x *data %x conf %x\n",
+        DBG("cfg_access %d bus->number %u dev %u at %x *data %x conf %lx\n",
-                        access_type, bus->number, device, where, *data, offset);
+            access_type, bus->number, device, where, *data, offset);
-        /* check master abort */
+        /* Check master abort */
        status = au_readl(Au1500_PCI_STATCMD);
-        if (status & (1<<29)) {
+        if (status & (1 << 29)) {
                *data = 0xffffffff;
                error = -1;
                DBG("Au1x Master Abort\n");
        } else if ((status >> 28) & 0xf) {
-                DBG("PCI ERR detected: device %d, status %x\n", device, ((status >> 28) & 0xf));
+                DBG("PCI ERR detected: device %u, status %lx\n",
+                    device, (status >> 28) & 0xf);
-                /* clear errors */
+                /* Clear errors */
                au_writel(status & 0xf000ffff, Au1500_PCI_STATCMD);
                *data = 0xffffffff;
                error = -1;
        }
-        /* Take away the idsel.
+        /* Take away the IDSEL. */
-        */
+        if (board_pci_idsel)
-        if (board_pci_idsel) {
                (void)board_pci_idsel(device, 0);
-        }
        local_irq_restore(flags);
        return error;
@@ -192,7 +187,7 @@ static int config_access(unsigned char access_type, struct pci_bus *bus,
 }
 static int read_config_byte(struct pci_bus *bus, unsigned int devfn,
-                            int where, u8 * val)
+                            int where,  u8 *val)
 {
        u32 data;
        int ret;
@@ -206,9 +201,8 @@ static int read_config_byte(struct pci_bus *bus, unsigned int devfn,
        return ret;
 }
 static int read_config_word(struct pci_bus *bus, unsigned int devfn,
-                            int where, u16 * val)
+                            int where, u16 *val)
 {
        u32 data;
        int ret;
@@ -221,7 +215,7 @@ static int read_config_word(struct pci_bus *bus, unsigned int devfn,
 }
 static int read_config_dword(struct pci_bus *bus, unsigned int devfn,
-                             int where, u32 * val)
+                             int where, u32 *val)
 {
        int ret;
@@ -229,9 +223,8 @@ static int read_config_dword(struct pci_bus *bus, unsigned int devfn,
        return ret;
 }
-static int
+static int write_config_byte(struct pci_bus *bus, unsigned int devfn,
-write_config_byte(struct pci_bus *bus, unsigned int devfn, int where,
+                             int where, u8 val)
-                  u8 val)
 {
        u32 data = 0;
@@ -239,7 +232,7 @@ write_config_byte(struct pci_bus *bus, unsigned int devfn, int where,
                return -1;
        data = (data & ~(0xff << ((where & 3) << 3))) |
-            (val << ((where & 3) << 3));
+               (val << ((where & 3) << 3));
        if (config_access(PCI_ACCESS_WRITE, bus, devfn, where, &data))
                return -1;
@@ -247,9 +240,8 @@ write_config_byte(struct pci_bus *bus, unsigned int devfn, int where,
        return PCIBIOS_SUCCESSFUL;
 }
-static int
+static int write_config_word(struct pci_bus *bus, unsigned int devfn,
-write_config_word(struct pci_bus *bus, unsigned int devfn, int where,
+                             int where, u16 val)
-                  u16 val)
 {
        u32 data = 0;
@@ -257,18 +249,16 @@ write_config_word(struct pci_bus *bus, unsigned int devfn, int where,
                return -1;
        data = (data & ~(0xffff << ((where & 3) << 3))) |
-            (val << ((where & 3) << 3));
+               (val << ((where & 3) << 3));
        if (config_access(PCI_ACCESS_WRITE, bus, devfn, where, &data))
                return -1;
        return PCIBIOS_SUCCESSFUL;
 }
-static int
+static int write_config_dword(struct pci_bus *bus, unsigned int devfn,
-write_config_dword(struct pci_bus *bus, unsigned int devfn, int where,
+                              int where, u32 val)
-                   u32 val)
 {
        if (config_access(PCI_ACCESS_WRITE, bus, devfn, where, &val))
                return -1;
@@ -277,18 +267,20 @@ write_config_dword(struct pci_bus *bus, unsigned int devfn, int where,
 }
 static int config_read(struct pci_bus *bus, unsigned int devfn,
-                       int where, int size, u32 * val)
+                       int where, int size, u32 *val)
 {
        switch (size) {
        case 1: {
                        u8 _val;
                        int rc = read_config_byte(bus, devfn, where, &_val);
                        *val = _val;
                        return rc;
                }
-       case 2: {
+        case 2: {
                        u16 _val;
                        int rc = read_config_word(bus, devfn, where, &_val);
                        *val = _val;
                        return rc;
                }
@@ -310,7 +302,6 @@ static int config_write(struct pci_bus *bus, unsigned int devfn,
        }
 }
 struct pci_ops au1x_pci_ops = {
        config_read,
        config_write
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c b/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
index ab96a2d7f4c4..11769b55438c 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
@@ -126,9 +126,6 @@ static irqreturn_t hwbutton_handler(int irq, void *data)
        struct hwbutton_interrupt *hirq = data;
        unsigned long cic_ext = *CIC_EXT_CFG_REG;
-        if (irq != hirq->irq)
-                return IRQ_NONE;
        if (CIC_EXT_IS_ACTIVE_HI(cic_ext, hirq->eirq)) {
                /* Interrupt: pin is now HI */
                CIC_EXT_SET_ACTIVE_LO(cic_ext, hirq->eirq);
@@ -164,7 +161,7 @@ static int msp_hwbutton_register(struct hwbutton_interrupt *hirq)
        *CIC_EXT_CFG_REG = cic_ext;
        return request_irq(hirq->irq, hwbutton_handler, IRQF_DISABLED,
-                                hirq->name, (void *)hirq);
+                           hirq->name, hirq);
 }
 static int __init msp_hwbutton_setup(void)
diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c
index 25d3baf0ebc4..9cebc9e7da63 100644
--- a/arch/mips/sgi-ip27/ip27-timer.c
+++ b/arch/mips/sgi-ip27/ip27-timer.c
@@ -158,7 +158,7 @@ static void rt_set_mode(enum clock_event_mode mode,
        }
 }
-unsigned int rt_timer_irq;
+int rt_timer_irq;
 static irqreturn_t hub_rt_counter_handler(int irq, void *dev_id)
 {
@@ -219,7 +219,7 @@ static void __cpuinit hub_rt_clock_event_init(void)
 static void __init hub_rt_clock_event_global_init(void)
 {
-        unsigned int irq;
+        int irq;
        do {
                smp_wmb();
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index d14cebf62bb0..2346d271fbfd 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -105,6 +105,9 @@ PHONY += systbl_chk
 systbl_chk: $(src)/systbl_chk.sh $(obj)/systbl_chk.i
        $(call cmd,systbl_chk)
+ifeq ($(CONFIG_PPC_MERGE),y)
 $(obj)/built-in.o:              prom_init_check
 quiet_cmd_prom_init_check = CALL    $<
@@ -114,4 +117,7 @@ PHONY += prom_init_check
 prom_init_check: $(src)/prom_init_check.sh $(obj)/prom_init.o
        $(call cmd,prom_init_check)
+endif
 clean-files := vmlinux.lds
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 81738a4b3c3a..e44d5530f0a6 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -1484,6 +1484,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                .dcache_bsize           = 32,
                .machine_check          = machine_check_e200,
                .platform               = "ppc5554",
+        }
 #endif /* CONFIG_E200 */
 #ifdef CONFIG_E500
        {       /* e500 */
@@ -1533,6 +1534,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                .dcache_bsize           = 32,
                .machine_check          = machine_check_e500,
                .platform               = "powerpc",
+        }
 #endif /* CONFIG_E500 */
 #endif /* CONFIG_PPC32 */
 };
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index f1d2cdc5331b..c71d37dc6a88 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -10,6 +10,7 @@ ifeq ($(CONFIG_PPC_MERGE),y)
 obj-y                   := string.o alloc.o \
                           checksum_$(CONFIG_WORD_SIZE).o
 obj-$(CONFIG_PPC32)     += div64.o copy_32.o
+obj-$(CONFIG_HAS_IOMEM) += devres.o
 endif
 obj-$(CONFIG_PPC64)     += copypage_64.o copyuser_64.o \
@@ -23,4 +24,3 @@ obj-$(CONFIG_SMP)	+= locks.o
 endif
 obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o
-obj-$(CONFIG_HAS_IOMEM) += devres.o
diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index 8df7f0e4c3a6..2352d139b262 100644
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -43,7 +43,7 @@ KBUILD_AFLAGS += $(cpu-as-y)
 KBUILD_CFLAGS += $(cpu-as-y)
 # Default to the common case.
-KBUILD_DEFCONFIG := common_defconfig
+KBUILD_DEFCONFIG := ebony_defconfig
 head-y                          := arch/ppc/kernel/head.o
 head-$(CONFIG_8xx)              := arch/ppc/kernel/head_8xx.o
diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c
index 16ac11ca7ba0..602c268fc8a2 100644
--- a/arch/ppc/kernel/ppc_ksyms.c
+++ b/arch/ppc/kernel/ppc_ksyms.c
@@ -24,6 +24,7 @@
 #include <asm/checksum.h>
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
+#include <asm/cacheflush.h>
 #include <linux/adb.h>
 #include <linux/cuda.h>
 #include <linux/pmu.h>
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c
index bfddfdee0b65..51e8094f52d6 100644
--- a/arch/ppc/kernel/setup.c
+++ b/arch/ppc/kernel/setup.c
@@ -36,6 +36,7 @@
 #include <asm/nvram.h>
 #include <asm/xmon.h>
 #include <asm/ocp.h>
+#include <asm/irq.h>
 #define USES_PPC_SYS (defined(CONFIG_MPC10X_BRIDGE) || defined(CONFIG_8260) || \
                      defined(CONFIG_PPC_MPC52xx))
diff --git a/arch/ppc/platforms/residual.c b/arch/ppc/platforms/residual.c
index 18495e754e30..d687b0f8763b 100644
--- a/arch/ppc/platforms/residual.c
+++ b/arch/ppc/platforms/residual.c
@@ -38,6 +38,7 @@
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/pci.h>
+#include <linux/proc_fs.h>
 #include <asm/sections.h>
 #include <asm/mmu.h>
diff --git a/arch/sparc/kernel/rtrap.S b/arch/sparc/kernel/rtrap.S
index b27b5b56f77a..ab818cdc4cc0 100644
--- a/arch/sparc/kernel/rtrap.S
+++ b/arch/sparc/kernel/rtrap.S
@@ -139,7 +139,7 @@ ret_trap_userwins_ok:
        LOAD_PT_PRIV(sp, t_psr, t_pc, t_npc)
        or      %t_pc, %t_npc, %g2
        andcc   %g2, 0x3, %g0
-        sethi   %hi(PSR_SYCALL), %g2
+        sethi   %hi(PSR_SYSCALL), %g2
        be      1f
         andn   %t_psr, %g2, %t_psr
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index ec3e2c72302a..a9828d748e2c 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -610,8 +610,6 @@ static void __init remap_kernel(void)
 static void __init inherit_prom_mappings(void)
 {
-        read_obp_translations();
        /* Now fixup OBP's idea about where we really are mapped. */
        printk("Remapping the kernel... ");
        remap_kernel();
@@ -1747,7 +1745,17 @@ void __init paging_init(void)
        lmb_init();
-        /* Find available physical memory... */
+        /* Find available physical memory...
+         *
+         * Read it twice in order to work around a bug in openfirmware.
+         * The call to grab this table itself can cause openfirmware to
+         * allocate memory, which in turn can take away some space from
+         * the list of available memory.  Reading it twice makes sure
+         * we really do get the final value.
+         */
+        read_obp_translations();
+        read_obp_memory("reg", &pall[0], &pall_ents);
+        read_obp_memory("available", &pavail[0], &pavail_ents);
        read_obp_memory("available", &pavail[0], &pavail_ents);
        phys_base = 0xffffffffffffffffUL;
@@ -1788,8 +1796,6 @@ void __init paging_init(void)
        
        inherit_prom_mappings();
        
-        read_obp_memory("reg", &pall[0], &pall_ents);
        init_kpte_bitmap();
        /* Ok, we can use our TLB miss and window trap handlers safely.  */