git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.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
9306486
..
5f8223e
100644
(file)
--- a/
include/asm-arm/arch-s3c2410/debug-macro.S
+++ b/
include/asm-arm/arch-s3c2410/debug-macro.S
@@
-10,6
+10,9
@@
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
+ *
+ * Modifications:
+ * 10-Mar-2005 LCVR Changed S3C2410_VA to S3C24XX_VA
*/
#include <asm/arch/map.h>
*/
#include <asm/arch/map.h>
@@
-30,7
+33,7
@@
.endm
.macro senduart,rd,rx
.endm
.macro senduart,rd,rx
- str
b
\rd, [\rx, # S3C2410_UTXH ]
+ str
\rd, [\rx, # S3C2410_UTXH ]
.endm
.macro busyuart, rd, rx
.endm
.macro busyuart, rd, rx
@@
-39,12
+42,6
@@
beq 1001f @
@ FIFO enabled...
1003:
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)
mrc p15, 0, \rd, c1, c0
tst \rd, #1
addeq \rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART)
@@
-53,7
+50,7
@@
ldr \rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ]
and \rd, \rd, #0x00ff0000
teq \rd, #0x00440000 @ is it 2440?
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
ldr \rd, [ \rx, # S3C2410_UFSTAT ]
moveq \rd, \rd, lsr #SHIFT_2440TXF
tst \rd, #S3C2410_UFSTAT_TXFULL