diff options
| author | David Jander <david@protonic.nl> | 2011-06-08 11:34:37 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-08 11:34:37 -0600 |
| commit | 910c8fb6b4b8c9e0be576b6a78f4cccf228a4bfd (patch) | |
| tree | e0825a1cb14400b5c938fe7d7e323dcb6a289c75 /drivers/gpio/gpio-pca953x.c | |
| parent | 47732cb4fdee72e6ea4d2ae40d72da4d2cedf97e (diff) | |
| download | olio-linux-3.10-910c8fb6b4b8c9e0be576b6a78f4cccf228a4bfd.tar.xz olio-linux-3.10-910c8fb6b4b8c9e0be576b6a78f4cccf228a4bfd.zip | |
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>
Diffstat (limited to 'drivers/gpio/gpio-pca953x.c')
| -rw-r--r-- | drivers/gpio/gpio-pca953x.c | 6 |
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, * this purpose. */ chip->irq_stat &= chip->reg_direction; - chip->irq_base = pdata->irq_base; mutex_init(&chip->irq_lock); + chip->irq_base = irq_alloc_descs(-1, pdata->irq_base, chip->gpio_chip.ngpio, -1); + if (chip->irq_base < 0) + goto out_failed; + for (lvl = 0; lvl < chip->gpio_chip.ngpio; lvl++) { int irq = lvl + chip->irq_base; + irq_clear_status_flags(irq, IRQ_NOREQUEST); irq_set_chip_data(irq, chip); irq_set_chip_and_handler(irq, &pca953x_irq_chip, handle_simple_irq); |