From: Mika Laitio <lamikr@pilppa.org>
Date: Mon, 19 Jan 2009 23:09:22 +0000 (+0200)
Subject: h63xx: mmc and sd card support
X-Git-Tag: v2.6.16-omap1-h63xx-1~4
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=6ecc7836d7c0db8ea724112c4584a192a349bb6c

h63xx: mmc and sd card support
---

diff --git a/arch/arm/mach-omap1/board-h6300.c b/arch/arm/mach-omap1/board-h6300.c
index 71caef9ea15..e2e93a2fca5 100644
--- a/arch/arm/mach-omap1/board-h6300.c
+++ b/arch/arm/mach-omap1/board-h6300.c
@@ -53,10 +53,21 @@ static struct omap_usb_config h6300_usb_config __initdata = {
 	.pins[0]	= 0,
 };
 
+static struct omap_mmc_config h6300_mmc_config __initdata = {
+	.mmc [0] = {
+		.enabled 	= 1,
+		.wire4		= 1,
+		.wp_pin		= OMAP_GPIO_IRQ(13),
+		.power_pin	= -1, // tps65010 ?
+		.switch_pin	= -1, // OMAP_MPUIO(1),	// = -1, // ARMIO2?
+	},
+};
+
 static struct omap_board_config_kernel h6300_config[] = {
 	{ OMAP_TAG_LCD,		&h6300_lcd_config },
  	{ OMAP_TAG_UART,	&h6300_uart_config },
 	{ OMAP_TAG_USB, 	&h6300_usb_config },
+	{ OMAP_TAG_MMC,		&h6300_mmc_config },
 };
 
 static void __init h6300_init_irq(void)
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 09aeeba61b7..8865175effd 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -21,6 +21,8 @@
 #include <asm/scatterlist.h>
 #include <linux/scatterlist.h>
 
+#include <asm/mach-types.h>
+
 #include <linux/mmc/card.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/protocol.h>
@@ -963,8 +965,9 @@ static void mmc_read_scrs(struct mmc_host *host)
 
 		mmc_decode_scr(card);
 	}
-
-	mmc_deselect_cards(host);
+	if (!machine_is_omap_h6300()) {
+		mmc_deselect_cards(host);
+	}
 }
 
 static unsigned int mmc_calculate_clock(struct mmc_host *host)