From a900e5d9971860f2c400ed84d529c891fcd9a3b2 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Tue, 12 Feb 2013 16:04:52 -0600 Subject: ARM: exynos: move exynos4210-combiner to drivers/irqchip Exynos boot is broken with commit 0529e315 (ARM: use common irqchip_init for GIC init). This commit split the irqchip initialization into 2 calls to of_irq_init. This does not work because of_irq_init requires interrupt parents to be in the match list. Rather than reverting exynos changes, make it do the proper thing by using IRQCHIP_DECLARE. This requires moving the combiner code to drivers/irqchip. Reported-by: Doug Anderson Signed-off-by: Rob Herring Cc: Kukjin Kim Cc: Russell King Cc: Thomas Gleixner Cc: linux-samsung-soc@vger.kernel.org Signed-off-by: Olof Johansson --- drivers/irqchip/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/irqchip/Makefile') diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index 0fb865574390..e65fbf2cdf71 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -1,6 +1,7 @@ obj-$(CONFIG_IRQCHIP) += irqchip.o obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o +obj-$(CONFIG_ARCH_EXYNOS) += exynos-combiner.o obj-$(CONFIG_ARCH_SUNXI) += irq-sunxi.o obj-$(CONFIG_ARCH_SPEAR3XX) += spear-shirq.o obj-$(CONFIG_ARM_GIC) += irq-gic.o -- cgit v1.2.3