X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=arch%2Farm%2Fmach-omap2%2Fboard-apollon-mmc.c;h=35c2c07b08d0a27749127ebde5e78966246b383f;hb=d85146443d38ff51900ffe50ecda5c938251be9d;hp=f77167e1af004440e74e524120c331c7f4420ea0;hpb=c473022842b6618c08fca6bb2421d2e796aeff05;p=linux-2.6-omap-h63xx.git

diff --git a/arch/arm/mach-omap2/board-apollon-mmc.c b/arch/arm/mach-omap2/board-apollon-mmc.c
index f77167e1af0..35c2c07b08d 100644
--- a/arch/arm/mach-omap2/board-apollon-mmc.c
+++ b/arch/arm/mach-omap2/board-apollon-mmc.c
@@ -10,9 +10,10 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/platform_device.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/mmc.h>
+#include <mach/gpio.h>
+#include <mach/mmc.h>
 
 #ifdef CONFIG_MMC_OMAP
 
@@ -58,25 +59,37 @@ static void apollon_mmc_cleanup(struct device *dev)
 {
 }
 
-static struct omap_mmc_platform_data apollon_mmc_data = {
+/*
+ * Note: If you want to detect card feature, please assign GPIO 37
+ */
+static struct omap_mmc_platform_data mmc1_data = {
 	.nr_slots			= 1,
-	.switch_slot			= NULL,
 	.init				= apollon_mmc_late_init,
 	.cleanup			= apollon_mmc_cleanup,
+	.dma_mask			= 0xffffffff,
 	.slots[0]	= {
+		.wire4			= 1,
+
+		/*
+		 * Use internal loop-back in MMC/SDIO Module Input Clock
+		 * selection
+		 */
+		.internal_clock		= 1,
+
 		.set_power		= apollon_mmc_set_power,
 		.set_bus_mode		= apollon_mmc_set_bus_mode,
-		.get_ro			= NULL,
-		.get_cover_state	= NULL,
 		.ocr_mask		= MMC_VDD_30_31 | MMC_VDD_31_32 |
 					  MMC_VDD_32_33 | MMC_VDD_33_34,
 		.name			= "mmcblk",
 	},
 };
 
+static struct omap_mmc_platform_data *mmc_data[OMAP24XX_NR_MMC];
+
 void __init apollon_mmc_init(void)
 {
-	omap_set_mmc_info(1, &apollon_mmc_data);
+	mmc_data[0] = &mmc1_data;
+	omap2_init_mmc(mmc_data, OMAP24XX_NR_MMC);
 }
 
 #else	/* !CONFIG_MMC_OMAP */