diff options
author | Stephen Warren <swarren@nvidia.com> | 2012-03-01 20:48:31 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-03-02 10:12:03 -0500 |
commit | d4e3198736d9d64e4ba4d2b46ab75cbcf5d0a4e0 (patch) | |
tree | e5e06f5c3ec83949e10f5407a1020ff5e07a7934 /drivers/pinctrl/core.h | |
parent | 3eedb4372354a70ce63c9f4ec294d2eba0d79d17 (diff) |
pinctrl: enhance pinctrl_get() to handle multiple functions
At present, pinctrl_get() assumes that all matching mapping table entries
have the same "function" value, albeit potentially applied to different
pins/groups.
This change removes this restriction; pinctrl_get() can now handle a set
of mapping tables where different functions are applied to the various
pins/groups.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/core.h')
-rw-r--r-- | drivers/pinctrl/core.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/pinctrl/core.h b/drivers/pinctrl/core.h index 7551611666f8..8164e7b4182b 100644 --- a/drivers/pinctrl/core.h +++ b/drivers/pinctrl/core.h | |||
@@ -53,8 +53,6 @@ struct pinctrl_dev { | |||
53 | * to keep track of nested use cases | 53 | * to keep track of nested use cases |
54 | * @pctldev: pin control device handling this pin control handle | 54 | * @pctldev: pin control device handling this pin control handle |
55 | * @mutex: a lock for the pin control state holder | 55 | * @mutex: a lock for the pin control state holder |
56 | * @func_selector: the function selector for the pinmux device handling | ||
57 | * this pinmux | ||
58 | * @groups: the group selectors for the pinmux device and | 56 | * @groups: the group selectors for the pinmux device and |
59 | * selector combination handling this pinmux, this is a list that | 57 | * selector combination handling this pinmux, this is a list that |
60 | * will be traversed on all pinmux operations such as | 58 | * will be traversed on all pinmux operations such as |
@@ -67,7 +65,6 @@ struct pinctrl { | |||
67 | struct pinctrl_dev *pctldev; | 65 | struct pinctrl_dev *pctldev; |
68 | struct mutex mutex; | 66 | struct mutex mutex; |
69 | #ifdef CONFIG_PINMUX | 67 | #ifdef CONFIG_PINMUX |
70 | unsigned func_selector; | ||
71 | struct list_head groups; | 68 | struct list_head groups; |
72 | #endif | 69 | #endif |
73 | }; | 70 | }; |