diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-08 06:35:17 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-08 06:35:17 +0900 |
| commit | 1b033447bf847ba49c3816c564c9191c97456b36 (patch) | |
| tree | 4b4b19649671a230a9071c8422a065766eb86a6f /include/linux/i2c-mux-gpio.h | |
| parent | c0703c12ef6744b6d2565ec67a15aaf25d534abd (diff) | |
| parent | c415b303a704e5c5f766fc0404093910c36cc4ab (diff) | |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull i2c updates from Jean Delvare:
"Most visible changes are the SMBus multiplexing support added to the
i2c-i801 driver, as well as support for the VIA VX900."
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
i2c-piix4: Fix build failure
i2c: Correct struct i2c_driver doc about detection
i2c-i801: Let i2c-mux-gpio find the GPIO chip
i2c-mux-gpio: Update documentation
i2c-mux-gpio: Add support for dynamically allocated GPIO pins
i2c-mux-gpio: Use devm_kzalloc instead of kzalloc
i2c-i801: Support SMBus multiplexing on Asus Z8 series
i2c-viapro: Add VIA VX900 device ID
i2c-parport: i2c_parport_irq can be static
i2c-designware: i2c_dw_xfer_msg can be static
i2c/scx200_*: Replace printks with pr_<level>s
i2c: Make I2C available on UML
i2c: Convert struct i2c_msg initialization to C99 format
i2c-smbus: Convert kzalloc to devm_kzalloc
i2c-mux: Add support for device auto-detection
Diffstat (limited to 'include/linux/i2c-mux-gpio.h')
| -rw-r--r-- | include/linux/i2c-mux-gpio.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/i2c-mux-gpio.h b/include/linux/i2c-mux-gpio.h index a36343a37ebc..4406108201fe 100644 --- a/include/linux/i2c-mux-gpio.h +++ b/include/linux/i2c-mux-gpio.h @@ -21,6 +21,9 @@ * @values: Array of bitmasks of GPIO settings (low/high) for each * position * @n_values: Number of multiplexer positions (busses to instantiate) + * @classes: Optional I2C auto-detection classes + * @gpio_chip: Optional GPIO chip name; if set, GPIO pin numbers are given + * relative to the base GPIO number of that chip * @gpios: Array of GPIO numbers used to control MUX * @n_gpios: Number of GPIOs used to control MUX * @idle: Bitmask to write to MUX when idle or GPIO_I2CMUX_NO_IDLE if not used @@ -30,6 +33,8 @@ struct i2c_mux_gpio_platform_data { int base_nr; const unsigned *values; int n_values; + const unsigned *classes; + char *gpio_chip; const unsigned *gpios; int n_gpios; unsigned idle; |