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

Merge branch '2_6_32_for_next' of git://git.pwsan.com/linux-2.6 into for-next

Browse Source
This commit is contained in:
Tony Lindgren
2009-09-03 10:17:39 -07:00
parent 5567fa1f54 ca4caa4e1d
commit 1f685b36db
36 changed files with 4335 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -578,7 +578,7 @@ static struct omap_uart_state omap_uart[OMAP_MAX_NR_PORTS] = {
#endif
};
void __init omap_serial_init(void)
void __init omap_serial_early_init(void)
{
int i;
char name[16];
@@ -624,6 +624,18 @@ void __init omap_serial_init(void)
p->irq += 32;
omap_uart_enable_clocks(uart);
}
}
void __init omap_serial_init(void)
{
int i;
for (i = 0; i < OMAP_MAX_NR_PORTS; i++) {
struct omap_uart_state *uart = &omap_uart[i];
struct platform_device *pdev = &uart->pdev;
struct device *dev = &pdev->dev;
omap_uart_reset(uart);
omap_uart_idle_init(uart);