Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (80 commits)
  [MIPS] tlbex.c: Cleanup __init usage.
  [MIPS] WRPPMC serial support move to platform device
  [MIPS] R1: Fix hazard barriers to make kernels work on R2 also.
  [MIPS] VPE: reimplement ELF loader.
  [MIPS] cleanup WRPPMC include files
  [MIPS] Add BUG_ON assertion for attempt to run kernel on the wrong CPU type.
  [MIPS] SMP: Use ISO C struct initializer for local structs.
  [MIPS] SMP: Kill useless casts.
  [MIPS] Kill num_online_cpus() loops.
  [MIPS] SMP: Implement smp_call_function_mask().
  [MIPS] Make facility to convert CPU types to strings generally available.
  [MIPS] Convert list of CPU types from #define to enum.
  [MIPS] Optimize get_unaligned / put_unaligned implementations.
  [MIPS] checkfiles: Fix "need space after that ','" errors.
  [MIPS] Fix "no space between function name and open parenthesis" warnings.
  [MIPS] Allow hardwiring of the CPU type to a single type for optimization.
  [MIPS] tlbex: Size optimize code by declaring a few functions inline.
  [MIPS] pg-r4k.c: Dump the generated code
  [MIPS] Cobalt: Remove cobalt_machine_power_off()
  [MIPS] Cobalt: Move reset port definition to arch/mips/cobalt/reset.c
  ...

8 files changed, 135 insertions, 125 deletions

diff --git a/arch/mips/cobalt/Makefile b/arch/mips/cobalt/Makefile
index a043f93f7d08..6b83f4ddc8fc 100644
--- a/arch/mips/cobalt/Makefile
+++ b/arch/mips/cobalt/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the Cobalt micro systems family specific parts of the kernel
 #
 
-obj-y := buttons.o irq.o reset.o rtc.o serial.o setup.o
+obj-y := buttons.o irq.o led.o reset.o rtc.o serial.o setup.o
 
 obj-$(CONFIG_PCI)               += pci.o
 obj-$(CONFIG_EARLY_PRINTK)      += console.o
diff --git a/arch/mips/cobalt/console.c b/arch/mips/cobalt/console.c
index 0485d51f7216..db330e811025 100644
--- a/arch/mips/cobalt/console.c
+++ b/arch/mips/cobalt/console.c
@@ -1,16 +1,15 @@
 /*
  * (C) P. Horton 2006
  */
+#include <linux/io.h>
 #include <linux/serial_reg.h>
 
-#include <asm/addrspace.h>
-
-#include <cobalt.h>
+#define UART_BASE       ((void __iomem *)CKSEG1ADDR(0x1c800000))
 
 void prom_putchar(char c)
 {
-        while(!(COBALT_UART[UART_LSR] & UART_LSR_THRE))
+        while (!(readb(UART_BASE + UART_LSR) & UART_LSR_THRE))
                 ;
 
-        COBALT_UART[UART_TX] = c;
+        writeb(c, UART_BASE + UART_TX);
 }
diff --git a/arch/mips/cobalt/irq.c b/arch/mips/cobalt/irq.c
index 950ad1e8be44..ac4fb912649d 100644
--- a/arch/mips/cobalt/irq.c
+++ b/arch/mips/cobalt/irq.c
@@ -15,102 +15,48 @@
 
 #include <asm/i8259.h>
 #include <asm/irq_cpu.h>
+#include <asm/irq_gt641xx.h>
 #include <asm/gt64120.h>
 
-#include <cobalt.h>
-
-/*
- * We have two types of interrupts that we handle, ones that come in through
- * the CPU interrupt lines, and ones that come in on the via chip. The CPU
- * mappings are:
- *
- *    16   - Software interrupt 0 (unused)      IE_SW0
- *    17   - Software interrupt 1 (unused)      IE_SW1
- *    18   - Galileo chip (timer)               IE_IRQ0
- *    19   - Tulip 0 + NCR SCSI                 IE_IRQ1
- *    20   - Tulip 1                            IE_IRQ2
- *    21   - 16550 UART                         IE_IRQ3
- *    22   - VIA southbridge PIC                IE_IRQ4
- *    23   - unused                             IE_IRQ5
- *
- * The VIA chip is a master/slave 8259 setup and has the following interrupts:
- *
- *     8  - RTC
- *     9  - PCI
- *    14  - IDE0
- *    15  - IDE1
- */
-
-static inline void galileo_irq(void)
-{
-        unsigned int mask, pending, devfn;
-
-        mask = GT_READ(GT_INTRMASK_OFS);
-        pending = GT_READ(GT_INTRCAUSE_OFS) & mask;
-
-        if (pending & GT_INTR_T0EXP_MSK) {
-                GT_WRITE(GT_INTRCAUSE_OFS, ~GT_INTR_T0EXP_MSK);
-                do_IRQ(COBALT_GALILEO_IRQ);
-        } else if (pending & GT_INTR_RETRYCTR0_MSK) {
-                devfn = GT_READ(GT_PCI0_CFGADDR_OFS) >> 8;
-                GT_WRITE(GT_INTRCAUSE_OFS, ~GT_INTR_RETRYCTR0_MSK);
-                printk(KERN_WARNING
-                       "Galileo: PCI retry count exceeded (%02x.%u)\n",
-                       PCI_SLOT(devfn), PCI_FUNC(devfn));
-        } else {
-                GT_WRITE(GT_INTRMASK_OFS, mask & ~pending);
-                printk(KERN_WARNING
-                       "Galileo: masking unexpected interrupt %08x\n", pending);
-        }
-}
-
-static inline void via_pic_irq(void)
-{
-        int irq;
-
-        irq = i8259_irq();
-        if (irq >= 0)
-                do_IRQ(irq);
-}
+#include <irq.h>
 
 asmlinkage void plat_irq_dispatch(void)
 {
-        unsigned pending = read_c0_status() & read_c0_cause();
+        unsigned pending = read_c0_status() & read_c0_cause() & ST0_IM;
+        int irq;
 
-        if (pending & CAUSEF_IP2)               /* COBALT_GALILEO_IRQ (18) */
-                galileo_irq();
-        else if (pending & CAUSEF_IP6)          /* COBALT_VIA_IRQ (22) */
-                via_pic_irq();
-        else if (pending & CAUSEF_IP3)          /* COBALT_ETH0_IRQ (19) */
-                do_IRQ(COBALT_CPU_IRQ + 3);
-        else if (pending & CAUSEF_IP4)          /* COBALT_ETH1_IRQ (20) */
-                do_IRQ(COBALT_CPU_IRQ + 4);
-        else if (pending & CAUSEF_IP5)          /* COBALT_SERIAL_IRQ (21) */
-                do_IRQ(COBALT_CPU_IRQ + 5);
-        else if (pending & CAUSEF_IP7)          /* IRQ 23 */
-                do_IRQ(COBALT_CPU_IRQ + 7);
+        if (pending & CAUSEF_IP2)
+                gt641xx_irq_dispatch();
+        else if (pending & CAUSEF_IP6) {
+                irq = i8259_irq();
+                if (irq < 0)
+                        spurious_interrupt();
+                else
+                        do_IRQ(irq);
+        } else if (pending & CAUSEF_IP3)
+                do_IRQ(MIPS_CPU_IRQ_BASE + 3);
+        else if (pending & CAUSEF_IP4)
+                do_IRQ(MIPS_CPU_IRQ_BASE + 4);
+        else if (pending & CAUSEF_IP5)
+                do_IRQ(MIPS_CPU_IRQ_BASE + 5);
+        else if (pending & CAUSEF_IP7)
+                do_IRQ(MIPS_CPU_IRQ_BASE + 7);
+        else
+                spurious_interrupt();
 }
 
-static struct irqaction irq_via = {
-        no_action, 0, { { 0, } }, "cascade", NULL, NULL
+static struct irqaction cascade = {
+        .handler        = no_action,
+        .mask           = CPU_MASK_NONE,
+        .name           = "cascade",
 };
 
 void __init arch_init_irq(void)
 {
-        /*
-         * Mask all Galileo interrupts. The Galileo
-         * handler is set in cobalt_timer_setup()
-         */
-        GT_WRITE(GT_INTRMASK_OFS, 0);
-
-        init_i8259_irqs();                              /*  0 ... 15 */
-        mips_cpu_irq_init();            /* 16 ... 23 */
-
-        /*
-         * Mask all cpu interrupts
-         *  (except IE4, we already masked those at VIA level)
-         */
-        change_c0_status(ST0_IM, IE_IRQ4);
+        mips_cpu_irq_init();
+        gt641xx_irq_init();
+        init_i8259_irqs();
 
-        setup_irq(COBALT_VIA_IRQ, &irq_via);
+        setup_irq(GT641XX_CASCADE_IRQ, &cascade);
+        setup_irq(I8259_CASCADE_IRQ, &cascade);
 }
diff --git a/arch/mips/cobalt/led.c b/arch/mips/cobalt/led.c
new file mode 100644
index 000000000000..1c6ebd468b07
--- /dev/null
+++ b/arch/mips/cobalt/led.c
@@ -0,0 +1,62 @@
+/*
+ *  Registration of Cobalt LED platform device.
+ *
+ *  Copyright (C) 2007  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/platform_device.h>
+
+#include <cobalt.h>
+
+static struct resource cobalt_led_resource __initdata = {
+        .start  = 0x1c000000,
+        .end    = 0x1c000000,
+        .flags  = IORESOURCE_MEM,
+};
+
+static __init int cobalt_led_add(void)
+{
+        struct platform_device *pdev;
+        int retval;
+
+        if (cobalt_board_id == COBALT_BRD_ID_QUBE1 ||
+            cobalt_board_id == COBALT_BRD_ID_QUBE2)
+                pdev = platform_device_alloc("cobalt-qube-leds", -1);
+        else
+                pdev = platform_device_alloc("cobalt-raq-leds", -1);
+
+        if (!pdev)
+                return -ENOMEM;
+
+        retval = platform_device_add_resources(pdev, &cobalt_led_resource, 1);
+        if (retval)
+                goto err_free_device;
+
+        retval = platform_device_add(pdev);
+        if (retval)
+                goto err_free_device;
+
+        return 0;
+
+err_free_device:
+        platform_device_put(pdev);
+
+        return retval;
+}
+device_initcall(cobalt_led_add);
diff --git a/arch/mips/cobalt/reset.c b/arch/mips/cobalt/reset.c
index 43cca21fdbc0..71eb4ccc4bc1 100644
--- a/arch/mips/cobalt/reset.c
+++ b/arch/mips/cobalt/reset.c
@@ -8,36 +8,46 @@
  * Copyright (C) 1995, 1996, 1997 by Ralf Baechle
  * Copyright (C) 2001 by Liam Davies (ldavies@agile.tv)
  */
+#include <linux/init.h>
+#include <linux/io.h>
 #include <linux/jiffies.h>
-
-#include <asm/io.h>
-#include <asm/reboot.h>
+#include <linux/leds.h>
 
 #include <cobalt.h>
 
+#define RESET_PORT      ((void __iomem *)CKSEG1ADDR(0x1c000000))
+#define RESET           0x0f
+
+DEFINE_LED_TRIGGER(power_off_led_trigger);
+
+static int __init ledtrig_power_off_init(void)
+{
+        led_trigger_register_simple("power-off", &power_off_led_trigger);
+        return 0;
+}
+device_initcall(ledtrig_power_off_init);
+
 void cobalt_machine_halt(void)
 {
         int state, last, diff;
         unsigned long mark;
 
         /*
-         * turn off bar on Qube, flash power off LED on RaQ (0.5Hz)
+         * turn on power off LED on RaQ
          *
          * restart if ENTER and SELECT are pressed
          */
 
         last = COBALT_KEY_PORT;
 
-        for (state = 0;;) {
-
-                state ^= COBALT_LED_POWER_OFF;
-                COBALT_LED_PORT = state;
+        led_trigger_event(power_off_led_trigger, LED_FULL);
 
+        for (state = 0;;) {
                 diff = COBALT_KEY_PORT ^ last;
                 last ^= diff;
 
                 if((diff & (COBALT_KEY_ENTER | COBALT_KEY_SELECT)) && !(~last & (COBALT_KEY_ENTER | COBALT_KEY_SELECT)))
-                        COBALT_LED_PORT = COBALT_LED_RESET;
+                        writeb(RESET, RESET_PORT);
 
                 for (mark = jiffies; jiffies - mark < HZ;)
                         ;
@@ -46,17 +56,8 @@ void cobalt_machine_halt(void)
 
 void cobalt_machine_restart(char *command)
 {
-        COBALT_LED_PORT = COBALT_LED_RESET;
+        writeb(RESET, RESET_PORT);
 
         /* we should never get here */
         cobalt_machine_halt();
 }
-
-/*
- * This triggers the luser mode device driver for the power switch ;-)
- */
-void cobalt_machine_power_off(void)
-{
-        printk("You can switch the machine off now.\n");
-        cobalt_machine_halt();
-}
diff --git a/arch/mips/cobalt/rtc.c b/arch/mips/cobalt/rtc.c
index 284daefc5c55..e70794b8bcba 100644
--- a/arch/mips/cobalt/rtc.c
+++ b/arch/mips/cobalt/rtc.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
+#include <linux/mc146818rtc.h>
 #include <linux/platform_device.h>
 
 static struct resource cobalt_rtc_resource[] __initdata = {
@@ -29,8 +30,8 @@ static struct resource cobalt_rtc_resource[] __initdata = {
                 .flags  = IORESOURCE_IO,
         },
         {
-                .start  = 8,
-                .end    = 8,
+                .start  = RTC_IRQ,
+                .end    = RTC_IRQ,
                 .flags  = IORESOURCE_IRQ,
         },
 };
diff --git a/arch/mips/cobalt/serial.c b/arch/mips/cobalt/serial.c
index 08e739704cc9..53b8d0d6da90 100644
--- a/arch/mips/cobalt/serial.c
+++ b/arch/mips/cobalt/serial.c
@@ -24,6 +24,7 @@
 #include <linux/serial_8250.h>
 
 #include <cobalt.h>
+#include <irq.h>
 
 static struct resource cobalt_uart_resource[] __initdata = {
         {
@@ -32,15 +33,15 @@ static struct resource cobalt_uart_resource[] __initdata = {
                 .flags  = IORESOURCE_MEM,
         },
         {
-                .start  = COBALT_SERIAL_IRQ,
-                .end    = COBALT_SERIAL_IRQ,
+                .start  = SERIAL_IRQ,
+                .end    = SERIAL_IRQ,
                 .flags  = IORESOURCE_IRQ,
         },
 };
 
 static struct plat_serial8250_port cobalt_serial8250_port[] = {
         {
-                .irq            = COBALT_SERIAL_IRQ,
+                .irq            = SERIAL_IRQ,
                 .uartclk        = 18432000,
                 .iotype         = UPIO_MEM,
                 .flags          = UPF_IOREMAP | UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c
index 7abe45e78425..d11bb1bc7b6b 100644
--- a/arch/mips/cobalt/setup.c
+++ b/arch/mips/cobalt/setup.c
@@ -15,15 +15,16 @@
 
 #include <asm/bootinfo.h>
 #include <asm/time.h>
+#include <asm/i8253.h>
 #include <asm/io.h>
 #include <asm/reboot.h>
 #include <asm/gt64120.h>
 
 #include <cobalt.h>
+#include <irq.h>
 
 extern void cobalt_machine_restart(char *command);
 extern void cobalt_machine_halt(void);
-extern void cobalt_machine_power_off(void);
 
 const char *get_system_type(void)
 {
@@ -45,14 +46,10 @@ void __init plat_timer_setup(struct irqaction *irq)
         /* Load timer value for HZ (TCLK is 50MHz) */
         GT_WRITE(GT_TC0_OFS, 50*1000*1000 / HZ);
 
-        /* Enable timer */
+        /* Enable timer0 */
         GT_WRITE(GT_TC_CONTROL_OFS, GT_TC_CONTROL_ENTC0_MSK | GT_TC_CONTROL_SELTC0_MSK);
 
-        /* Register interrupt */
-        setup_irq(COBALT_GALILEO_IRQ, irq);
-
-        /* Enable interrupt */
-        GT_WRITE(GT_INTRMASK_OFS, GT_INTR_T0EXP_MSK | GT_READ(GT_INTRMASK_OFS));
+        setup_irq(GT641XX_TIMER0_IRQ, irq);
 }
 
 /*
@@ -87,13 +84,18 @@ static struct resource cobalt_reserved_resources[] = {
         },
 };
 
+void __init plat_time_init(void)
+{
+        setup_pit_timer();
+}
+
 void __init plat_mem_setup(void)
 {
         int i;
 
         _machine_restart = cobalt_machine_restart;
         _machine_halt = cobalt_machine_halt;
-        pm_power_off = cobalt_machine_power_off;
+        pm_power_off = cobalt_machine_halt;
 
         set_io_port_base(CKSEG1ADDR(GT_DEF_PCI0_IO_BASE));
 
@@ -117,8 +119,6 @@ void __init prom_init(void)
         unsigned long memsz;
         char **argv;
 
-        mips_machgroup = MACH_GROUP_COBALT;
-
         memsz = fw_arg0 & 0x7fff0000;
         narg = fw_arg0 & 0x0000ffff;