diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-02-15 12:26:07 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-02-15 12:26:07 -0500 |
| commit | be26a3df0b80307bf8f73cea535c112210151bb9 (patch) | |
| tree | 8e3d90563b6d689ad37500929c05c211153295be /arch/arm/plat-mxc | |
| parent | 918cae14872c56446415299fc17cf98704c9a537 (diff) | |
| parent | 61b603b4ee0c70708539e2fa5c3d47f17b7c7849 (diff) | |
Merge branch 'debug-ll' into omap-for-linus
Diffstat (limited to 'arch/arm/plat-mxc')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/debug-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/include/mach/debug-macro.S b/arch/arm/plat-mxc/include/mach/debug-macro.S index 15b2b148a105..5a6ae1b9e1e8 100644 --- a/arch/arm/plat-mxc/include/mach/debug-macro.S +++ b/arch/arm/plat-mxc/include/mach/debug-macro.S | |||
| @@ -52,7 +52,7 @@ | |||
| 52 | #define UART_PADDR MXC91231_UART2_BASE_ADDR | 52 | #define UART_PADDR MXC91231_UART2_BASE_ADDR |
| 53 | #define UART_VADDR MXC91231_AIPS1_IO_ADDRESS(MXC91231_UART2_BASE_ADDR) | 53 | #define UART_VADDR MXC91231_AIPS1_IO_ADDRESS(MXC91231_UART2_BASE_ADDR) |
| 54 | #endif | 54 | #endif |
| 55 | .macro addruart,rx | 55 | .macro addruart, rx, tmp |
| 56 | mrc p15, 0, \rx, c1, c0 | 56 | mrc p15, 0, \rx, c1, c0 |
| 57 | tst \rx, #1 @ MMU enabled? | 57 | tst \rx, #1 @ MMU enabled? |
| 58 | ldreq \rx, =UART_PADDR @ physical | 58 | ldreq \rx, =UART_PADDR @ physical |