diff options
| author | Tom Rini <trini@konsulko.com> | 2021-06-28 16:22:13 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-06-28 16:22:13 -0400 |
| commit | 6d0453d88915feeece6e55748a2476d8509e5fad (patch) | |
| tree | f4564a64f771cb071a74787f11471250fdbdf47b /drivers/mmc/dw_mmc.c | |
| parent | 67edf2553f15e5148efca213af3f41cef3410680 (diff) | |
| parent | 3ef4572110a43acdd7d401b0cb184c6ebd6eaa17 (diff) | |
| download | u-boot-6d0453d88915feeece6e55748a2476d8509e5fad.zip u-boot-6d0453d88915feeece6e55748a2476d8509e5fad.tar.gz u-boot-6d0453d88915feeece6e55748a2476d8509e5fad.tar.bz2 | |
Merge tag 'v2021.07-rc5' into next
Prepare v2021.07-rc5
# gpg: Signature made Mon 28 Jun 2021 03:39:36 PM EDT
# gpg: using RSA key 1A3C7F70E08FAB1707809BBF147C39FF9634B72C
# gpg: Good signature from "Thomas Rini <trini@konsulko.com>" [ultimate]
# Conflicts:
# configs/am64x_evm_r5_defconfig
Diffstat (limited to 'drivers/mmc/dw_mmc.c')
| -rw-r--r-- | drivers/mmc/dw_mmc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c index 7c8a312..a949dad 100644 --- a/drivers/mmc/dw_mmc.c +++ b/drivers/mmc/dw_mmc.c @@ -166,7 +166,9 @@ static int dwmci_data_transfer(struct dwmci_host *host, struct mmc_data *data) if (host->fifo_mode && size) { len = 0; if (data->flags == MMC_DATA_READ && - (mask & DWMCI_INTMSK_RXDR)) { + (mask & (DWMCI_INTMSK_RXDR | DWMCI_INTMSK_DTO))) { + dwmci_writel(host, DWMCI_RINTSTS, + DWMCI_INTMSK_RXDR | DWMCI_INTMSK_DTO); while (size) { ret = dwmci_fifo_ready(host, DWMCI_FIFO_EMPTY, @@ -182,8 +184,6 @@ static int dwmci_data_transfer(struct dwmci_host *host, struct mmc_data *data) dwmci_readl(host, DWMCI_DATA); size = size > len ? (size - len) : 0; } - dwmci_writel(host, DWMCI_RINTSTS, - DWMCI_INTMSK_RXDR); } else if (data->flags == MMC_DATA_WRITE && (mask & DWMCI_INTMSK_TXDR)) { while (size) { |