summaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-omap.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-07-29 11:48:54 +0200
committerLinus Walleij <linus.walleij@linaro.org>2013-07-31 00:34:31 +0200
commitc119fee06309a5b6969992b6fe2593299c803c81 (patch)
tree4aa6b16f33def5ce0221079fd980810d50029ab3 /drivers/gpio/gpio-omap.c
parentRevert "gpio/omap: fix build error when OF_GPIO is not defined." (diff)
downloadlinux-c119fee06309a5b6969992b6fe2593299c803c81.tar.xz
linux-c119fee06309a5b6969992b6fe2593299c803c81.zip
Revert "gpio/omap: auto request GPIO as input if used as IRQ via DT"
This reverts commit b4419e1a15905191661ffe75ba2f9e649f5d565e. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-omap.c')
-rw-r--r--drivers/gpio/gpio-omap.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 3a0c1606f885..5e667ff91dc3 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1090,8 +1090,6 @@ static int omap_gpio_irq_map(struct irq_domain *d, unsigned int virq,
irq_hw_number_t hwirq)
{
struct gpio_bank *bank = d->host_data;
- int gpio;
- int ret;
if (!bank)
return -EINVAL;
@@ -1106,22 +1104,6 @@ static int omap_gpio_irq_map(struct irq_domain *d, unsigned int virq,
set_irq_flags(virq, IRQF_VALID);
}
- /*
- * REVISIT most GPIO IRQ chip drivers need to call
- * gpio_request() before a GPIO line can be used as an
- * IRQ. Ideally this should be handled by the IRQ core
- * but until then this has to be done on a per driver
- * basis. Remove this once this is managed by the core.
- */
- if (bank->chip.of_node) {
- gpio = irq_to_gpio(bank, hwirq);
- ret = gpio_request_one(gpio, GPIOF_IN, NULL);
- if (ret) {
- dev_err(bank->dev, "Could not request GPIO%d\n", gpio);
- return ret;
- }
- }
-
return 0;
}