aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/pinctrl/pinconf-generic.c1
-rw-r--r--include/linux/pinctrl/pinconf-generic.h3
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/pinctrl/pinconf-generic.c b/drivers/pinctrl/pinconf-generic.c
index 833a36458157..bcf8157ceea7 100644
--- a/drivers/pinctrl/pinconf-generic.c
+++ b/drivers/pinctrl/pinconf-generic.c
@@ -46,6 +46,7 @@ struct pin_config_item conf_items[] = {
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"),
48 PCONFDUMP(PIN_CONFIG_LOW_POWER_MODE, "pin low power", "mode"), 48 PCONFDUMP(PIN_CONFIG_LOW_POWER_MODE, "pin low power", "mode"),
49 PCONFDUMP(PIN_CONFIG_OUTPUT, "pin output", "level"),
49}; 50};
50 51
51void pinconf_generic_dump_pin(struct pinctrl_dev *pctldev, 52void pinconf_generic_dump_pin(struct pinctrl_dev *pctldev,
diff --git a/include/linux/pinctrl/pinconf-generic.h b/include/linux/pinctrl/pinconf-generic.h
index 47a1bdd88878..b23d99da3b4b 100644
--- a/include/linux/pinctrl/pinconf-generic.h
+++ b/include/linux/pinctrl/pinconf-generic.h
@@ -62,6 +62,8 @@
62 * operation, if several modes of operation are supported these can be 62 * operation, if several modes of operation are supported these can be
63 * passed in the argument on a custom form, else just use argument 1 63 * passed in the argument on a custom form, else just use argument 1
64 * to indicate low power mode, argument 0 turns low power mode off. 64 * to indicate low power mode, argument 0 turns low power mode off.
65 * @PIN_CONFIG_OUTPUT: this will configure the pin in output, use argument
66 * 1 to indicate high level, argument 0 to indicate low level.
65 * @PIN_CONFIG_END: this is the last enumerator for pin configurations, if 67 * @PIN_CONFIG_END: this is the last enumerator for pin configurations, if
66 * you need to pass in custom configurations to the pin controller, use 68 * you need to pass in custom configurations to the pin controller, use
67 * PIN_CONFIG_END+1 as the base offset. 69 * PIN_CONFIG_END+1 as the base offset.
@@ -79,6 +81,7 @@ enum pin_config_param {
79 PIN_CONFIG_INPUT_DEBOUNCE, 81 PIN_CONFIG_INPUT_DEBOUNCE,
80 PIN_CONFIG_POWER_SOURCE, 82 PIN_CONFIG_POWER_SOURCE,
81 PIN_CONFIG_LOW_POWER_MODE, 83 PIN_CONFIG_LOW_POWER_MODE,
84 PIN_CONFIG_OUTPUT,
82 PIN_CONFIG_END = 0x7FFF, 85 PIN_CONFIG_END = 0x7FFF,
83}; 86};
84 87