Skip to content

Commit

Permalink
omap: Fix cmdline muxing
Browse files Browse the repository at this point in the history
Looks like cmdline muxing got broken at some point when we
decided to limit muxing to __init code. Currently omap_mux_entry
list is not yet initialized when we try to initialize cmdline
muxing.

Fix this by calling omap_mux_init_list() before calling
omap_mux_set_cmdline_signals().

Reported-by: Philip Balister <philip@balister.org>
Tested-by: Philip Balister <philip@balister.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Tony Lindgren committed Jan 20, 2010
1 parent 7284ce6 commit 2cb0c54
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions arch/arm/mach-omap2/mux.c
Original file line number Diff line number Diff line change
Expand Up @@ -998,12 +998,15 @@ int __init omap_mux_init(u32 mux_pbase, u32 mux_size,
omap_mux_package_fixup(package_subset, superset);
if (package_balls)
omap_mux_package_init_balls(package_balls, superset);
omap_mux_set_cmdline_signals();
omap_mux_set_board_signals(board_mux);
#endif

omap_mux_init_list(superset);

#ifdef CONFIG_OMAP_MUX
omap_mux_set_cmdline_signals();
omap_mux_set_board_signals(board_mux);
#endif

return 0;
}

Expand Down

0 comments on commit 2cb0c54

Please sign in to comment.