OMAP3 Touchbook: fix board initialization
authorRadek Pilař (Mrkva) <mrkva@mrkva.eu>
Thu, 24 Feb 2011 18:02:49 +0000 (19:02 +0100)
committerTony Lindgren <tony@atomide.com>
Fri, 25 Feb 2011 18:19:21 +0000 (10:19 -0800)
init_early hook runs too early for omap3_mux_init(), so the board
won't boot. Moved to init_machine, then it works just fine.

Signed-off-by: Radek Pilar <mrkva@mrkva.eu>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/board-omap3touchbook.c

index 6a60f79dcccb602220741af6d4ae247baad2d675..a35afe2227d3633ac0f4da7c7707b03314fd1e00 100644 (file)
@@ -417,7 +417,6 @@ static struct omap_board_mux board_mux[] __initdata = {
 
 static void __init omap3_touchbook_init_early(void)
 {
-       omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
        omap_board_config = omap3_touchbook_config;
        omap_board_config_size = ARRAY_SIZE(omap3_touchbook_config);
        omap2_init_common_infrastructure();
@@ -514,6 +513,7 @@ static struct omap_musb_board_data musb_board_data = {
 
 static void __init omap3_touchbook_init(void)
 {
+       omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
        pm_power_off = omap3_touchbook_poweroff;
 
        omap3_touchbook_i2c_init();