ARM64: DTS: Add rk3399-firefly uart4 device, node as /dev/ttyS1

[firefly-linux-kernel-4.4.55.git] / include / uapi / linux / i2c.h

diff --git a/include/uapi/linux/i2c.h b/include/uapi/linux/i2c.h
index 740002ed9b33f2545d78aaad59a6f0f388128f0f..b0a7dd61eb353a273e3009a01e0682495064e643 100644 (file)
--- a/include/uapi/linux/i2c.h
+++ b/include/uapi/linux/i2c.h
@@ -78,9 +78,6 @@ struct i2c_msg {
 #define I2C_M_RECV_LEN         0x0400  /* length will be first received byte */
        __u16 len;              /* msg length                           */
        __u8 *buf;              /* pointer to msg data                  */
-#ifdef CONFIG_I2C_ROCKCHIP_COMPAT
-       __u32 scl_rate;         /* add by kfx */
-#endif
 };
 
 /* To determine what functionality is present */
@@ -90,6 +87,7 @@ struct i2c_msg {
 #define I2C_FUNC_PROTOCOL_MANGLING     0x00000004 /* I2C_M_IGNORE_NAK etc. */
 #define I2C_FUNC_SMBUS_PEC             0x00000008
 #define I2C_FUNC_NOSTART               0x00000010 /* I2C_M_NOSTART */
+#define I2C_FUNC_SLAVE                 0x00000020
 #define I2C_FUNC_SMBUS_BLOCK_PROC_CALL 0x00008000 /* SMBus 2.0 */
 #define I2C_FUNC_SMBUS_QUICK           0x00010000
 #define I2C_FUNC_SMBUS_READ_BYTE       0x00020000