aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-omap.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-07-29 05:48:54 -0400
committerLinus Walleij <linus.walleij@linaro.org>2013-07-30 18:34:31 -0400
commitc119fee06309a5b6969992b6fe2593299c803c81 (patch)
tree4aa6b16f33def5ce0221079fd980810d50029ab3 /drivers/gpio/gpio-omap.c
parent27d470c1ab555a1c0b87099c242dc479e19076af (diff)
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,
1090 irq_hw_number_t hwirq) 1090 irq_hw_number_t hwirq)
1091{ 1091{
1092 struct gpio_bank *bank = d->host_data; 1092 struct gpio_bank *bank = d->host_data;
1093 int gpio;
1094 int ret;
1095 1093
1096 if (!bank) 1094 if (!bank)
1097 return -EINVAL; 1095 return -EINVAL;
@@ -1106,22 +1104,6 @@ static int omap_gpio_irq_map(struct irq_domain *d, unsigned int virq,
1106 set_irq_flags(virq, IRQF_VALID); 1104 set_irq_flags(virq, IRQF_VALID);
1107 } 1105 }
1108 1106
1109 /*
1110 * REVISIT most GPIO IRQ chip drivers need to call
1111 * gpio_request() before a GPIO line can be used as an
1112 * IRQ. Ideally this should be handled by the IRQ core
1113 * but until then this has to be done on a per driver
1114 * basis. Remove this once this is managed by the core.
1115 */
1116 if (bank->chip.of_node) {
1117 gpio = irq_to_gpio(bank, hwirq);
1118 ret = gpio_request_one(gpio, GPIOF_IN, NULL);
1119 if (ret) {
1120 dev_err(bank->dev, "Could not request GPIO%d\n", gpio);
1121 return ret;
1122 }
1123 }
1124
1125 return 0; 1107 return 0;
1126} 1108}
1127 1109