diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-08-11 03:27:12 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-08-11 03:27:12 -0400 |
| commit | f9baa031dd6bedc6d4b39e254e3b76cd2c37769b (patch) | |
| tree | 216e51a0dc73b76f8e7be6648ecf4ee7dbbceec1 /arch/arm/mach-omap1/include/mach/debug-macro.S | |
| parent | 21ee0ab5fa80eb7307079e1a126f642fe7a937a6 (diff) | |
| parent | d21872b3683ff37f73c68993749a6e6aeeaed265 (diff) | |
Merge commit 'd21872b'linaro_merge_100811
Diffstat (limited to 'arch/arm/mach-omap1/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/mach-omap1/include/mach/debug-macro.S | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/include/mach/debug-macro.S b/arch/arm/mach-omap1/include/mach/debug-macro.S index e8a8cf36b7f..671408eb4ab 100644 --- a/arch/arm/mach-omap1/include/mach/debug-macro.S +++ b/arch/arm/mach-omap1/include/mach/debug-macro.S @@ -33,7 +33,7 @@ omap_uart_virt: .word 0x0 /* Use omap_uart_phys/virt if already configured */ 9: mrc p15, 0, \rx, c1, c0 tst \rx, #1 @ MMU enabled? - ldreq \rx, =omap_uart_phys @ physical base address + ldreq \rx, =__virt_to_phys(omap_uart_phys) @ physical base address ldrne \rx, =omap_uart_virt @ virtual base ldr \rx, [\rx, #0] cmp \rx, #0 @ is port configured? @@ -68,11 +68,15 @@ omap_uart_virt: .word 0x0 /* Store both phys and virt address for the uart */ 98: add \rx, \rx, #0xff000000 @ phys base - ldr \tmp, =omap_uart_phys + mrc p15, 0, \tmp, c1, c0 + tst \tmp, #1 @ MMU enabled? + ldreq \tmp, =__virt_to_phys(omap_uart_phys) + ldrne \tmp, =omap_uart_phys str \rx, [\tmp, #0] sub \rx, \rx, #0xff000000 @ phys base add \rx, \rx, #0xfe000000 @ virt base - ldr \tmp, =omap_uart_virt + ldreq \tmp, =__virt_to_phys(omap_uart_virt) + ldrne \tmp, =omap_uart_virt str \rx, [\tmp, #0] b 9b 99: |