aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Jander <david@protonic.nl>2011-06-08 13:34:37 -0400
committerGrant Likely <grant.likely@secretlab.ca>2011-06-08 13:34:37 -0400
commit910c8fb6b4b8c9e0be576b6a78f4cccf228a4bfd (patch)
treee0825a1cb14400b5c938fe7d7e323dcb6a289c75
parent47732cb4fdee72e6ea4d2ae40d72da4d2cedf97e (diff)
gpio/pca953x: Fix IRQ support.
It seems that in the normal case, IRQ_NOREQUEST needs to be explicitly cleared, otherwise claiming the interrupt fails. In the case of sparse interrupts, the descriptor needs to be allocated first. Signed-off-by: David Jander <david@protonic.nl> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
-rw-r--r--drivers/gpio/gpio-pca953x.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index a610864b7e1..ce5736e8362 100644
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -474,12 +474,16 @@ static int pca953x_irq_setup(struct pca953x_chip *chip,
474 * this purpose. 474 * this purpose.
475 */ 475 */
476 chip->irq_stat &= chip->reg_direction; 476 chip->irq_stat &= chip->reg_direction;
477 chip->irq_base = pdata->irq_base;
478 mutex_init(&chip->irq_lock); 477 mutex_init(&chip->irq_lock);
479 478
479 chip->irq_base = irq_alloc_descs(-1, pdata->irq_base, chip->gpio_chip.ngpio, -1);
480 if (chip->irq_base < 0)
481 goto out_failed;
482
480 for (lvl = 0; lvl < chip->gpio_chip.ngpio; lvl++) { 483 for (lvl = 0; lvl < chip->gpio_chip.ngpio; lvl++) {
481 int irq = lvl + chip->irq_base; 484 int irq = lvl + chip->irq_base;
482 485
486 irq_clear_status_flags(irq, IRQ_NOREQUEST);
483 irq_set_chip_data(irq, chip); 487 irq_set_chip_data(irq, chip);
484 irq_set_chip_and_handler(irq, &pca953x_irq_chip, 488 irq_set_chip_and_handler(irq, &pca953x_irq_chip,
485 handle_simple_irq); 489 handle_simple_irq);