diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-12 22:57:34 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-12 22:57:34 -0400 |
| commit | 7af07ad902cce88ebbd2ce0e681d0c541e8f95fa (patch) | |
| tree | 40a5aedb583c35d16505d96ea8996c413a747fe6 /include/linux/pinctrl | |
| parent | 7afeca1a30360c7b5cee94fc7ff8f350d582282a (diff) | |
| parent | 08d98fe0e81cd9424ef2451ed13afe91a9a26f9f (diff) | |
Merge tag 'ux500-gpio-pins-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/pinctrl
ux500 GPIO and pinctrl changes for kernel 3.5
* tag 'ux500-gpio-pins-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: switch MSP to using pinctrl for pins
ARM: ux500: alter MSP registration to return a device pointer
ARM: ux500: switch to using pinctrl for uart0
ARM: ux500: delete custom pin control system
ARM: ux500: switch over to Nomadik pinctrl driver
pinctrl: add sleep state definition
pinctrl/nomadik: implement pin configuration
pinctrl/nomadik: implement pin multiplexing
pinctrl/nomadik: reuse GPIO debug function for pins
pinctrl/nomadik: break out single GPIO debug function
pinctrl/nomadik: basic Nomadik pinctrl interface
pinctrl/nomadik: !CONFIG_OF build error
gpio: move the Nomadik GPIO driver to pinctrl
Context conflicts resolved in drivers/pinctrl/Kconfig and
drivers/pinctrl/Makefile.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/linux/pinctrl')
| -rw-r--r-- | include/linux/pinctrl/pinctrl-state.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/pinctrl/pinctrl-state.h b/include/linux/pinctrl/pinctrl-state.h index 3920e28b4da7..634608dc6c89 100644 --- a/include/linux/pinctrl/pinctrl-state.h +++ b/include/linux/pinctrl/pinctrl-state.h | |||
| @@ -2,5 +2,18 @@ | |||
| 2 | * Standard pin control state definitions | 2 | * Standard pin control state definitions |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | /** | ||
| 6 | * @PINCTRL_STATE_DEFAULT: the state the pinctrl handle shall be put | ||
| 7 | * into as default, usually this means the pins are up and ready to | ||
| 8 | * be used by the device driver. This state is commonly used by | ||
| 9 | * hogs to configure muxing and pins at boot. | ||
| 10 | * @PINCTRL_STATE_IDLE: the state the pinctrl handle shall be put into | ||
| 11 | * when the pins are idle. Could typically be set from a | ||
| 12 | * pm_runtime_suspend() operation. | ||
| 13 | * @PINCTRL_STATE_SLEEP: the state the pinctrl handle shall be put into | ||
| 14 | * when the pins are sleeping. Could typically be set from a | ||
| 15 | * common suspend() function. | ||
| 16 | */ | ||
| 5 | #define PINCTRL_STATE_DEFAULT "default" | 17 | #define PINCTRL_STATE_DEFAULT "default" |
| 6 | #define PINCTRL_STATE_IDLE "idle" | 18 | #define PINCTRL_STATE_IDLE "idle" |
| 19 | #define PINCTRL_STATE_SLEEP "sleep" | ||