diff options
| author | Wu, Josh <Josh.wu@atmel.com> | 2012-09-13 22:22:04 +0000 |
|---|---|---|
| committer | Josh Wu <josh.wu@atmel.com> | 2013-03-25 17:21:34 +0800 |
| commit | 35678b66c2615ba6dec8e040fe7f9a38beb2b381 (patch) | |
| tree | e4270a56270535b3c711884b7071ec7f97bf795e | |
| parent | 5a631ad95526c7ea7440581631f5f3dc8a4a2ab8 (diff) | |
mmc: at91: add multi block read/write support.
Since the at91sam9263, the mmc hardware support multi blocks read/write. So this driver enable it.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| -rw-r--r-- | drivers/mmc/gen_atmel_mci.c | 16 | ||||
| -rw-r--r-- | include/atmel_mci.h | 5 |
2 files changed, 13 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); diff --git a/include/atmel_mci.h b/include/atmel_mci.h index 4455b32fc7..c711881276 100644 --- a/include/atmel_mci.h +++ b/include/atmel_mci.h @@ -118,6 +118,11 @@ typedef struct atmel_mci { #define MMCI_TRTYP_OFFSET 19 #define MMCI_TRTYP_SIZE 2 +/* Bitfields in BLKR */ +/* MMCI_BLKLEN_OFFSET/SIZE already defined in MR */ +#define MMCI_BCNT_OFFSET 0 +#define MMCI_BCNT_SIZE 16 + /* Bitfields in RSPRx */ #define MMCI_RSP_OFFSET 0 #define MMCI_RSP_SIZE 32 |