summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2016-06-07 08:31:21 +0200
committerTom Rini <trini@konsulko.com>2016-06-09 13:53:08 -0400
commita5e27b416fd2068e2e9c01b307f449e29e7abcb5 (patch)
tree75c2103413ffdabfd82fb5cee2fe1c97522b62ab /drivers/mmc
parent496c5483e9ad80d34ff0d9ee9abb813e51be2237 (diff)
downloadtalos-obmc-uboot-a5e27b416fd2068e2e9c01b307f449e29e7abcb5.tar.gz
talos-obmc-uboot-a5e27b416fd2068e2e9c01b307f449e29e7abcb5.zip
mmc: revert mmc: Handle switch error status bit in MMC card status
revert patch: commit: 6b2221b008e0: mmc: Handle switch error status bit in MMC card status to get eMMC working on shc board Signed-off-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/mmc.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 94f19ade3e..758655850b 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -155,8 +155,6 @@ int mmc_send_status(struct mmc *mmc, int timeout)
#endif
return TIMEOUT;
}
- if (cmd.response[0] & MMC_STATUS_SWITCH_ERROR)
- return SWITCH_ERR;
return 0;
}
@@ -516,7 +514,7 @@ static int mmc_change_freq(struct mmc *mmc)
err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_HS_TIMING, 1);
if (err)
- return err == SWITCH_ERR ? 0 : err;
+ return err;
/* Now check to see that it worked */
err = mmc_send_ext_csd(mmc, ext_csd);
OpenPOWER on IntegriCloud