Merge tag 'iio-fixes-for-4.20a' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / drivers / i2c / busses / i2c-imx.c

diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index 498c5e89164988beb8d82e5f4bc53aac82b137ac..c406700789e1f9c5a3af5c3fa62f045180702bb1 100644 (file)
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -421,10 +421,14 @@ static int i2c_imx_bus_busy(struct imx_i2c_struct *i2c_imx, int for_busy)
                        return -EAGAIN;
                }
 
-               if (for_busy && (temp & I2SR_IBB))
+               if (for_busy && (temp & I2SR_IBB)) {
+                       i2c_imx->stopped = 0;
                        break;
-               if (!for_busy && !(temp & I2SR_IBB))
+               }
+               if (!for_busy && !(temp & I2SR_IBB)) {
+                       i2c_imx->stopped = 1;
                        break;
+               }
                if (time_after(jiffies, orig_jiffies + msecs_to_jiffies(500))) {
                        dev_dbg(&i2c_imx->adapter.dev,
                                "<%s> I2C bus is busy\n", __func__);
@@ -538,7 +542,6 @@ static int i2c_imx_start(struct imx_i2c_struct *i2c_imx)
        result = i2c_imx_bus_busy(i2c_imx, 1);
        if (result)
                return result;
-       i2c_imx->stopped = 0;
 
        temp |= I2CR_IIEN | I2CR_MTX | I2CR_TXAK;
        temp &= ~I2CR_DMAEN;
@@ -567,10 +570,8 @@ static void i2c_imx_stop(struct imx_i2c_struct *i2c_imx)
                udelay(i2c_imx->disable_delay);
        }
 
-       if (!i2c_imx->stopped) {
+       if (!i2c_imx->stopped)
                i2c_imx_bus_busy(i2c_imx, 0);
-               i2c_imx->stopped = 1;
-       }
 
        /* Disable I2C controller */
        temp = i2c_imx->hwdata->i2cr_ien_opcode ^ I2CR_IEN,
@@ -668,9 +669,6 @@ static int i2c_imx_dma_read(struct imx_i2c_struct *i2c_imx,
        struct imx_i2c_dma *dma = i2c_imx->dma;
        struct device *dev = &i2c_imx->adapter.dev;
 
-       temp = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2CR);
-       temp |= I2CR_DMAEN;
-       imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2CR);
 
        dma->chan_using = dma->chan_rx;
        dma->dma_transfer_dir = DMA_DEV_TO_MEM;
@@ -727,7 +725,6 @@ static int i2c_imx_dma_read(struct imx_i2c_struct *i2c_imx,
                temp &= ~(I2CR_MSTA | I2CR_MTX);
                imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2CR);
                i2c_imx_bus_busy(i2c_imx, 0);
-               i2c_imx->stopped = 1;
        } else {
                /*
                 * For i2c master receiver repeat restart operation like:
@@ -783,6 +780,7 @@ static int i2c_imx_read(struct imx_i2c_struct *i2c_imx, struct i2c_msg *msgs, bo
        int i, result;
        unsigned int temp;
        int block_data = msgs->flags & I2C_M_RECV_LEN;
+       int use_dma = i2c_imx->dma && msgs->len >= DMA_THRESHOLD && !block_data;
 
        dev_dbg(&i2c_imx->adapter.dev,
                "<%s> write slave address: addr=0x%x\n",
@@ -809,12 +807,14 @@ static int i2c_imx_read(struct imx_i2c_struct *i2c_imx, struct i2c_msg *msgs, bo
         */
        if ((msgs->len - 1) || block_data)
                temp &= ~I2CR_TXAK;
+       if (use_dma)
+               temp |= I2CR_DMAEN;
        imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2CR);
        imx_i2c_read_reg(i2c_imx, IMX_I2C_I2DR); /* dummy read */
 
        dev_dbg(&i2c_imx->adapter.dev, "<%s> read data\n", __func__);
 
-       if (i2c_imx->dma && msgs->len >= DMA_THRESHOLD && !block_data)
+       if (use_dma)
                return i2c_imx_dma_read(i2c_imx, msgs, is_lastmsg);
 
        /* read data */
@@ -850,7 +850,6 @@ static int i2c_imx_read(struct imx_i2c_struct *i2c_imx, struct i2c_msg *msgs, bo
                                temp &= ~(I2CR_MSTA | I2CR_MTX);
                                imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2CR);
                                i2c_imx_bus_busy(i2c_imx, 0);
-                               i2c_imx->stopped = 1;
                        } else {
                                /*
                                 * For i2c master receiver repeat restart operation like: