Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw

[linux-2.6] / arch / mips / jazz / setup.c

diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c
index 5c6271ab927fc9e9e0d8738760bf32000234d6d5..cfc7dce78dab24b9060a432ad8465d22925ef4de 100644 (file)
--- a/arch/mips/jazz/setup.c
+++ b/arch/mips/jazz/setup.c
@@ -25,6 +25,7 @@
 #include <linux/serial_8250.h>
 
 #include <asm/bootinfo.h>
+#include <asm/i8253.h>
 #include <asm/irq.h>
 #include <asm/jazz.h>
 #include <asm/jazzdma.h>
@@ -39,13 +40,6 @@ extern asmlinkage void jazz_handle_int(void);
 
 extern void jazz_machine_restart(char *command);
 
-void __init plat_timer_setup(struct irqaction *irq)
-{
-       /* set the clock to 100 Hz */
-       r4030_write_reg32(JAZZ_TIMER_INTERVAL, 9);
-       setup_irq(JAZZ_TIMER_IRQ, irq);
-}
-
 static struct resource jazz_io_resources[] = {
        {
                .start  = 0x00,
@@ -70,16 +64,21 @@ static struct resource jazz_io_resources[] = {
        }
 };
 
+void __init plat_time_init(void)
+{
+       setup_pit_timer();
+}
+
 void __init plat_mem_setup(void)
 {
        int i;
 
        /* Map 0xe0000000 -> 0x0:800005C0, 0xe0010000 -> 0x1:30000580 */
-       add_wired_entry (0x02000017, 0x03c00017, 0xe0000000, PM_64K);
+       add_wired_entry(0x02000017, 0x03c00017, 0xe0000000, PM_64K);
        /* Map 0xe2000000 -> 0x0:900005C0, 0xe3010000 -> 0x0:910005C0 */
-       add_wired_entry (0x02400017, 0x02440017, 0xe2000000, PM_16M);
+       add_wired_entry(0x02400017, 0x02440017, 0xe2000000, PM_16M);
        /* Map 0xe4000000 -> 0x0:600005C0, 0xe4100000 -> 400005C0 */
-       add_wired_entry (0x01800017, 0x01000017, 0xe4000000, PM_4M);
+       add_wired_entry(0x01800017, 0x01000017, 0xe4000000, PM_4M);
 
        set_io_port_base(JAZZ_PORT_BASE);
 #ifdef CONFIG_EISA