diff mbox

[U-Boot,v3,08/12] mmc: revert mmc: Handle switch error status bit in MMC card status

Message ID 1465281085-10481-9-git-send-email-hs@denx.de
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Heiko Schocher June 7, 2016, 6:31 a.m. UTC 
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>
---

Changes in v3: None
Changes in v2: None

 drivers/mmc/mmc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Tom Rini June 9, 2016, 6:03 p.m. UTC | #1 
On Tue, Jun 07, 2016 at 08:31:21AM +0200, Heiko Schocher wrote:

> 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>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 94f19ad..7586558 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);