aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-cm-t35.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2009-12-11 19:16:32 -0500
committerTony Lindgren <tony@atomide.com>2009-12-11 19:16:32 -0500
commitca5742bdb58ebb74499731855dccf8f8a858b2e4 (patch)
tree081a83ab562edc561487c24ca889d133750790e2 /arch/arm/mach-omap2/board-cm-t35.c
parentddaa912a2164d7ce7a03fcb384ed37e712bb4549 (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-cm-t35.c')
-rw-r--r--arch/arm/mach-omap2/board-cm-t35.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 22c45290db63..84321f67e7f1 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -45,6 +45,7 @@
45 45
46#include <mach/hardware.h> 46#include <mach/hardware.h>
47 47
48#include "mux.h"
48#include "sdram-micron-mt46h32m32lf-6.h" 49#include "sdram-micron-mt46h32m32lf-6.h"
49#include "mmc-twl4030.h" 50#include "mmc-twl4030.h"
50 51
@@ -482,8 +483,17 @@ static void __init cm_t35_map_io(void)
482 omap2_map_common_io(); 483 omap2_map_common_io();
483} 484}
484 485
486#ifdef CONFIG_OMAP_MUX
487static struct omap_board_mux board_mux[] __initdata = {
488 { .reg_offset = OMAP_MUX_TERMINATOR },
489};
490#else
491#define board_mux NULL
492#endif
493
485static void __init cm_t35_init(void) 494static void __init cm_t35_init(void)
486{ 495{
496 omap3_mux_init(board_mux, OMAP_PACKAGE_CUS);
487 omap_serial_init(); 497 omap_serial_init();
488 cm_t35_init_i2c(); 498 cm_t35_init_i2c();
489 cm_t35_init_nand(); 499 cm_t35_init_nand();