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

Tegra2: mmc: Factor out mmc_wait_inhibit functionality

Browse Source 
This is a well encapsulated section of mmc_send_cmd, by moving
it to it's own function it increases the readability of mmc_send_cmd.

Signed-off-by: Anton Staaf <robotboy@chromium.org>
Cc: Andy Fleming <afleming@gmail.com>
Cc: Tom Warren <twarren@nvidia.com>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
This commit is contained in:
Anton staaf
2011-11-10 11:56:52 +00:00
committed by Andy Fleming
parent 9b3d1873c8
commit 0963ff3a97
1 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/mmc/tegra2_mmc.c
View File

@@ -116,34 +116,24 @@ static void mmc_set_transfer_mode(struct mmc_host *host, struct mmc_data *data)
writew(mode, &host->reg->trnmod); writew(mode, &host->reg->trnmod);
} }
static int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, static int mmc_wait_inhibit(struct mmc_host *host,
struct mmc_data *data) struct mmc_cmd *cmd,
struct mmc_data *data,
unsigned int timeout)
{ {
struct mmc_host *host = (struct mmc_host *)mmc->priv;
int flags, i;
unsigned int timeout;
unsigned int mask;
unsigned int retry = 0x100000;
debug(" mmc_send_cmd called\n");
/* Wait max 10 ms */
timeout = 10;
/* /*
* PRNSTS * PRNSTS
* CMDINHDAT[1] : Command Inhibit (DAT) * CMDINHDAT[1] : Command Inhibit (DAT)
* CMDINHCMD[0] : Command Inhibit (CMD) * CMDINHCMD[0] : Command Inhibit (CMD)
*/ */
mask = TEGRA_MMC_PRNSTS_CMD_INHIBIT_CMD; unsigned int mask = TEGRA_MMC_PRNSTS_CMD_INHIBIT_CMD;
if ((data != NULL) || (cmd->resp_type & MMC_RSP_BUSY))
mask |= TEGRA_MMC_PRNSTS_CMD_INHIBIT_DAT;
/* /*
* We shouldn't wait for data inhibit for stop commands, even * We shouldn't wait for data inhibit for stop commands, even
* though they might use busy signaling * though they might use busy signaling
*/ */
if (data) if ((data == NULL) && (cmd->resp_type & MMC_RSP_BUSY))
mask &= ~TEGRA_MMC_PRNSTS_CMD_INHIBIT_DAT; mask |= TEGRA_MMC_PRNSTS_CMD_INHIBIT_DAT;
while (readl(&host->reg->prnsts) & mask) { while (readl(&host->reg->prnsts) & mask) {
if (timeout == 0) { if (timeout == 0) {
@@ -154,6 +144,24 @@ static int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
udelay(1000); udelay(1000);
} }
return 0;
}
static int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
struct mmc_data *data)
{
struct mmc_host *host = (struct mmc_host *)mmc->priv;
int flags, i;
int result;
unsigned int mask;
unsigned int retry = 0x100000;
debug(" mmc_send_cmd called\n");
result = mmc_wait_inhibit(host, cmd, data, 10 /* ms */);
if (result < 0)
return result;
if (data) if (data)
mmc_prepare_data(host, data); mmc_prepare_data(host, data);