2 files changed, 13 insertions, 9 deletions

diff --git a/arch/arm/mach-omap1/include/mach/debug-macro.S b/arch/arm/mach-omap1/include/mach/debug-macro.S
index 8c74cab2fa8b..9ea12f29e0b6 100644
--- a/arch/arm/mach-omap1/include/mach/debug-macro.S
+++ b/arch/arm/mach-omap1/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?
@@ -30,13 +34,13 @@
                 .endm
 
                 .macro  busyuart,rd,rx
-1001:           ldrb    \rd, [\rx, #(0x5 << 2)] @ OMAP-1510 and friends
-                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)
                 beq     1002f
-                ldrb    \rd, [\rx, #(0x5 << 0)] @ OMAP-730 only
-                and     \rd, \rd, #0x60
-                teq     \rd, #0x60
+                ldrb    \rd, [\rx, #(UART_LSR << OMAP7XX_PORT_SHIFT)]
+                and     \rd, \rd, #(UART_LSR_TEMT | UART_LSR_THRE)
+                teq     \rd, #(UART_LSR_TEMT | UART_LSR_THRE)
                 bne     1001b
 1002:
                 .endm
diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c
index 6e5207c81cf4..349de90194e3 100644
--- a/arch/arm/mach-omap1/serial.c
+++ b/arch/arm/mach-omap1/serial.c
@@ -64,7 +64,7 @@ static void __init omap_serial_reset(struct plat_serial8250_port *p)
 
 static struct plat_serial8250_port serial_platform_data[] = {
         {
-                .mapbase        = OMAP_UART1_BASE,
+                .mapbase        = OMAP1_UART1_BASE,
                 .irq            = INT_UART1,
                 .flags          = UPF_BOOT_AUTOCONF,
                 .iotype         = UPIO_MEM,
@@ -72,7 +72,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
                 .uartclk        = OMAP16XX_BASE_BAUD * 16,
         },
         {
-                .mapbase        = OMAP_UART2_BASE,
+                .mapbase        = OMAP1_UART2_BASE,
                 .irq            = INT_UART2,
                 .flags          = UPF_BOOT_AUTOCONF,
                 .iotype         = UPIO_MEM,
@@ -80,7 +80,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
                 .uartclk        = OMAP16XX_BASE_BAUD * 16,
         },
         {
-                .mapbase        = OMAP_UART3_BASE,
+                .mapbase        = OMAP1_UART3_BASE,
                 .irq            = INT_UART3,
                 .flags          = UPF_BOOT_AUTOCONF,
                 .iotype         = UPIO_MEM,