commented early_printk patch because of rejects.

[linux-flexiantxendom0-3.2.10.git] / arch / mips / jazz / setup.c

diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c
index 88f3c58..aadaa90 100644 (file)
--- a/arch/mips/jazz/setup.c
+++ b/arch/mips/jazz/setup.c
@@ -20,7 +20,6 @@
 #include <linux/mc146818rtc.h>
 #include <linux/ide.h>
 #include <asm/bootinfo.h>
-#include <asm/keyboard.h>
 #include <asm/irq.h>
 #include <asm/jazz.h>
 #include <asm/jazzdma.h>
@@ -28,6 +27,7 @@
 #include <asm/reboot.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
+#include <asm/traps.h>
 
 /*
  * Initial irq handlers.
@@ -72,7 +72,7 @@ static void __init jazz_irq_setup(void)
                          JAZZ_IE_FLOPPY);
        r4030_read_reg16(JAZZ_IO_IRQ_SOURCE); /* clear pending IRQs */
        r4030_read_reg32(JAZZ_R4030_INVAL_ADDR); /* clear error bits */
-       change_cp0_status(ST0_IM, IE_IRQ4 | IE_IRQ3 | IE_IRQ2 | IE_IRQ1);
+       change_c0_status(ST0_IM, IE_IRQ4 | IE_IRQ3 | IE_IRQ2 | IE_IRQ1);
        /* set the clock to 100 Hz */
        r4030_write_reg32(JAZZ_TIMER_INTERVAL, 9);
        request_region(0x20, 0x20, "pic1");
@@ -80,16 +80,24 @@ static void __init jazz_irq_setup(void)
        i8259_setup_irq(2, &irq2);
 }
 
+
 void __init jazz_setup(void)
 {
+       /* Map 0xe0000000 -> 0x0:800005C0, 0xe0010000 -> 0x1:30000580 */
        add_wired_entry (0x02000017, 0x03c00017, 0xe0000000, PM_64K);
+
+       /* Map 0xe2000000 -> 0x0:900005C0, 0xe3010000 -> 0x0:910005C0 */
        add_wired_entry (0x02400017, 0x02440017, 0xe2000000, PM_16M);
+
+       /* Map 0xe4000000 -> 0x0:600005C0, 0xe4100000 -> 400005C0 */
        add_wired_entry (0x01800017, 0x01000017, 0xe4000000, PM_4M);
 
        irq_setup = jazz_irq_setup;
-       mips_io_port_base = JAZZ_PORT_BASE;
+       set_io_port_base(JAZZ_PORT_BASE);
+#ifdef CONFIG_EISA
        if (mips_machtype == MACH_MIPS_MAGNUM_4000)
                EISA_bus = 1;
+#endif
        isa_slot_offset = 0xe3000000;
        request_region(0x00,0x20,"dma1");
        request_region(0x40,0x20,"timer");