diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-11-30 14:46:36 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-11-30 14:46:36 -0800 |
| commit | 52aa8c539dad56728527de664f368915ff44badf (patch) | |
| tree | 4aa8615023e0bc49153e1dc160fd727f09eb4f71 /arch/arm/mach-omap2/board-4430sdp.c | |
| parent | 55a4e78952286d498d89a399d845e7cfaa8ddd56 (diff) | |
| parent | 032a6424aeea7333a8dafc8cc05dd10b09c62680 (diff) | |
Merge branch 'ctrl-wip/mux-omap4-v4' of git://gitorious.org/omap-pm/linux into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-4430sdp.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-4430sdp.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index df5a425a49d..94d989bee8a 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -35,6 +35,7 @@ #include <plat/usb.h> #include <plat/mmc.h> +#include "mux.h" #include "hsmmc.h" #include "timer-gp.h" #include "control.h" @@ -505,9 +506,22 @@ static void __init omap_sfh7741prox_init(void) } } +#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_4430sdp_init(void) { int status; + int package = OMAP_PACKAGE_CBS; + + if (omap_rev() == OMAP4430_REV_ES1_0) + package = OMAP_PACKAGE_CBL; + omap4_mux_init(board_mux, package); omap4_i2c_init(); omap_sfh7741prox_init(); |