diff options
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt | 3 | ||||
| -rw-r--r-- | drivers/pinctrl/pinconf-generic.c | 2 | ||||
| -rw-r--r-- | include/linux/pinctrl/pinconf-generic.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt index 7498bdc00e19..788ab09e4c1c 100644 --- a/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt +++ b/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt | |||
| @@ -173,7 +173,8 @@ Arguments for parameters: | |||
| 173 | - input-schmitt takes as argument the adjustable hysteresis in a | 173 | - input-schmitt takes as argument the adjustable hysteresis in a |
| 174 | driver-specific format | 174 | driver-specific format |
| 175 | 175 | ||
| 176 | - input-debounce takes the debounce time as argument or 0 to disable debouncing | 176 | - input-debounce takes the debounce time in usec as argument |
| 177 | or 0 to disable debouncing | ||
| 177 | 178 | ||
| 178 | - power-source argument is the custom value describing the source to select | 179 | - power-source argument is the custom value describing the source to select |
| 179 | 180 | ||
diff --git a/drivers/pinctrl/pinconf-generic.c b/drivers/pinctrl/pinconf-generic.c index 794dad7d68d8..2b271d5d90bf 100644 --- a/drivers/pinctrl/pinconf-generic.c +++ b/drivers/pinctrl/pinconf-generic.c | |||
| @@ -49,7 +49,7 @@ static struct pin_config_item conf_items[] = { | |||
| 49 | PCONFDUMP(PIN_CONFIG_DRIVE_STRENGTH, "output drive strength", "mA"), | 49 | PCONFDUMP(PIN_CONFIG_DRIVE_STRENGTH, "output drive strength", "mA"), |
| 50 | PCONFDUMP(PIN_CONFIG_INPUT_SCHMITT_ENABLE, "input schmitt enabled", NULL), | 50 | PCONFDUMP(PIN_CONFIG_INPUT_SCHMITT_ENABLE, "input schmitt enabled", NULL), |
| 51 | PCONFDUMP(PIN_CONFIG_INPUT_SCHMITT, "input schmitt trigger", NULL), | 51 | PCONFDUMP(PIN_CONFIG_INPUT_SCHMITT, "input schmitt trigger", NULL), |
| 52 | PCONFDUMP(PIN_CONFIG_INPUT_DEBOUNCE, "input debounce", "time units"), | 52 | PCONFDUMP(PIN_CONFIG_INPUT_DEBOUNCE, "input debounce", "usec"), |
| 53 | PCONFDUMP(PIN_CONFIG_POWER_SOURCE, "pin power source", "selector"), | 53 | PCONFDUMP(PIN_CONFIG_POWER_SOURCE, "pin power source", "selector"), |
| 54 | PCONFDUMP(PIN_CONFIG_SLEW_RATE, "slew rate", NULL), | 54 | PCONFDUMP(PIN_CONFIG_SLEW_RATE, "slew rate", NULL), |
| 55 | PCONFDUMP(PIN_CONFIG_LOW_POWER_MODE, "pin low power", "mode"), | 55 | PCONFDUMP(PIN_CONFIG_LOW_POWER_MODE, "pin low power", "mode"), |
diff --git a/include/linux/pinctrl/pinconf-generic.h b/include/linux/pinctrl/pinconf-generic.h index 48aa4ba7b089..bf7e989abcb5 100644 --- a/include/linux/pinctrl/pinconf-generic.h +++ b/include/linux/pinctrl/pinconf-generic.h | |||
| @@ -70,7 +70,7 @@ | |||
| 70 | * setting pins to this mode. | 70 | * setting pins to this mode. |
| 71 | * @PIN_CONFIG_INPUT_DEBOUNCE: this will configure the pin to debounce mode, | 71 | * @PIN_CONFIG_INPUT_DEBOUNCE: this will configure the pin to debounce mode, |
| 72 | * which means it will wait for signals to settle when reading inputs. The | 72 | * which means it will wait for signals to settle when reading inputs. The |
| 73 | * argument gives the debounce time on a custom format. Setting the | 73 | * argument gives the debounce time in usecs. Setting the |
| 74 | * argument to zero turns debouncing off. | 74 | * argument to zero turns debouncing off. |
| 75 | * @PIN_CONFIG_POWER_SOURCE: if the pin can select between different power | 75 | * @PIN_CONFIG_POWER_SOURCE: if the pin can select between different power |
| 76 | * supplies, the argument to this parameter (on a custom format) tells | 76 | * supplies, the argument to this parameter (on a custom format) tells |
