diff options
author | John Crispin <blogic@openwrt.org> | 2013-02-01 07:04:59 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-02-05 10:17:23 -0500 |
commit | 933862873740923a059cbcda0c66487c6179ba3c (patch) | |
tree | b44fc635ff73d189e3a6c96b66b3189cde48d482 /drivers/pinctrl | |
parent | 6360350cbc0567f51afacb2d1e6a8e611b3b9b2b (diff) |
pinctrl/lantiq: the pinconf OD parameter argument was ignored
When setting the OpenDrain bit we should really honour the
argument passed inside the devicetree.
Signed-off-by: John Crispin <blogic@openwrt.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r-- | drivers/pinctrl/pinctrl-xway.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-xway.c b/drivers/pinctrl/pinctrl-xway.c index b23b8954ae31..53cb6a3a56ed 100644 --- a/drivers/pinctrl/pinctrl-xway.c +++ b/drivers/pinctrl/pinctrl-xway.c | |||
@@ -494,7 +494,10 @@ static int xway_pinconf_set(struct pinctrl_dev *pctldev, | |||
494 | reg = GPIO3_OD; | 494 | reg = GPIO3_OD; |
495 | else | 495 | else |
496 | reg = GPIO_OD(pin); | 496 | reg = GPIO_OD(pin); |
497 | gpio_setbit(info->membase[0], reg, PORT_PIN(pin)); | 497 | if (arg == 0) |
498 | gpio_setbit(info->membase[0], reg, PORT_PIN(pin)); | ||
499 | else | ||
500 | gpio_clearbit(info->membase[0], reg, PORT_PIN(pin)); | ||
498 | break; | 501 | break; |
499 | 502 | ||
500 | case LTQ_PINCONF_PARAM_PULL: | 503 | case LTQ_PINCONF_PARAM_PULL: |