Commit ca029701 authored by Alek Du's avatar Alek Du Committed by Linus Torvalds

gpio: Langwell GPIO driver bugfixes

- Remove wrong and unnecessary unmask operation

- Remove extra GEDR reading

This fixes the loss of interrupts which occurs when two or more pins are
triggered in close succession.
Signed-off-by: default avatarAlek Du <alek.du@intel.com>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 97434843
...@@ -144,13 +144,6 @@ static int lnw_irq_type(unsigned irq, unsigned type) ...@@ -144,13 +144,6 @@ static int lnw_irq_type(unsigned irq, unsigned type)
static void lnw_irq_unmask(unsigned irq) static void lnw_irq_unmask(unsigned irq)
{ {
struct lnw_gpio *lnw = get_irq_chip_data(irq);
u32 gpio = irq - lnw->irq_base;
u8 reg = gpio / 32;
void __iomem *gedr;
gedr = (void __iomem *)(&lnw->reg_base->GEDR[reg]);
writel(BIT(gpio % 32), gedr);
}; };
static void lnw_irq_mask(unsigned irq) static void lnw_irq_mask(unsigned irq)
...@@ -183,13 +176,11 @@ static void lnw_irq_handler(unsigned irq, struct irq_desc *desc) ...@@ -183,13 +176,11 @@ static void lnw_irq_handler(unsigned irq, struct irq_desc *desc)
gedr_v = readl(gedr); gedr_v = readl(gedr);
if (!gedr_v) if (!gedr_v)
continue; continue;
for (gpio = reg*32; gpio < reg*32+32; gpio++) { for (gpio = reg*32; gpio < reg*32+32; gpio++)
gedr_v = readl(gedr);
if (gedr_v & BIT(gpio % 32)) { if (gedr_v & BIT(gpio % 32)) {
pr_debug("pin %d triggered\n", gpio); pr_debug("pin %d triggered\n", gpio);
generic_handle_irq(lnw->irq_base + gpio); generic_handle_irq(lnw->irq_base + gpio);
} }
}
/* clear the edge detect status bit */ /* clear the edge detect status bit */
writel(gedr_v, gedr); writel(gedr_v, gedr);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment