summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-h4.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-07-05 16:31:37 +0300
committerTony Lindgren <tony@atomide.com>2010-07-05 16:31:37 +0300
commit23275d459e1b0afcc6bd6b5fe8aaca8a573d6d5a (patch)
tree6304aec83490fdc2164f63ce2efd317b4af84ab7 /arch/arm/mach-omap2/board-h4.c
parent89ba1092296bc455bfd59db608ae1954861f5911 (diff)
downloadtalos-obmc-linux-23275d459e1b0afcc6bd6b5fe8aaca8a573d6d5a.tar.gz
talos-obmc-linux-23275d459e1b0afcc6bd6b5fe8aaca8a573d6d5a.zip
omap: mux: Select SIP package for H4
Select SIP package for H4 Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-h4.c')
-rw-r--r--arch/arm/mach-omap2/board-h4.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index 54a231c7465e..8c58f5106393 100644
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -42,6 +42,8 @@
#include <plat/dma.h>
#include <plat/gpmc.h>
+#include "mux.h"
+
#define H4_FLASH_CS 0
#define H4_SMC91X_CS 1
@@ -338,8 +340,18 @@ static struct i2c_board_info __initdata h4_i2c_board_info[] = {
},
};
+#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_h4_init(void)
{
+ omap2420_mux_init(board_mux, OMAP_PACKAGE_ZAF);
+
/*
* Make sure the serial ports are muxed on at this point.
* You have to mux them off in device drivers later on
OpenPOWER on IntegriCloud