diff options
author | Haojian Zhuang <haojian.zhuang@linaro.org> | 2013-02-11 12:10:57 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-02-15 03:52:29 -0500 |
commit | ea27c396174d5a4576853cbe7aeabeb9f7cba6e1 (patch) | |
tree | 2503f7a3638b70ddde2fdf8bff0077fd52700f2a | |
parent | 6f9e41f4e673bf9ae6a5c0831b1524a91ea1c440 (diff) |
pinctrl: generic: rename input schmitt disable
Rename PIN_CONFIG_INPUT_SCHMITT_DISABLE to
PIN_CONFIG_INPUT_SCHMITT_ENABLE. It's used to make it more generialize.
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r-- | drivers/pinctrl/pinconf-generic.c | 2 | ||||
-rw-r--r-- | include/linux/pinctrl/pinconf-generic.h | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/pinctrl/pinconf-generic.c b/drivers/pinctrl/pinconf-generic.c index e5948f8172af..06c304ac6f7d 100644 --- a/drivers/pinctrl/pinconf-generic.c +++ b/drivers/pinctrl/pinconf-generic.c | |||
@@ -41,7 +41,7 @@ struct pin_config_item conf_items[] = { | |||
41 | PCONFDUMP(PIN_CONFIG_DRIVE_PUSH_PULL, "output drive push pull", NULL), | 41 | PCONFDUMP(PIN_CONFIG_DRIVE_PUSH_PULL, "output drive push pull", NULL), |
42 | PCONFDUMP(PIN_CONFIG_DRIVE_OPEN_DRAIN, "output drive open drain", NULL), | 42 | PCONFDUMP(PIN_CONFIG_DRIVE_OPEN_DRAIN, "output drive open drain", NULL), |
43 | PCONFDUMP(PIN_CONFIG_DRIVE_OPEN_SOURCE, "output drive open source", NULL), | 43 | PCONFDUMP(PIN_CONFIG_DRIVE_OPEN_SOURCE, "output drive open source", NULL), |
44 | PCONFDUMP(PIN_CONFIG_INPUT_SCHMITT_DISABLE, "input schmitt disabled", NULL), | 44 | PCONFDUMP(PIN_CONFIG_INPUT_SCHMITT_ENABLE, "input schmitt enabled", NULL), |
45 | PCONFDUMP(PIN_CONFIG_INPUT_SCHMITT, "input schmitt trigger", NULL), | 45 | PCONFDUMP(PIN_CONFIG_INPUT_SCHMITT, "input schmitt trigger", NULL), |
46 | PCONFDUMP(PIN_CONFIG_INPUT_DEBOUNCE, "input debounce", "time units"), | 46 | PCONFDUMP(PIN_CONFIG_INPUT_DEBOUNCE, "input debounce", "time units"), |
47 | PCONFDUMP(PIN_CONFIG_POWER_SOURCE, "pin power source", "selector"), | 47 | PCONFDUMP(PIN_CONFIG_POWER_SOURCE, "pin power source", "selector"), |
diff --git a/include/linux/pinctrl/pinconf-generic.h b/include/linux/pinctrl/pinconf-generic.h index 3e7909aa5c03..72474e18f1e0 100644 --- a/include/linux/pinctrl/pinconf-generic.h +++ b/include/linux/pinctrl/pinconf-generic.h | |||
@@ -48,7 +48,9 @@ | |||
48 | * argument is ignored. | 48 | * argument is ignored. |
49 | * @PIN_CONFIG_DRIVE_STRENGTH: the pin will output the current passed as | 49 | * @PIN_CONFIG_DRIVE_STRENGTH: the pin will output the current passed as |
50 | * argument. The argument is in mA. | 50 | * argument. The argument is in mA. |
51 | * @PIN_CONFIG_INPUT_SCHMITT_DISABLE: disable schmitt-trigger mode on the pin. | 51 | * @PIN_CONFIG_INPUT_SCHMITT_ENABLE: control schmitt-trigger mode on the pin. |
52 | * If the argument != 0, schmitt-trigger mode is enabled. If it's 0, | ||
53 | * schmitt-trigger mode is disabled. | ||
52 | * @PIN_CONFIG_INPUT_SCHMITT: this will configure an input pin to run in | 54 | * @PIN_CONFIG_INPUT_SCHMITT: this will configure an input pin to run in |
53 | * schmitt-trigger mode. If the schmitt-trigger has adjustable hysteresis, | 55 | * schmitt-trigger mode. If the schmitt-trigger has adjustable hysteresis, |
54 | * the threshold value is given on a custom format as argument when | 56 | * the threshold value is given on a custom format as argument when |
@@ -82,7 +84,7 @@ enum pin_config_param { | |||
82 | PIN_CONFIG_DRIVE_OPEN_DRAIN, | 84 | PIN_CONFIG_DRIVE_OPEN_DRAIN, |
83 | PIN_CONFIG_DRIVE_OPEN_SOURCE, | 85 | PIN_CONFIG_DRIVE_OPEN_SOURCE, |
84 | PIN_CONFIG_DRIVE_STRENGTH, | 86 | PIN_CONFIG_DRIVE_STRENGTH, |
85 | PIN_CONFIG_INPUT_SCHMITT_DISABLE, | 87 | PIN_CONFIG_INPUT_SCHMITT_ENABLE, |
86 | PIN_CONFIG_INPUT_SCHMITT, | 88 | PIN_CONFIG_INPUT_SCHMITT, |
87 | PIN_CONFIG_INPUT_DEBOUNCE, | 89 | PIN_CONFIG_INPUT_DEBOUNCE, |
88 | PIN_CONFIG_POWER_SOURCE, | 90 | PIN_CONFIG_POWER_SOURCE, |