Commit ce1c532e authored by Tony Lindgren's avatar Tony Lindgren

Merge with mainline: Add back omap 8250 hacks

Add back omap 8250 hacks
parent 572012cf
...@@ -1383,7 +1383,11 @@ static irqreturn_t serial8250_interrupt(int irq, void *dev_id) ...@@ -1383,7 +1383,11 @@ static irqreturn_t serial8250_interrupt(int irq, void *dev_id)
DEBUG_INTR("end.\n"); DEBUG_INTR("end.\n");
#ifdef CONFIG_ARCH_OMAP15XX
return IRQ_HANDLED; /* FIXME: iir status not ready on 1510 */
#else
return IRQ_RETVAL(handled); return IRQ_RETVAL(handled);
#endif
} }
/* /*
...@@ -1956,6 +1960,11 @@ static int serial8250_request_std_resource(struct uart_8250_port *up) ...@@ -1956,6 +1960,11 @@ static int serial8250_request_std_resource(struct uart_8250_port *up)
unsigned int size = 8 << up->port.regshift; unsigned int size = 8 << up->port.regshift;
int ret = 0; 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) { switch (up->port.iotype) {
case UPIO_AU: case UPIO_AU:
size = 0x100000; size = 0x100000;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment