diff options
author | Radek PilaĆ (Mrkva) <mrkva@mrkva.eu> | 2011-02-24 19:02:49 +0100 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-02-25 10:19:21 -0800 |
commit | e0530460f6bc268b446040f1973d427d21f042d9 (patch) | |
tree | 3add0a0a748087fb632f8aa01ea591af1bf06487 /arch/arm | |
parent | 589541c0bfb1426ad39c7b59c0372346bcf84229 (diff) | |
download | op-kernel-dev-e0530460f6bc268b446040f1973d427d21f042d9.zip op-kernel-dev-e0530460f6bc268b446040f1973d427d21f042d9.tar.gz |
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')
-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 6a60f79..a35afe2 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(); |