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-omap1/include | |
| parent | 639da5ee374ba8f070690bbd355ca30139ce145a (diff) | |
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-omap1/include')
| -rw-r--r-- | arch/arm/mach-omap1/include/mach/debug-macro.S | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-omap1/include/mach/debug-macro.S b/arch/arm/mach-omap1/include/mach/debug-macro.S index f944ae8abc9..6a171181986 100644 --- a/arch/arm/mach-omap1/include/mach/debug-macro.S +++ b/arch/arm/mach-omap1/include/mach/debug-macro.S | |||
| @@ -46,11 +46,9 @@ omap_uart_virt: .word 0x0 | |||
| 46 | bne 99f @ already configured | 46 | bne 99f @ already configured |
| 47 | 47 | ||
| 48 | /* Check the debug UART configuration set in uncompress.h */ | 48 | /* Check the debug UART configuration set in uncompress.h */ |
| 49 | mrc p15, 0, \rp, c1, c0 | 49 | and \rp, pc, #0xff000000 |
| 50 | tst \rp, #1 @ MMU enabled? | 50 | ldr \rv, =OMAP_UART_INFO_OFS |
| 51 | ldreq \rp, =OMAP_UART_INFO @ MMU not enabled | 51 | ldr \rp, [\rp, \rv] |
| 52 | ldrne \rp, =omap_uart_p2v(OMAP_UART_INFO) @ MMU enabled | ||
| 53 | ldr \rp, [\rp, #0] | ||
| 54 | 52 | ||
| 55 | /* Select the UART to use based on the UART1 scratchpad value */ | 53 | /* Select the UART to use based on the UART1 scratchpad value */ |
| 56 | 10: cmp \rp, #0 @ no port configured? | 54 | 10: cmp \rp, #0 @ no port configured? |