Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b1bbd3f authored by Sergio Aguirre's avatar Sergio Aguirre
Browse files

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: default avatarSergio Aguirre <saaguirre@ti.com>
parent 10c805eb

arch/arm/mach-omap2/serial.c

+1 −13
Original line number Diff line number Diff line
@@ -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,