[pm-wip/uart] Serial: Avoid populating uart_list in early init phase

Commit Message

Govindraj R June 30, 2010, 2:43 p.m. UTC

None

Patch

diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c
b/arch/arm/mach-omap2/board-zoom-debugboard.c
index 1d7f827..9307f58 100644
--- a/arch/arm/mach-omap2/board-zoom-debugboard.c
+++ b/arch/arm/mach-omap2/board-zoom-debugboard.c
@@ -96,7 +96,7 @@  static struct plat_serial8250_port serial_platform_data[] = {

 static struct platform_device zoom_debugboard_serial_device = {
        .name                   = "serial8250",
-       .id                     = PLAT8250_DEV_PLATFORM,
+       .id                     = PLAT8250_DEV_PLATFORM + 4,
        .dev                    = {
                .platform_data  = serial_platform_data,
        },
diff --git a/arch/arm/mach-omap2/board-zoom2.c
b/arch/arm/mach-omap2/board-zoom2.c
index 803ef14..c858b43 100644
--- a/arch/arm/mach-omap2/board-zoom2.c
+++ b/arch/arm/mach-omap2/board-zoom2.c
@@ -80,6 +80,7 @@  static struct omap_board_mux board_mux[] __initdata = {
 static void __init omap_zoom2_init(void)
 {
        omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
+       omap_serial_init();
        zoom_peripherals_init();
        zoom_debugboard_init();
 }