summaryrefslogtreecommitdiff
path: root/drivers/pinctrl/core.h
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-03-01 18:48:31 -0700
committerLinus Walleij <linus.walleij@linaro.org>2012-03-02 16:12:03 +0100
commitd4e3198736d9d64e4ba4d2b46ab75cbcf5d0a4e0 (patch)
treee5e06f5c3ec83949e10f5407a1020ff5e07a7934 /drivers/pinctrl/core.h
parent3eedb4372354a70ce63c9f4ec294d2eba0d79d17 (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.h3
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 {
* to keep track of nested use cases
* @pctldev: pin control device handling this pin control handle
* @mutex: a lock for the pin control state holder
- * @func_selector: the function selector for the pinmux device handling
- * this pinmux
* @groups: the group selectors for the pinmux device and
* selector combination handling this pinmux, this is a list that
* will be traversed on all pinmux operations such as
@@ -67,7 +65,6 @@ struct pinctrl {
struct pinctrl_dev *pctldev;
struct mutex mutex;
#ifdef CONFIG_PINMUX
- unsigned func_selector;
struct list_head groups;
#endif
};