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

Commit adfed159 authored by Will Deacon's avatar Will Deacon
Browse files

ARM: nmk: update GPIO chained IRQ handler to entry/exit functions 



This patch updates the Nomadik gpio chained IRQ handler to use the
chained IRQ enter/exit functions in order to function correctly on
primary controllers with different methods of flow control.

Cc: Rabin Vincent <rabin@rab.in>
Cc: Grant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 03dd765f

arch/arm/plat-nomadik/gpio.c

+4 −8
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
#include <linux/irq.h>

#include <linux/slab.h>



#include <asm/mach/irq.h>



#include <plat/pincfg.h>

#include <mach/hardware.h>

#include <mach/gpio.h>
@@ -681,13 +683,7 @@ static void __nmk_gpio_irq_handler(unsigned int irq, struct irq_desc *desc, 
	struct irq_chip *host_chip = irq_get_chip(irq);

	unsigned int first_irq;



	if (host_chip->irq_mask_ack)

		host_chip->irq_mask_ack(&desc->irq_data);

	else {

		host_chip->irq_mask(&desc->irq_data);

		if (host_chip->irq_ack)

			host_chip->irq_ack(&desc->irq_data);

	}

	chained_irq_enter(host_chip, desc);



	nmk_chip = irq_get_handler_data(irq);

	first_irq = NOMADIK_GPIO_TO_IRQ(nmk_chip->chip.base);
@@ -698,7 +694,7 @@ static void __nmk_gpio_irq_handler(unsigned int irq, struct irq_desc *desc, 
		status &= ~BIT(bit);

	}



	host_chip->irq_unmask(&desc->irq_data);

	chained_irq_exit(host_chip, desc);

}



static void nmk_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)