X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=arch%2Fmips%2Fcobalt%2Fconsole.c;h=db330e811025d36cf9a33a1b2a2c6d169d1a9e23;hb=5cdddecc8b423308798453484149297a503e9cc0;hp=46c23b66bc171883d2d9ae2e58dc8d750ffd7bab;hpb=71bc7bf045262e82c645cad48fd56dd17e75344e;p=linux-2.6-omap-h63xx.git diff --git a/arch/mips/cobalt/console.c b/arch/mips/cobalt/console.c index 46c23b66bc1..db330e81102 100644 --- a/arch/mips/cobalt/console.c +++ b/arch/mips/cobalt/console.c @@ -1,47 +1,15 @@ /* * (C) P. Horton 2006 */ - -#include -#include -#include +#include #include -#include -#include - -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); }