Merge git://git.denx.de/u-boot-dm

[oweals/u-boot.git] / drivers / mmc / sdhci.c

diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 5b404ff4a32b9b35d7a1ed2ef18882720b7cbb5f..c94d58db65c70ee8b32cd64e79ebd1b8f44dc262 100644 (file)
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -242,8 +242,10 @@ static int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd,
 
        sdhci_writel(host, cmd->cmdarg, SDHCI_ARGUMENT);
 #ifdef CONFIG_MMC_SDHCI_SDMA
-       trans_bytes = ALIGN(trans_bytes, CONFIG_SYS_CACHELINE_SIZE);
-       flush_cache(start_addr, trans_bytes);
+       if (data != 0) {
+               trans_bytes = ALIGN(trans_bytes, CONFIG_SYS_CACHELINE_SIZE);
+               flush_cache(start_addr, trans_bytes);
+       }
 #endif
        sdhci_writew(host, SDHCI_MAKE_CMD(cmd->cmdidx, flags), SDHCI_COMMAND);
        start = get_timer(0);
@@ -295,7 +297,7 @@ static int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd,
 static int sdhci_set_clock(struct mmc *mmc, unsigned int clock)
 {
        struct sdhci_host *host = mmc->priv;
-       unsigned int div, clk = 0, timeout, reg;
+       unsigned int div, clk = 0, timeout;
 
        /* Wait max 20 ms */
        timeout = 200;
@@ -311,9 +313,7 @@ static int sdhci_set_clock(struct mmc *mmc, unsigned int clock)
                udelay(100);
        }
 
-       reg = sdhci_readw(host, SDHCI_CLOCK_CONTROL);
-       reg &= ~(SDHCI_CLOCK_CARD_EN | SDHCI_CLOCK_INT_EN);
-       sdhci_writew(host, reg, SDHCI_CLOCK_CONTROL);
+       sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);
 
        if (clock == 0)
                return 0;
@@ -325,7 +325,7 @@ static int sdhci_set_clock(struct mmc *mmc, unsigned int clock)
                 */
                if (host->clk_mul) {
                        for (div = 1; div <= 1024; div++) {
-                               if ((mmc->cfg->f_max * host->clk_mul / div)
+                               if ((host->max_clk * host->clk_mul / div)
                                        <= clock)
                                        break;
                        }
@@ -338,13 +338,13 @@ static int sdhci_set_clock(struct mmc *mmc, unsigned int clock)
                        div--;
                } else {
                        /* Version 3.00 divisors must be a multiple of 2. */
-                       if (mmc->cfg->f_max <= clock) {
+                       if (host->max_clk <= clock) {
                                div = 1;
                        } else {
                                for (div = 2;
                                     div < SDHCI_MAX_DIV_SPEC_300;
                                     div += 2) {
-                                       if ((mmc->cfg->f_max / div) <= clock)
+                                       if ((host->max_clk / div) <= clock)
                                                break;
                                }
                        }
@@ -353,7 +353,7 @@ static int sdhci_set_clock(struct mmc *mmc, unsigned int clock)
        } else {
                /* Version 2.00 divisors must be a power of 2. */
                for (div = 1; div < SDHCI_MAX_DIV_SPEC_200; div *= 2) {
-                       if ((mmc->cfg->f_max / div) <= clock)
+                       if ((host->max_clk / div) <= clock)
                                break;
                }
                div >>= 1;
@@ -460,6 +460,10 @@ static int sdhci_set_ios(struct mmc *mmc)
 
        sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);
 
+       /* If available, call the driver specific "post" set_ios() function */
+       if (host->ops && host->ops->set_ios_post)
+               host->ops->set_ios_post(host);
+
        return 0;
 }
 
@@ -513,7 +517,7 @@ static const struct mmc_ops sdhci_ops = {
 #endif
 
 int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host,
-               u32 max_clk, u32 min_clk)
+               u32 f_max, u32 f_min)
 {
        u32 caps, caps_1;
 
@@ -536,24 +540,26 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host,
 #ifndef CONFIG_DM_MMC_OPS
        cfg->ops = &sdhci_ops;
 #endif
-       if (max_clk)
-               cfg->f_max = max_clk;
-       else {
+       if (host->max_clk == 0) {
                if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300)
-                       cfg->f_max = (caps & SDHCI_CLOCK_V3_BASE_MASK) >>
+                       host->max_clk = (caps & SDHCI_CLOCK_V3_BASE_MASK) >>
                                SDHCI_CLOCK_BASE_SHIFT;
                else
-                       cfg->f_max = (caps & SDHCI_CLOCK_BASE_MASK) >>
+                       host->max_clk = (caps & SDHCI_CLOCK_BASE_MASK) >>
                                SDHCI_CLOCK_BASE_SHIFT;
-               cfg->f_max *= 1000000;
+               host->max_clk *= 1000000;
        }
-       if (cfg->f_max == 0) {
+       if (host->max_clk == 0) {
                printf("%s: Hardware doesn't specify base clock frequency\n",
                       __func__);
                return -EINVAL;
        }
-       if (min_clk)
-               cfg->f_min = min_clk;
+       if (f_max && (f_max < host->max_clk))
+               cfg->f_max = f_max;
+       else
+               cfg->f_max = host->max_clk;
+       if (f_min)
+               cfg->f_min = f_min;
        else {
                if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300)
                        cfg->f_min = cfg->f_max / SDHCI_MAX_DIV_SPEC_300;
@@ -598,11 +604,11 @@ int sdhci_bind(struct udevice *dev, struct mmc *mmc, struct mmc_config *cfg)
        return mmc_bind(dev, mmc, cfg);
 }
 #else
-int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk)
+int add_sdhci(struct sdhci_host *host, u32 f_max, u32 f_min)
 {
        int ret;
 
-       ret = sdhci_setup_cfg(&host->cfg, host, max_clk, min_clk);
+       ret = sdhci_setup_cfg(&host->cfg, host, f_max, f_min);
        if (ret)
                return ret;