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 | 23275d459e1b0afcc6bd6b5fe8aaca8a573d6d5a (patch) | |
tree | 6304aec83490fdc2164f63ce2efd317b4af84ab7 /arch/arm/mach-omap2/board-h4.c | |
parent | 89ba1092296bc455bfd59db608ae1954861f5911 (diff) |
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.c | 12 |
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 @@ | |||
42 | #include <plat/dma.h> | 42 | #include <plat/dma.h> |
43 | #include <plat/gpmc.h> | 43 | #include <plat/gpmc.h> |
44 | 44 | ||
45 | #include "mux.h" | ||
46 | |||
45 | #define H4_FLASH_CS 0 | 47 | #define H4_FLASH_CS 0 |
46 | #define H4_SMC91X_CS 1 | 48 | #define H4_SMC91X_CS 1 |
47 | 49 | ||
@@ -338,8 +340,18 @@ static struct i2c_board_info __initdata h4_i2c_board_info[] = { | |||
338 | }, | 340 | }, |
339 | }; | 341 | }; |
340 | 342 | ||
343 | #ifdef CONFIG_OMAP_MUX | ||
344 | static struct omap_board_mux board_mux[] __initdata = { | ||
345 | { .reg_offset = OMAP_MUX_TERMINATOR }, | ||
346 | }; | ||
347 | #else | ||
348 | #define board_mux NULL | ||
349 | #endif | ||
350 | |||
341 | static void __init omap_h4_init(void) | 351 | static void __init omap_h4_init(void) |
342 | { | 352 | { |
353 | omap2420_mux_init(board_mux, OMAP_PACKAGE_ZAF); | ||
354 | |||
343 | /* | 355 | /* |
344 | * Make sure the serial ports are muxed on at this point. | 356 | * Make sure the serial ports are muxed on at this point. |
345 | * You have to mux them off in device drivers later on | 357 | * You have to mux them off in device drivers later on |