From: Tony Lindgren <tony@atomide.com>
Date: Mon, 23 Oct 2006 19:55:52 +0000 (+0300)
Subject: Merge with mainline: Add back omap 8250 hacks
X-Git-Tag: v2.6.19-omap1~118
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ce1c532e010c2b647823f0e34cc36067557239e4;p=linux-2.6-omap-h63xx.git

Merge with mainline: Add back omap 8250 hacks

Add back omap 8250 hacks
---

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index e34bd03cfce..f265cd63e14 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -1383,7 +1383,11 @@ static irqreturn_t serial8250_interrupt(int irq, void *dev_id)
 
 	DEBUG_INTR("end.\n");
 
+#ifdef CONFIG_ARCH_OMAP15XX
+	return IRQ_HANDLED;	/* FIXME: iir status not ready on 1510 */
+#else
 	return IRQ_RETVAL(handled);
+#endif
 }
 
 /*
@@ -1956,6 +1960,11 @@ static int serial8250_request_std_resource(struct uart_8250_port *up)
 	unsigned int size = 8 << up->port.regshift;
 	int ret = 0;
 
+#ifdef CONFIG_ARCH_OMAP
+	if (is_omap_port((unsigned int)up->port.membase))
+		size = 0x16 << up->port.regshift;
+#endif
+
 	switch (up->port.iotype) {
 	case UPIO_AU:
 		size = 0x100000;