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