diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-12-11 16:19:16 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-12-11 16:19:16 -0800 |
| commit | 5ccf197859d6f6bcf56e85657019503b2d95767a (patch) | |
| tree | 85cb5562b550571297cdd347a578ae337eb8f39f /arch/arm/mach-omap2/board-ldp.c | |
| parent | 24ed45aa0776f9f645aa1ac1a88b2e1d5f29a9aa (diff) | |
| parent | 435bb827499014ab0e57de75e9606861b08fe894 (diff) | |
Merge branch 'for-next' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-ldp.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-ldp.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index c062238fe881..37431738f1c2 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c @@ -43,6 +43,7 @@ #include <plat/control.h> #include <plat/usb.h> +#include "mux.h" #include "mmc-twl4030.h" #define LDP_SMSC911X_CS 1 @@ -374,8 +375,17 @@ static struct platform_device *ldp_devices[] __initdata = { &ldp_gpio_keys_device, }; +#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_ldp_init(void) { + omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); omap_i2c_init(); platform_add_devices(ldp_devices, ARRAY_SIZE(ldp_devices)); ts_gpio = 54; |