Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+4
-4
+4
-4
drivers/i2c/busses/i2c-imx.c
+4
-4
drivers/i2c/busses/i2c-imx.c
···
734
734
* the first read operation, otherwise the first read cost
735
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
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
741
msgs->buf[msgs->len-1] = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2DR);
742
742
···
857
857
* the first read operation, otherwise the first read cost
858
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
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
864
} else if (i == (msgs->len - 2)) {
865
865
dev_dbg(&i2c_imx->adapter.dev,