From 065258ff31604ea21e1be401505c13a4f89c3ba4 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Tue, 8 Jan 2013 22:43:12 +0100 Subject: [PATCH] --- yaml --- r: 350483 b: refs/heads/master c: f868ef995b32f0f08d7b6ce700bbe25de3ad65ac h: refs/heads/master i: 350481: 45dea9042634c0d3db2184eee4e8b66931ef5d8c 350479: d128fce730fa669268a1dcc3f0c7850a39f4d224 v: v3 --- [refs] | 2 +- trunk/include/linux/pinctrl/pinconf-generic.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f44d8f82ae21..b5a911b87243 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6ae7a26535bb37c6c023c6f25b7f98904a8ab7c +refs/heads/master: f868ef995b32f0f08d7b6ce700bbe25de3ad65ac diff --git a/trunk/include/linux/pinctrl/pinconf-generic.h b/trunk/include/linux/pinctrl/pinconf-generic.h index b23d99da3b4b..40d7bb9c7562 100644 --- a/trunk/include/linux/pinctrl/pinconf-generic.h +++ b/trunk/include/linux/pinctrl/pinconf-generic.h @@ -46,6 +46,8 @@ * @PIN_CONFIG_DRIVE_OPEN_SOURCE: the pin will be driven with open source * (open emitter). Sending this config will enabale open drain mode, the * argument is ignored. + * @PIN_CONFIG_DRIVE_STRENGTH: the pin will output the current passed as + * argument. The argument is in mA. * @PIN_CONFIG_INPUT_SCHMITT_DISABLE: disable schmitt-trigger mode on the pin. * @PIN_CONFIG_INPUT_SCHMITT: this will configure an input pin to run in * schmitt-trigger mode. If the schmitt-trigger has adjustable hysteresis, @@ -76,6 +78,7 @@ enum pin_config_param { PIN_CONFIG_DRIVE_PUSH_PULL, PIN_CONFIG_DRIVE_OPEN_DRAIN, PIN_CONFIG_DRIVE_OPEN_SOURCE, + PIN_CONFIG_DRIVE_STRENGTH, PIN_CONFIG_INPUT_SCHMITT_DISABLE, PIN_CONFIG_INPUT_SCHMITT, PIN_CONFIG_INPUT_DEBOUNCE,