diff options
| author | Tom Rini <trini@ti.com> | 2013-07-25 08:22:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-07-25 08:51:51 -0400 |
| commit | aaf5e825606a70ddc8fca8e366d8c16a6fd3cc7c (patch) | |
| tree | 64eaea4d396dce4e0a30bb955b8240d4b199cdca /drivers/mmc | |
| parent | 0b17998e509e5614633aee0a3c5d6248f8bc580b (diff) | |
| parent | c54fd3efa497876a33cc3c6e7df514ae53abc729 (diff) | |
| download | u-boot-imx-aaf5e825606a70ddc8fca8e366d8c16a6fd3cc7c.zip u-boot-imx-aaf5e825606a70ddc8fca8e366d8c16a6fd3cc7c.tar.gz u-boot-imx-aaf5e825606a70ddc8fca8e366d8c16a6fd3cc7c.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-nds32
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/ftsdc010_mci.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c index f7b54b2..7600d5c 100644 --- a/drivers/mmc/ftsdc010_mci.c +++ b/drivers/mmc/ftsdc010_mci.c @@ -174,7 +174,11 @@ static int ftsdc010_request(struct mmc *mmc, struct mmc_cmd *cmd, len = data->blocksize * data->blocks; /* 1. data disable + fifo reset */ - writel(FTSDC010_DCR_FIFO_RST, ®s->dcr); + dcr = 0; +#ifdef CONFIG_FTSDC010_SDIO + dcr |= FTSDC010_DCR_FIFO_RST; +#endif + writel(dcr, ®s->dcr); /* 2. clear status register */ writel(FTSDC010_STATUS_DATA_MASK | FTSDC010_STATUS_FIFO_URUN |