Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

Browse source
This commit is contained in:
Albert ARIBAUD 2013-04-14 11:45:06 +02:00
commit 345be0b267
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/mmc/fsl_esdhc.c
View file

@ -327,9 +327,6 @@ esdhc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data)
while (!(esdhc_read32(&regs->irqstat) & (IRQSTAT_CC | IRQSTAT_CTOE))) while (!(esdhc_read32(&regs->irqstat) & (IRQSTAT_CC | IRQSTAT_CTOE)))
; ;
if (data && (data->flags & MMC_DATA_READ))
check_and_invalidate_dcache_range(cmd, data);
irqstat = esdhc_read32(&regs->irqstat); irqstat = esdhc_read32(&regs->irqstat);
esdhc_write32(&regs->irqstat, irqstat); esdhc_write32(&regs->irqstat, irqstat);
@ -400,9 +397,10 @@ esdhc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data)
if (irqstat & DATA_ERR) if (irqstat & DATA_ERR)
return COMM_ERR; return COMM_ERR;
} while (!(irqstat & IRQSTAT_TC) && } while ((irqstat & DATA_COMPLETE) != DATA_COMPLETE);
(esdhc_read32(&regs->prsstat) & PRSSTAT_DLA));
#endif #endif
if (data->flags & MMC_DATA_READ)
check_and_invalidate_dcache_range(cmd, data);
} }
esdhc_write32(&regs->irqstat, -1); esdhc_write32(&regs->irqstat, -1);

4
include/fsl_esdhc.h
View file

@ -63,7 +63,9 @@
#define IRQSTAT_CC (0x00000001) #define IRQSTAT_CC (0x00000001)
#define CMD_ERR (IRQSTAT_CIE | IRQSTAT_CEBE | IRQSTAT_CCE) #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 0x0002e034
#define IRQSTATEN_DMAE (0x10000000) #define IRQSTATEN_DMAE (0x10000000)