summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-06-04 08:49:08 -0400
committerTom Rini <trini@konsulko.com>2016-06-04 08:49:08 -0400
commitc41c649c2fdec7bf6ef84173597cc3feabdb7828 (patch)
treea6b7e3d25eb9d62e5b9989040aa39ddd1c00a83a /drivers/mmc
parentf15715afea3e7b576fad1f6877a073b65576a335 (diff)
parentff78aa2ba19cda755b01818fb3caf2aca9236865 (diff)
downloadblackbird-obmc-uboot-c41c649c2fdec7bf6ef84173597cc3feabdb7828.tar.gz
blackbird-obmc-uboot-c41c649c2fdec7bf6ef84173597cc3feabdb7828.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.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index 3acf9e8820..57ad9754f5 100644
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -308,14 +308,10 @@ static int esdhc_setup_data(struct mmc *mmc, struct mmc_data *data)
static void check_and_invalidate_dcache_range
(struct mmc_cmd *cmd,
struct mmc_data *data) {
-#ifdef CONFIG_FSL_LAYERSCAPE
unsigned start = 0;
-#else
- unsigned start = (unsigned)data->dest ;
-#endif
+ unsigned end = 0;
unsigned size = roundup(ARCH_DMA_MINALIGN,
data->blocks*data->blocksize);
- unsigned end = start+size ;
#ifdef CONFIG_FSL_LAYERSCAPE
dma_addr_t addr;
@@ -324,7 +320,10 @@ static void check_and_invalidate_dcache_range
printf("Error found for upper 32 bits\n");
else
start = lower_32_bits(addr);
+#else
+ start = (unsigned)data->dest;
#endif
+ end = start + size;
invalidate_dcache_range(start, end);
}
OpenPOWER on IntegriCloud