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>

diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c
index d496e50fec40ced80eaf194cb2f2cdd5898d8dd0..49381e271be31469731d735da4516d9828deea3d 100644 (file)
--- 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;