diff options
author | Radek PilaĆ (Mrkva) <mrkva@mrkva.eu> | 2011-02-24 13:02:49 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-02-25 13:19:21 -0500 |
commit | e0530460f6bc268b446040f1973d427d21f042d9 (patch) | |
tree | 3add0a0a748087fb632f8aa01ea591af1bf06487 /arch/arm/mach-omap2 | |
parent | 589541c0bfb1426ad39c7b59c0372346bcf84229 (diff) |
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 <mrkva@mrkva.eu>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3touchbook.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c index 6a60f79dcccb..a35afe2227d3 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 = { | |||
417 | 417 | ||
418 | static void __init omap3_touchbook_init_early(void) | 418 | static void __init omap3_touchbook_init_early(void) |
419 | { | 419 | { |
420 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); | ||
421 | omap_board_config = omap3_touchbook_config; | 420 | omap_board_config = omap3_touchbook_config; |
422 | omap_board_config_size = ARRAY_SIZE(omap3_touchbook_config); | 421 | omap_board_config_size = ARRAY_SIZE(omap3_touchbook_config); |
423 | omap2_init_common_infrastructure(); | 422 | omap2_init_common_infrastructure(); |
@@ -514,6 +513,7 @@ static struct omap_musb_board_data musb_board_data = { | |||
514 | 513 | ||
515 | static void __init omap3_touchbook_init(void) | 514 | static void __init omap3_touchbook_init(void) |
516 | { | 515 | { |
516 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); | ||
517 | pm_power_off = omap3_touchbook_poweroff; | 517 | pm_power_off = omap3_touchbook_poweroff; |
518 | 518 | ||
519 | omap3_touchbook_i2c_init(); | 519 | omap3_touchbook_i2c_init(); |