From: Daniel Chen <daniel.ch_chen@htc.com>
Date: Wed, 9 Dec 2009 17:45:36 +0000 (-0800)
Subject: mmc: sdio: Add high speed support to sdio_reset_comm()
X-Git-Tag: firefly_0821_release~9833^2~5^2~292
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=193916248ff067abfb0ea8c80c81c5c47f97d2d0;p=firefly-linux-kernel-4.4.55.git

mmc: sdio: Add high speed support to sdio_reset_comm()

Signed-off-by: San Mehat <san@google.com>
---

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index e2da3ac3fd92..cd37b3511f68 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -841,7 +841,28 @@ int sdio_reset_comm(struct mmc_card *card)
 			goto err;
 	}
 
-	mmc_set_clock(host, card->cis.max_dtr);
+	/*
+	 * Switch to high-speed (if supported).
+	 */
+	err = sdio_enable_hs(card);
+	if (err)
+		goto err;
+
+	/*
+	 * Change to the card's maximum speed.
+	 */
+	if (mmc_card_highspeed(card)) {
+		/*
+		 * The SDIO specification doesn't mention how
+		 * the CIS transfer speed register relates to
+		 * high-speed, but it seems that 50 MHz is
+		 * mandatory.
+		 */
+		mmc_set_clock(host, 50000000);
+	} else {
+		mmc_set_clock(host, card->cis.max_dtr);
+	}
+
 	err = sdio_enable_wide(card);
 	if (err)
 		goto err;