aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/sdhci.c
diff options
context:
space:
mode:
authorZhangfei Gao <zhangfei.gao@marvell.com>2010-09-20 15:15:18 -0400
committerChris Ball <cjb@laptop.org>2010-10-23 09:11:14 -0400
commit0397526d6ae2518b6c53efd1ff1e81b7d24c91da (patch)
treea57c3a2a2d69badff447bd76dfad7447d1986643 /drivers/mmc/host/sdhci.c
parentc4687d5f601be3f928b815b46964f7426c31aec7 (diff)
mmc: SDHC 3.0: correct f_min calculation for SD 3.0 spec
While we're at it, add symbols for SDHCI_MAX_DIV_SPEC_{200,300}. Signed-off-by: Zhangfei Gao <zhangfei.gao@marvell.com> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host/sdhci.c')
-rw-r--r--drivers/mmc/host/sdhci.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index ac8b12b18fa..e3c9153a87e 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1006,14 +1006,14 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
1006 if (host->max_clk <= clock) 1006 if (host->max_clk <= clock)
1007 div = 1; 1007 div = 1;
1008 else { 1008 else {
1009 for (div = 2; div < 2046; div += 2) { 1009 for (div = 2; div < SDHCI_MAX_DIV_SPEC_300; div += 2) {
1010 if ((host->max_clk / div) <= clock) 1010 if ((host->max_clk / div) <= clock)
1011 break; 1011 break;
1012 } 1012 }
1013 } 1013 }
1014 } else { 1014 } else {
1015 /* Version 2.00 divisors must be a power of 2. */ 1015 /* Version 2.00 divisors must be a power of 2. */
1016 for (div = 1; div < 256; div *= 2) { 1016 for (div = 1; div < SDHCI_MAX_DIV_SPEC_200; div *= 2) {
1017 if ((host->max_clk / div) <= clock) 1017 if ((host->max_clk / div) <= clock)
1018 break; 1018 break;
1019 } 1019 }
@@ -1835,8 +1835,10 @@ int sdhci_add_host(struct sdhci_host *host)
1835 mmc->ops = &sdhci_ops; 1835 mmc->ops = &sdhci_ops;
1836 if (host->ops->get_min_clock) 1836 if (host->ops->get_min_clock)
1837 mmc->f_min = host->ops->get_min_clock(host); 1837 mmc->f_min = host->ops->get_min_clock(host);
1838 else if (host->version >= SDHCI_SPEC_300)
1839 mmc->f_min = host->max_clk / SDHCI_MAX_DIV_SPEC_300;
1838 else 1840 else
1839 mmc->f_min = host->max_clk / 256; 1841 mmc->f_min = host->max_clk / SDHCI_MAX_DIV_SPEC_200;
1840 mmc->f_max = host->max_clk; 1842 mmc->f_max = host->max_clk;
1841 mmc->caps |= MMC_CAP_SDIO_IRQ; 1843 mmc->caps |= MMC_CAP_SDIO_IRQ;
1842 1844