Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6584cb88 authored by Sascha Hauer's avatar Sascha Hauer
Browse files

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: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 9d732424

drivers/dma/imx-dma.c

+2 −1
Original line number Diff line number Diff line
@@ -135,7 +135,8 @@ static int imxdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, 
		if (ret)

			return ret;



		imx_dma_config_burstlen(imxdmac->imxdma_channel, imxdmac->watermark_level);

		imx_dma_config_burstlen(imxdmac->imxdma_channel,

				imxdmac->watermark_level * imxdmac->word_size);



		return 0;

	default:

drivers/mmc/host/mxcmmc.c

+4 −4
Original line number Diff line number Diff line
@@ -715,13 +715,13 @@ static void mxcmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
	int burstlen, ret;



	/*

	 * use burstlen of 64 in 4 bit mode (--> reg value  0)

	 * use burstlen of 16 in 1 bit mode (--> reg value 16)

	 * use burstlen of 64 (16 words) in 4 bit mode (--> reg value  0)

	 * use burstlen of 16 (4 words) in 1 bit mode (--> reg value 16)

	 */

	if (ios->bus_width == MMC_BUS_WIDTH_4)

		burstlen = 64;

	else

		burstlen = 16;

	else

		burstlen = 4;



	if (mxcmci_use_dma(host) && burstlen != host->burstlen) {

		host->burstlen = burstlen;

sound/soc/imx/imx-pcm-dma-mx2.c

+2 −2
Original line number Diff line number Diff line
@@ -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);