Commit 3762442a authored by Linus Walleij's avatar Linus Walleij
Browse files

Revert "gpio: omap: handle pin config bias flags" 



This reverts commit 40e30d26.
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: default avatarLinus Walleij <linus.walleij@linaro.org>
parent c4429556

drivers/gpio/gpio-omap.c

+4 −13
Original line number Diff line number Diff line
@@ -896,21 +896,12 @@ static int omap_gpio_set_config(struct gpio_chip *chip, unsigned offset, 
				unsigned long config)

{

	u32 debounce;

	int ret = -ENOTSUPP;



	if ((pinconf_to_config_param(config) == PIN_CONFIG_BIAS_DISABLE) ||

	    (pinconf_to_config_param(config) == PIN_CONFIG_BIAS_PULL_UP) ||

	    (pinconf_to_config_param(config) == PIN_CONFIG_BIAS_PULL_DOWN))

	{

		ret = gpiochip_generic_config(chip, offset, config);

	}

	else if (pinconf_to_config_param(config) == PIN_CONFIG_INPUT_DEBOUNCE)

	{

		debounce = pinconf_to_config_argument(config);

		ret = omap_gpio_debounce(chip, offset, debounce);

	}

	if (pinconf_to_config_param(config) != PIN_CONFIG_INPUT_DEBOUNCE)

		return -ENOTSUPP;



	return ret;

	debounce = pinconf_to_config_argument(config);

	return omap_gpio_debounce(chip, offset, debounce);

}



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