ARM: OMAP: Adds MMC multislot for apollon

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / board-apollon.c

diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c
index 9cff0278aa00950d1dddcbf8c7c72d3f2124aad9..d81563564895d801ccf4821f4f75b1128b74109d 100644 (file)
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@ -283,16 +283,15 @@ static struct omap_uart_config apollon_uart_config __initdata = {
        .enabled_uarts = (1 << 0) | (0 << 1) | (0 << 2),
 };
 
+/*
+ * Note: If you want to detect card feature, please assign GPIO 37
+ */
 static struct omap_mmc_config apollon_mmc_config __initdata = {
        .mmc [0] = {
                .enabled        = 1,
                .wire4          = 1,
        /* Use internal loop-back in MMC/SDIO Module Input Clock selection */
                .internal_clock = 1,
-               .wp_pin         = -1,
-               .power_pin      = -1,
-       /* Note: If you want to detect card feature, please assign 37 */
-               .switch_pin     = -1,
        },
 };
 
@@ -386,6 +385,8 @@ static void __init omap_apollon_init(void)
 
        spi_register_board_info(apollon_spi_board_info,
                                ARRAY_SIZE(apollon_spi_board_info));
+
+       apollon_mmc_init();
 }
 
 static void __init omap_apollon_map_io(void)