LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmc: dw_mmc: cleanups 

The dw_mmc driver was responding to errors with debug(). Change that
to prinf()/puts() respectively so that any errors are immediately
obvious. Also adjust english in comments.

Signed-off-by: Pavel Machek <pavel@denx.de>
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@altera.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Tom Rini <trini@ti.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Pavel Machek <pavel@denx.de>
Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
Acked-by: Chin Liang See <clsee@altera.com>
This commit is contained in:
Pavel Machek 2014-09-05 12:49:48 +02:00 committed by Marek Vasut
parent be9f643ae6
commit f33c930583
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/mmc/dw_mmc.c
View File

@ -119,7 +119,7 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
while (dwmci_readl(host, DWMCI_STATUS) & DWMCI_BUSY) { while (dwmci_readl(host, DWMCI_STATUS) & DWMCI_BUSY) {
if (get_timer(start) > timeout) { if (get_timer(start) > timeout) {
printf("Timeout on data busy\n"); printf("%s: Timeout on data busy\n", __func__);
return TIMEOUT; return TIMEOUT;
} }
} }
@ -177,14 +177,24 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
} }
} }
if (i == retry) if (i == retry) {
printf("%s: Timeout.\n", __func__);
return TIMEOUT; return TIMEOUT;
}
if (mask & DWMCI_INTMSK_RTO) { if (mask & DWMCI_INTMSK_RTO) {
debug("Response Timeout..\n"); /*
* Timeout here is not necessarily fatal. (e)MMC cards
* will splat here when they receive CMD55 as they do
* not support this command and that is exactly the way
* to tell them apart from SD cards. Thus, this output
* below shall be debug(). eMMC cards also do not favor
* CMD8, please keep that in mind.
*/
debug("%s: Response Timeout.\n", __func__);
return TIMEOUT; return TIMEOUT;
} else if (mask & DWMCI_INTMSK_RE) { } else if (mask & DWMCI_INTMSK_RE) {
debug("Response Error..\n"); printf("%s: Response Error.\n", __func__);
return -1; return -1;
} }
@ -204,7 +214,7 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
do { do {
mask = dwmci_readl(host, DWMCI_RINTSTS); mask = dwmci_readl(host, DWMCI_RINTSTS);
if (mask & (DWMCI_DATA_ERR | DWMCI_DATA_TOUT)) { if (mask & (DWMCI_DATA_ERR | DWMCI_DATA_TOUT)) {
debug("DATA ERROR!\n"); printf("%s: DATA ERROR!\n", __func__);
return -1; return -1;
} }
} while (!(mask & DWMCI_INTMSK_DTO)); } while (!(mask & DWMCI_INTMSK_DTO));
@ -232,16 +242,16 @@ static int dwmci_setup_bus(struct dwmci_host *host, u32 freq)
if ((freq == host->clock) || (freq == 0)) if ((freq == host->clock) || (freq == 0))
return 0; return 0;
/* /*
* If host->get_mmc_clk didn't define, * If host->get_mmc_clk isn't defined,
* then assume that host->bus_hz is source clock value. * then assume that host->bus_hz is source clock value.
* host->bus_hz should be set from user. * host->bus_hz should be set by user.
*/ */
if (host->get_mmc_clk) if (host->get_mmc_clk)
sclk = host->get_mmc_clk(host); sclk = host->get_mmc_clk(host);
else if (host->bus_hz) else if (host->bus_hz)
sclk = host->bus_hz; sclk = host->bus_hz;
else { else {
printf("Didn't get source clock value..\n"); printf("%s: Didn't get source clock value.\n", __func__);
return -EINVAL; return -EINVAL;
} }
@ -260,7 +270,7 @@ static int dwmci_setup_bus(struct dwmci_host *host, u32 freq)
do { do {
status = dwmci_readl(host, DWMCI_CMD); status = dwmci_readl(host, DWMCI_CMD);
if (timeout-- < 0) { if (timeout-- < 0) {
printf("TIMEOUT error!!\n"); printf("%s: Timeout!\n", __func__);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
} while (status & DWMCI_CMD_START); } while (status & DWMCI_CMD_START);
@ -275,7 +285,7 @@ static int dwmci_setup_bus(struct dwmci_host *host, u32 freq)
do { do {
status = dwmci_readl(host, DWMCI_CMD); status = dwmci_readl(host, DWMCI_CMD);
if (timeout-- < 0) { if (timeout-- < 0) {
printf("TIMEOUT error!!\n"); printf("%s: Timeout!\n", __func__);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
} while (status & DWMCI_CMD_START); } while (status & DWMCI_CMD_START);
@ -290,7 +300,7 @@ static void dwmci_set_ios(struct mmc *mmc)
struct dwmci_host *host = (struct dwmci_host *)mmc->priv; struct dwmci_host *host = (struct dwmci_host *)mmc->priv;
u32 ctype, regs; u32 ctype, regs;
debug("Buswidth = %d, clock: %d\n",mmc->bus_width, mmc->clock); debug("Buswidth = %d, clock: %d\n", mmc->bus_width, mmc->clock);
dwmci_setup_bus(host, mmc->clock); dwmci_setup_bus(host, mmc->clock);
switch (mmc->bus_width) { switch (mmc->bus_width) {
@ -329,7 +339,7 @@ static int dwmci_init(struct mmc *mmc)
dwmci_writel(host, DWMCI_PWREN, 1); dwmci_writel(host, DWMCI_PWREN, 1);
if (!dwmci_wait_reset(host, DWMCI_RESET_ALL)) { if (!dwmci_wait_reset(host, DWMCI_RESET_ALL)) {
debug("%s[%d] Fail-reset!!\n",__func__,__LINE__); printf("%s[%d] Fail-reset!!\n", __func__, __LINE__);
return -1; return -1;
} }