Skip to contentSkip to conversation

MMC/SD Controller driver for OMAP2430

PATCH New Madhusudhan Chikkature Rajashekar 1 participant 1 message Dec 11, 2007

Subsystems (2)
Arm (32-bit) Arm sub-architectures
lore
Share & tools
lore

Madhusudhan Chikkature Rajashekar

author
#0 lore raw

PATCH 3/4 MMC/SD Controller driver for OMAP2430

Hi Tony,

I am reposting the patch after removing the ifdefs pointed out by you.

Thanks,
Madhu
--------------------------------------------------------------------------------

This patch registers the MMC device for OMAP2430/3430.

Signed-off-by Madhusudhan Chikkature<[email protected]>
---
 arch/arm/plat-omap/devices.c |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)
arch/arm/plat-omap/devices.c +10 -5
Index: Madhu-linux-mmc/arch/arm/plat-omap/devices.c
===================================================================
@@ -19,6 +19,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
 
+#include <asm/arch/mmc.h>
 #include <asm/arch/tc.h>
 #include <asm/arch/board.h>
 #include <asm/arch/mmc.h>

@@ -156,7 +157,7 @@
 
 #if	defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)
 
-#ifdef CONFIG_ARCH_OMAP24XX
+#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
 #define	OMAP_MMC1_BASE		0x4809c000
 #define OMAP_MMC1_INT		INT_24XX_MMC_IRQ
 #else

@@ -228,10 +229,6 @@
 	const struct omap_mmc_config	*mmc_conf;
 	const struct omap_mmc_conf	*mmc;
 
-	/* REVISIT: 2430 has HS MMC */
-	if (cpu_is_omap2430() || cpu_is_omap34xx())
-		return;
-
 	/* NOTE:  assumes MMC was never (wrongly) enabled */
 	mmc_conf = omap_get_config(OMAP_TAG_MMC, struct omap_mmc_config);
 	if (!mmc_conf)

@@ -239,6 +236,13 @@
 
 	/* block 1 is always available and has just one pinout option */
 	mmc = &mmc_conf->mmc[0];
+
+	if (cpu_is_omap2430() || cpu_is_omap34xx()) {
+		if (mmc->enabled)
+			(void) platform_device_register(&mmc_omap_device1);
+		return;
+	}
+
 	if (mmc->enabled) {
 		if (cpu_is_omap24xx()) {
 			omap_cfg_reg(H18_24XX_MMC_CMD);

@@ -339,6 +343,7 @@
 }
 
 #else
+void omap_set_mmc_info(int host, const struct omap_mmc_platform_data *info) {}
 static inline void omap_init_mmc(void) {}
 #endif