diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-23 20:46:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-23 20:46:10 -0400 |
| commit | ba6cbdb673c287cee87a965266419fd2111e20c4 (patch) | |
| tree | aef4f30552353259b27421cc2d179ca762f3a89a /drivers | |
| parent | 25b2398f5c0167accd6d0ab18db0561ac22ca6cc (diff) | |
| parent | 6c782a5ea56a799658e213a78dc1455264938afa (diff) | |
Merge branch 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fix from Wolfram Sang.
* 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: imx: Use correct function to write to register
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/busses/i2c-imx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 95ed17183e73..54a47b40546f 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c | |||
| @@ -734,9 +734,9 @@ static int i2c_imx_dma_read(struct imx_i2c_struct *i2c_imx, | |||
| 734 | * the first read operation, otherwise the first read cost | 734 | * the first read operation, otherwise the first read cost |
| 735 | * one extra clock cycle. | 735 | * one extra clock cycle. |
| 736 | */ | 736 | */ |
| 737 | temp = readb(i2c_imx->base + IMX_I2C_I2CR); | 737 | temp = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2CR); |
| 738 | temp |= I2CR_MTX; | 738 | temp |= I2CR_MTX; |
| 739 | writeb(temp, i2c_imx->base + IMX_I2C_I2CR); | 739 | imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2CR); |
| 740 | } | 740 | } |
| 741 | msgs->buf[msgs->len-1] = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2DR); | 741 | msgs->buf[msgs->len-1] = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2DR); |
| 742 | 742 | ||
| @@ -857,9 +857,9 @@ static int i2c_imx_read(struct imx_i2c_struct *i2c_imx, struct i2c_msg *msgs, bo | |||
| 857 | * the first read operation, otherwise the first read cost | 857 | * the first read operation, otherwise the first read cost |
| 858 | * one extra clock cycle. | 858 | * one extra clock cycle. |
| 859 | */ | 859 | */ |
| 860 | temp = readb(i2c_imx->base + IMX_I2C_I2CR); | 860 | temp = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2CR); |
| 861 | temp |= I2CR_MTX; | 861 | temp |= I2CR_MTX; |
| 862 | writeb(temp, i2c_imx->base + IMX_I2C_I2CR); | 862 | imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2CR); |
| 863 | } | 863 | } |
| 864 | } else if (i == (msgs->len - 2)) { | 864 | } else if (i == (msgs->len - 2)) { |
| 865 | dev_dbg(&i2c_imx->adapter.dev, | 865 | dev_dbg(&i2c_imx->adapter.dev, |