diff options
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/debug-macro.S | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/plat-mxc/include/mach/debug-macro.S b/arch/arm/plat-mxc/include/mach/debug-macro.S index 25606409aabc..d56213fb901b 100644 --- a/arch/arm/plat-mxc/include/mach/debug-macro.S +++ b/arch/arm/plat-mxc/include/mach/debug-macro.S | |||
| @@ -62,11 +62,9 @@ | |||
| 62 | #define UART_PADDR MXC91231_UART2_BASE_ADDR | 62 | #define UART_PADDR MXC91231_UART2_BASE_ADDR |
| 63 | #define UART_VADDR MXC91231_IO_ADDRESS(MXC91231_UART2_BASE_ADDR) | 63 | #define UART_VADDR MXC91231_IO_ADDRESS(MXC91231_UART2_BASE_ADDR) |
| 64 | #endif | 64 | #endif |
| 65 | .macro addruart, rx, tmp | 65 | .macro addruart, rp, rv |
| 66 | mrc p15, 0, \rx, c1, c0 | 66 | ldr \rp, =UART_PADDR @ physical |
| 67 | tst \rx, #1 @ MMU enabled? | 67 | ldr \rv, =UART_VADDR @ virtual |
| 68 | ldreq \rx, =UART_PADDR @ physical | ||
| 69 | ldrne \rx, =UART_VADDR @ virtual | ||
| 70 | .endm | 68 | .endm |
| 71 | 69 | ||
| 72 | .macro senduart,rd,rx | 70 | .macro senduart,rd,rx |