diff options
Diffstat (limited to 'include/linux/i2c.h')
| -rw-r--r-- | include/linux/i2c.h | 6 | 
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index ddfa04108baf..5970266930a2 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -68,6 +68,9 @@ extern int i2c_master_recv(const struct i2c_client *client, char *buf,   */  extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs,  			int num); +/* Unlocked flavor */ +extern int __i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, +			  int num);  /* This is the very generalized SMBus access routine. You probably do not     want to use this, though; one of the functions below may be much easier, @@ -425,6 +428,8 @@ void i2c_unlock_adapter(struct i2c_adapter *);  #define I2C_CLIENT_TEN	0x10		/* we have a ten bit chip address */  					/* Must equal I2C_M_TEN below */  #define I2C_CLIENT_WAKE	0x80		/* for board_info; true iff can wake */ +#define I2C_CLIENT_SCCB	0x9000		/* Use Omnivision SCCB protocol */ +					/* Must match I2C_M_STOP|IGNORE_NAK */  /* i2c adapter classes (bitmask) */  #define I2C_CLASS_HWMON		(1<<0)	/* lm_sensors, ... */ @@ -541,6 +546,7 @@ struct i2c_msg {  	__u16 flags;  #define I2C_M_TEN		0x0010	/* this is a ten bit chip address */  #define I2C_M_RD		0x0001	/* read data, from slave to master */ +#define I2C_M_STOP		0x8000	/* if I2C_FUNC_PROTOCOL_MANGLING */  #define I2C_M_NOSTART		0x4000	/* if I2C_FUNC_NOSTART */  #define I2C_M_REV_DIR_ADDR	0x2000	/* if I2C_FUNC_PROTOCOL_MANGLING */  #define I2C_M_IGNORE_NAK	0x1000	/* if I2C_FUNC_PROTOCOL_MANGLING */  | 
