From ceea6399767dfb47b07211f55d5c57ce19e8de12 Mon Sep 17 00:00:00 2001 From: Zhangfei Gao Date: Mon, 20 Sep 2010 15:15:18 -0400 Subject: [PATCH] --- yaml --- r: 218987 b: refs/heads/master c: 0397526d6ae2518b6c53efd1ff1e81b7d24c91da h: refs/heads/master i: 218985: 7ca4d2635266e74e7ae7c31976a8689bb858ec8c 218983: 001e1ee254cc2e86e748448351ad4a28d13499dd v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sdhci.c | 8 +++++--- trunk/drivers/mmc/host/sdhci.h | 7 +++++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5cd3736b9d49..52c7b7431ce6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c4687d5f601be3f928b815b46964f7426c31aec7 +refs/heads/master: 0397526d6ae2518b6c53efd1ff1e81b7d24c91da diff --git a/trunk/drivers/mmc/host/sdhci.c b/trunk/drivers/mmc/host/sdhci.c index ac8b12b18fa4..e3c9153a87e8 100644 --- a/trunk/drivers/mmc/host/sdhci.c +++ b/trunk/drivers/mmc/host/sdhci.c @@ -1006,14 +1006,14 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock) if (host->max_clk <= clock) div = 1; else { - for (div = 2; div < 2046; div += 2) { + for (div = 2; div < SDHCI_MAX_DIV_SPEC_300; div += 2) { if ((host->max_clk / div) <= clock) break; } } } else { /* Version 2.00 divisors must be a power of 2. */ - for (div = 1; div < 256; div *= 2) { + for (div = 1; div < SDHCI_MAX_DIV_SPEC_200; div *= 2) { if ((host->max_clk / div) <= clock) break; } @@ -1835,8 +1835,10 @@ int sdhci_add_host(struct sdhci_host *host) mmc->ops = &sdhci_ops; if (host->ops->get_min_clock) mmc->f_min = host->ops->get_min_clock(host); + else if (host->version >= SDHCI_SPEC_300) + mmc->f_min = host->max_clk / SDHCI_MAX_DIV_SPEC_300; else - mmc->f_min = host->max_clk / 256; + mmc->f_min = host->max_clk / SDHCI_MAX_DIV_SPEC_200; mmc->f_max = host->max_clk; mmc->caps |= MMC_CAP_SDIO_IRQ; diff --git a/trunk/drivers/mmc/host/sdhci.h b/trunk/drivers/mmc/host/sdhci.h index ae28a310a6a1..112543ae36c9 100644 --- a/trunk/drivers/mmc/host/sdhci.h +++ b/trunk/drivers/mmc/host/sdhci.h @@ -185,6 +185,13 @@ #define SDHCI_SPEC_200 1 #define SDHCI_SPEC_300 2 +/* + * End of controller registers. + */ + +#define SDHCI_MAX_DIV_SPEC_200 256 +#define SDHCI_MAX_DIV_SPEC_300 2046 + struct sdhci_ops; struct sdhci_host {