linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / mips / sgi-ip27 / ip27-console.c

diff --git a/arch/mips/sgi-ip27/ip27-console.c b/arch/mips/sgi-ip27/ip27-console.c
index 14211e3..3e1ac29 100644 (file)
--- a/arch/mips/sgi-ip27/ip27-console.c
+++ b/arch/mips/sgi-ip27/ip27-console.c
@@ -46,29 +46,33 @@ void prom_putchar(char c)
        uart->iu_thr = c;
 }
 
-static void ioc3_console_write(struct console *con, const char *s, unsigned n)
+char __init prom_getchar(void)
 {
-       while (n-- && *s) {
-               if (*s == '\n')
-                       prom_putchar('\r');
-               prom_putchar(*s);
-               s++;
-       }
+       return 0;
 }
 
-static struct console ioc3_console = {
-       .name   = "ioc3",
-       .write  = ioc3_console_write,
-       .flags  = CON_PRINTBUFFER | CON_BOOT,
-       .index  = -1
-};
-
-__init void ip27_setup_console(void)
+static void inline ioc3_console_probe(void)
 {
-       register_console(&ioc3_console);
+       struct uart_port up;
+
+       /*
+        * Register to interrupt zero because we share the interrupt with
+        * the serial driver which we don't properly support yet.
+        */
+       memset(&up, 0, sizeof(up));
+       up.membase      = (unsigned char *) console_uart();
+       up.irq          = 0;
+       up.uartclk      = IOC3_CLK;
+       up.regshift     = 0;
+       up.iotype       = UPIO_MEM;
+       up.flags        = IOC3_FLAGS;
+       up.line         = 0;
+
+       if (early_serial_setup(&up))
+               printk(KERN_ERR "Early serial init of port 0 failed\n");
 }
 
-void __init disable_early_printk(void)
+__init void ip27_setup_console(void)
 {
-       unregister_console(&ioc3_console);
+       ioc3_console_probe();
 }