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

Commit 21b90340 authored by Thomas Weber's avatar Thomas Weber Committed by Tony Lindgren
Browse files

OMAP2: serial.c: Fix number of uarts in early_init 



The omap_serial_early_init prints the following errors:

Could not get uart4_ick
Could not get uart4_fck

because all the uarts available in omap_uart[] will be initialized.
Only omap4430 and omap3630 have 4 uarts at the moment.
This patch reduces the number of uarts when cpu is not omap4430 or
omap3630.

Signed-off-by: default avatarThomas Weber <weber@corscience.de>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 9e542f37

arch/arm/mach-omap2/serial.c

+10 −5
Original line number Diff line number Diff line
@@ -644,16 +644,21 @@ static void serial_out_override(struct uart_port *up, int offset, int value) 
}

void __init omap_serial_early_init(void)

{

	int i;

	int i, nr_ports;

	char name[16];



	if (!(cpu_is_omap3630() || cpu_is_omap4430()))

		nr_ports = 3;

	else

		nr_ports = ARRAY_SIZE(omap_uart);



	/*

	 * Make sure the serial ports are muxed on at this point.

	 * You have to mux them off in device drivers later on

	 * if not needed.

	 */



	for (i = 0; i < ARRAY_SIZE(omap_uart); i++) {

	for (i = 0; i < nr_ports; i++) {

		struct omap_uart_state *uart = &omap_uart[i];

		struct platform_device *pdev = &uart->pdev;

		struct device *dev = &pdev->dev;