diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2012-06-12 22:56:09 +0200 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2012-07-21 00:02:07 -0400 |
| commit | 7541ca98477862e2e9988c6c2ceadbdccefa9d77 (patch) | |
| tree | a1a98f8dba20ed272b9c7acbd7cd2ed2e4da60de /drivers/mmc | |
| parent | 94c6cee91bebfc17596243b6a5f4fe910feec426 (diff) | |
| download | linux-7541ca98477862e2e9988c6c2ceadbdccefa9d77.tar.gz linux-7541ca98477862e2e9988c6c2ceadbdccefa9d77.tar.bz2 linux-7541ca98477862e2e9988c6c2ceadbdccefa9d77.zip | |
mmc: sh_mmcif: Support MMC_SLEEP_AWAKE command
The MMC_SLEEP_AWAKE and SD_IO_SEND_OP_COND commands share the same
opcode. SD_IO_SEND_OP_COND isn't supported by the SH MMCIF, but
MMC_SLEEP_AWAKE is. Discriminate between the two commands using the
command flags, and reject SD_IO_SEND_OP_COND only.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sh_mmcif.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index 724b35e85a26..e32da1126e8d 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c @@ -892,21 +892,15 @@ static void sh_mmcif_request(struct mmc_host *mmc, struct mmc_request *mrq) switch (mrq->cmd->opcode) { /* MMCIF does not support SD/SDIO command */ - case SD_IO_SEND_OP_COND: + case MMC_SLEEP_AWAKE: /* = SD_IO_SEND_OP_COND (5) */ + case MMC_SEND_EXT_CSD: /* = SD_SEND_IF_COND (8) */ + if ((mrq->cmd->flags & MMC_CMD_MASK) != MMC_CMD_BCR) + break; case MMC_APP_CMD: host->state = STATE_IDLE; mrq->cmd->error = -ETIMEDOUT; mmc_request_done(mmc, mrq); return; - case MMC_SEND_EXT_CSD: /* = SD_SEND_IF_COND (8) */ - if (!mrq->data) { - /* send_if_cond cmd (not support) */ - host->state = STATE_IDLE; - mrq->cmd->error = -ETIMEDOUT; - mmc_request_done(mmc, mrq); - return; - } - break; default: break; } |