omap: Fix cmdline muxing
authorTony Lindgren <tony@atomide.com>
Wed, 20 Jan 2010 02:17:07 +0000 (18:17 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 20 Jan 2010 02:17:07 +0000 (18:17 -0800)
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>
arch/arm/mach-omap2/mux.c

index 459ef23ab8a818539aaa0da0464d5cf9e7af49bd..40ea9fd4211da338b6c543a1aa3d1cb2cf7085f1 100644 (file)
@@ -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;
 }