[PATCH 2/2] MIPS: malta: use common DEBUG_LL code for NS16550

Antony Pavlov antonynpavlov at gmail.com
Sat May 12 03:15:04 EDT 2012


Signed-off-by: Antony Pavlov <antonynpavlov at gmail.com>
---
 arch/mips/mach-malta/include/mach/debug_ll.h |   11 +----------
 arch/mips/mach-malta/include/mach/hardware.h |    1 +
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/arch/mips/mach-malta/include/mach/debug_ll.h b/arch/mips/mach-malta/include/mach/debug_ll.h
index ccc9d9b..9de469b 100644
--- a/arch/mips/mach-malta/include/mach/debug_ll.h
+++ b/arch/mips/mach-malta/include/mach/debug_ll.h
@@ -24,17 +24,8 @@
 #ifndef __INCLUDE_ARCH_DEBUG_LL_H__
 #define   __INCLUDE_ARCH_DEBUG_LL_H__
 
-#include <io.h>
 #include <mach/hardware.h>
 
-#define rbr		0
-#define lsr		5
-#define LSR_THRE	0x20	/* Xmit holding register empty */
-
-static __inline__ void putc(char ch)
-{
-	while (!(__raw_readb(DEBUG_LL_UART_ADDR + lsr) & LSR_THRE));
-	__raw_writeb(ch, DEBUG_LL_UART_ADDR + rbr);
-}
+#include <debug_ll_ns16550.h>
 
 #endif  /* __INCLUDE_ARCH_DEBUG_LL_H__ */
diff --git a/arch/mips/mach-malta/include/mach/hardware.h b/arch/mips/mach-malta/include/mach/hardware.h
index f827cc3..ddeb1b7 100644
--- a/arch/mips/mach-malta/include/mach/hardware.h
+++ b/arch/mips/mach-malta/include/mach/hardware.h
@@ -22,6 +22,7 @@
 #define   __INCLUDE_ARCH_HARDWARE_H__
 
 #define DEBUG_LL_UART_ADDR	0xb00003f8
+#define DEBUG_LL_UART_SHIFT	0
 
 /*
  * Reset register.
-- 
1.7.10




More information about the barebox mailing list