Skip to content

Commit

Permalink
mmc: SDHC 3.0: correct f_min calculation for SD 3.0 spec
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Zhangfei Gao authored and Chris Ball committed Oct 23, 2010
1 parent c4687d5 commit 0397526
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/mmc/host/sdhci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;

Expand Down
7 changes: 7 additions & 0 deletions drivers/mmc/host/sdhci.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 0397526

Please sign in to comment.