diff options
Diffstat (limited to 'include/asm-arm/arch-s3c2410/debug-macro.S')
| -rw-r--r-- | include/asm-arm/arch-s3c2410/debug-macro.S | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/asm-arm/arch-s3c2410/debug-macro.S b/include/asm-arm/arch-s3c2410/debug-macro.S index 5f8223e700d3..b7d15d125458 100644 --- a/include/asm-arm/arch-s3c2410/debug-macro.S +++ b/include/asm-arm/arch-s3c2410/debug-macro.S | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | .endm | 33 | .endm |
| 34 | 34 | ||
| 35 | .macro senduart,rd,rx | 35 | .macro senduart,rd,rx |
| 36 | str \rd, [\rx, # S3C2410_UTXH ] | 36 | strb \rd, [\rx, # S3C2410_UTXH ] |
| 37 | .endm | 37 | .endm |
| 38 | 38 | ||
| 39 | .macro busyuart, rd, rx | 39 | .macro busyuart, rd, rx |
| @@ -42,6 +42,12 @@ | |||
| 42 | beq 1001f @ | 42 | beq 1001f @ |
| 43 | @ FIFO enabled... | 43 | @ FIFO enabled... |
| 44 | 1003: | 44 | 1003: |
| 45 | @ check for arm920 vs arm926. currently assume all arm926 | ||
| 46 | @ devices have an 64 byte FIFO identical to the s3c2440 | ||
| 47 | mrc p15, 0, \rd, c0, c0 | ||
| 48 | and \rd, \rd, #0xff0 | ||
| 49 | teq \rd, #0x260 | ||
| 50 | beq 1004f | ||
| 45 | mrc p15, 0, \rd, c1, c0 | 51 | mrc p15, 0, \rd, c1, c0 |
| 46 | tst \rd, #1 | 52 | tst \rd, #1 |
| 47 | addeq \rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART) | 53 | addeq \rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART) |
| @@ -50,7 +56,7 @@ | |||
| 50 | ldr \rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ] | 56 | ldr \rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ] |
| 51 | and \rd, \rd, #0x00ff0000 | 57 | and \rd, \rd, #0x00ff0000 |
| 52 | teq \rd, #0x00440000 @ is it 2440? | 58 | teq \rd, #0x00440000 @ is it 2440? |
| 53 | 59 | 1004: | |
| 54 | ldr \rd, [ \rx, # S3C2410_UFSTAT ] | 60 | ldr \rd, [ \rx, # S3C2410_UFSTAT ] |
| 55 | moveq \rd, \rd, lsr #SHIFT_2440TXF | 61 | moveq \rd, \rd, lsr #SHIFT_2440TXF |
| 56 | tst \rd, #S3C2410_UFSTAT_TXFULL | 62 | tst \rd, #S3C2410_UFSTAT_TXFULL |