git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
[pandora-kernel.git]
/
arch
/
arm
/
plat-mxc
/
include
/
mach
/
debug-macro.S
diff --git
a/arch/arm/plat-mxc/include/mach/debug-macro.S
b/arch/arm/plat-mxc/include/mach/debug-macro.S
index
2560640
..
d56213f
100644
(file)
--- a/
arch/arm/plat-mxc/include/mach/debug-macro.S
+++ b/
arch/arm/plat-mxc/include/mach/debug-macro.S
@@
-62,11
+62,9
@@
#define UART_PADDR MXC91231_UART2_BASE_ADDR
#define UART_VADDR MXC91231_IO_ADDRESS(MXC91231_UART2_BASE_ADDR)
#endif
#define UART_PADDR MXC91231_UART2_BASE_ADDR
#define UART_VADDR MXC91231_IO_ADDRESS(MXC91231_UART2_BASE_ADDR)
#endif
- .macro addruart, rx, tmp
- mrc p15, 0, \rx, c1, c0
- tst \rx, #1 @ MMU enabled?
- ldreq \rx, =UART_PADDR @ physical
- ldrne \rx, =UART_VADDR @ virtual
+ .macro addruart, rp, rv
+ ldr \rp, =UART_PADDR @ physical
+ ldr \rv, =UART_VADDR @ virtual
.endm
.macro senduart,rd,rx
.endm
.macro senduart,rd,rx