| From 2b666aaefc2ce2a5e40003a73009bf51ffb930c8 Mon Sep 17 00:00:00 2001 |
| From: "Ivan T. Ivanov" <iivanov@mm-sol.com> |
| Date: Tue, 27 May 2014 09:27:36 +0300 |
| Subject: 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> |
| (cherry picked from commit ca6c55189a631f3380ff0a28f90d920a84e60d7b) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt | 1 + |
| drivers/pinctrl/pinconf-generic.c | 1 + |
| 2 files changed, 2 insertions(+) |
| |
| 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, }, |
| -- |
| 2.1.2 |
| |