sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

atmel_mci: after a software timeout the IP need to be reset 

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2013-01-25 16:17:43 +01:00 committed by Sascha Hauer
parent 14b2c8f15b
commit bc33582a8a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/mci/atmel_mci.c
View File

@ -48,6 +48,7 @@ struct atmel_mci {
unsigned long bus_hz;
u32 mode_reg;
bool need_reset;
};
#define to_mci_host(mci) container_of(mci, struct atmel_mci, mci)
@ -118,6 +119,7 @@ static int atmci_poll_status(struct atmel_mci *host, u32 mask)
return stat;
if (is_timeout(start, SECOND)) {
dev_err(host->hw_dev, "timeout\n");
host->need_reset = true;
return ATMCI_RTOE | stat;
}
if (stat & mask)
@ -412,10 +414,11 @@ static int atmci_request(struct mci_host *mci, struct mci_cmd *cmd, struct mci_d
u32 stat, cmdat = 0;
int ret;
if (host->caps.need_reset_after_xfer) {
if (host->need_reset || host->caps.need_reset_after_xfer) {
atmci_writel(host, ATMCI_CR, ATMCI_CR_SWRST);
atmci_writel(host, ATMCI_CR, ATMCI_CR_MCIEN);
atmci_writel(host, ATMCI_MR, host->mode_reg);
host->need_reset = false;
}
if (cmd->resp_type != MMC_RSP_NONE)