From: Pierre Ossman <drzeus@drzeus.cx>
Date: Mon, 30 Jul 2007 16:23:53 +0000 (+0200)
Subject: sdio: enable wide bus mode
X-Git-Tag: v2.6.24-rc1~1464^2~33
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4ff6471c028a9885e8f09a000d87694f81190ab9;p=linux-2.6-omap-h63xx.git

sdio: enable wide bus mode

Enable 4-bit data bus mode, according to host and card
capabilities.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
---

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 62df8e17758..48c465a8e34 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -138,6 +138,32 @@ out:
 	return ret;
 }
 
+static int sdio_enable_wide(struct mmc_card *card)
+{
+	int ret;
+	u8 ctrl;
+
+	if (!(card->host->caps & MMC_CAP_4_BIT_DATA))
+		return 0;
+
+	if (card->cccr.low_speed && !card->cccr.wide_bus)
+		return 0;
+
+	ret = mmc_io_rw_direct(card, 0, 0, SDIO_CCCR_IF, 0, &ctrl);
+	if (ret)
+		return ret;
+
+	ctrl |= SDIO_BUS_WIDTH_4BIT;
+
+	ret = mmc_io_rw_direct(card, 1, 0, SDIO_CCCR_IF, ctrl, NULL);
+	if (ret)
+		return ret;
+
+	mmc_set_bus_width(card->host, MMC_BUS_WIDTH_4);
+
+	return 0;
+}
+
 /*
  * Host is being removed. Free up the current card.
  */
@@ -299,6 +325,13 @@ int mmc_attach_sdio(struct mmc_host *host, u32 ocr)
 	 */
 	mmc_set_clock(host, card->cis.max_dtr);
 
+	/*
+	 * Switch to wider bus (if supported).
+	 */
+	err = sdio_enable_wide(card);
+	if (err)
+		goto remove;
+
 	/*
 	 * Initialize (but don't add) all present functions.
 	 */