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

Commit ba3abe3f authored by Juergen Borleis's avatar Juergen Borleis Committed by Greg Kroah-Hartman
Browse files

dmaengine: imx-dma: configure the generic DMA type to make it work 



[ Upstream commit 7199ddede9f0f2f68d41e6928e1c6c4bca9c39c0 ]

Commit dea7a9fb ("dmaengine: imx-dma: remove dma_slave_config
direction usage") changes the method from a "configuration when called"
to an "configuration when used". Due to this, only the cyclic DMA type
gets configured correctly, while the generic DMA type is left
non-configured.

Without this additional call, the struct imxdma_channel::word_size member
is stuck at DMA_SLAVE_BUSWIDTH_UNDEFINED and imxdma_prep_slave_sg() always
returns NULL.

Signed-off-by: default avatarJuergen Borleis <jbe@pengutronix.de>
Fixes: dea7a9fb ("dmaengine: imx-dma: remove dma_slave_config direction usage")
Link: https://lore.kernel.org/r/20210729071821.9857-1-jbe@pengutronix.de


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ee2f8133

drivers/dma/imx-dma.c

+2 −0
Original line number Diff line number Diff line
@@ -832,6 +832,8 @@ static struct dma_async_tx_descriptor *imxdma_prep_slave_sg( 
		dma_length += sg_dma_len(sg);

	}



	imxdma_config_write(chan, &imxdmac->config, direction);



	switch (imxdmac->word_size) {

	case DMA_SLAVE_BUSWIDTH_4_BYTES:

		if (sg_dma_len(sgl) & 3 || sgl->dma_address & 3)