From: Radek Pilař (Mrkva) Date: Thu, 24 Feb 2011 18:02:49 +0000 (+0100) Subject: OMAP3 Touchbook: fix board initialization X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e0530460f6bc268b446040f1973d427d21f042d9;p=mv-sheeva.git OMAP3 Touchbook: fix board initialization 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 Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c index 6a60f79dccc..a35afe2227d 100644 --- a/arch/arm/mach-omap2/board-omap3touchbook.c +++ b/arch/arm/mach-omap2/board-omap3touchbook.c @@ -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();