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-3430sdp.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-3430sdp.c')
-rw-r--r-- | arch/arm/mach-omap2/board-3430sdp.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index 5bda9fdbee9e..e5d911881534 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c | |||
@@ -42,6 +42,7 @@ | |||
42 | #include <plat/control.h> | 42 | #include <plat/control.h> |
43 | #include <plat/gpmc-smc91x.h> | 43 | #include <plat/gpmc-smc91x.h> |
44 | 44 | ||
45 | #include "mux.h" | ||
45 | #include "sdram-qimonda-hyb18m512160af-6.h" | 46 | #include "sdram-qimonda-hyb18m512160af-6.h" |
46 | #include "mmc-twl4030.h" | 47 | #include "mmc-twl4030.h" |
47 | 48 | ||
@@ -640,8 +641,17 @@ static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { | |||
640 | .reset_gpio_port[2] = -EINVAL | 641 | .reset_gpio_port[2] = -EINVAL |
641 | }; | 642 | }; |
642 | 643 | ||
644 | #ifdef CONFIG_OMAP_MUX | ||
645 | static struct omap_board_mux board_mux[] __initdata = { | ||
646 | { .reg_offset = OMAP_MUX_TERMINATOR }, | ||
647 | }; | ||
648 | #else | ||
649 | #define board_mux NULL | ||
650 | #endif | ||
651 | |||
643 | static void __init omap_3430sdp_init(void) | 652 | static void __init omap_3430sdp_init(void) |
644 | { | 653 | { |
654 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); | ||
645 | omap3430_i2c_init(); | 655 | omap3430_i2c_init(); |
646 | platform_add_devices(sdp3430_devices, ARRAY_SIZE(sdp3430_devices)); | 656 | platform_add_devices(sdp3430_devices, ARRAY_SIZE(sdp3430_devices)); |
647 | if (omap_rev() > OMAP3430_REV_ES1_0) | 657 | if (omap_rev() > OMAP3430_REV_ES1_0) |