aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSoby Mathew <soby.mathew@arm.com>2018-10-12 14:17:59 +0100
committerGitHub <noreply@github.com>2018-10-12 14:17:59 +0100
commita3f92142e2fe21fc717aedb8b958b1b8c7502630 (patch)
tree5355d5820f2bd5c8983d87dada720c142ffc3166 /drivers
parent3e75ea4d1a6bb58b2a542cddcf274be6b612c440 (diff)
parenta21da47806c1b4590b040f88a8667c2d37973bea (diff)
downloadplatform_external_arm-trusted-firmware-a3f92142e2fe21fc717aedb8b958b1b8c7502630.tar.gz
platform_external_arm-trusted-firmware-a3f92142e2fe21fc717aedb8b958b1b8c7502630.tar.bz2
platform_external_arm-trusted-firmware-a3f92142e2fe21fc717aedb8b958b1b8c7502630.zip
Merge pull request #1622 from bryanodonoghue/master+imx7-mmc_fix
drivers: imx: mxc_usdhc: Do not set MMC_RSP_48 for MMC_RESPONSE_R2
Diffstat (limited to 'drivers')
-rw-r--r--drivers/imx/usdhc/imx_usdhc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/imx/usdhc/imx_usdhc.c b/drivers/imx/usdhc/imx_usdhc.c
index ea96833f5..1f9550e17 100644
--- a/drivers/imx/usdhc/imx_usdhc.c
+++ b/drivers/imx/usdhc/imx_usdhc.c
@@ -160,7 +160,7 @@ static int imx_usdhc_send_cmd(struct mmc_cmd *cmd)
mixctl |= MIXCTRL_DMAEN;
}
- if (cmd->resp_type & MMC_RSP_48)
+ if (cmd->resp_type & MMC_RSP_48 && cmd->resp_type != MMC_RESPONSE_R2)
xfertype |= XFERTYPE_RSPTYP_48;
else if (cmd->resp_type & MMC_RSP_136)
xfertype |= XFERTYPE_RSPTYP_136;