aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/i2c-mux-gpio.h2
-rw-r--r--include/linux/i2c-mux.h1
-rw-r--r--include/linux/i2c/pca954x.h1
3 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/i2c-mux-gpio.h b/include/linux/i2c-mux-gpio.h
index a36343a37ebc..4ea1cc7392bd 100644
--- a/include/linux/i2c-mux-gpio.h
+++ b/include/linux/i2c-mux-gpio.h
@@ -21,6 +21,7 @@
21 * @values: Array of bitmasks of GPIO settings (low/high) for each 21 * @values: Array of bitmasks of GPIO settings (low/high) for each
22 * position 22 * position
23 * @n_values: Number of multiplexer positions (busses to instantiate) 23 * @n_values: Number of multiplexer positions (busses to instantiate)
24 * @classes: Optional I2C auto-detection classes
24 * @gpios: Array of GPIO numbers used to control MUX 25 * @gpios: Array of GPIO numbers used to control MUX
25 * @n_gpios: Number of GPIOs used to control MUX 26 * @n_gpios: Number of GPIOs used to control MUX
26 * @idle: Bitmask to write to MUX when idle or GPIO_I2CMUX_NO_IDLE if not used 27 * @idle: Bitmask to write to MUX when idle or GPIO_I2CMUX_NO_IDLE if not used
@@ -30,6 +31,7 @@ struct i2c_mux_gpio_platform_data {
30 int base_nr; 31 int base_nr;
31 const unsigned *values; 32 const unsigned *values;
32 int n_values; 33 int n_values;
34 const unsigned *classes;
33 const unsigned *gpios; 35 const unsigned *gpios;
34 int n_gpios; 36 int n_gpios;
35 unsigned idle; 37 unsigned idle;
diff --git a/include/linux/i2c-mux.h b/include/linux/i2c-mux.h
index c79083830014..40cb05a97b46 100644
--- a/include/linux/i2c-mux.h
+++ b/include/linux/i2c-mux.h
@@ -36,6 +36,7 @@
36struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent, 36struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent,
37 struct device *mux_dev, 37 struct device *mux_dev,
38 void *mux_priv, u32 force_nr, u32 chan_id, 38 void *mux_priv, u32 force_nr, u32 chan_id,
39 unsigned int class,
39 int (*select) (struct i2c_adapter *, 40 int (*select) (struct i2c_adapter *,
40 void *mux_dev, u32 chan_id), 41 void *mux_dev, u32 chan_id),
41 int (*deselect) (struct i2c_adapter *, 42 int (*deselect) (struct i2c_adapter *,
diff --git a/include/linux/i2c/pca954x.h b/include/linux/i2c/pca954x.h
index 28f1f8d5ab1f..1712677d5904 100644
--- a/include/linux/i2c/pca954x.h
+++ b/include/linux/i2c/pca954x.h
@@ -36,6 +36,7 @@
36struct pca954x_platform_mode { 36struct pca954x_platform_mode {
37 int adap_id; 37 int adap_id;
38 unsigned int deselect_on_exit:1; 38 unsigned int deselect_on_exit:1;
39 unsigned int class;
39}; 40};
40 41
41/* Per mux/switch data, used with i2c_register_board_info */ 42/* Per mux/switch data, used with i2c_register_board_info */