소스 검색

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>
Tony Lindgren 15 년 전
부모
커밋
2cb0c54f3a
1개의 변경된 파일5개의 추가작업 그리고 2개의 파일을 삭제
  1. 5 2
      arch/arm/mach-omap2/mux.c

+ 5 - 2
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);
 		omap_mux_package_fixup(package_subset, superset);
 	if (package_balls)
 	if (package_balls)
 		omap_mux_package_init_balls(package_balls, superset);
 		omap_mux_package_init_balls(package_balls, superset);
-	omap_mux_set_cmdline_signals();
-	omap_mux_set_board_signals(board_mux);
 #endif
 #endif
 
 
 	omap_mux_init_list(superset);
 	omap_mux_init_list(superset);
 
 
+#ifdef CONFIG_OMAP_MUX
+	omap_mux_set_cmdline_signals();
+	omap_mux_set_board_signals(board_mux);
+#endif
+
 	return 0;
 	return 0;
 }
 }