projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'origin' into devel-stable
[firefly-linux-kernel-4.4.55.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 133d66bfb533c83559a5452985b2ecdea760bc74..0b6e11eaeb8ca0b2d64c847810a44fbc96355909 100644
(file)
--- a/
arch/arm/plat-mxc/include/mach/debug-macro.S
+++ b/
arch/arm/plat-mxc/include/mach/debug-macro.S
@@
-62,7
+62,7
@@
#define UART_PADDR MXC91231_UART2_BASE_ADDR
#define UART_VADDR MXC91231_IO_ADDRESS(MXC91231_UART2_BASE_ADDR)
#endif
- .macro addruart,
rx
+ .macro addruart,
rx, tmp
mrc p15, 0, \rx, c1, c0
tst \rx, #1 @ MMU enabled?
ldreq \rx, =UART_PADDR @ physical