summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/plat-s3c
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2007-07-22 16:10:23 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-07-22 16:44:29 +0100
commitcbc4dbffc89fbaada94ae7873ad6631a701fd00e (patch)
treeeb3bf936404858651972b01fb11430dd6c7525e3 /include/asm-arm/plat-s3c
parentb2627588cbeb70364357048854affd52bf02fe64 (diff)
downloadop-kernel-dev-cbc4dbffc89fbaada94ae7873ad6631a701fd00e.zip
op-kernel-dev-cbc4dbffc89fbaada94ae7873ad6631a701fd00e.tar.gz
[ARM] 4512/1: S3C: rename the debug macros for per-cpu updates
Update the debug macros for use with the new per-cpu configuration and usage. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/plat-s3c')
-rw-r--r--include/asm-arm/plat-s3c/debug-macro.S22
1 files changed, 20 insertions, 2 deletions
diff --git a/include/asm-arm/plat-s3c/debug-macro.S b/include/asm-arm/plat-s3c/debug-macro.S
index a43bbfa..84c40b8 100644
--- a/include/asm-arm/plat-s3c/debug-macro.S
+++ b/include/asm-arm/plat-s3c/debug-macro.S
@@ -11,7 +11,26 @@
#include <asm/plat-s3c/regs-serial.h>
-#define S3C2410_UART1_OFF (0x4000)
+/* The S3C2440 implementations are used by default as they are the
+ * most widely re-used */
+
+ .macro fifo_level_s3c2440 rd, rx
+ ldr \rd, [ \rx, # S3C2410_UFSTAT ]
+ and \rd, \rd, #S3C2440_UFSTAT_TXMASK
+ .endm
+
+#ifndef fifo_level
+#define fifo_level fifo_level_s3c2410
+#endif
+
+ .macro fifo_full_s3c2440 rd, rx
+ ldr \rd, [ \rx, # S3C2410_UFSTAT ]
+ tst \rd, #S3C2440_UFSTAT_TXFULL
+ .endm
+
+#ifndef fifo_full
+#define fifo_full fifo_full_s3c2440
+#endif
.macro senduart,rd,rx
strb \rd, [\rx, # S3C2410_UTXH ]
@@ -37,7 +56,6 @@
.endm
.macro waituart,rd,rx
-
ldr \rd, [ \rx, # S3C2410_UFCON ]
tst \rd, #S3C2410_UFCON_FIFOMODE @ fifo enabled?
beq 1001f @
OpenPOWER on IntegriCloud