aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-omap3beagle.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-omap3beagle.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-omap3beagle.c')
-rw-r--r--arch/arm/mach-omap2/board-omap3beagle.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 41480bd0e58a..e669dbb23b7e 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -45,6 +45,7 @@
45#include <plat/usb.h> 45#include <plat/usb.h>
46#include <plat/timer-gp.h> 46#include <plat/timer-gp.h>
47 47
48#include "mux.h"
48#include "mmc-twl4030.h" 49#include "mmc-twl4030.h"
49 50
50#define GPMC_CS0_BASE 0x60 51#define GPMC_CS0_BASE 0x60
@@ -422,8 +423,17 @@ static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
422 .reset_gpio_port[2] = -EINVAL 423 .reset_gpio_port[2] = -EINVAL
423}; 424};
424 425
426#ifdef CONFIG_OMAP_MUX
427static struct omap_board_mux board_mux[] __initdata = {
428 { .reg_offset = OMAP_MUX_TERMINATOR },
429};
430#else
431#define board_mux NULL
432#endif
433
425static void __init omap3_beagle_init(void) 434static void __init omap3_beagle_init(void)
426{ 435{
436 omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
427 omap3_beagle_i2c_init(); 437 omap3_beagle_i2c_init();
428 platform_add_devices(omap3_beagle_devices, 438 platform_add_devices(omap3_beagle_devices,
429 ARRAY_SIZE(omap3_beagle_devices)); 439 ARRAY_SIZE(omap3_beagle_devices));