Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5a860424a1bcf21655d993a7c09b36662e34d2a9
Commit: 5a860424a1bcf21655d993a7c09b36662e34d2a9
Parent: b4126e86301cfc6863cbc74bc4500a88b7c582df
Author: Yoichi Yuasa <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 2 23:13:17 2007 +0900
Committer: Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Thu Oct 11 23:46:14 2007 +0100
[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 <[EMAIL PROTECTED]>
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
arch/mips/cobalt/console.c | 9 ++++-----
include/asm-mips/mach-cobalt/cobalt.h | 2 --
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/arch/mips/cobalt/console.c b/arch/mips/cobalt/console.c
index 0485d51..db330e8 100644
--- 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 f27fcef..4cb5844 100644
--- 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 */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
