Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 016da144 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Linus Walleij
Browse files

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: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 0752e169

drivers/gpio/gpio-zynq.c

+9 −1
Original line number Original line Diff line number Diff line
@@ -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

 * zynq_gpio_get_value - Get the state of the specified pin of GPIO device

 * @chip:	gpio_chip instance to be worked on

 * @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 int bank_num,

				      unsigned long pending)

				      unsigned long pending)

{

{

	unsigned int bank_offset = zynq_gpio_bank_offset[bank_num];

	struct irq_domain *irqdomain = gpio->chip.irqdomain;

	struct irq_domain *irqdomain = gpio->chip.irqdomain;

	int offset;

	int offset;
@@ -470,7 +478,7 @@ static void zynq_gpio_handle_bank_irq(struct zynq_gpio *gpio, 
	for_each_set_bit(offset, &pending, 32) {

	for_each_set_bit(offset, &pending, 32) {

		unsigned int gpio_irq;

		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);

		generic_handle_irq(gpio_irq);

	}

	}

}

}