diff options
| author | Andrew Gabbasov <andrew_gabbasov@mentor.com> | 2013-04-07 23:06:08 +0000 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2013-04-14 11:22:47 +0200 |
| commit | 9b74dc56fba2b9db39420f81c990284f36d5801f (patch) | |
| tree | de12f8c9a57135903b70ae9895fdc8a97397fee7 | |
| parent | 54899fc8fe7b33cbe1a7179e39d24e75ababcdc6 (diff) | |
| download | u-boot-imx-9b74dc56fba2b9db39420f81c990284f36d5801f.zip u-boot-imx-9b74dc56fba2b9db39420f81c990284f36d5801f.tar.gz u-boot-imx-9b74dc56fba2b9db39420f81c990284f36d5801f.tar.bz2 | |
fsl_esdhc: Fix DMA transfer completion waiting loop
Rework the waiting for transfer completion loop condition
to continue waiting until both Transfer Complete and DMA End
interrupts occur. Checking of DLA bit in Present State register
looks not needed in addition to interrupts status checking,
so it can be removed from the condition. Also, DMA Error
condition is added to the list of data errors, checked in the loop.
Signed-off-by: Andrew Gabbasov <andrew_gabbasov@mentor.com>
| -rw-r--r-- | drivers/mmc/fsl_esdhc.c | 3 | ||||
| -rw-r--r-- | include/fsl_esdhc.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index 737b812..e945c0a 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -397,8 +397,7 @@ esdhc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data) if (irqstat & DATA_ERR) return COMM_ERR; - } while (!(irqstat & IRQSTAT_TC) && - (esdhc_read32(®s->prsstat) & PRSSTAT_DLA)); + } while ((irqstat & DATA_COMPLETE) != DATA_COMPLETE); #endif if (data->flags & MMC_DATA_READ) check_and_invalidate_dcache_range(cmd, data); diff --git a/include/fsl_esdhc.h b/include/fsl_esdhc.h index 0a1a071..67d6057 100644 --- a/include/fsl_esdhc.h +++ b/include/fsl_esdhc.h @@ -63,7 +63,9 @@ #define IRQSTAT_CC (0x00000001) #define CMD_ERR (IRQSTAT_CIE | IRQSTAT_CEBE | IRQSTAT_CCE) -#define DATA_ERR (IRQSTAT_DEBE | IRQSTAT_DCE | IRQSTAT_DTOE) +#define DATA_ERR (IRQSTAT_DEBE | IRQSTAT_DCE | IRQSTAT_DTOE | \ + IRQSTAT_DMAE) +#define DATA_COMPLETE (IRQSTAT_TC | IRQSTAT_DINT) #define IRQSTATEN 0x0002e034 #define IRQSTATEN_DMAE (0x10000000) |