Skip to content

Commit c07bfa4

Browse files
schlatterbeckgregkh
authored andcommitted
spi-mxs: Fix chipselect glitch
commit 269e31aecdd0b70f53a05def79480f15cbcc0fd6 upstream. There was a change in the mxs-dma engine that uses a new custom flag. The change was not applied to the mxs spi driver. This results in chipselect being deasserted too early. This fixes the chipselect problem by using the new flag in the mxs-spi driver. Fixes: ceeeb99 ("dmaengine: mxs: rename custom flag") Signed-off-by: Ralf Schlatterbeck <[email protected]> Link: https://msgid.link/r/[email protected] Signed-off-by: Mark Brown <[email protected]> Cc: Stefan Wahren <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 260c056 commit c07bfa4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/spi/spi-mxs.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#include <linux/spi/spi.h>
4040
#include <linux/spi/mxs-spi.h>
4141
#include <trace/events/spi.h>
42+
#include <linux/dma/mxs-dma.h>
4243

4344
#define DRIVER_NAME "mxs-spi"
4445

@@ -252,7 +253,7 @@ static int mxs_spi_txrx_dma(struct mxs_spi *spi,
252253
desc = dmaengine_prep_slave_sg(ssp->dmach,
253254
&dma_xfer[sg_count].sg, 1,
254255
(flags & TXRX_WRITE) ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM,
255-
DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
256+
DMA_PREP_INTERRUPT | MXS_DMA_CTRL_WAIT4END);
256257

257258
if (!desc) {
258259
dev_err(ssp->dev,

0 commit comments

Comments
 (0)