diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-02-06 22:28:34 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-02-06 22:28:34 +0100 |
| commit | e9e481f74b4ebb75858a535a79dbb1cde6aff0b6 (patch) | |
| tree | 9eb9f92fd053600c37f77d36ea86f53ce23acfb1 /drivers/mmc/fsl_esdhc.c | |
| parent | f69b980d108b5f15ca7dd3f4284d5a66488c3625 (diff) | |
| parent | 04a641df25c73283ce22dc5fdf8bc6d56d1d3742 (diff) | |
| download | u-boot-imx-e9e481f74b4ebb75858a535a79dbb1cde6aff0b6.zip u-boot-imx-e9e481f74b4ebb75858a535a79dbb1cde6aff0b6.tar.gz u-boot-imx-e9e481f74b4ebb75858a535a79dbb1cde6aff0b6.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'drivers/mmc/fsl_esdhc.c')
| -rw-r--r-- | drivers/mmc/fsl_esdhc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index d01c926..f3cccbe 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -219,6 +219,11 @@ static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data) if (timeout < 0) timeout = 0; +#ifdef CONFIG_SYS_FSL_ERRATUM_ESDHC_A001 + if ((timeout == 4) || (timeout == 8) || (timeout == 12)) + timeout++; +#endif + esdhc_clrsetbits32(®s->sysctl, SYSCTL_TIMEOUT_MASK, timeout << 16); return 0; |