Skip to contentSkip to conversation

ARM: OMAP: Adds MMC multislot for apollon

PATCH In review Kyungmin Park 2 participants 2 messages Dec 2, 2007 – Dec 3, 2007

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: OMAP: Adds MMC multislot for apollon

Adds MMC support for apollon using the MMC multislot support code.

---

arch/arm/mach-omap2/Makefile +1 -0
index 2195991..d4d6d98 100644
@@ -28,6 +28,7 @@ obj-$(CONFIG_MACH_OMAP_2430SDP)		+= board-2430sdp.o \
 obj-$(CONFIG_MACH_OMAP_2430OSK)		+= board-2430osk.o
 obj-$(CONFIG_MACH_OMAP_3430SDP)		+= board-3430sdp.o
 obj-$(CONFIG_MACH_OMAP_APOLLON)		+= board-apollon.o \
+					   board-apollon-mmc.o	\
 					   board-apollon-keys.o
 obj-$(CONFIG_MACH_NOKIA_N800)		+= board-n800.o board-n800-flash.o \
 					   board-n800-mmc.o board-n800-bt.o \
arch/arm/mach-omap2/board-apollon-mmc.c new file +88 -0

88 lines not on this page · raw message

arch/arm/mach-omap2/board-apollon.c +5 -4
index 9cff027..d815635 100644
@@ -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)
include/asm-arm/arch-omap/board-apollon.h +2 -0
index dcb587b..547125a 100644
@@ -29,6 +29,8 @@
 #ifndef __ASM_ARCH_OMAP_APOLLON_H
 #define __ASM_ARCH_OMAP_APOLLON_H
 
+extern void apollon_mmc_init(void);
+
 /* Placeholder for APOLLON specific defines */
 #define APOLLON_ETHR_GPIO_IRQ		74
 
maintainer
#1 lore raw
Quoted 1 line · Kyungmin Park

Adds MMC support for apollon using the MMC multislot support code.

Pushing today.

Tony