diff options
Diffstat (limited to 'arch/arm/mach-ux500/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/debug-macro.S | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-ux500/include/mach/debug-macro.S b/arch/arm/mach-ux500/include/mach/debug-macro.S index c5203b7ea55..be7c0f14e31 100644 --- a/arch/arm/mach-ux500/include/mach/debug-macro.S +++ b/arch/arm/mach-ux500/include/mach/debug-macro.S | |||
| @@ -18,11 +18,9 @@ | |||
| 18 | #define UX500_UART(n) __UX500_UART(n) | 18 | #define UX500_UART(n) __UX500_UART(n) |
| 19 | #define UART_BASE UX500_UART(CONFIG_UX500_DEBUG_UART) | 19 | #define UART_BASE UX500_UART(CONFIG_UX500_DEBUG_UART) |
| 20 | 20 | ||
| 21 | .macro addruart, rx, tmp | 21 | .macro addruart, rp, rv |
| 22 | mrc p15, 0, \rx, c1, c0 | 22 | ldr \rp, =UART_BASE @ no, physical address |
| 23 | tst \rx, #1 @ MMU enabled? | 23 | ldr \rv, =IO_ADDRESS(UART_BASE) @ yes, virtual address |
| 24 | ldreq \rx, =UART_BASE @ no, physical address | ||
| 25 | ldrne \rx, =IO_ADDRESS(UART_BASE) @ yes, virtual address | ||
| 26 | .endm | 24 | .endm |
| 27 | 25 | ||
| 28 | #include <asm/hardware/debug-pl01x.S> | 26 | #include <asm/hardware/debug-pl01x.S> |