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-omap3pandora.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-omap3pandora.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3pandora.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index 2db5ba5b3bf7..9f59c03d7808 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c | |||
@@ -42,6 +42,7 @@ | |||
42 | #include <plat/usb.h> | 42 | #include <plat/usb.h> |
43 | #include <plat/mux.h> | 43 | #include <plat/mux.h> |
44 | 44 | ||
45 | #include "mux.h" | ||
45 | #include "sdram-micron-mt46h32m32lf-6.h" | 46 | #include "sdram-micron-mt46h32m32lf-6.h" |
46 | #include "mmc-twl4030.h" | 47 | #include "mmc-twl4030.h" |
47 | 48 | ||
@@ -409,8 +410,17 @@ static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { | |||
409 | .reset_gpio_port[2] = -EINVAL | 410 | .reset_gpio_port[2] = -EINVAL |
410 | }; | 411 | }; |
411 | 412 | ||
413 | #ifdef CONFIG_OMAP_MUX | ||
414 | static struct omap_board_mux board_mux[] __initdata = { | ||
415 | { .reg_offset = OMAP_MUX_TERMINATOR }, | ||
416 | }; | ||
417 | #else | ||
418 | #define board_mux NULL | ||
419 | #endif | ||
420 | |||
412 | static void __init omap3pandora_init(void) | 421 | static void __init omap3pandora_init(void) |
413 | { | 422 | { |
423 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); | ||
414 | omap3pandora_i2c_init(); | 424 | omap3pandora_i2c_init(); |
415 | platform_add_devices(omap3pandora_devices, | 425 | platform_add_devices(omap3pandora_devices, |
416 | ARRAY_SIZE(omap3pandora_devices)); | 426 | ARRAY_SIZE(omap3pandora_devices)); |