From 7e575dc34c7e4fefc3589f48d89bbf847bbe5220 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Fri, 4 Jan 2013 17:57:40 +0100 Subject: [PATCH] --- yaml --- r: 350476 b: refs/heads/master c: 483f33f63c1cb3c6becb465bac7b75d7ff5e3b8f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/pinconf-generic.c | 1 + trunk/include/linux/pinctrl/pinconf-generic.h | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a1ef3bbeddbc..f0a331bde0c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d99b32d7b9fb542c5efb00a8ec3b96e77be86fd +refs/heads/master: 483f33f63c1cb3c6becb465bac7b75d7ff5e3b8f diff --git a/trunk/drivers/pinctrl/pinconf-generic.c b/trunk/drivers/pinctrl/pinconf-generic.c index 833a36458157..bcf8157ceea7 100644 --- a/trunk/drivers/pinctrl/pinconf-generic.c +++ b/trunk/drivers/pinctrl/pinconf-generic.c @@ -46,6 +46,7 @@ struct pin_config_item conf_items[] = { PCONFDUMP(PIN_CONFIG_INPUT_DEBOUNCE, "input debounce", "time units"), PCONFDUMP(PIN_CONFIG_POWER_SOURCE, "pin power source", "selector"), PCONFDUMP(PIN_CONFIG_LOW_POWER_MODE, "pin low power", "mode"), + PCONFDUMP(PIN_CONFIG_OUTPUT, "pin output", "level"), }; void pinconf_generic_dump_pin(struct pinctrl_dev *pctldev, diff --git a/trunk/include/linux/pinctrl/pinconf-generic.h b/trunk/include/linux/pinctrl/pinconf-generic.h index 47a1bdd88878..b23d99da3b4b 100644 --- a/trunk/include/linux/pinctrl/pinconf-generic.h +++ b/trunk/include/linux/pinctrl/pinconf-generic.h @@ -62,6 +62,8 @@ * operation, if several modes of operation are supported these can be * passed in the argument on a custom form, else just use argument 1 * to indicate low power mode, argument 0 turns low power mode off. + * @PIN_CONFIG_OUTPUT: this will configure the pin in output, use argument + * 1 to indicate high level, argument 0 to indicate low level. * @PIN_CONFIG_END: this is the last enumerator for pin configurations, if * you need to pass in custom configurations to the pin controller, use * PIN_CONFIG_END+1 as the base offset. @@ -79,6 +81,7 @@ enum pin_config_param { PIN_CONFIG_INPUT_DEBOUNCE, PIN_CONFIG_POWER_SOURCE, PIN_CONFIG_LOW_POWER_MODE, + PIN_CONFIG_OUTPUT, PIN_CONFIG_END = 0x7FFF, };