---

yaml --- r: 298815 b: refs/heads/master c: 4188bba h: refs/heads/master i: 298813: f2e8977 298811: 8ab2c15 298807: f60fa72 298799: 914f224 298783: 4304780 298751: fab771c v: v3
git-mirror · Apr 6, 2012 · 37f2907 · 37f2907
1 parent 83a4524
commit 37f2907
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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 */