diff options
| author |   Maxime Ripard <maxime.ripard@bootlin.com> | 2019-03-14 20:32:50 +0100 |
|---|---|---|
| committer |   Linus Walleij <linus.walleij@linaro.org> | 2019-04-05 00:04:28 +0700 |
| commit | 542f36159f9466faf4bd8d776fdc79f07c048c42 (patch) | |
| tree | affd978d0121b6727a57ef467a43dfd42243d7e0 /drivers/gpio | |
| parent | gpio: omap: use devm_platform_ioremap_resource() (diff) | |
| download | linux-dev-542f36159f9466faf4bd8d776fdc79f07c048c42.tar.xz linux-dev-542f36159f9466faf4bd8d776fdc79f07c048c42.zip | |
gpio: Set proper argument value to set_config
The gpio_set_config function creates a pinconf configuration for a given
pinc_config_param.
However, it always uses an arg of 0, which might not be a valid argument
for a given param. A good example of that would be the bias parameters,
where 0 means that the pull up or down resistor is null, and the pin is
directly connected to VCC/GND.
The framework uses in some other places the value 1 as a default argument
to enable the pull resistor, so let's use the same one here.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpiolib.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index f41ad889124f..e5c3c4bff6fe 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -2565,8 +2565,20 @@ EXPORT_SYMBOL_GPL(gpiochip_free_own_desc); static int gpio_set_config(struct gpio_chip *gc, unsigned offset, enum pin_config_param mode) { - unsigned long config = { PIN_CONF_PACKED(mode, 0) }; + unsigned long config; + unsigned arg; + switch (mode) { + case PIN_CONFIG_BIAS_PULL_DOWN: + case PIN_CONFIG_BIAS_PULL_UP: + arg = 1; + break; + + default: + arg = 0; + } + + config = PIN_CONF_PACKED(mode, arg); return gc->set_config ? gc->set_config(gc, offset, config) : -ENOTSUPP; } |