diff options
author | Alistair Buxton <a.j.buxton@gmail.com> | 2009-09-22 05:49:53 +0100 |
---|---|---|
committer | Alistair Buxton <a.j.buxton@gmail.com> | 2009-10-07 23:09:52 +0100 |
commit | d8723ae2a416473f8e974baadcb6acb7f8b0b485 (patch) | |
tree | bb377cd04dae8af54b2684a0a472f3b4f53bb595 /arch | |
parent | 374576a8b6f865022c0fd1ca62396889b23d66dd (diff) | |
download | op-kernel-dev-d8723ae2a416473f8e974baadcb6acb7f8b0b485.zip op-kernel-dev-d8723ae2a416473f8e974baadcb6acb7f8b0b485.tar.gz |
OMAP7XX: Serial: Remove duplicate omap850 code
This patch is part of a series which unifies all duplicated code between
omap730 and omap850. All cpu checks are converted to cpu_is_omap7xx() and
CONFIG_ARCH_OMAP850 is added to all CONFIG_ARCH_OMAP730 checks.
Signed-off-by: Alistair Buxton <a.j.buxton@gmail.com>
Reviewed-by: Zebediah C. McClure <zmc@lurian.net>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap1/serial.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c index d496e50..49381e2 100644 --- a/arch/arm/mach-omap1/serial.c +++ b/arch/arm/mach-omap1/serial.c @@ -110,20 +110,13 @@ void __init omap_serial_init(void) { int i; - if (cpu_is_omap730()) { + if (cpu_is_omap7xx()) { serial_platform_data[0].regshift = 0; serial_platform_data[1].regshift = 0; serial_platform_data[0].irq = INT_730_UART_MODEM_1; serial_platform_data[1].irq = INT_730_UART_MODEM_IRDA_2; } - if (cpu_is_omap850()) { - serial_platform_data[0].regshift = 0; - serial_platform_data[1].regshift = 0; - serial_platform_data[0].irq = INT_850_UART_MODEM_1; - serial_platform_data[1].irq = INT_850_UART_MODEM_IRDA_2; - } - if (cpu_is_omap15xx()) { serial_platform_data[0].uartclk = OMAP1510_BASE_BAUD * 16; serial_platform_data[1].uartclk = OMAP1510_BASE_BAUD * 16; |