summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-apollon.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-07-05 15:31:37 +0200
committerTony Lindgren <tony@atomide.com>2010-07-05 15:31:37 +0200
commitb52b14ef0d637718b7a648eb3949aef83ffc796d (patch)
treea6afd63aa53047027358d7cf87c5d1f1519658aa /arch/arm/mach-omap2/board-apollon.c
parentomap: mux: Select SIP package for H4 (diff)
downloadlinux-b52b14ef0d637718b7a648eb3949aef83ffc796d.tar.xz
linux-b52b14ef0d637718b7a648eb3949aef83ffc796d.zip
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.c12
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 @@
#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();