Skip to content

Commit

Permalink
gpio: Langwell GPIO driver bugfixes
Browse files Browse the repository at this point in the history
- 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: Alek Du <alek.du@intel.com>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Alek Du authored and Linus Torvalds committed Dec 2, 2009
1 parent 9743484 commit ca02970
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions drivers/gpio/langwell_gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,6 @@ static int lnw_irq_type(unsigned irq, unsigned type)

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)
Expand Down Expand Up @@ -183,13 +176,11 @@ static void lnw_irq_handler(unsigned irq, struct irq_desc *desc)
gedr_v = readl(gedr);
if (!gedr_v)
continue;
for (gpio = reg*32; gpio < reg*32+32; gpio++) {
gedr_v = readl(gedr);
for (gpio = reg*32; gpio < reg*32+32; gpio++)
if (gedr_v & BIT(gpio % 32)) {
pr_debug("pin %d triggered\n", gpio);
generic_handle_irq(lnw->irq_base + gpio);
}
}
/* clear the edge detect status bit */
writel(gedr_v, gedr);
}
Expand Down

0 comments on commit ca02970

Please sign in to comment.