diff options
| author |   John Crispin <blogic@openwrt.org> | 2013-02-01 13:04:59 +0100 |
|---|---|---|
| committer |   Linus Walleij <linus.walleij@linaro.org> | 2013-02-05 16:17:23 +0100 |
| commit | 933862873740923a059cbcda0c66487c6179ba3c (patch) | |
| tree | b44fc635ff73d189e3a6c96b66b3189cde48d482 /drivers/pinctrl/pinctrl-xway.c | |
| parent | pinctrl/lantiq: add output pinconf parameter (diff) | |
| download | linux-dev-933862873740923a059cbcda0c66487c6179ba3c.tar.xz linux-dev-933862873740923a059cbcda0c66487c6179ba3c.zip | |
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/pinctrl-xway.c')
| -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, reg = GPIO3_OD; else reg = GPIO_OD(pin); - gpio_setbit(info->membase[0], reg, PORT_PIN(pin)); + if (arg == 0) + gpio_setbit(info->membase[0], reg, PORT_PIN(pin)); + else + gpio_clearbit(info->membase[0], reg, PORT_PIN(pin)); break; case LTQ_PINCONF_PARAM_PULL: |