diff options
Diffstat (limited to 'arch/arm/mach-s5pc100/include/mach/debug-macro.S')
-rw-r--r-- | arch/arm/mach-s5pc100/include/mach/debug-macro.S | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/mach-s5pc100/include/mach/debug-macro.S b/arch/arm/mach-s5pc100/include/mach/debug-macro.S index 70e02e91ee3c..b2ba95ddf8e0 100644 --- a/arch/arm/mach-s5pc100/include/mach/debug-macro.S +++ b/arch/arm/mach-s5pc100/include/mach/debug-macro.S | |||
@@ -22,13 +22,12 @@ | |||
22 | * aligned and add in the offset when we load the value here. | 22 | * aligned and add in the offset when we load the value here. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | .macro addruart, rx, rtmp | 25 | .macro addruart, rp, rv |
26 | mrc p15, 0, \rx, c1, c0 | 26 | ldr \rp, = S3C_PA_UART |
27 | tst \rx, #1 | 27 | ldr \rv, = S3C_VA_UART |
28 | ldreq \rx, = S3C_PA_UART | ||
29 | ldrne \rx, = S3C_VA_UART | ||
30 | #if CONFIG_DEBUG_S3C_UART != 0 | 28 | #if CONFIG_DEBUG_S3C_UART != 0 |
31 | add \rx, \rx, #(0x400 * CONFIG_DEBUG_S3C_UART) | 29 | add \rp, \rp, #(0x400 * CONFIG_DEBUG_S3C_UART) |
30 | add \rv, \rv, #(0x400 * CONFIG_DEBUG_S3C_UART) | ||
32 | #endif | 31 | #endif |
33 | .endm | 32 | .endm |
34 | 33 | ||