diff options
author | Tom Rini <trini@konsulko.com> | 2020-02-20 07:27:31 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-02-20 07:27:31 -0500 |
commit | 4246fae418f213d13ddd1829367183e94b5a7942 (patch) | |
tree | 7bcaff8eccf086e9a87536ee74c7ebde817c71a8 /drivers/mmc/tmio-common.c | |
parent | 9770f92d022211dc02fb496a7642fde1a96a2292 (diff) | |
parent | 4155ad9aac9474610038b525da9eec8ad9afbc12 (diff) |
Merge tag 'mmc-2-20-2020' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc
- sdhci: code clean-up and fix cache coherency problem
- enable cache snooping on mpc830x
- Fix build error when MMC_WRITE disabled
Diffstat (limited to 'drivers/mmc/tmio-common.c')
-rw-r--r-- | drivers/mmc/tmio-common.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c index 092b740f564..faf18191b30 100644 --- a/drivers/mmc/tmio-common.c +++ b/drivers/mmc/tmio-common.c @@ -4,7 +4,6 @@ * Author: Masahiro Yamada <yamada.masahiro@socionext.com> */ -#include <asm/dma-mapping.h> #include <common.h> #include <clk.h> #include <cpu_func.h> @@ -14,7 +13,7 @@ #include <dm/device_compat.h> #include <dm/pinctrl.h> #include <linux/compat.h> -#include <linux/dma-direction.h> +#include <linux/dma-mapping.h> #include <linux/io.h> #include <linux/sizes.h> #include <power/regulator.h> @@ -353,7 +352,7 @@ static int tmio_sd_dma_xfer(struct udevice *dev, struct mmc_data *data) if (poll_flag == TMIO_SD_DMA_INFO1_END_RD) udelay(1); - dma_unmap_single(buf, len, dir); + dma_unmap_single(dma_addr, len, dir); return ret; } |