summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSimon Horman <horms+renesas@verge.net.au>2013-12-19 17:13:40 +0900
committerSimon Horman <horms+renesas@verge.net.au>2013-12-19 17:13:40 +0900
commit8a1a3b1dbd8a7c65855c25bc2d114c28264285ca (patch)
tree895c8d7c9d154386746c02e64fdbf4eb9bc893b4 /include
parentbd0609896eabe2e64b75d7955ae5ecec528cf860 (diff)
parent70c8f01a357ac74d223a632659787396fef1e649 (diff)
Merge commit '70c8f01' into dt3-base
This is a commit from the for-next branch of Linus Walleij's pin control tre git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git It is the oldest commit in that branch that provides the dependencies needed for SoC changes to the usage of sh-pfc.
Diffstat (limited to 'include')
-rw-r--r--include/linux/pinctrl/pinconf-generic.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/pinctrl/pinconf-generic.h b/include/linux/pinctrl/pinconf-generic.h
index fb90ef5eb038..282309d7c4dc 100644
--- a/include/linux/pinctrl/pinconf-generic.h
+++ b/include/linux/pinctrl/pinconf-generic.h
@@ -82,8 +82,10 @@
* operation, if several modes of operation are supported these can be
* passed in the argument on a custom form, else just use argument 1
* to indicate low power mode, argument 0 turns low power mode off.
- * @PIN_CONFIG_OUTPUT: this will configure the pin in output, use argument
- * 1 to indicate high level, argument 0 to indicate low level.
+ * @PIN_CONFIG_OUTPUT: this will configure the pin as an output. Use argument
+ * 1 to indicate high level, argument 0 to indicate low level. (Please
+ * see Documentation/pinctrl.txt, section "GPIO mode pitfalls" for a
+ * discussion around this parameter.)
* @PIN_CONFIG_END: this is the last enumerator for pin configurations, if
* you need to pass in custom configurations to the pin controller, use
* PIN_CONFIG_END+1 as the base offset.