aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2013-10-02 07:37:12 -0400
committerLinus Walleij <linus.walleij@linaro.org>2013-10-08 07:27:27 -0400
commita047914e7f123074bc8ee6f40e4502111a1b4cc4 (patch)
tree98b01fe67accfccd8ea1f9dad81f74bf65f89071
parentbfabb59433fc18ff78d2818e10e212d0f85d56ae (diff)
pinctrl: palmas: remove pin config BIAS_PULL_PIN_DEFAULT support
Palmas devices do not support the default bias configuration and hence removing this option from valid pin config parameters. Acked-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt2
-rw-r--r--drivers/pinctrl/pinctrl-palmas.c3
2 files changed, 1 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt
index 734d9b04d533..caf297bee1fb 100644
--- a/Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt
+++ b/Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt
@@ -41,7 +41,7 @@ pinctrl-bindings.txt:
41 41
42Required: pins 42Required: pins
43Options: function, bias-disable, bias-pull-up, bias-pull-down, 43Options: function, bias-disable, bias-pull-up, bias-pull-down,
44 bias-pin-default, drive-open-drain. 44 drive-open-drain.
45 45
46Note that many of these properties are only valid for certain specific pins. 46Note that many of these properties are only valid for certain specific pins.
47See the Palmas device datasheet for complete details regarding which pins 47See the Palmas device datasheet for complete details regarding which pins
diff --git a/drivers/pinctrl/pinctrl-palmas.c b/drivers/pinctrl/pinctrl-palmas.c
index 61643815e73e..f13d0e78a41c 100644
--- a/drivers/pinctrl/pinctrl-palmas.c
+++ b/drivers/pinctrl/pinctrl-palmas.c
@@ -891,9 +891,6 @@ static int palmas_pinconf_set(struct pinctrl_dev *pctldev,
891 param = pinconf_to_config_param(configs[i]); 891 param = pinconf_to_config_param(configs[i]);
892 param_val = pinconf_to_config_argument(configs[i]); 892 param_val = pinconf_to_config_argument(configs[i]);
893 893
894 if (param == PIN_CONFIG_BIAS_PULL_PIN_DEFAULT)
895 continue;
896
897 switch (param) { 894 switch (param) {
898 case PIN_CONFIG_BIAS_DISABLE: 895 case PIN_CONFIG_BIAS_DISABLE:
899 case PIN_CONFIG_BIAS_PULL_UP: 896 case PIN_CONFIG_BIAS_PULL_UP: