diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-01-20 03:17:07 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-01-20 03:17:07 +0100 |
| commit | 2cb0c54f3a696351b81e6670f8419120c94b5e0b (patch) | |
| tree | e556bfbf3abe3df558781a2e6e5ad37c1093387b /arch/arm/mach-omap2/mux.c | |
| parent | Linux 2.6.33-rc4 (diff) | |
| download | linux-2cb0c54f3a696351b81e6670f8419120c94b5e0b.tar.xz linux-2cb0c54f3a696351b81e6670f8419120c94b5e0b.zip | |
omap: Fix cmdline muxing
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>
Diffstat (limited to 'arch/arm/mach-omap2/mux.c')
| -rw-r--r-- | arch/arm/mach-omap2/mux.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c index 459ef23ab8a8..40ea9fd4211d 100644 --- a/arch/arm/mach-omap2/mux.c +++ b/arch/arm/mach-omap2/mux.c @@ -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; } |