Skip to content

Commit

Permalink
omap2/3/4: serial: Remove condition for getting uart4_phys
Browse files Browse the repository at this point in the history
This check is invalid, since we haven't filled the
omap_revision var at this point.

Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
  • Loading branch information
Sergio Aguirre committed Mar 15, 2010
1 parent 10c805e commit 4b1bbd3
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions arch/arm/mach-omap2/serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down

0 comments on commit 4b1bbd3

Please sign in to comment.