diff options
| author | Tom Rini <trini@konsulko.com> | 2016-01-27 15:05:36 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-01-27 15:05:36 -0500 |
| commit | cd85bec36d0e0d16fedb00e0c434ed070a9c6b37 (patch) | |
| tree | 69f52abae63886f9c50671e1e058c1a26fc7c8bf /drivers/mmc | |
| parent | 19bde0316f2c58b3ab6357832790aee6ed7a4ad5 (diff) | |
| parent | b0f20caf6570fbc4d19c41dcedf9679784042860 (diff) | |
| download | talos-obmc-uboot-cd85bec36d0e0d16fedb00e0c434ed070a9c6b37.tar.gz talos-obmc-uboot-cd85bec36d0e0d16fedb00e0c434ed070a9c6b37.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/fsl_esdhc.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index 1ccc576c34..ea5f4bf6c0 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -105,12 +105,9 @@ static uint esdhc_xfertyp(struct mmc_cmd *cmd, struct mmc_data *data) else if (cmd->resp_type & MMC_RSP_PRESENT) xfertyp |= XFERTYP_RSPTYP_48; -#if defined(CONFIG_MX53) || defined(CONFIG_PPC_T4240) || \ - defined(CONFIG_LS102XA) || defined(CONFIG_FSL_LAYERSCAPE) || \ - defined(CONFIG_PPC_T4160) if (cmd->cmdidx == MMC_CMD_STOP_TRANSMISSION) xfertyp |= XFERTYP_CMDTYP_ABORT; -#endif + return XFERTYP_CMD(cmd->cmdidx) | xfertyp; } @@ -252,8 +249,15 @@ static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data) * Rounding up to next power of 2 * => timeout + 13 = log2(mmc->clock/4) + 1 * => timeout + 13 = fls(mmc->clock/4) + * + * However, the MMC spec "It is strongly recommended for hosts to + * implement more than 500ms timeout value even if the card + * indicates the 250ms maximum busy length." Even the previous + * value of 300ms is known to be insufficient for some cards. + * So, we use + * => timeout + 13 = fls(mmc->clock/2) */ - timeout = fls(mmc->clock/4); + timeout = fls(mmc->clock/2); timeout -= 13; if (timeout > 14) |
