diff options
| author | Linus Walleij <linusw@kernel.org> | 2026-10-14 02:04:02 +0200 |
|---|---|---|
| committer | Linus Walleij <linusw@kernel.org> | 2026-10-14 02:04:02 +0200 |
| commit | 6e648fe0b51f9cc15dbc63391bb723ac037d686c (patch) | |
| tree | 06816ae71832e6298dc3f5b09eb8b1c503c4d85b /include/linux | |
| parent | c5895eadf287116434b7b01d67b92e8146f7ff61 (diff) | |
| parent | c1cf10a8896c20f6a09c8980e370c010e8684308 (diff) | |
| download | linux-next-6e648fe0b51f9cc15dbc63391bb723ac037d686c.tar.gz linux-next-6e648fe0b51f9cc15dbc63391bb723ac037d686c.zip | |
Merge branch 'devel' into for-next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pinctrl/consumer.h | 5 | ||||
| -rw-r--r-- | include/linux/pinctrl/pinconf-generic.h | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h index 11b8f0b8da0c..81e7866bd2e3 100644 --- a/include/linux/pinctrl/consumer.h +++ b/include/linux/pinctrl/consumer.h @@ -12,6 +12,7 @@ #define __LINUX_PINCTRL_CONSUMER_H #include <linux/err.h> +#include <linux/errno.h> #include <linux/types.h> #include <linux/pinctrl/pinctrl-state.h> @@ -107,14 +108,14 @@ static inline int pinctrl_gpio_get_config(struct gpio_chip *gc, unsigned int offset, unsigned long *config) { - return 0; + return -ENOTSUPP; } static inline int pinctrl_gpio_set_config(struct gpio_chip *gc, unsigned int offset, unsigned long config) { - return 0; + return -ENOTSUPP; } static inline struct pinctrl * __must_check pinctrl_get(struct device *dev) diff --git a/include/linux/pinctrl/pinconf-generic.h b/include/linux/pinctrl/pinconf-generic.h index a5d4b2d8633a..1df63c732b99 100644 --- a/include/linux/pinctrl/pinconf-generic.h +++ b/include/linux/pinctrl/pinconf-generic.h @@ -71,6 +71,10 @@ struct pinctrl_map; * which means it will wait for signals to settle when reading inputs. The * argument gives the debounce time in usecs. Setting the * argument to zero turns debouncing off. + * @PIN_CONFIG_INPUT_DEBOUNCE_NS: this will configure the pin to debounce mode, + * which means it will wait for signals to settle when reading inputs. The + * argument gives the debounce time in nsecs. Setting the + * argument to zero turns debouncing off. * @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. @@ -143,6 +147,7 @@ enum pin_config_param { PIN_CONFIG_DRIVE_STRENGTH, PIN_CONFIG_DRIVE_STRENGTH_UA, PIN_CONFIG_INPUT_DEBOUNCE, + PIN_CONFIG_INPUT_DEBOUNCE_NS, PIN_CONFIG_INPUT_ENABLE, PIN_CONFIG_INPUT_SCHMITT, PIN_CONFIG_INPUT_SCHMITT_ENABLE, |