diff options
author | Tony Lindgren <tony@atomide.com> | 2010-02-15 08:48:53 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-02-15 08:48:53 -0800 |
commit | 4f2c49fedf833e522001bc51824b894732900a3d (patch) | |
tree | 3fa99c328a2acac5752edf7c91d97c10a2b6bafa /arch/arm/mach-omap2/include/mach/debug-macro.S | |
parent | 4e6d488af37980d224cbf298224db6173673f362 (diff) | |
download | kernel_samsung_tuna-4f2c49fedf833e522001bc51824b894732900a3d.zip kernel_samsung_tuna-4f2c49fedf833e522001bc51824b894732900a3d.tar.gz kernel_samsung_tuna-4f2c49fedf833e522001bc51824b894732900a3d.tar.bz2 |
omap: Clean the serial port defines
This way we don't have conflicts with the defines
with compiling in multiple omaps. Set the addresses
for uarts in struct omap_globals for the early serial
init code.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/include/mach/debug-macro.S')
-rw-r--r-- | arch/arm/mach-omap2/include/mach/debug-macro.S | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/include/mach/debug-macro.S b/arch/arm/mach-omap2/include/mach/debug-macro.S index 86979d7..8d6da9a 100644 --- a/arch/arm/mach-omap2/include/mach/debug-macro.S +++ b/arch/arm/mach-omap2/include/mach/debug-macro.S @@ -11,6 +11,10 @@ * */ +#include <linux/serial_reg.h> + +#include <plat/serial.h> + .macro addruart, rx, tmp mrc p15, 0, \rx, c1, c0 tst \rx, #1 @ MMU enabled? @@ -44,15 +48,10 @@ .endm .macro busyuart,rd,rx -1001: ldrb \rd, [\rx, #(0x5 << 2)] @ OMAP-1510 and friends - and \rd, \rd, #0x60 - teq \rd, #0x60 - beq 1002f - ldrb \rd, [\rx, #(0x5 << 0)] @ OMAP-730 only - and \rd, \rd, #0x60 - teq \rd, #0x60 +1001: ldrb \rd, [\rx, #(UART_LSR << OMAP_PORT_SHIFT)] + and \rd, \rd, #(UART_LSR_TEMT | UART_LSR_THRE) + teq \rd, #(UART_LSR_TEMT | UART_LSR_THRE) bne 1001b -1002: .endm .macro waituart,rd,rx |