Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 177977
b: refs/heads/master
c: f2eeeae
h: refs/heads/master
i:
  177975: 9cd6347
v: v3
  • Loading branch information
Mika Westerberg authored and Tony Lindgren committed Dec 16, 2009
1 parent b3d29b9 commit 6942b41
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ebeb53e1e1f11a51d8a93843a437f516e3528bfa
refs/heads/master: f2eeeae06a41d4f9c90f8382cc0ef1d35888d09a
7 changes: 4 additions & 3 deletions trunk/arch/arm/mach-omap2/serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -640,12 +640,9 @@ void __init omap_serial_early_init(void)
uart->num = i;
p->private_data = uart;
uart->p = p;
list_add_tail(&uart->node, &uart_list);

if (cpu_is_omap44xx())
p->irq += 32;

omap_uart_enable_clocks(uart);
}
}

Expand Down Expand Up @@ -673,9 +670,13 @@ void __init omap_serial_init_port(int port)
pdev = &uart->pdev;
dev = &pdev->dev;

omap_uart_enable_clocks(uart);

omap_uart_reset(uart);
omap_uart_idle_init(uart);

list_add_tail(&uart->node, &uart_list);

if (WARN_ON(platform_device_register(pdev)))
return;

Expand Down

0 comments on commit 6942b41

Please sign in to comment.