diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2019-06-29 14:02:48 +0300 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2019-06-29 14:02:48 +0300 |
| commit | 45c9cc681d8d9122fd64e1f2a4cc82e3dcc7f0a5 (patch) | |
| tree | 18ab31531ac870d6fa1ba2022a1c6d6886277a09 /include/linux | |
| parent | 504ee6b306a70a106c2e8858fd916ed8c43c5776 (diff) | |
| parent | 05af0765707fc136433ab380d5d627afe3b8dda9 (diff) | |
| download | linux-45c9cc681d8d9122fd64e1f2a4cc82e3dcc7f0a5.tar.xz | |
Merge branch 'i2c-mux/for-next' of https://github.com/peda-r/i2c-mux into i2c/for-5.3
I realize that there are changes in drivers/i2c/busses/i2c-i801.c that strictly
speaking don't belong here, but I hope you don't mind. These changes are all
about the interaction with the i2c-mux-gpio code, and I did a test-merge a few
days ago w/o conflicts.
Anyway, the GPIO-work from Linus Walleij (with help from Serge Semin) in the
i2c-mux-gpio and i2c-arb-gpio-challenge drivers is the main feature.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/platform_data/i2c-mux-gpio.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/platform_data/i2c-mux-gpio.h b/include/linux/platform_data/i2c-mux-gpio.h index 4406108201fe..28f288eed652 100644 --- a/include/linux/platform_data/i2c-mux-gpio.h +++ b/include/linux/platform_data/i2c-mux-gpio.h @@ -22,10 +22,6 @@ * 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 */ struct i2c_mux_gpio_platform_data { @@ -34,9 +30,6 @@ struct i2c_mux_gpio_platform_data { const unsigned *values; int n_values; const unsigned *classes; - char *gpio_chip; - const unsigned *gpios; - int n_gpios; unsigned idle; }; |