ARM: OMAP: Move omap_serial_init() to happen after board specific map_io()

Move omap_serial_init() to happen after board specific map_io().
Patch based on Kyungmin Park's suggestion.

diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index e6aba1976c929f8a8122af79674a57c8bf9f6ccc..61dc5b213d470562360d04a7bbcc925b1b54450f 100644 (file)
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -183,12 +183,12 @@ static void __init h2_init(void)
        platform_add_devices(h2_devices, ARRAY_SIZE(h2_devices));
        omap_board_config = h2_config;
        omap_board_config_size = ARRAY_SIZE(h2_config);
+       omap_serial_init();
 }
 
 static void __init h2_map_io(void)
 {
        omap_map_common_io();
-       omap_serial_init();
 }
 
 MACHINE_START(OMAP_H2, "TI-H2")

diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index de73337b2ba0790853472a2331f063e4e0b1f5f4..92b0a99d3181a2b972b2559a5e9295d448233abc 100644 (file)
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -171,8 +171,8 @@ static struct omap_uart_config h3_uart_config __initdata = {
 };
 
 static struct omap_board_config_kernel h3_config[] = {
-       { OMAP_TAG_USB,  &h3_usb_config },
-       { OMAP_TAG_MMC,  &h3_mmc_config },
+       { OMAP_TAG_USB,         &h3_usb_config },
+       { OMAP_TAG_MMC,         &h3_mmc_config },
        { OMAP_TAG_UART,        &h3_uart_config },
 };
 
@@ -183,6 +183,7 @@ static void __init h3_init(void)
        (void) platform_add_devices(devices, ARRAY_SIZE(devices));
        omap_board_config = h3_config;
        omap_board_config_size = ARRAY_SIZE(h3_config);
+       omap_serial_init();
 }
 
 static void __init h3_init_smc91x(void)
@@ -204,7 +205,6 @@ void h3_init_irq(void)
 static void __init h3_map_io(void)
 {
        omap_map_common_io();
-       omap_serial_init();
 }
 
 MACHINE_START(OMAP_H3, "TI OMAP1710 H3 board")

diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c
index af832a3f7d2d17e9706de1f96423e4c80bb01615..c1618850438ff0f698d92da381dab2c31e9c61ec 100644 (file)
--- a/arch/arm/mach-omap1/board-innovator.c
+++ b/arch/arm/mach-omap1/board-innovator.c
@@ -261,6 +261,7 @@ static void __init innovator_init(void)
 #endif
        omap_board_config = innovator_config;
        omap_board_config_size = ARRAY_SIZE(innovator_config);
+       omap_serial_init();
 }
 
 static void __init innovator_map_io(void)
@@ -279,7 +280,6 @@ static void __init innovator_map_io(void)
                       fpga_read(OMAP1510_FPGA_BOARD_REV));
        }
 #endif
-       omap_serial_init();
 }
 
 MACHINE_START(OMAP_INNOVATOR, "TI-Innovator")

diff --git a/arch/arm/mach-omap1/board-netstar.c b/arch/arm/mach-omap1/board-netstar.c
index 5e31e6f3a5f08bd3609be660615d6a2d8579b39d..6de8ac73611b6fa531f9990ac22977a4a56b03ef 100644 (file)
--- a/arch/arm/mach-omap1/board-netstar.c
+++ b/arch/arm/mach-omap1/board-netstar.c
@@ -103,12 +103,12 @@ static void __init netstar_init(void)
 
        omap_board_config = netstar_config;
        omap_board_config_size = ARRAY_SIZE(netstar_config);
+       omap_serial_init();
 }
 
 static void __init netstar_map_io(void)
 {
        omap_map_common_io();
-       omap_serial_init();
 }
 
 #define MACHINE_PANICED                1

diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index 2e5c551f50c11ed9bcfbb43b6c25351107e1b0ca..b5600568e90559705cdb7378621241bc890d36d6 100644 (file)
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -257,13 +257,13 @@ static void __init osk_init(void)
        omap_board_config_size = ARRAY_SIZE(osk_config);
        USB_TRANSCEIVER_CTRL_REG |= (3 << 1);
 
+       omap_serial_init();
        osk_mistral_init();
 }
 
 static void __init osk_map_io(void)
 {
        omap_map_common_io();
-       omap_serial_init();
 }
 
 MACHINE_START(OMAP_OSK, "TI-OSK")

diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index 869990e033f6e5dd138007a2bc5e182e78000219..43021aa628be50149b4dbf91d8e63754b91a6de6 100644 (file)
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -124,6 +124,7 @@ static void __init omap_perseus2_init(void)
 
        omap_board_config = perseus2_config;
        omap_board_config_size = ARRAY_SIZE(perseus2_config);
+       omap_serial_init();
 }
 
 static void __init perseus2_init_smc91x(void)
@@ -184,7 +185,6 @@ static void __init omap_perseus2_map_io(void)
         * It is used as the Ethernet controller interrupt
         */
        omap_writel(omap_readl(OMAP730_IO_CONF_9) & 0x1FFFFFFF, OMAP730_IO_CONF_9);
-       omap_serial_init();
 }
 
 MACHINE_START(OMAP_PERSEUS2, "OMAP730 Perseus2")

diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c
index 0f693f965b3e1cbdcfd55082368082bab6a67e12..0ae824395bb85bbaf12fe01baf66e7e32012fbb9 100644 (file)
--- a/arch/arm/mach-omap1/board-voiceblue.c
+++ b/arch/arm/mach-omap1/board-voiceblue.c
@@ -196,6 +196,7 @@ static void __init voiceblue_init(void)
        platform_add_devices(voiceblue_devices, ARRAY_SIZE(voiceblue_devices));
        omap_board_config = voiceblue_config;
        omap_board_config_size = ARRAY_SIZE(voiceblue_config);
+       omap_serial_init();
 
        /* There is a good chance board is going up, so enable power LED
         * (it is connected through invertor) */
@@ -206,7 +207,6 @@ static void __init voiceblue_init(void)
 static void __init voiceblue_map_io(void)
 {
        omap_map_common_io();
-       omap_serial_init();
 }
 
 #define MACHINE_PANICED                1