gpio: zynq: Take bank offset into account when reporting a IRQ

When looking up the IRQ the bank offset needs to be taken into account.
Otherwise interrupts for banks other than bank 0 get incorrectly reported as
interrupts for bank 0.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-zynq.c b/drivers/gpio/gpio-zynq.c
index 36034b6811bb209d462649ae1bdbd4bca44a70b1..dccadea9d830bbd8f400f1f41fa488c08a2525a2 100644 (file)
--- a/drivers/gpio/gpio-zynq.c
+++ b/drivers/gpio/gpio-zynq.c
@@ -138,6 +138,13 @@ static inline void zynq_gpio_get_bank_pin(unsigned int pin_num,
        }
 }
 
+static const unsigned int zynq_gpio_bank_offset[] = {
+       ZYNQ_GPIO_BANK0_PIN_MIN,
+       ZYNQ_GPIO_BANK1_PIN_MIN,
+       ZYNQ_GPIO_BANK2_PIN_MIN,
+       ZYNQ_GPIO_BANK3_PIN_MIN,
+};
+
 /**
  * zynq_gpio_get_value - Get the state of the specified pin of GPIO device
  * @chip:      gpio_chip instance to be worked on
@@ -461,6 +468,7 @@ static void zynq_gpio_handle_bank_irq(struct zynq_gpio *gpio,
                                      unsigned int bank_num,
                                      unsigned long pending)
 {
+       unsigned int bank_offset = zynq_gpio_bank_offset[bank_num];
        struct irq_domain *irqdomain = gpio->chip.irqdomain;
        int offset;
 
@@ -470,7 +478,7 @@ static void zynq_gpio_handle_bank_irq(struct zynq_gpio *gpio,
        for_each_set_bit(offset, &pending, 32) {
                unsigned int gpio_irq;
 
-               gpio_irq = irq_find_mapping(irqdomain, offset);
+               gpio_irq = irq_find_mapping(irqdomain, offset + bank_offset);
                generic_handle_irq(gpio_irq);
        }
 }