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 --- arch/arm/mach-exynos/common.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch/arm/mach-exynos/common.h') diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h index feefc86293c2..9339bb8954be 100644 --- a/arch/arm/mach-exynos/common.h +++ b/arch/arm/mach-exynos/common.h @@ -60,6 +60,9 @@ void exynos4212_register_clocks(void); #define exynos4212_register_clocks() #endif +struct device_node; +void combiner_init(void __iomem *combiner_base, struct device_node *np); + extern struct smp_operations exynos_smp_ops; extern void exynos_cpu_die(unsigned int cpu); -- cgit v1.2.3