aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVille Syrjala <syrjala@sci.fi>2008-06-09 15:06:45 -0400
committerPierre Ossman <drzeus@drzeus.cx>2008-07-15 08:14:43 -0400
commit12bd257532708a4d5be4b8548ff121a45ff88f5d (patch)
treef1a8b6ce9775cf995eeeff1c9b8d736cb7e34b56
parent9da3cbaf2881df97e502593c49c93f55eb696091 (diff)
at91_mci: Fix byte mode transitions.
The byte mode support fails to clear the byte mode bit in the command register, possibly leaving byte mode enabled with the counters programmed in non-byte mode. Signed-off-by: Ville Syrjala <syrjala@sci.fi> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
-rw-r--r--drivers/mmc/host/at91_mci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
index f8c3f7c330e3..16df235fcc2e 100644
--- a/drivers/mmc/host/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
@@ -579,7 +579,7 @@ static void at91_mci_send_command(struct at91mci_host *host, struct mmc_command
579 ier = AT91_MCI_CMDRDY; 579 ier = AT91_MCI_CMDRDY;
580 } else { 580 } else {
581 /* zero block length and PDC mode */ 581 /* zero block length and PDC mode */
582 mr = at91_mci_read(host, AT91_MCI_MR) & 0x7fff; 582 mr = at91_mci_read(host, AT91_MCI_MR) & 0x5fff;
583 mr |= (data->blksz & 0x3) ? AT91_MCI_PDCFBYTE : 0; 583 mr |= (data->blksz & 0x3) ? AT91_MCI_PDCFBYTE : 0;
584 mr |= (block_length << 16); 584 mr |= (block_length << 16);
585 mr |= AT91_MCI_PDCMODE; 585 mr |= AT91_MCI_PDCMODE;