colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-nds32

Browse Source
This commit is contained in:
Tom Rini
2013-07-25 08:22:08 -04:00
parent 0b17998e50 c54fd3efa4
commit aaf5e82560
25 changed files with 384 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mmc/ftsdc010_mci.c
View File

@@ -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, &regs->dcr);
dcr = 0;
#ifdef CONFIG_FTSDC010_SDIO
dcr |= FTSDC010_DCR_FIFO_RST;
#endif
writel(dcr, &regs->dcr);
/* 2. clear status register */
writel(FTSDC010_STATUS_DATA_MASK | FTSDC010_STATUS_FIFO_URUN