mirror of https://gitee.com/openkylin/linux.git
ARM: 6101/1: nomadik-gpio: don't enable in set_type
On this peripheral, setting the trigger type enables the interrupt, and the current set_type() implementation unconditionally enables the interrupt, even if it is called when the interrupt is disabled. Fix set_type() to: - if the interrupt is disabled, defer the actual trigger setting to when it is unmasked - if the interrupt is enabled, change the type immediately by clearing the old type and then re-enabling with the new type. Acked-by: Alessandro Rubini <rubini@unipv.it> Acked-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
040e5ecdda
commit
7a852d8060
|
@ -162,6 +162,7 @@ static void nmk_gpio_irq_unmask(unsigned int irq)
|
|||
|
||||
static int nmk_gpio_irq_set_type(unsigned int irq, unsigned int type)
|
||||
{
|
||||
bool enabled = !(irq_to_desc(irq)->status & IRQ_DISABLED);
|
||||
int gpio;
|
||||
struct nmk_gpio_chip *nmk_chip;
|
||||
unsigned long flags;
|
||||
|
@ -180,20 +181,22 @@ static int nmk_gpio_irq_set_type(unsigned int irq, unsigned int type)
|
|||
|
||||
spin_lock_irqsave(&nmk_chip->lock, flags);
|
||||
|
||||
if (enabled)
|
||||
__nmk_gpio_irq_modify(nmk_chip, gpio, false);
|
||||
|
||||
nmk_chip->edge_rising &= ~bitmask;
|
||||
if (type & IRQ_TYPE_EDGE_RISING)
|
||||
nmk_chip->edge_rising |= bitmask;
|
||||
writel(nmk_chip->edge_rising, nmk_chip->addr + NMK_GPIO_RIMSC);
|
||||
|
||||
nmk_chip->edge_falling &= ~bitmask;
|
||||
if (type & IRQ_TYPE_EDGE_FALLING)
|
||||
nmk_chip->edge_falling |= bitmask;
|
||||
writel(nmk_chip->edge_falling, nmk_chip->addr + NMK_GPIO_FIMSC);
|
||||
|
||||
if (enabled)
|
||||
__nmk_gpio_irq_modify(nmk_chip, gpio, true);
|
||||
|
||||
spin_unlock_irqrestore(&nmk_chip->lock, flags);
|
||||
|
||||
nmk_gpio_irq_unmask(irq);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue