summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-02-09 19:47:48 +0100
committerLinus Walleij <linus.walleij@linaro.org>2012-02-10 21:33:06 +0100
commitbefe5bdfbb698b3bc57c58d0bd7ca3391c9275ed (patch)
tree71416f2adc515f010f54de2371e29626cd144a5b /include
parente93bcee00c43e2bd4037291262111016f4c05793 (diff)
downloadop-kernel-dev-befe5bdfbb698b3bc57c58d0bd7ca3391c9275ed.zip
op-kernel-dev-befe5bdfbb698b3bc57c58d0bd7ca3391c9275ed.tar.gz
pinctrl: factor pin control handles over to the core
This moves the per-devices struct pinctrl handles and device map over from the pinmux part of the subsystem to the core pinctrl part. This makes the device handles core infrastructure with the goal of using these handles also for pin configuration, so that device drivers (or boards etc) will need one and only one handle to the pin control core. Acked-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/pinctrl/consumer.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h
index c7d0617..3086594 100644
--- a/include/linux/pinctrl/consumer.h
+++ b/include/linux/pinctrl/consumer.h
@@ -19,9 +19,9 @@
/* This struct is private to the core and should be regarded as a cookie */
struct pinctrl;
-#ifdef CONFIG_PINMUX
+#ifdef CONFIG_PINCTRL
-/* External interface to pinmux */
+/* External interface to pin control */
extern int pinctrl_request_gpio(unsigned gpio);
extern void pinctrl_free_gpio(unsigned gpio);
extern int pinctrl_gpio_direction_input(unsigned gpio);
@@ -31,7 +31,7 @@ extern void pinctrl_put(struct pinctrl *p);
extern int pinctrl_enable(struct pinctrl *p);
extern void pinctrl_disable(struct pinctrl *p);
-#else /* !CONFIG_PINMUX */
+#else /* !CONFIG_PINCTRL */
static inline int pinctrl_request_gpio(unsigned gpio)
{
@@ -70,7 +70,7 @@ static inline void pinctrl_disable(struct pinctrl *p)
{
}
-#endif /* CONFIG_PINMUX */
+#endif /* CONFIG_PINCTRL */
#ifdef CONFIG_PINCONF
OpenPOWER on IntegriCloud