diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap2/serial.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index 39b797bc14d6..19805a7de06c 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c | |||
@@ -640,12 +640,9 @@ void __init omap_serial_early_init(void) | |||
640 | uart->num = i; | 640 | uart->num = i; |
641 | p->private_data = uart; | 641 | p->private_data = uart; |
642 | uart->p = p; | 642 | uart->p = p; |
643 | list_add_tail(&uart->node, &uart_list); | ||
644 | 643 | ||
645 | if (cpu_is_omap44xx()) | 644 | if (cpu_is_omap44xx()) |
646 | p->irq += 32; | 645 | p->irq += 32; |
647 | |||
648 | omap_uart_enable_clocks(uart); | ||
649 | } | 646 | } |
650 | } | 647 | } |
651 | 648 | ||
@@ -673,9 +670,13 @@ void __init omap_serial_init_port(int port) | |||
673 | pdev = &uart->pdev; | 670 | pdev = &uart->pdev; |
674 | dev = &pdev->dev; | 671 | dev = &pdev->dev; |
675 | 672 | ||
673 | omap_uart_enable_clocks(uart); | ||
674 | |||
676 | omap_uart_reset(uart); | 675 | omap_uart_reset(uart); |
677 | omap_uart_idle_init(uart); | 676 | omap_uart_idle_init(uart); |
678 | 677 | ||
678 | list_add_tail(&uart->node, &uart_list); | ||
679 | |||
679 | if (WARN_ON(platform_device_register(pdev))) | 680 | if (WARN_ON(platform_device_register(pdev))) |
680 | return; | 681 | return; |
681 | 682 | ||