diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-26 12:26:24 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-26 12:26:24 -0500 |
| commit | cf4128e53caa4f7b0a6586fc3f10690d5c05db31 (patch) | |
| tree | 2e953d14e76609fadaf1acb8593b46c38c604cdc /drivers/mmc/sdhci.c | |
| parent | f59f07ece5ec78a8fc2f0e06a80ff66029002629 (diff) | |
| parent | e559ef1ae80c1bde942ad9c62932de20e2b68cef (diff) | |
Merge git://www.denx.de/git/u-boot-marvell
Diffstat (limited to 'drivers/mmc/sdhci.c')
| -rw-r--r-- | drivers/mmc/sdhci.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 84e05815bf..93cefd89cd 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -295,7 +295,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 +311,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; @@ -460,6 +458,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; } |