Merge remote-tracking branch 'omap_dss2/for-next'

[deliverable/linux.git] / include / linux / i2c-mux.h

diff --git a/include/linux/i2c-mux.h b/include/linux/i2c-mux.h
index d4c1d12f900d9aff084f360d76247d5b149b6dff..bd74d5706f3b4b7513e21ab26faf6ac7f1918361 100644 (file)
--- a/include/linux/i2c-mux.h
+++ b/include/linux/i2c-mux.h
@@ -32,7 +32,9 @@
 struct i2c_mux_core {
        struct i2c_adapter *parent;
        struct device *dev;
-       bool mux_locked;
+       unsigned int mux_locked:1;
+       unsigned int arbitrator:1;
+       unsigned int gate:1;
 
        void *priv;
 
@@ -51,7 +53,9 @@ struct i2c_mux_core *i2c_mux_alloc(struct i2c_adapter *parent,
                                   int (*deselect)(struct i2c_mux_core *, u32));
 
 /* flags for i2c_mux_alloc */
-#define I2C_MUX_LOCKED BIT(0)
+#define I2C_MUX_LOCKED     BIT(0)
+#define I2C_MUX_ARBITRATOR BIT(1)
+#define I2C_MUX_GATE       BIT(2)
 
 static inline void *i2c_mux_priv(struct i2c_mux_core *muxc)
 {