diff options
author | Tony Lindgren <tony@atomide.com> | 2010-07-05 09:31:37 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-07-05 09:31:37 -0400 |
commit | b52b14ef0d637718b7a648eb3949aef83ffc796d (patch) | |
tree | a6afd63aa53047027358d7cf87c5d1f1519658aa /arch/arm/mach-omap2/board-apollon.c | |
parent | 23275d459e1b0afcc6bd6b5fe8aaca8a573d6d5a (diff) |
omap: mux: Select POP package for Apollon
Select POP package for Apollon
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-apollon.c')
-rw-r--r-- | arch/arm/mach-omap2/board-apollon.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c index 987b24d400a8..b86a8790dd98 100644 --- a/arch/arm/mach-omap2/board-apollon.c +++ b/arch/arm/mach-omap2/board-apollon.c | |||
@@ -42,6 +42,8 @@ | |||
42 | #include <plat/gpmc.h> | 42 | #include <plat/gpmc.h> |
43 | #include <plat/control.h> | 43 | #include <plat/control.h> |
44 | 44 | ||
45 | #include "mux.h" | ||
46 | |||
45 | /* LED & Switch macros */ | 47 | /* LED & Switch macros */ |
46 | #define LED0_GPIO13 13 | 48 | #define LED0_GPIO13 13 |
47 | #define LED1_GPIO14 14 | 49 | #define LED1_GPIO14 14 |
@@ -309,10 +311,20 @@ static void __init apollon_usb_init(void) | |||
309 | omap2_usbfs_init(&apollon_usb_config); | 311 | omap2_usbfs_init(&apollon_usb_config); |
310 | } | 312 | } |
311 | 313 | ||
314 | #ifdef CONFIG_OMAP_MUX | ||
315 | static struct omap_board_mux board_mux[] __initdata = { | ||
316 | { .reg_offset = OMAP_MUX_TERMINATOR }, | ||
317 | }; | ||
318 | #else | ||
319 | #define board_mux NULL | ||
320 | #endif | ||
321 | |||
312 | static void __init omap_apollon_init(void) | 322 | static void __init omap_apollon_init(void) |
313 | { | 323 | { |
314 | u32 v; | 324 | u32 v; |
315 | 325 | ||
326 | omap2420_mux_init(board_mux, OMAP_PACKAGE_ZAC); | ||
327 | |||
316 | apollon_led_init(); | 328 | apollon_led_init(); |
317 | apollon_flash_init(); | 329 | apollon_flash_init(); |
318 | apollon_usb_init(); | 330 | apollon_usb_init(); |