diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-09-03 10:17:39 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-09-03 10:17:39 -0700 |
| commit | 1f685b36dbf27db55072fb738aac57aaf37d2c71 (patch) | |
| tree | 43cdcd1288d3bfa042a7cd6a89d2bf40f9b0261e /arch/arm/mach-omap2/serial.c | |
| parent | 5567fa1f543dde3c42f8e52bf4f7005135b24896 (diff) | |
| parent | ca4caa4e1d45f9542fa54263974d0ef637157b4a (diff) | |
Merge branch '2_6_32_for_next' of git://git.pwsan.com/linux-2.6 into for-next
Diffstat (limited to 'arch/arm/mach-omap2/serial.c')
| -rw-r--r-- | arch/arm/mach-omap2/serial.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index 0f508109adcc..021130d830b5 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -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); |