diff options
| -rw-r--r-- | drivers/mmc/host/atmel-mci.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index 301351a5d83..ad2a7a032cd 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/stat.h> | 26 | #include <linux/stat.h> |
| 27 | 27 | ||
| 28 | #include <linux/mmc/host.h> | 28 | #include <linux/mmc/host.h> |
| 29 | #include <linux/mmc/sdio.h> | ||
| 29 | 30 | ||
| 30 | #include <mach/atmel-mci.h> | 31 | #include <mach/atmel-mci.h> |
| 31 | #include <linux/atmel-mci.h> | 32 | #include <linux/atmel-mci.h> |
| @@ -532,12 +533,17 @@ static u32 atmci_prepare_command(struct mmc_host *mmc, | |||
| 532 | data = cmd->data; | 533 | data = cmd->data; |
| 533 | if (data) { | 534 | if (data) { |
| 534 | cmdr |= MCI_CMDR_START_XFER; | 535 | cmdr |= MCI_CMDR_START_XFER; |
| 535 | if (data->flags & MMC_DATA_STREAM) | 536 | |
| 536 | cmdr |= MCI_CMDR_STREAM; | 537 | if (cmd->opcode == SD_IO_RW_EXTENDED) { |
| 537 | else if (data->blocks > 1) | 538 | cmdr |= MCI_CMDR_SDIO_BLOCK; |
| 538 | cmdr |= MCI_CMDR_MULTI_BLOCK; | 539 | } else { |
| 539 | else | 540 | if (data->flags & MMC_DATA_STREAM) |
| 540 | cmdr |= MCI_CMDR_BLOCK; | 541 | cmdr |= MCI_CMDR_STREAM; |
| 542 | else if (data->blocks > 1) | ||
| 543 | cmdr |= MCI_CMDR_MULTI_BLOCK; | ||
| 544 | else | ||
| 545 | cmdr |= MCI_CMDR_BLOCK; | ||
| 546 | } | ||
| 541 | 547 | ||
| 542 | if (data->flags & MMC_DATA_READ) | 548 | if (data->flags & MMC_DATA_READ) |
| 543 | cmdr |= MCI_CMDR_TRDIR_READ; | 549 | cmdr |= MCI_CMDR_TRDIR_READ; |