diff options
author | Haojian Zhuang <haojian.zhuang@gmail.com> | 2012-11-15 03:36:33 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-11-21 02:55:26 -0500 |
commit | 2ccb0bcfb0dd2001b1a40048c1e407cd9a78bd3d (patch) | |
tree | 3ccc9a232d2b90b87adf94b50224677c6f916c40 /include | |
parent | 8604ac34eb19f7b02f8cf22c787fe30d96ad2651 (diff) |
pinctrl: generic: add input schmitt disable parameter
In Marvell PXA/MMP silicons, input schmitt disable value is 0x40, not 0.
So append new config parameter -- input schmitt disable.
Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/pinctrl/pinconf-generic.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/pinctrl/pinconf-generic.h b/include/linux/pinctrl/pinconf-generic.h index 4f0abb9f1c09..47a1bdd88878 100644 --- a/include/linux/pinctrl/pinconf-generic.h +++ b/include/linux/pinctrl/pinconf-generic.h | |||
@@ -46,11 +46,11 @@ | |||
46 | * @PIN_CONFIG_DRIVE_OPEN_SOURCE: the pin will be driven with open source | 46 | * @PIN_CONFIG_DRIVE_OPEN_SOURCE: the pin will be driven with open source |
47 | * (open emitter). Sending this config will enabale open drain mode, the | 47 | * (open emitter). Sending this config will enabale open drain mode, the |
48 | * argument is ignored. | 48 | * argument is ignored. |
49 | * @PIN_CONFIG_INPUT_SCHMITT_DISABLE: disable schmitt-trigger mode on the pin. | ||
49 | * @PIN_CONFIG_INPUT_SCHMITT: this will configure an input pin to run in | 50 | * @PIN_CONFIG_INPUT_SCHMITT: this will configure an input pin to run in |
50 | * schmitt-trigger mode. If the schmitt-trigger has adjustable hysteresis, | 51 | * schmitt-trigger mode. If the schmitt-trigger has adjustable hysteresis, |
51 | * the threshold value is given on a custom format as argument when | 52 | * the threshold value is given on a custom format as argument when |
52 | * setting pins to this mode. The argument zero turns the schmitt trigger | 53 | * setting pins to this mode. |
53 | * off. | ||
54 | * @PIN_CONFIG_INPUT_DEBOUNCE: this will configure the pin to debounce mode, | 54 | * @PIN_CONFIG_INPUT_DEBOUNCE: this will configure the pin to debounce mode, |
55 | * which means it will wait for signals to settle when reading inputs. The | 55 | * which means it will wait for signals to settle when reading inputs. The |
56 | * argument gives the debounce time on a custom format. Setting the | 56 | * argument gives the debounce time on a custom format. Setting the |
@@ -74,6 +74,7 @@ enum pin_config_param { | |||
74 | PIN_CONFIG_DRIVE_PUSH_PULL, | 74 | PIN_CONFIG_DRIVE_PUSH_PULL, |
75 | PIN_CONFIG_DRIVE_OPEN_DRAIN, | 75 | PIN_CONFIG_DRIVE_OPEN_DRAIN, |
76 | PIN_CONFIG_DRIVE_OPEN_SOURCE, | 76 | PIN_CONFIG_DRIVE_OPEN_SOURCE, |
77 | PIN_CONFIG_INPUT_SCHMITT_DISABLE, | ||
77 | PIN_CONFIG_INPUT_SCHMITT, | 78 | PIN_CONFIG_INPUT_SCHMITT, |
78 | PIN_CONFIG_INPUT_DEBOUNCE, | 79 | PIN_CONFIG_INPUT_DEBOUNCE, |
79 | PIN_CONFIG_POWER_SOURCE, | 80 | PIN_CONFIG_POWER_SOURCE, |