Pull embedded i2c update from Wolfram Sang: "This only contains one new driver which had multiple dependencies (pinctrl, i2c-mux-rework, new devm_* functions), so I decided to wait for rc1. Plus, it had to wait a little for the ack of a devicetree maintainer since the bindings were not trivial enough for me to pass through. So, given that, I hope there is still something like the "new driver rule", so we could have the driver in 3.5 and people can start using it. That would make merging support for some boards easier for 3.6 since the dependency on this driver is gone then." * 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux: i2c: Add generic I2C multiplexer using pinctrl API
Showing the changes to include/linux (1 of 5 files). Show all
Unified · Split
| @@ -0,0 +1,41 @@ | |||
| 1 | /* | ||
| 2 | * i2c-mux-pinctrl platform data | ||
| 3 | * | ||
| 4 | * Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved. | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify it | ||
| 7 | * under the terms and conditions of the GNU General Public License, | ||
| 8 | * version 2, as published by the Free Software Foundation. | ||
| 9 | * | ||
| 10 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
| 11 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| 12 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
| 13 | * more details. | ||
| 14 | * | ||
| 15 | * You should have received a copy of the GNU General Public License | ||
| 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 17 | */ | ||
| 18 | |||
| 19 | #ifndef _LINUX_I2C_MUX_PINCTRL_H | ||
| 20 | #define _LINUX_I2C_MUX_PINCTRL_H | ||
| 21 | |||
| 22 | /** | ||
| 23 | * struct i2c_mux_pinctrl_platform_data - Platform data for i2c-mux-pinctrl | ||
| 24 | * @parent_bus_num: Parent I2C bus number | ||
| 25 | * @base_bus_num: Base I2C bus number for the child busses. 0 for dynamic. | ||
| 26 | * @bus_count: Number of child busses. Also the number of elements in | ||
| 27 | * @pinctrl_states | ||
| 28 | * @pinctrl_states: The names of the pinctrl state to select for each child bus | ||
| 29 | * @pinctrl_state_idle: The pinctrl state to select when no child bus is being | ||
| 30 | * accessed. If NULL, the most recently used pinctrl state will be left | ||
| 31 | * selected. | ||
| 32 | */ | ||
| 33 | struct i2c_mux_pinctrl_platform_data { | ||
| 34 | int parent_bus_num; | ||
| 35 | int base_bus_num; | ||
| 36 | int bus_count; | ||
| 37 | const char **pinctrl_states; | ||
| 38 | const char *pinctrl_state_idle; | ||
| 39 | }; | ||
| 40 | |||
| 41 | #endif | ||