Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e13e19e1 authored by Noralf Trønnes's avatar Noralf Trønnes Committed by Wolfram Sang
Browse files

i2c: bcm2835: Support i2c-dev ioctl I2C_TIMEOUT 



Use i2c_adapter->timeout for the completion timeout value. The core
default is 1 second.

Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent ee05fea2

drivers/i2c/busses/i2c-bcm2835.c

+1 −3
Original line number Diff line number Diff line
@@ -53,8 +53,6 @@ 
#define BCM2835_I2C_CDIV_MIN	0x0002

#define BCM2835_I2C_CDIV_MAX	0xFFFE



#define BCM2835_I2C_TIMEOUT (msecs_to_jiffies(1000))



struct bcm2835_i2c_dev {

	struct device *dev;

	void __iomem *regs;
@@ -242,7 +240,7 @@ static int bcm2835_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], 
	bcm2835_i2c_start_transfer(i2c_dev);



	time_left = wait_for_completion_timeout(&i2c_dev->completion,

						BCM2835_I2C_TIMEOUT);

						adap->timeout);

	if (!time_left) {

		bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_C,

				   BCM2835_I2C_C_CLEAR);