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
mmc: sdhi, mmcif: zboot: Correct clock disable logic
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c24a0
/
include
/
mach
/
debug-macro.S
diff --git
a/arch/arm/mach-s3c24a0/include/mach/debug-macro.S
b/arch/arm/mach-s3c24a0/include/mach/debug-macro.S
index
239476b
..
0c5a738
100644
(file)
--- a/
arch/arm/mach-s3c24a0/include/mach/debug-macro.S
+++ b/
arch/arm/mach-s3c24a0/include/mach/debug-macro.S
@@
-10,13
+10,12
@@
#include <mach/map.h>
#include <plat/regs-serial.h>
#include <mach/map.h>
#include <plat/regs-serial.h>
- .macro addruart, rx, tmp
- mrc p15, 0, \rx, c1, c0
- tst \rx, #1
- ldreq \rx, = S3C24XX_PA_UART
- ldrne \rx, = S3C24XX_VA_UART
+ .macro addruart, rp, rv
+ ldr \rp, = S3C24XX_PA_UART
+ ldr \rv, = S3C24XX_VA_UART
#if CONFIG_DEBUG_S3C_UART != 0
#if CONFIG_DEBUG_S3C_UART != 0
- add \rx, \rx, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C_UART)
+ add \rp, \rp, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C_UART)
+ add \rv, \rv, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C_UART)
#endif
.endm
#endif
.endm