diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-07-05 16:31:37 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-07-05 16:31:37 +0300 |
| commit | b52b14ef0d637718b7a648eb3949aef83ffc796d (patch) | |
| tree | a6afd63aa53047027358d7cf87c5d1f1519658aa /arch | |
| 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')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-apollon.c | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index b59cdb7542c..269f84fd94d 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -56,6 +56,7 @@ config MACH_OMAP_H4 config MACH_OMAP_APOLLON bool "OMAP 2420 Apollon board" depends on ARCH_OMAP2 + select OMAP_PACKAGE_ZAC config MACH_OMAP_2430SDP bool "OMAP 2430 SDP board" diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c index 987b24d400a..b86a8790dd9 100644 --- a/arch/arm/mach-omap2/board-apollon.c +++ b/arch/arm/mach-omap2/board-apollon.c @@ -42,6 +42,8 @@ #include <plat/gpmc.h> #include <plat/control.h> +#include "mux.h" + /* LED & Switch macros */ #define LED0_GPIO13 13 #define LED1_GPIO14 14 @@ -309,10 +311,20 @@ static void __init apollon_usb_init(void) omap2_usbfs_init(&apollon_usb_config); } +#ifdef CONFIG_OMAP_MUX +static struct omap_board_mux board_mux[] __initdata = { + { .reg_offset = OMAP_MUX_TERMINATOR }, +}; +#else +#define board_mux NULL +#endif + static void __init omap_apollon_init(void) { u32 v; + omap2420_mux_init(board_mux, OMAP_PACKAGE_ZAC); + apollon_led_init(); apollon_flash_init(); apollon_usb_init(); |