diff options
| author | Sergio Aguirre <saaguirre@ti.com> | 2010-02-27 04:58:47 +0300 |
|---|---|---|
| committer | Sergio Aguirre <saaguirre@ti.com> | 2010-03-16 00:34:16 +0300 |
| commit | 4b1bbd3fd9384ad6ca62903172ccb6a8729dd897 (patch) | |
| tree | 8fb4f398f923a92b49fb7836eb1a8fba85291c0d | |
| parent | 10c805eb4f89d44fe4e457d727b59af15c4a4a36 (diff) | |
| download | linux-4b1bbd3fd9384ad6ca62903172ccb6a8729dd897.tar.xz | |
omap2/3/4: serial: Remove condition for getting uart4_phys
This check is invalid, since we haven't filled the
omap_revision var at this point.
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
| -rw-r--r-- | arch/arm/mach-omap2/serial.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index a55e6aeb648e..3771254dfa81 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -115,7 +115,6 @@ static struct plat_serial8250_port serial_platform_data2[] = { } }; -#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4) static struct plat_serial8250_port serial_platform_data3[] = { { .irq = 70, @@ -128,23 +127,12 @@ static struct plat_serial8250_port serial_platform_data3[] = { } }; -static inline void omap2_set_globals_uart4(struct omap_globals *omap2_globals) -{ - serial_platform_data3[0].mapbase = omap2_globals->uart4_phys; -} -#else -static inline void omap2_set_globals_uart4(struct omap_globals *omap2_globals) -{ -} -#endif - void __init omap2_set_globals_uart(struct omap_globals *omap2_globals) { serial_platform_data0[0].mapbase = omap2_globals->uart1_phys; serial_platform_data1[0].mapbase = omap2_globals->uart2_phys; serial_platform_data2[0].mapbase = omap2_globals->uart3_phys; - if (cpu_is_omap3630() || cpu_is_omap44xx()) - omap2_set_globals_uart4(omap2_globals); + serial_platform_data3[0].mapbase = omap2_globals->uart4_phys; } static inline unsigned int __serial_read_reg(struct uart_port *up, |