[MIPS] Cobalt: Move UART base definition to arch/mips/cobalt/console.c

They're only used in arch/mips/cobalt/console.c.

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/cobalt/console.c b/arch/mips/cobalt/console.c
index 0485d51f72165169190bd1895526581fd4eb35c5..db330e811025d36cf9a33a1b2a2c6d169d1a9e23 100644 (file)
--- a/arch/mips/cobalt/console.c
+++ b/arch/mips/cobalt/console.c
@@ -1,16 +1,15 @@
 /*
  * (C) P. Horton 2006
  */
+#include <linux/io.h>
 #include <linux/serial_reg.h>
 
-#include <asm/addrspace.h>
-
-#include <cobalt.h>
+#define UART_BASE      ((void __iomem *)CKSEG1ADDR(0x1c800000))
 
 void prom_putchar(char c)
 {
-       while(!(COBALT_UART[UART_LSR] & UART_LSR_THRE))
+       while (!(readb(UART_BASE + UART_LSR) & UART_LSR_THRE))
                ;
 
-       COBALT_UART[UART_TX] = c;
+       writeb(c, UART_BASE + UART_TX);
 }

diff --git a/include/asm-mips/mach-cobalt/cobalt.h b/include/asm-mips/mach-cobalt/cobalt.h
index f27fcef3e3ff4648763300c8c084221ba4e335c9..4cb5844d42df9595e4c369a8b6918afd6ed7db0f 100644 (file)
--- a/include/asm-mips/mach-cobalt/cobalt.h
+++ b/include/asm-mips/mach-cobalt/cobalt.h
@@ -39,6 +39,4 @@ extern int cobalt_board_id;
 # define COBALT_KEY_SELECT     (1 << 7)
 # define COBALT_KEY_MASK       0xfe
 
-#define COBALT_UART            ((volatile unsigned char *) CKSEG1ADDR(0x1c800000))
-
 #endif /* __ASM_COBALT_H */