diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-08-31 13:57:37 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2011-09-26 10:11:25 -0400 |
| commit | dd185456efce7f326c058fc12fd0df17bd8466eb (patch) | |
| tree | 78abc6ff08a905c25eda49b7f67e6790c6257f7c /arch/arm/mach-omap2 | |
| parent | 639da5ee374ba8f070690bbd355ca30139ce145a (diff) | |
| download | linux-3.10-dd185456efce7f326c058fc12fd0df17bd8466eb.tar.gz linux-3.10-dd185456efce7f326c058fc12fd0df17bd8466eb.tar.bz2 linux-3.10-dd185456efce7f326c058fc12fd0df17bd8466eb.zip | |
ARM: plat-omap: make OMAP_UART_INFO into a relative offset
This is the first step to remove PLAT_PHYS_OFFSET usage from the debug
UART code.
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Tested-by: Tony Lindgren <tony@atomide.com>
Reviewed-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/include/mach/debug-macro.S | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/include/mach/debug-macro.S b/arch/arm/mach-omap2/include/mach/debug-macro.S index fbd23ec81a2..745e2ff3e90 100644 --- a/arch/arm/mach-omap2/include/mach/debug-macro.S +++ b/arch/arm/mach-omap2/include/mach/debug-macro.S @@ -49,11 +49,10 @@ omap_uart_lsr: .word 0 bne 99f @ already configured /* Check the debug UART configuration set in uncompress.h */ - mrc p15, 0, \rp, c1, c0 - tst \rp, #1 @ MMU enabled? - ldreq \rp, =OMAP_UART_INFO @ MMU not enabled - ldrne \rp, =omap_uart_p2v(OMAP_UART_INFO) @ MMU enabled - ldr \rp, [\rp, #0] + mov \rp, pc + ldr \rv, =OMAP_UART_INFO_OFS + and \rp, \rp, #0xff000000 + ldr \rp, [\rp, \rv] /* Select the UART to use based on the UART1 scratchpad value */ cmp \rp, #0 @ no port configured? |