diff options
| author | Josh Wu <josh.wu@atmel.com> | 2012-10-22 15:49:04 +0800 |
|---|---|---|
| committer | Josh Wu <josh.wu@atmel.com> | 2012-10-22 15:49:04 +0800 |
| commit | d09dc68d74844b44b89a1311f60055351952fb0e (patch) | |
| tree | 6d4bf5d6962bfa3c5d4597d8fbcdb7e2fd840266 /drivers/mmc | |
| parent | 6528ff0109d81c1f21d20f9f1370782bccf87bcb (diff) | |
| parent | 3cda03c7fa4413eef2ee250b5936a88c25dbc1be (diff) | |
Merge branch 'josh/sama5ek/v2012.10-rc1' into josh/sama5ek/v2012.10
Conflicts:
drivers/mtd/spi/atmel.c
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/gen_atmel_mci.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c index 4968c5e491..1e104f6fe1 100644 --- a/drivers/mmc/gen_atmel_mci.c +++ b/drivers/mmc/gen_atmel_mci.c @@ -83,10 +83,17 @@ static void mci_set_mode(struct mmc *mmc, u32 hz, u32 blklen) blklen &= 0xfffc; /* On some platforms RDPROOF and WRPROOF are ignored */ +#ifdef CONFIG_AT91SAMA5 + writel((MMCI_BF(CLKDIV, clkdiv) + | MMCI_BIT(RDPROOF) + | MMCI_BIT(WRPROOF)), &mci->mr); + writel((blklen << 16), &mci->blkr); +#else writel((MMCI_BF(CLKDIV, clkdiv) | MMCI_BF(BLKLEN, blklen) | MMCI_BIT(RDPROOF) | MMCI_BIT(WRPROOF)), &mci->mr); +#endif initialized = 1; } @@ -183,6 +190,10 @@ mci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data) /* Figure out the transfer arguments */ cmdr = mci_encode_cmd(cmd, data, &error_flags); + if ((cmd->cmdidx == MMC_CMD_READ_MULTIPLE_BLOCK) + || (cmd->cmdidx == MMC_CMD_WRITE_MULTIPLE_BLOCK)) + writel(data->blocks | mmc->read_bl_len << 16, &mci->blkr); + /* Send the command */ writel(cmd->cmdarg, &mci->argr); writel(cmdr, &mci->cmdr); |