diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-07-06 11:18:33 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-07-07 09:55:50 +0200 |
| commit | 6584cb8825e4c74915a5a13756b1902523391d78 (patch) | |
| tree | e1abfedf3480f98df93fd22586344a9668a9afe5 /sound | |
| parent | 9d73242458d9a2fe26e2e240488063d414eacb1c (diff) | |
| download | talos-obmc-linux-6584cb8825e4c74915a5a13756b1902523391d78.tar.gz talos-obmc-linux-6584cb8825e4c74915a5a13756b1902523391d78.zip | |
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 'sound')
| -rw-r--r-- | sound/soc/imx/imx-pcm-dma-mx2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/imx/imx-pcm-dma-mx2.c b/sound/soc/imx/imx-pcm-dma-mx2.c index aab7765f401a..b2ed764fd896 100644 --- a/sound/soc/imx/imx-pcm-dma-mx2.c +++ b/sound/soc/imx/imx-pcm-dma-mx2.c @@ -110,12 +110,12 @@ static int imx_ssi_dma_alloc(struct snd_pcm_substream *substream, slave_config.direction = DMA_TO_DEVICE; slave_config.dst_addr = dma_params->dma_addr; slave_config.dst_addr_width = buswidth; - slave_config.dst_maxburst = dma_params->burstsize * buswidth; + slave_config.dst_maxburst = dma_params->burstsize; } else { slave_config.direction = DMA_FROM_DEVICE; slave_config.src_addr = dma_params->dma_addr; slave_config.src_addr_width = buswidth; - slave_config.src_maxburst = dma_params->burstsize * buswidth; + slave_config.src_maxburst = dma_params->burstsize; } ret = dmaengine_slave_config(iprtd->dma_chan, &slave_config); |
