gpio: omap: rework omap_gpio_request to touch only gpio specific registers
authorGrygorii Strashko <grygorii.strashko@linaro.org>
Fri, 22 May 2015 14:35:51 +0000 (17:35 +0300)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 1 Jun 2015 14:53:50 +0000 (16:53 +0200)
The GPIO Chip and GPIO IRQ Chip functionality are essentially orthogonal,
so GPIO Chip implementation shouldn't touch GPIO IRQ specific registers
and vise versa.

Hence, rework omap_gpio_request:
- don't reset GPIO IRQ triggering type to IRQ_TYPE_NONE, because
  GPIO irqchip should be responsible for that;
- call directly omap_enable_gpio_module as all needed checks are already
  present inside it.

Signed-off-by: Grygorii Strashko <grygorii.strashko@linaro.org>
Tested-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/gpio/gpio-omap.c

index b2fcdf4..606b401 100644 (file)
@@ -668,14 +668,7 @@ static int omap_gpio_request(struct gpio_chip *chip, unsigned offset)
                pm_runtime_get_sync(bank->dev);
 
        spin_lock_irqsave(&bank->lock, flags);
-       /* Set trigger to none. You need to enable the desired trigger with
-        * request_irq() or set_irq_type(). Only do this if the IRQ line has
-        * not already been requested.
-        */
-       if (!LINE_USED(bank->irq_usage, offset)) {
-               omap_set_gpio_triggering(bank, offset, IRQ_TYPE_NONE);
-               omap_enable_gpio_module(bank, offset);
-       }
+       omap_enable_gpio_module(bank, offset);
        bank->mod_usage |= BIT(offset);
        spin_unlock_irqrestore(&bank->lock, flags);