[2/2] omap: serial: fix non-empty rx uart fifo abort

Commit Message

vikram pandita Nov. 17, 2009, 9:17 p.m. UTC

None

Patch

diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 2e17b57..669652b 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -624,8 +624,15 @@  void __init omap_serial_early_init(void)
 		uart->p = p;
 		list_add_tail(&uart->node, &uart_list);
 
-		if (cpu_is_omap44xx())
+		if (cpu_is_omap44xx()) {
 			p->irq += 32;
+			/* Do not read empty UART fifo on omap4 */
+			p->flags |= UPF_NO_EMPTY_FIFO_READ;
+		}
+
+		/* Do not read empty UART fifo on omap3630 */
+		if (cpu_is_omap3630())
+			p->flags |= UPF_NO_EMPTY_FIFO_READ;
 
 		omap_uart_enable_clocks(uart);
 	}