Pull cpuidle into release branch

[pandora-kernel.git] / arch / mips / cobalt / console.c

diff --git a/arch/mips/cobalt/console.c b/arch/mips/cobalt/console.c
index 46c23b6..db330e8 100644 (file)
--- a/arch/mips/cobalt/console.c
+++ b/arch/mips/cobalt/console.c
@@ -1,47 +1,15 @@
 /*
  * (C) P. Horton 2006
  */
-
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/console.h>
+#include <linux/io.h>
 #include <linux/serial_reg.h>
-#include <asm/addrspace.h>
-#include <asm/mach-cobalt/cobalt.h>
-
-static void putchar(int c)
-{
-       if(c == '\n')
-               putchar('\r');
-
-       while(!(COBALT_UART[UART_LSR] & UART_LSR_THRE))
-               ;
 
-       COBALT_UART[UART_TX] = c;
-}
+#define UART_BASE      ((void __iomem *)CKSEG1ADDR(0x1c800000))
 
-static void cons_write(struct console *c, const char *s, unsigned n)
+void prom_putchar(char c)
 {
-       while(n-- && *s)
-               putchar(*s++);
-}
-
-static struct console cons_info =
-{
-       .name   = "uart",
-       .write  = cons_write,
-       .flags  = CON_PRINTBUFFER | CON_BOOT,
-       .index  = -1,
-};
-
-void __init cobalt_early_console(void)
-{
-       register_console(&cons_info);
-
-       printk("Cobalt: early console registered\n");
-}
+       while (!(readb(UART_BASE + UART_LSR) & UART_LSR_THRE))
+               ;
 
-void __init disable_early_printk(void)
-{
-       unregister_console(&cons_info);
+       writeb(c, UART_BASE + UART_TX);
 }