Skip to contentSkip to conversation

PLAT: OMAP: Add device configuration to support second HSMMC slot on OMAP 2430 and 3430 boards.

PATCH In review Carlos Aguiar 3 participants 4 messages Mar 20, 2008 – Mar 28, 2008

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

Carlos Aguiar

author
#0 lore raw

PATCH 1/1 PLAT: OMAP: Add device configuration to support second HSMMC slot on OMAP 2430 and 3430 boards.

From: Jarkko Lavinen <[email protected]>

This patch adds device configuration to provide second HSMMC slot support on OMAP 2430 and 3430 boards.

Signed-off-by Jarkko Lavinen <[email protected]>
Signed-off-by Carlos Eduardo Aguiar <[email protected]>
---
 arch/arm/plat-omap/devices.c |   39 ++++++++++++++++++++++++++++++---------
 1 files changed, 30 insertions(+), 9 deletions(-)
arch/arm/plat-omap/devices.c +30 -9
index ec9a999..3ac2b9b 100644
@@ -155,13 +155,29 @@ static inline void omap_init_kp(void) {}
 	|| defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)
 
 #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
+#define OMAP_MMC_NAME		"hsmmc-omap"
+
 #define	OMAP_MMC1_BASE		0x4809c000
+#define OMAP_MMC1_END		OMAP_MMC1_BASE + 0x1fc
 #define OMAP_MMC1_INT		INT_24XX_MMC_IRQ
+
+#define OMAP_MMC2_BASE		0x480b4000
+#define OMAP_MMC2_END		OMAP_MMC2_BASE + 0x1fc
+#define OMAP_MMC2_INT		INT_24XX_MMC_IRQ
+
 #else
+
+#define OMAP_MMC_NAME		"mmci-omap"
+
 #define	OMAP_MMC1_BASE		0xfffb7800
+#define OMAP_MMC1_END		OMAP_MMC1_BASE + 0x7f
 #define OMAP_MMC1_INT		INT_MMC
-#endif
+
 #define	OMAP_MMC2_BASE		0xfffb7c00	/* omap16xx only */
+#define OMAP_MMC2_END		OMAP_MMC2_BASE + 0x7f
+#define OMAP_MMC2_INT		INT_1610_MMC2
+
+#endif
 
 static struct omap_mmc_platform_data mmc1_data;
 

@@ -170,7 +186,7 @@ static u64 mmc1_dmamask = 0xffffffff;
 static struct resource mmc1_resources[] = {
 	{
 		.start		= OMAP_MMC1_BASE,
-		.end		= OMAP_MMC1_BASE + 0x7f,
+		.end		= OMAP_MMC1_END,
 		.flags		= IORESOURCE_MEM,
 	},
 	{

@@ -180,7 +196,7 @@ static struct resource mmc1_resources[] = {
 };
 
 static struct platform_device mmc_omap_device1 = {
-	.name		= "mmci-omap",
+	.name		= OMAP_MMC_NAME,
 	.id		= 1,
 	.dev = {
 		.dma_mask	= &mmc1_dmamask,

@@ -190,7 +206,8 @@ static struct platform_device mmc_omap_device1 = {
 	.resource	= mmc1_resources,
 };
 
-#ifdef	CONFIG_ARCH_OMAP16XX
+#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX) \
+	|| defined(CONFIG_ARCH_OMAP34XX)
 
 static struct omap_mmc_platform_data mmc2_data;
 

@@ -200,17 +217,17 @@ static u64 mmc2_dmamask = 0xffffffff;
 static struct resource mmc2_resources[] = {
 	{
 		.start		= OMAP_MMC2_BASE,
-		.end		= OMAP_MMC2_BASE + 0x7f,
+		.end		= OMAP_MMC2_END,
 		.flags		= IORESOURCE_MEM,
 	},
 	{
-		.start		= INT_1610_MMC2,
+		.start		= OMAP_MMC2_INT,
 		.flags		= IORESOURCE_IRQ,
 	},
 };
 
 static struct platform_device mmc_omap_device2 = {
-	.name		= "mmci-omap",
+	.name		= OMAP_MMC_NAME,
 	.id		= 2,
 	.dev = {
 		.dma_mask	= &mmc2_dmamask,

@@ -235,8 +252,11 @@ static void __init omap_init_mmc(void)
 	mmc = &mmc_conf->mmc[0];
 
 	if (cpu_is_omap2430() || cpu_is_omap34xx()) {
-		if (mmc->enabled)
+		mmc = &mmc_conf->mmc[1];
+		if (mmc->enabled) {
 			(void) platform_device_register(&mmc_omap_device1);
+			(void) platform_device_register(&mmc_omap_device2);
+		}
 		return;
 	}
 

@@ -329,7 +349,8 @@ void omap_set_mmc_info(int host, const struct omap_mmc_platform_data *info)
 	case 1:
 		mmc1_data = *info;
 		break;
-#ifdef CONFIG_ARCH_OMAP16XX
+#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX) \
+	       || defined(CONFIG_ARCH_OMAP34XX)
 	case 2:
 		mmc2_data = *info;
 		break;

-- 1.5.3.GIT

#1 lore raw

arch/arm/plat-omap/devices.c static void __init omap_init_mmc(void) · line 259

Quoted 7 lines · Carlos Aguiar
arch/arm/plat-omap/devices.c +4 -1
 	if (cpu_is_omap2430() || cpu_is_omap34xx()) {
-		if (mmc->enabled)
+		mmc = &mmc_conf->mmc[1];
+		if (mmc->enabled) {
 			(void) platform_device_register(&mmc_omap_device1);
+			(void) platform_device_register(&mmc_omap_device2);
+		}

Shouldn't you only register each device if enabled in the corresponding configuration, i.e.:

	if (mmc_conf->mmc[1].enabled)
		(void) platform_device_register(&mmc_omap_device1);
	if (mmc_conf->mmc[2].enabled)
		(void) platform_device_register(&mmc_omap_device2);

It looks to me like, with this patch applied, no MMC devices will be registered with the current board-2430sdp.c.

Otherwise I'd say this looks like an improvement over what I worked up (I overlooked the section quoted above, which would have saved me the trouble of working out the muxings).

Cheers,
Seth

#2 lore raw
Quoted 7 lines · Seth Forshee

Shouldn't you only register each device if enabled in the corresponding configuration, i.e.:

	if (mmc_conf->mmc[1].enabled)
		(void) platform_device_register(&mmc_omap_device1);
	if (mmc_conf->mmc[2].enabled)
		(void) platform_device_register(&mmc_omap_device2);

Of course that should be 0 and 1, not 1 and 2.

#3 lore raw
Quoted 10 lines · Seth Forshee
Quoted 7 lines · Seth Forshee

Shouldn't you only register each device if enabled in the corresponding configuration, i.e.:

	if (mmc_conf->mmc[1].enabled)
		(void) platform_device_register(&mmc_omap_device1);
	if (mmc_conf->mmc[2].enabled)
		(void) platform_device_register(&mmc_omap_device2);

Of course that should be 0 and 1, not 1 and 2.

This sounds like a valid comment to me, so not pushing.

Tony