From ce1c532e010c2b647823f0e34cc36067557239e4 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Mon, 23 Oct 2006 22:55:52 +0300 Subject: [PATCH] Merge with mainline: Add back omap 8250 hacks Add back omap 8250 hacks --- drivers/serial/8250.c | 9 +++++++++ 1 file changed, 9 insertions(+) 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; -- 2.41.1