lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: Thomas Weber <weber@corscience.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Thomas Weber
2010-02-25 09:40:19 +00:00
committed by Tony Lindgren
parent 9e542f37ce
commit 21b9034020
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm/mach-omap2/serial.c
View File

@@ -644,16 +644,21 @@ static void serial_out_override(struct uart_port *up, int offset, int value)
} }
void __init omap_serial_early_init(void) void __init omap_serial_early_init(void)
{ {
int i; int i, nr_ports;
char name[16]; 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. * Make sure the serial ports are muxed on at this point.
* You have to mux them off in device drivers later on * You have to mux them off in device drivers later on
* if not needed. * 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 omap_uart_state *uart = &omap_uart[i];
struct platform_device *pdev = &uart->pdev; struct platform_device *pdev = &uart->pdev;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
@@ -669,17 +674,17 @@ void __init omap_serial_early_init(void)
continue; continue;
} }
sprintf(name, "uart%d_ick", i+1); sprintf(name, "uart%d_ick", i + 1);
uart->ick = clk_get(NULL, name); uart->ick = clk_get(NULL, name);
if (IS_ERR(uart->ick)) { if (IS_ERR(uart->ick)) {
printk(KERN_ERR "Could not get uart%d_ick\n", i+1); printk(KERN_ERR "Could not get uart%d_ick\n", i + 1);
uart->ick = NULL; uart->ick = NULL;
} }
sprintf(name, "uart%d_fck", i+1); sprintf(name, "uart%d_fck", i+1);
uart->fck = clk_get(NULL, name); uart->fck = clk_get(NULL, name);
if (IS_ERR(uart->fck)) { if (IS_ERR(uart->fck)) {
printk(KERN_ERR "Could not get uart%d_fck\n", i+1); printk(KERN_ERR "Could not get uart%d_fck\n", i + 1);
uart->fck = NULL; uart->fck = NULL;
} }