This patch merges the codes of both IRQ controller types into one, and uses autodetection to set up the proper one at boot. To work around the plat_irq_dispatch mess both ICs are set up as chained handlers of the traditional MIPS IRQs. Should be safe until SMP Alchemys arrive (which is not going to happen anytime soon, I guess). Works as intended on all my test boards. Applies on top of the other Alchemy patches in mips-next-3.3 Manuel Lauss (3): MIPS: Alchemy: irq: register pm at irq init time MIPS: Alchemy: cascade IRQ controllers to MIPS IRQ controller MIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code. arch/mips/alchemy/common/Makefile | 5 +- arch/mips/alchemy/common/gpioint.c | 411 ----------------- arch/mips/alchemy/common/irq.c | 864 +++++++++++++++++++++++++----------- 3 files changed, 614 insertions(+), 666 deletions(-) delete mode 100644 arch/mips/alchemy/common/gpioint.c -- 1.7.7.2