serial/8250: Limit the omap workarounds to omap1

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Tony Lindgren and committed by

Greg Kroah-Hartman 13 years ago cdd86b27 81732c3b

+2 -2

1 changed file

expand all

drivers

tty

serial

8250

8250.c

+2 -2

drivers/tty/serial/8250/8250.c

··· 2340 2340 serial_port_out(port, UART_EFR, efr); 2341 2341 } 2342 2342 2343 - #ifdef CONFIG_ARCH_OMAP 2343 + #ifdef CONFIG_ARCH_OMAP1 2344 2344 /* Workaround to enable 115200 baud on OMAP1510 internal ports */ 2345 2345 if (cpu_is_omap1510() && is_omap_port(up)) { 2346 2346 if (baud == 115200) { ··· 2430 2430 { 2431 2431 if (pt->port.iotype == UPIO_AU) 2432 2432 return 0x1000; 2433 - #ifdef CONFIG_ARCH_OMAP 2433 + #ifdef CONFIG_ARCH_OMAP1 2434 2434 if (is_omap_port(pt)) 2435 2435 return 0x16 << pt->port.regshift; 2436 2436 #endif