vserver 1.9.5.x5

[linux-2.6.git] / arch / mips / sgi-ip32 / ip32-setup.c

diff --git a/arch/mips/sgi-ip32/ip32-setup.c b/arch/mips/sgi-ip32/ip32-setup.c
index 51cad2d..8d270be 100644 (file)
--- a/arch/mips/sgi-ip32/ip32-setup.c
+++ b/arch/mips/sgi-ip32/ip32-setup.c
@@ -6,7 +6,7 @@
  * for more details.
  *
  * Copyright (C) 2000 Harald Koerfgen
- * Copyright (C) 2002, 03 Ilya A. Volynets
+ * Copyright (C) 2002, 2003, 2005 Ilya A. Volynets
  */
 #include <linux/config.h>
 #include <linux/console.h>
@@ -80,8 +80,8 @@ void __init ip32_time_init(void)
 {
        printk(KERN_INFO "Calibrating system timer... ");
        write_c0_count(0);
-       crime_write(0, CRIME_TIMER);
-       while (crime_read(CRIME_TIMER) < CRIME_MASTER_FREQ * WAIT_MS / 1000) ;
+       crime->timer = 0;
+       while (crime->timer < CRIME_MASTER_FREQ * WAIT_MS / 1000) ;
        mips_hpt_frequency = read_c0_count() * 1000 / WAIT_MS;
        printk("%d MHz CPU detected\n", mips_hpt_frequency * 2 / 1000000);
 }
@@ -94,10 +94,6 @@ void __init ip32_timer_setup(struct irqaction *irq)
 
 static int __init ip32_setup(void)
 {
-       set_io_port_base((unsigned long) ioremap(MACEPCI_LOW_IO, 0x2000000));
-
-       crime_init();
-
        board_be_init = ip32_be_init;
 
        rtc_get_time = mc146818_get_cmos_time;
@@ -114,7 +110,7 @@ static int __init ip32_setup(void)
                o2_serial[0].type       = PORT_16550A;
                o2_serial[0].line       = 0;
                o2_serial[0].irq        = MACEISA_SERIAL1_IRQ;
-               o2_serial[0].flags      = STD_COM_FLAGS | UPF_RESOURCES;
+               o2_serial[0].flags      = STD_COM_FLAGS;
                o2_serial[0].uartclk    = BASE_BAUD * 16;
                o2_serial[0].iotype     = UPIO_MEM;
                o2_serial[0].membase    = (char *)&mace->isa.serial1;
@@ -125,7 +121,7 @@ static int __init ip32_setup(void)
                o2_serial[1].type       = PORT_16550A;
                o2_serial[1].line       = 1;
                o2_serial[1].irq        = MACEISA_SERIAL2_IRQ;
-               o2_serial[1].flags      = STD_COM_FLAGS | UPF_RESOURCES;
+               o2_serial[1].flags      = STD_COM_FLAGS;
                o2_serial[1].uartclk    = BASE_BAUD * 16;
                o2_serial[1].iotype     = UPIO_MEM;
                o2_serial[1].membase    = (char *)&mace->isa.serial2;