forked from Minki/linux
Revert "gpio/omap: auto request GPIO as input if used as IRQ via DT"
This reverts commit b4419e1a15
.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
27d470c1ab
commit
c119fee063
@ -1090,8 +1090,6 @@ static int omap_gpio_irq_map(struct irq_domain *d, unsigned int virq,
|
|||||||
irq_hw_number_t hwirq)
|
irq_hw_number_t hwirq)
|
||||||
{
|
{
|
||||||
struct gpio_bank *bank = d->host_data;
|
struct gpio_bank *bank = d->host_data;
|
||||||
int gpio;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
if (!bank)
|
if (!bank)
|
||||||
return -EINVAL;
|
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);
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user