diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-07-06 05:18:33 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-07-07 03:55:50 -0400 |
commit | 6584cb8825e4c74915a5a13756b1902523391d78 (patch) | |
tree | e1abfedf3480f98df93fd22586344a9668a9afe5 /drivers/mmc/host/mxcmmc.c | |
parent | 9d73242458d9a2fe26e2e240488063d414eacb1c (diff) |
ARM i.MX dma: Fix burstsize settings
dmaengine expects the maxburst parameter in words, not bytes.
The imxdma driver and its users do this wrong. Fix this.
As a side note the imx-pcm-dma-mx2 driver was 'fixed' to work
with imx-dma. This broke the driver with imx-sdma support which
correctly takes the maxburst parameter in words. This patch
puts the sdma based sound back to work.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mmc/host/mxcmmc.c')
-rw-r--r-- | drivers/mmc/host/mxcmmc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c index cc20e0259325..14aa213b00da 100644 --- a/drivers/mmc/host/mxcmmc.c +++ b/drivers/mmc/host/mxcmmc.c | |||
@@ -715,13 +715,13 @@ static void mxcmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) | |||
715 | int burstlen, ret; | 715 | int burstlen, ret; |
716 | 716 | ||
717 | /* | 717 | /* |
718 | * use burstlen of 64 in 4 bit mode (--> reg value 0) | 718 | * use burstlen of 64 (16 words) in 4 bit mode (--> reg value 0) |
719 | * use burstlen of 16 in 1 bit mode (--> reg value 16) | 719 | * use burstlen of 16 (4 words) in 1 bit mode (--> reg value 16) |
720 | */ | 720 | */ |
721 | if (ios->bus_width == MMC_BUS_WIDTH_4) | 721 | if (ios->bus_width == MMC_BUS_WIDTH_4) |
722 | burstlen = 64; | ||
723 | else | ||
724 | burstlen = 16; | 722 | burstlen = 16; |
723 | else | ||
724 | burstlen = 4; | ||
725 | 725 | ||
726 | if (mxcmci_use_dma(host) && burstlen != host->burstlen) { | 726 | if (mxcmci_use_dma(host) && burstlen != host->burstlen) { |
727 | host->burstlen = burstlen; | 727 | host->burstlen = burstlen; |