]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
mmc: revert mmc: Handle switch error status bit in MMC card status
authorHeiko Schocher <hs@denx.de>
Tue, 7 Jun 2016 06:31:21 +0000 (08:31 +0200)
committerTom Rini <trini@konsulko.com>
Thu, 9 Jun 2016 17:53:08 +0000 (13:53 -0400)
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>
drivers/mmc/mmc.c

index 94f19ade3eda0b3d6e2157d87e66c0bed29e62f3..758655850bb10ae38266e14b57c52bc08a89dda4 100644 (file)
@@ -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);