diff options
| author | Ivan T. Ivanov <iivanov@mm-sol.com> | 2014-05-27 09:27:36 +0300 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-05-28 10:16:35 +0200 |
| commit | ca6c55189a631f3380ff0a28f90d920a84e60d7b (patch) | |
| tree | a40580c22cf5e2bbf73d5849cb5c723cd7282da3 | |
| parent | d54e9a28ca0fe69ec3965f9a19fdc42628f9a0e0 (diff) | |
| download | linux-stable-ca6c55189a631f3380ff0a28f90d920a84e60d7b.tar.gz linux-stable-ca6c55189a631f3380ff0a28f90d920a84e60d7b.tar.bz2 linux-stable-ca6c55189a631f3380ff0a28f90d920a84e60d7b.zip | |
pinctrl: Enable "power-source" to be extracted from DT files
Add "power-source" property to generic options used for DT parsing files.
This enables drivers, which use generic pin configurations, to get the
value passed to this property.
Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt | 1 | ||||
| -rw-r--r-- | drivers/pinctrl/pinconf-generic.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt index 4414163e76d2..fa40a177164c 100644 --- a/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt +++ b/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt @@ -156,6 +156,7 @@ input-disable - disable input on pin (no effect on output) input-schmitt-enable - enable schmitt-trigger mode input-schmitt-disable - disable schmitt-trigger mode input-debounce - debounce mode with debound time X +power-source - select between different power supplies low-power-enable - enable low power mode low-power-disable - disable low power mode output-low - set the pin to output mode with low level diff --git a/drivers/pinctrl/pinconf-generic.c b/drivers/pinctrl/pinconf-generic.c index 2457ca961f1c..29ff77f90fcb 100644 --- a/drivers/pinctrl/pinconf-generic.c +++ b/drivers/pinctrl/pinconf-generic.c @@ -166,6 +166,7 @@ static struct pinconf_generic_dt_params dt_params[] = { { "input-schmitt-enable", PIN_CONFIG_INPUT_SCHMITT_ENABLE, 1 }, { "input-schmitt-disable", PIN_CONFIG_INPUT_SCHMITT_ENABLE, 0 }, { "input-debounce", PIN_CONFIG_INPUT_DEBOUNCE, 0 }, + { "power-source", PIN_CONFIG_POWER_SOURCE, 0 }, { "low-power-enable", PIN_CONFIG_LOW_POWER_MODE, 1 }, { "low-power-disable", PIN_CONFIG_LOW_POWER_MODE, 0 }, { "output-low", PIN_CONFIG_OUTPUT, 0, }, |