From e338e457cd0d9256bd4fb95920864578b0a94931 Mon Sep 17 00:00:00 2001 From: Haojian Zhuang Date: Fri, 18 Jan 2013 15:31:15 +0800 Subject: [PATCH] --- yaml --- r: 350489 b: refs/heads/master c: 684697cbbcd076b8fde78d8863e341700533b542 h: refs/heads/master i: 350487: 3627b8601f40984e98d48d48bf3430b38a339091 v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/pinconf-generic.c | 1 + trunk/include/linux/pinctrl/pinconf-generic.h | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4b45cd959b3f..4dfb8ad4cab4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef5e3eef6b6b22eb4ad7a893d2299418808667ba +refs/heads/master: 684697cbbcd076b8fde78d8863e341700533b542 diff --git a/trunk/drivers/pinctrl/pinconf-generic.c b/trunk/drivers/pinctrl/pinconf-generic.c index bcf8157ceea7..e5948f8172af 100644 --- a/trunk/drivers/pinctrl/pinconf-generic.c +++ b/trunk/drivers/pinctrl/pinconf-generic.c @@ -45,6 +45,7 @@ struct pin_config_item conf_items[] = { PCONFDUMP(PIN_CONFIG_INPUT_SCHMITT, "input schmitt trigger", NULL), PCONFDUMP(PIN_CONFIG_INPUT_DEBOUNCE, "input debounce", "time units"), PCONFDUMP(PIN_CONFIG_POWER_SOURCE, "pin power source", "selector"), + PCONFDUMP(PIN_CONFIG_SLEW_RATE, "slew rate", NULL), PCONFDUMP(PIN_CONFIG_LOW_POWER_MODE, "pin low power", "mode"), PCONFDUMP(PIN_CONFIG_OUTPUT, "pin output", "level"), }; diff --git a/trunk/include/linux/pinctrl/pinconf-generic.h b/trunk/include/linux/pinctrl/pinconf-generic.h index 40d7bb9c7562..3e7909aa5c03 100644 --- a/trunk/include/linux/pinctrl/pinconf-generic.h +++ b/trunk/include/linux/pinctrl/pinconf-generic.h @@ -60,6 +60,9 @@ * @PIN_CONFIG_POWER_SOURCE: if the pin can select between different power * supplies, the argument to this parameter (on a custom format) tells * the driver which alternative power source to use. + * @PIN_CONFIG_SLEW_RATE: if the pin can select slew rate, the argument to + * this parameter (on a custom format) tells the driver which alternative + * slew rate to use. * @PIN_CONFIG_LOW_POWER_MODE: this will configure the pin for low power * operation, if several modes of operation are supported these can be * passed in the argument on a custom form, else just use argument 1 @@ -83,6 +86,7 @@ enum pin_config_param { PIN_CONFIG_INPUT_SCHMITT, PIN_CONFIG_INPUT_DEBOUNCE, PIN_CONFIG_POWER_SOURCE, + PIN_CONFIG_SLEW_RATE, PIN_CONFIG_LOW_POWER_MODE, PIN_CONFIG_OUTPUT, PIN_CONFIG_END = 0x7FFF,