diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 14:58:44 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-10 14:58:44 +1100 |
| commit | 73d6909aec62b5f0bbb1ad5ea9cfde4efa791726 (patch) | |
| tree | f2e0b7c5191ed40aae70a2b41361d48adddd3f9f /include | |
| parent | 17e4632c68f7b25b7e8a669847ae0296feddcbd3 (diff) | |
| parent | 8385af02bad1724a720f6ba4c1ec590d4f082229 (diff) | |
Merge remote-tracking branch 'pinctrl/for-next'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pinctrl/pinconf-generic.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/pinctrl/pinconf-generic.h b/include/linux/pinctrl/pinconf-generic.h index 282309d7c4dc..a15f10727eb8 100644 --- a/include/linux/pinctrl/pinconf-generic.h +++ b/include/linux/pinctrl/pinconf-generic.h @@ -61,6 +61,9 @@ * argument is ignored. * @PIN_CONFIG_DRIVE_STRENGTH: the pin will sink or source at most the current * passed as argument. The argument is in mA. + * @PIN_CONFIG_INPUT_ENABLE: enable the pin's input. Note that this does not + * affect the pin's ability to drive output. 1 enables input, 0 disables + * input. * @PIN_CONFIG_INPUT_SCHMITT_ENABLE: control schmitt-trigger mode on the pin. * If the argument != 0, schmitt-trigger mode is enabled. If it's 0, * schmitt-trigger mode is disabled. @@ -101,6 +104,7 @@ enum pin_config_param { PIN_CONFIG_DRIVE_OPEN_DRAIN, PIN_CONFIG_DRIVE_OPEN_SOURCE, PIN_CONFIG_DRIVE_STRENGTH, + PIN_CONFIG_INPUT_ENABLE, PIN_CONFIG_INPUT_SCHMITT_ENABLE, PIN_CONFIG_INPUT_SCHMITT, PIN_CONFIG_INPUT_DEBOUNCE, |