Commit 6eb158ec authored by Matthias Schiffer's avatar Matthias Schiffer Committed by Wolfram Sang
Browse files

i2c: mxs: use MXS_DMA_CTRL_WAIT4END instead of DMA_CTRL_ACK 



The driver-specific usage of the DMA_CTRL_ACK flag was replaced with a
custom flag in commit ceeeb99c ("dmaengine: mxs: rename custom flag"),
but i2c-mxs was not updated to use the new flag, completely breaking I2C
transactions using DMA.

Fixes: ceeeb99c ("dmaengine: mxs: rename custom flag")
Signed-off-by: default avatarMatthias Schiffer <matthias.schiffer@ew.tq-group.com>
Reviewed-by: default avatarFabio Estevam <festevam@gmail.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent b44658e7

drivers/i2c/busses/i2c-mxs.c

+7 −3
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/of_device.h>

#include <linux/dma-mapping.h>

#include <linux/dmaengine.h>

#include <linux/dma/mxs-dma.h>



#define DRIVER_NAME "mxs-i2c"
@@ -200,7 +201,8 @@ static int mxs_i2c_dma_setup_xfer(struct i2c_adapter *adap, 
		dma_map_sg(i2c->dev, &i2c->sg_io[0], 1, DMA_TO_DEVICE);

		desc = dmaengine_prep_slave_sg(i2c->dmach, &i2c->sg_io[0], 1,

					DMA_MEM_TO_DEV,

					DMA_PREP_INTERRUPT | DMA_CTRL_ACK);

					DMA_PREP_INTERRUPT |

					MXS_DMA_CTRL_WAIT4END);

		if (!desc) {

			dev_err(i2c->dev,

				"Failed to get DMA data write descriptor.\n");
@@ -228,7 +230,8 @@ static int mxs_i2c_dma_setup_xfer(struct i2c_adapter *adap, 
		dma_map_sg(i2c->dev, &i2c->sg_io[1], 1, DMA_FROM_DEVICE);

		desc = dmaengine_prep_slave_sg(i2c->dmach, &i2c->sg_io[1], 1,

					DMA_DEV_TO_MEM,

					DMA_PREP_INTERRUPT | DMA_CTRL_ACK);

					DMA_PREP_INTERRUPT |

					MXS_DMA_CTRL_WAIT4END);

		if (!desc) {

			dev_err(i2c->dev,

				"Failed to get DMA data write descriptor.\n");
@@ -260,7 +263,8 @@ static int mxs_i2c_dma_setup_xfer(struct i2c_adapter *adap, 
		dma_map_sg(i2c->dev, i2c->sg_io, 2, DMA_TO_DEVICE);

		desc = dmaengine_prep_slave_sg(i2c->dmach, i2c->sg_io, 2,

					DMA_MEM_TO_DEV,

					DMA_PREP_INTERRUPT | DMA_CTRL_ACK);

					DMA_PREP_INTERRUPT |

					MXS_DMA_CTRL_WAIT4END);

		if (!desc) {

			dev_err(i2c->dev,

				"Failed to get DMA data write descriptor.\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE