From 37f290704e471c438f67c4c133b2a58594ace3ff Mon Sep 17 00:00:00 2001
From: Al Cooper <acooper@gmail.com>
Date: Fri, 16 Mar 2012 15:54:17 -0400
Subject: [PATCH] --- yaml --- r: 298815 b: refs/heads/master c:
 4188bba0e9e7ba58d231b528df495666f2742b74 h: refs/heads/master i:   298813:
 f2e89776e6a24ea4a320f0c4bf6b25b081940365   298811:
 8ab2c15184df7d78cc4d70a088ce3f4b2b025efd   298807:
 f60fa7252ef587c68e8652cb6de98f7705c8089e   298799:
 914f224257b440dd676c9d9823b79e31767060e7   298783:
 4304780ef703adf7fe6704509f1fbae063ea1416   298751:
 fab771cf0ab18e0e2ea39c451dfc49b93c2898e5 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/mmc/host/sdhci.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 86dd1c13e5b8..46c4c0353c56 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79263f33b0f3abe26d74a66824b457b94bdbef9f
+refs/heads/master: 4188bba0e9e7ba58d231b528df495666f2742b74
diff --git a/trunk/drivers/mmc/host/sdhci.c b/trunk/drivers/mmc/host/sdhci.c
index 8262cadfdab7..9aa77f3f04a8 100644
--- a/trunk/drivers/mmc/host/sdhci.c
+++ b/trunk/drivers/mmc/host/sdhci.c
@@ -2782,8 +2782,9 @@ int sdhci_add_host(struct sdhci_host *host)
 	    mmc_card_is_removable(mmc))
 		mmc->caps |= MMC_CAP_NEEDS_POLL;
 
-	/* UHS-I mode(s) supported by the host controller. */
-	if (host->version >= SDHCI_SPEC_300)
+	/* Any UHS-I mode in caps implies SDR12 and SDR25 support. */
+	if (caps[1] & (SDHCI_SUPPORT_SDR104 | SDHCI_SUPPORT_SDR50 |
+		       SDHCI_SUPPORT_DDR50))
 		mmc->caps |= MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25;
 
 	/* SDR104 supports also implies SDR50 support */