diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/gen_atmel_mci.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c index 741619fb14..9f06304548 100644 --- a/drivers/mmc/gen_atmel_mci.c +++ b/drivers/mmc/gen_atmel_mci.c @@ -83,17 +83,15 @@ static void mci_set_mode(struct mmc *mmc, u32 hz, u32 blklen) blklen &= 0xfffc; /* On some platforms RDPROOF and WRPROOF are ignored */ -#ifdef CONFIG_SAMA5D3 - 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 + /* + * On some new platforms BLKLEN in mci->mr is ignored. + * Should use the BLKLEN in the block register. + */ + writel(MMCI_BF(BLKLEN, blklen), &mci->blkr); initialized = 1; } @@ -190,9 +188,11 @@ 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); + /* For multi blocks read/write, set the block register */ 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); + writel(data->blocks | MMCI_BF(BLKLEN, mmc->read_bl_len), + &mci->blkr); /* Send the command */ writel(cmd->cmdarg, &mci->argr); |