[ARM] 3635/1: S3C24XX: Add S3C2412 core cpu support

[mv-sheeva.git] / include / asm-arm / arch-s3c2410 / debug-macro.S

diff --git a/include/asm-arm/arch-s3c2410/debug-macro.S b/include/asm-arm/arch-s3c2410/debug-macro.S
index 5f8223e700d353f22a75c94c3e173f14ad609b78..b7d15d125458ad3fff6bd79e62df67821d9ac761 100644 (file)
--- a/include/asm-arm/arch-s3c2410/debug-macro.S
+++ b/include/asm-arm/arch-s3c2410/debug-macro.S
@@ -33,7 +33,7 @@
                .endm
 
                .macro  senduart,rd,rx
-               str     \rd, [\rx, # S3C2410_UTXH ]
+               strb    \rd, [\rx, # S3C2410_UTXH ]
                .endm
 
                .macro  busyuart, rd, rx
@@ -42,6 +42,12 @@
                beq     1001f                           @
                @ FIFO enabled...
 1003:
+               @ check for arm920 vs arm926. currently assume all arm926
+               @ devices have an 64 byte FIFO identical to the s3c2440
+               mrc     p15, 0, \rd, c0, c0
+               and     \rd, \rd, #0xff0
+               teq     \rd, #0x260
+               beq     1004f
                mrc     p15, 0, \rd, c1, c0
                tst     \rd, #1
                addeq   \rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART)
@@ -50,7 +56,7 @@
                ldr     \rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ]
                and     \rd, \rd, #0x00ff0000
                teq     \rd, #0x00440000                @ is it 2440?
-
+1004:
                ldr     \rd, [ \rx, # S3C2410_UFSTAT ]
                moveq   \rd, \rd, lsr #SHIFT_2440TXF
                tst     \rd, #S3C2410_UFSTAT_TXFULL