|
@@ -121,8 +121,8 @@ static void esdhc_writeb(struct sdhci_host *host, u8 val, int reg)
|
|
|
|
|
|
static void esdhc_set_clock(struct sdhci_host *host, unsigned int clock)
|
|
|
{
|
|
|
- int div;
|
|
|
int pre_div = 2;
|
|
|
+ int div = 1;
|
|
|
|
|
|
clrbits32(host->ioaddr + ESDHC_SYSTEM_CONTROL, ESDHC_CLOCK_IPGEN |
|
|
|
ESDHC_CLOCK_HCKEN | ESDHC_CLOCK_PEREN | ESDHC_CLOCK_MASK);
|
|
@@ -130,17 +130,14 @@ static void esdhc_set_clock(struct sdhci_host *host, unsigned int clock)
|
|
|
if (clock == 0)
|
|
|
goto out;
|
|
|
|
|
|
- if (host->max_clk / 16 > clock) {
|
|
|
- for (; pre_div < 256; pre_div *= 2) {
|
|
|
- if (host->max_clk / pre_div < clock * 16)
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
+ while (host->max_clk / pre_div / 16 > clock && pre_div < 256)
|
|
|
+ pre_div *= 2;
|
|
|
|
|
|
- for (div = 1; div <= 16; div++) {
|
|
|
- if (host->max_clk / (div * pre_div) <= clock)
|
|
|
- break;
|
|
|
- }
|
|
|
+ while (host->max_clk / pre_div / div > clock && div < 16)
|
|
|
+ div++;
|
|
|
+
|
|
|
+ dev_dbg(mmc_dev(host->mmc), "desired SD clock: %d, actual: %d\n",
|
|
|
+ clock, host->max_clk / pre_div / div);
|
|
|
|
|
|
pre_div >>= 1;
|
|
|
div--;
|