summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-zoom3.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2009-12-12 01:16:33 +0100
committerTony Lindgren <tony@atomide.com>2009-12-12 01:16:33 +0100
commit662c8b55d26abeabc0b125f922dfa66338a046ae (patch)
treec983e25b2b90df62ffca47ee0d849de30b203353 /arch/arm/mach-omap2/board-zoom3.c
parentomap: mux: Remove old mux code for 34xx (diff)
downloadlinux-662c8b55d26abeabc0b125f922dfa66338a046ae.tar.xz
linux-662c8b55d26abeabc0b125f922dfa66338a046ae.zip
omap: mux: Add 36xx CBP package support
Add 36xx CBP package support Cc: Benoit Cousson <b-cousson@ti.com> Signed-off-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-zoom3.c')
-rw-r--r--arch/arm/mach-omap2/board-zoom3.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-zoom3.c b/arch/arm/mach-omap2/board-zoom3.c
index 8d965a6516c8..a9fe9181b010 100644
--- a/arch/arm/mach-omap2/board-zoom3.c
+++ b/arch/arm/mach-omap2/board-zoom3.c
@@ -21,6 +21,7 @@
#include <plat/common.h>
#include <plat/board.h>
+#include "mux.h"
#include "sdram-hynix-h8mbx00u0mer-0em.h"
static void __init omap_zoom_map_io(void)
@@ -42,8 +43,17 @@ static void __init omap_zoom_init_irq(void)
omap_gpio_init();
}
+#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_zoom_init(void)
{
+ omap3_mux_init(board_mux, OMAP_PACKAGE_CBP);
zoom_peripherals_init();
zoom_debugboard_init();
}