gpio: merrifield: Make bias configuration available for GPIOs

If we get bias set request, for example, from GpioIo() resource,
we silently ignore it. Make bias configuration available for GPIOs.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

diff --git a/drivers/gpio/gpio-merrifield.c b/drivers/gpio/gpio-merrifield.c
index 706687fab634e7545e7ed8e75f1f74bd9a644c49..22f3ce218f5d8c90a40a1144b52d1c978754d37b 100644 (file)
--- a/drivers/gpio/gpio-merrifield.c
+++ b/drivers/gpio/gpio-merrifield.c
@@ -194,6 +194,11 @@ static int mrfld_gpio_set_config(struct gpio_chip *chip, unsigned int offset,
 {
        u32 debounce;
 
+       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))
+               return gpiochip_generic_config(chip, offset, config);
+
        if (pinconf_to_config_param(config) != PIN_CONFIG_INPUT_DEBOUNCE)
                return -ENOTSUPP;