Move Cobalt UART base address definition to arch/mips/cobalt/console.c.
It's only used in arch/mips/cobalt/console.c.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@xxxxxxxxxxxxxx>
diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/console.c mips/arch/mips/cobalt/console.c
--- mips-orig/arch/mips/cobalt/console.c 2007-08-24 11:14:29.808868500 +0900
+++ mips/arch/mips/cobalt/console.c 2007-08-24 11:18:24.867558750 +0900
@@ -4,13 +4,14 @@
#include <linux/serial_reg.h>
#include <asm/addrspace.h>
+#include <asm/io.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 -pruN -X mips/Documentation/dontdiff mips-orig/include/asm-mips/mach-cobalt/cobalt.h mips/include/asm-mips/mach-cobalt/cobalt.h
--- mips-orig/include/asm-mips/mach-cobalt/cobalt.h 2007-08-24 11:19:03.585978500 +0900
+++ mips/include/asm-mips/mach-cobalt/cobalt.h 2007-08-24 11:18:24.891560250 +0900
@@ -29,6 +29,4 @@ extern int cobalt_board_id;
# define COBALT_LED_POWER_OFF (1 << 3) /* RaQ */
# define COBALT_LED_RESET 0x0f
-#define COBALT_UART ((volatile unsigned char *) CKSEG1ADDR(0x1c800000))
-
#endif /* __ASM_COBALT_H */
