Commit 0397526d authored by Zhangfei Gao's avatar Zhangfei Gao Committed by Chris Ball
Browse files

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: default avatarZhangfei Gao <zhangfei.gao@marvell.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent c4687d5f

drivers/mmc/host/sdhci.c

+5 −3
Original line number Diff line number Diff line
@@ -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;

drivers/mmc/host/sdhci.h

+7 −0
Original line number Diff line number Diff line
@@ -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 {