From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Wed, 22 Mar 2006 20:14:09 +0000 (+0000)
Subject: [ARM] 3379/1: ixp2000: use generic 8250 debug macros
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e99053e07514e514611167ad648c65c87982c4d9;p=deliverable%2Flinux.git

[ARM] 3379/1: ixp2000: use generic 8250 debug macros

Patch from Lennert Buytenhek

The xscale UART in the ixp2000 is basically just an 8250 UART (with
some extra bits and pieces), so we can use the generic 8250 debug
macros on the ixp2000.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/include/asm-arm/arch-ixp2000/debug-macro.S b/include/asm-arm/arch-ixp2000/debug-macro.S
index 5631e0889861..bc8b39654793 100644
--- a/include/asm-arm/arch-ixp2000/debug-macro.S
+++ b/include/asm-arm/arch-ixp2000/debug-macro.S
@@ -23,18 +23,5 @@
 #endif
 		.endm
 
-		.macro	senduart,rd,rx
-		strb	\rd, [\rx]
-		.endm
-
-		.macro	busyuart,rd,rx
-1002:		ldrb	\rd, [\rx, #0x14]
-		tst	\rd, #0x20
-		beq	1002b
-		.endm
-
-		.macro	waituart,rd,rx
-		nop
-		nop
-		nop
-		.endm
+#define UART_SHIFT	2
+#include <asm/hardware/debug-8250.S>