Commit 090878aa authored Jun 07, 2013 by Olof Johansson

linux-2.6 into fixes

From Shawn Guo, mxs fixes for 3.10:

- Since the time we move to MULTI_IRQ_HANDLER, the 0x7f polling for no
  interrupt in icoll_handle_irq() becomes insane, because 0x7f is an
  valid interrupt number, the irq of gpio bank 0.  That unnecessary
  polling results in the driver not detecting when irq 0x7f is active
  which makes the machine effectively dead lock.  The fix removes the
  interrupt poll loop and allows usage of gpio0 interrupt without an
  infinite loop.

* tag 'mxs-fixes-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6

:
  ARM: mxs: icoll: Fix interrupts gpio bank 0

Signed-off-by: Olof Johansson <olof@lixom.net>

parents 3d0d8b91 b5f83e9b

drivers/irqchip/irq-mxs.c

+4 −10

Original line number	Diff line number	Diff line
		@@ -76,16 +76,10 @@ asmlinkage void __exception_irq_entry icoll_handle_irq(struct pt_regs *regs)
		{
		u32 irqnr;

		do {
		irqnr = __raw_readl(icoll_base + HW_ICOLL_STAT_OFFSET);
		if (irqnr != 0x7f) {
		__raw_writel(irqnr, icoll_base + HW_ICOLL_VECTOR);
		irqnr = irq_find_mapping(icoll_domain, irqnr);
		handle_IRQ(irqnr, regs);
		continue;
		}
		break;
		} while (1);
		}

		static int icoll_irq_domain_map(struct irq_domain *d, unsigned int virq,

Admin message