From: Bo Shen <voice.shen@atmel.com>
Date: Fri, 26 Apr 2013 00:27:07 +0000 (+0000)
Subject: mmc: atmel_mci: add mmc card support
X-Git-Tag: v2013.07-rc1~76
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=93e3236ccbd37369ed309bef5d77761e63d1759c;p=oweals%2Fu-boot.git

mmc: atmel_mci: add mmc card support

add mmc card support with atmel mci driver

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
---

diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c
index fc0a181231..77ebf174f0 100644
--- a/drivers/mmc/gen_atmel_mci.c
+++ b/drivers/mmc/gen_atmel_mci.c
@@ -211,7 +211,10 @@ mci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data)
 	/* Wait for the command to complete */
 	while (!((status = readl(&mci->sr)) & MMCI_BIT(CMDRDY)));
 
-	if (status & error_flags) {
+	if ((status & error_flags) & MMCI_BIT(RTOE)) {
+		dump_cmd(cmdr, cmd->cmdarg, status, "Command Time Out");
+		return TIMEOUT;
+	} else if (status & error_flags) {
 		dump_cmd(cmdr, cmd->cmdarg, status, "Command Failed");
 		return COMM_ERR;
 	}