summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2026-10-14 15:04:57 +0100
committerMark Brown <broonie@kernel.org>2026-10-14 15:04:57 +0100
commitddba5497f5b84c65a5e27b1a9c8cbfaa68d36ea7 (patch)
tree67a27c47b18575dd5e748421329b8e84a14fbd2f /include/linux
parent8ca7ebe4ecd471c110a05a797711418cf9d15f40 (diff)
parent6e648fe0b51f9cc15dbc63391bb723ac037d686c (diff)
downloadlinux-next-ddba5497f5b84c65a5e27b1a9c8cbfaa68d36ea7.tar.gz
linux-next-ddba5497f5b84c65a5e27b1a9c8cbfaa68d36ea7.zip
Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/pinctrl/consumer.h1
-rw-r--r--include/linux/pinctrl/pinconf-generic.h5
2 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h
index 7be49d447426..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>
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,