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

Commit 01cb087e authored by Haavard Skinnemoen's avatar Haavard Skinnemoen
Browse files

[AVR32] Set flow handler for external interrupts 



Make sure that the flow handler for external interrupts is updated
whenever they type is changed. Also make sure that the defaults
correspond with how the interrupt controller is configured.

Signed-off-by: default avatarHaavard Skinnemoen <hskinnemoen@atmel.com>
parent da58e92f

arch/avr32/mach-at32ap/extint.c

+20 −2
Original line number Original line Diff line number Diff line
@@ -49,12 +49,25 @@ static void eim_unmask_irq(unsigned int irq) 
static int eim_set_irq_type(unsigned int irq, unsigned int flow_type)

static int eim_set_irq_type(unsigned int irq, unsigned int flow_type)

{

{

	struct at32_sm *sm = get_irq_chip_data(irq);

	struct at32_sm *sm = get_irq_chip_data(irq);

	struct irq_desc *desc;

	unsigned int i = irq - sm->eim_first_irq;

	unsigned int i = irq - sm->eim_first_irq;

	u32 mode, edge, level;

	u32 mode, edge, level;

	unsigned long flags;

	unsigned long flags;

	int ret = 0;

	int ret = 0;





	flow_type &= IRQ_TYPE_SENSE_MASK;

	if (flow_type == IRQ_TYPE_NONE)

		flow_type = IRQ_TYPE_LEVEL_LOW;



	desc = &irq_desc[irq];

	desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);

	desc->status |= flow_type & IRQ_TYPE_SENSE_MASK;



	if (flow_type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH)) {

		desc->status |= IRQ_LEVEL;

		set_irq_handler(irq, handle_level_irq);

	} else {

		set_irq_handler(irq, handle_edge_irq);

	}





	spin_lock_irqsave(&sm->lock, flags);

	spin_lock_irqsave(&sm->lock, flags);
@@ -148,10 +161,15 @@ static int __init eim_init(void) 
	pattern = sm_readl(sm, EIM_MODE);

	pattern = sm_readl(sm, EIM_MODE);

	nr_irqs = fls(pattern);

	nr_irqs = fls(pattern);





	/* Trigger on falling edge unless overridden by driver */

	sm_writel(sm, EIM_MODE, 0UL);

	sm_writel(sm, EIM_EDGE, 0UL);



	sm->eim_chip = &eim_chip;

	sm->eim_chip = &eim_chip;





	for (i = 0; i < nr_irqs; i++) {

	for (i = 0; i < nr_irqs; i++) {

		set_irq_chip(sm->eim_first_irq + i, &eim_chip);

		set_irq_chip_and_handler(sm->eim_first_irq + i, &eim_chip,

					 handle_edge_irq);

		set_irq_chip_data(sm->eim_first_irq + i, sm);

		set_irq_chip_data(sm->eim_first_irq + i, sm);

	}

	}