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/dma | |
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/dma')
-rw-r--r-- | drivers/dma/imx-dma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c index e18eaabe92b9..d99f71c356b5 100644 --- a/drivers/dma/imx-dma.c +++ b/drivers/dma/imx-dma.c | |||
@@ -135,7 +135,8 @@ static int imxdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, | |||
135 | if (ret) | 135 | if (ret) |
136 | return ret; | 136 | return ret; |
137 | 137 | ||
138 | imx_dma_config_burstlen(imxdmac->imxdma_channel, imxdmac->watermark_level); | 138 | imx_dma_config_burstlen(imxdmac->imxdma_channel, |
139 | imxdmac->watermark_level * imxdmac->word_size); | ||
139 | 140 | ||
140 | return 0; | 141 | return 0; |
141 | default: | 142 | default: |