[3/3] i.MX SDMA: Fix burstsize settings

Submitted by Philippe Rétornaz on Jan. 20, 2012, 5:58 p.m.

Details

Message ID 1327082304-11398-4-git-send-email-philippe.retornaz@epfl.ch
State New
Headers show

Commit Message

Philippe Rétornaz Jan. 20, 2012, 5:58 p.m.
Commit 6584cb88 fixed the mxcmmc driver but forgot to fix the
SDMA driver to handle the correct burtsize.
This make the SD card access works again with DMA on i.MX31 boards.

Signed-off-by: Philippe Rétornaz <philippe.retornaz@epfl.ch>
---
 drivers/dma/imx-sdma.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Comments

Sascha Hauer Jan. 23, 2012, 10:25 a.m.
On Fri, Jan 20, 2012 at 06:58:24PM +0100, Philippe Rétornaz wrote:
> Commit 6584cb88 fixed the mxcmmc driver but forgot to fix the
> SDMA driver to handle the correct burtsize.
> This make the SD card access works again with DMA on i.MX31 boards.
> 
> Signed-off-by: Philippe Rétornaz <philippe.retornaz@epfl.ch>

Tested-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>

Please resend this patch With Cc: Vinod Koul <vinod.koul@intel.com> as
a single patch, not part of a series.

Sascha

> ---
>  drivers/dma/imx-sdma.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
> index f993955..c193dac 100644
> --- a/drivers/dma/imx-sdma.c
> +++ b/drivers/dma/imx-sdma.c
> @@ -1095,11 +1095,13 @@ static int sdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
>  	case DMA_SLAVE_CONFIG:
>  		if (dmaengine_cfg->direction == DMA_FROM_DEVICE) {
>  			sdmac->per_address = dmaengine_cfg->src_addr;
> -			sdmac->watermark_level = dmaengine_cfg->src_maxburst;
> +			sdmac->watermark_level = dmaengine_cfg->src_maxburst *
> +						dmaengine_cfg->src_addr_width;
>  			sdmac->word_size = dmaengine_cfg->src_addr_width;
>  		} else {
>  			sdmac->per_address = dmaengine_cfg->dst_addr;
> -			sdmac->watermark_level = dmaengine_cfg->dst_maxburst;
> +			sdmac->watermark_level = dmaengine_cfg->dst_maxburst *
> +						dmaengine_cfg->dst_addr_width;
>  			sdmac->word_size = dmaengine_cfg->dst_addr_width;
>  		}
>  		return sdma_config_channel(sdmac);
> -- 
> 1.6.3.3
> 
>

Patch hide | download patch | download mbox

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index f993955..c193dac 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1095,11 +1095,13 @@  static int sdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
 	case DMA_SLAVE_CONFIG:
 		if (dmaengine_cfg->direction == DMA_FROM_DEVICE) {
 			sdmac->per_address = dmaengine_cfg->src_addr;
-			sdmac->watermark_level = dmaengine_cfg->src_maxburst;
+			sdmac->watermark_level = dmaengine_cfg->src_maxburst *
+						dmaengine_cfg->src_addr_width;
 			sdmac->word_size = dmaengine_cfg->src_addr_width;
 		} else {
 			sdmac->per_address = dmaengine_cfg->dst_addr;
-			sdmac->watermark_level = dmaengine_cfg->dst_maxburst;
+			sdmac->watermark_level = dmaengine_cfg->dst_maxburst *
+						dmaengine_cfg->dst_addr_width;
 			sdmac->word_size = dmaengine_cfg->dst_addr_width;
 		}
 		return sdma_config_channel(sdmac);