Skip to content

Commit 3762442

Browse files
committed
Revert "gpio: omap: handle pin config bias flags"
This reverts commit 40e30d2. I applied the patch to the wrong tree, oooups. Also there is a new version of it. Revert it out of pinctrl and apply to the gpio tree. Signed-off-by: Linus Walleij <[email protected]>
1 parent c442955 commit 3762442

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

drivers/gpio/gpio-omap.c

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -896,21 +896,12 @@ static int omap_gpio_set_config(struct gpio_chip *chip, unsigned offset,
896896
unsigned long config)
897897
{
898898
u32 debounce;
899-
int ret = -ENOTSUPP;
900899

901-
if ((pinconf_to_config_param(config) == PIN_CONFIG_BIAS_DISABLE) ||
902-
(pinconf_to_config_param(config) == PIN_CONFIG_BIAS_PULL_UP) ||
903-
(pinconf_to_config_param(config) == PIN_CONFIG_BIAS_PULL_DOWN))
904-
{
905-
ret = gpiochip_generic_config(chip, offset, config);
906-
}
907-
else if (pinconf_to_config_param(config) == PIN_CONFIG_INPUT_DEBOUNCE)
908-
{
909-
debounce = pinconf_to_config_argument(config);
910-
ret = omap_gpio_debounce(chip, offset, debounce);
911-
}
900+
if (pinconf_to_config_param(config) != PIN_CONFIG_INPUT_DEBOUNCE)
901+
return -ENOTSUPP;
912902

913-
return ret;
903+
debounce = pinconf_to_config_argument(config);
904+
return omap_gpio_debounce(chip, offset, debounce);
914905
}
915906

916907
static void omap_gpio_set(struct gpio_chip *chip, unsigned offset, int value)

0 commit comments

Comments
 (0)