Commit cdd86b27 authored by Tony Lindgren's avatar Tony Lindgren Committed by Greg Kroah-Hartman

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: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 81732c3b
...@@ -2340,7 +2340,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, ...@@ -2340,7 +2340,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
serial_port_out(port, UART_EFR, efr); serial_port_out(port, UART_EFR, efr);
} }
#ifdef CONFIG_ARCH_OMAP #ifdef CONFIG_ARCH_OMAP1
/* Workaround to enable 115200 baud on OMAP1510 internal ports */ /* Workaround to enable 115200 baud on OMAP1510 internal ports */
if (cpu_is_omap1510() && is_omap_port(up)) { if (cpu_is_omap1510() && is_omap_port(up)) {
if (baud == 115200) { if (baud == 115200) {
...@@ -2430,7 +2430,7 @@ static unsigned int serial8250_port_size(struct uart_8250_port *pt) ...@@ -2430,7 +2430,7 @@ static unsigned int serial8250_port_size(struct uart_8250_port *pt)
{ {
if (pt->port.iotype == UPIO_AU) if (pt->port.iotype == UPIO_AU)
return 0x1000; return 0x1000;
#ifdef CONFIG_ARCH_OMAP #ifdef CONFIG_ARCH_OMAP1
if (is_omap_port(pt)) if (is_omap_port(pt))
return 0x16 << pt->port.regshift; return 0x16 << pt->port.regshift;
#endif #endif
......
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