aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-09-11 01:31:04 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-11 15:21:32 -0400
commitcdd86b277dc82220aa630414896505517a02a201 (patch)
treeb4a47ac4ebbc4f9091ade2e14b83abcf6c6a9890
parent81732c3b2fede049a692e58a7ceabb6d18ffb18c (diff)
serial/8250: Limit the omap workarounds to omap1
These workarounds do not apply for CONFIG_ARCH_OMAP2PLUS at all, so let's make it just CONFIG_ARCH_OMAP1. This is needed to for ARM common zImage changes for omap2+ to avoid including plat and mach headers. Signed-off-by: Tony Lindgren <tony@atomide.com> Acked-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/8250/8250.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/8250/8250.c b/drivers/tty/serial/8250/8250.c
index 44f52c6f15b9..d4e0b07cb130 100644
--- a/drivers/tty/serial/8250/8250.c
+++ b/drivers/tty/serial/8250/8250.c
@@ -2340,7 +2340,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
2340 serial_port_out(port, UART_EFR, efr); 2340 serial_port_out(port, UART_EFR, efr);
2341 } 2341 }
2342 2342
2343#ifdef CONFIG_ARCH_OMAP 2343#ifdef CONFIG_ARCH_OMAP1
2344 /* Workaround to enable 115200 baud on OMAP1510 internal ports */ 2344 /* Workaround to enable 115200 baud on OMAP1510 internal ports */
2345 if (cpu_is_omap1510() && is_omap_port(up)) { 2345 if (cpu_is_omap1510() && is_omap_port(up)) {
2346 if (baud == 115200) { 2346 if (baud == 115200) {
@@ -2430,7 +2430,7 @@ static unsigned int serial8250_port_size(struct uart_8250_port *pt)
2430{ 2430{
2431 if (pt->port.iotype == UPIO_AU) 2431 if (pt->port.iotype == UPIO_AU)
2432 return 0x1000; 2432 return 0x1000;
2433#ifdef CONFIG_ARCH_OMAP 2433#ifdef CONFIG_ARCH_OMAP1
2434 if (is_omap_port(pt)) 2434 if (is_omap_port(pt))
2435 return 0x16 << pt->port.regshift; 2435 return 0x16 << pt->port.regshift;
2436#endif 2436#endif