summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/core.h
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-02-20 07:45:44 +0100
committerLinus Walleij <linus.walleij@linaro.org>2012-02-22 17:59:35 +0100
commit3cc70ed32cd6c5cb57de17bde615148ed7eda88f (patch)
treef9eb9c82c9b5862617cf2bf18a1cb3c96fddc968 /drivers/pinctrl/core.h
parentpinctrl: error if mapping table's control dev can't be found (diff)
downloadlinux-3cc70ed32cd6c5cb57de17bde615148ed7eda88f.tar.xz
linux-3cc70ed32cd6c5cb57de17bde615148ed7eda88f.zip
pinctrl: record a pin owner, not mux function, when requesting pins
When pins are requested/acquired/got, some device becomes the owner of their mux setting. At this point, it isn't certain which mux function will be selected for the pin, since this may vary between each of the device's states in the pinctrl mapping table. As such, we should record the owning device, not what we think the initial mux setting will be, when requesting pins. This doesn't make a lot of difference right now since pinctrl_get gets only one single device/state combination, but this will make a difference when pinctrl_get gets all states, and pinctrl_select_state can switch between states. 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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/core.h b/drivers/pinctrl/core.h
index 7c305672919e..061c57d0e8f9 100644
--- a/drivers/pinctrl/core.h
+++ b/drivers/pinctrl/core.h
@@ -94,7 +94,7 @@ struct pin_desc {
spinlock_t lock;
/* These fields only added when supporting pinmux drivers */
#ifdef CONFIG_PINMUX
- const char *mux_function;
+ const char *owner;
#endif
};