diff options
author | Tony Lindgren <tony@atomide.com> | 2009-12-11 19:16:32 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-12-11 19:16:32 -0500 |
commit | ca5742bdb58ebb74499731855dccf8f8a858b2e4 (patch) | |
tree | 081a83ab562edc561487c24ca889d133750790e2 /arch/arm/mach-omap2/board-ldp.c | |
parent | ddaa912a2164d7ce7a03fcb384ed37e712bb4549 (diff) |
omap: mux: Add new style init functions to omap3 board-*.c files
Add new style mux init functions to omap3 board-*.c files
So far Beagle has been confirmed to be a CBB package,
and CM-T35 a CUS package.
Signed-off-by: Tony Lindgren <tony@atomide.com>
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 @@ | |||
43 | #include <plat/control.h> | 43 | #include <plat/control.h> |
44 | #include <plat/usb.h> | 44 | #include <plat/usb.h> |
45 | 45 | ||
46 | #include "mux.h" | ||
46 | #include "mmc-twl4030.h" | 47 | #include "mmc-twl4030.h" |
47 | 48 | ||
48 | #define LDP_SMSC911X_CS 1 | 49 | #define LDP_SMSC911X_CS 1 |
@@ -374,8 +375,17 @@ static struct platform_device *ldp_devices[] __initdata = { | |||
374 | &ldp_gpio_keys_device, | 375 | &ldp_gpio_keys_device, |
375 | }; | 376 | }; |
376 | 377 | ||
378 | #ifdef CONFIG_OMAP_MUX | ||
379 | static struct omap_board_mux board_mux[] __initdata = { | ||
380 | { .reg_offset = OMAP_MUX_TERMINATOR }, | ||
381 | }; | ||
382 | #else | ||
383 | #define board_mux NULL | ||
384 | #endif | ||
385 | |||
377 | static void __init omap_ldp_init(void) | 386 | static void __init omap_ldp_init(void) |
378 | { | 387 | { |
388 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); | ||
379 | omap_i2c_init(); | 389 | omap_i2c_init(); |
380 | platform_add_devices(ldp_devices, ARRAY_SIZE(ldp_devices)); | 390 | platform_add_devices(ldp_devices, ARRAY_SIZE(ldp_devices)); |
381 | ts_gpio = 54; | 391 | ts_gpio = 54; |