]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ARM: EXYNOS: Remove legacy interrupt initialization code
authorTomasz Figa <t.figa@samsung.com>
Sat, 15 Jun 2013 00:04:55 +0000 (09:04 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Sat, 15 Jun 2013 00:33:06 +0000 (09:33 +0900)
This patch removes legacy IRQ initialization code that was used to set
up interrupt handling when booting with ATAGS, which is not supported
any more.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
arch/arm/mach-exynos/common.c

index 598e4b89ddd8e824fb8041e1f99b80c608786bf0..9626ce4f1346bd9ecbe1c887839f02bd16e4e5b8 100644 (file)
@@ -41,7 +41,6 @@
 #include <mach/regs-irq.h>
 #include <mach/regs-pmu.h>
 #include <mach/regs-gpio.h>
-#include <mach/irqs.h>
 
 #include <plat/cpu.h>
 #include <plat/devs.h>
@@ -486,41 +485,14 @@ void __init exynos_init_time(void)
        }
 }
 
-static unsigned int max_combiner_nr(void)
-{
-       if (soc_is_exynos5250())
-               return EXYNOS5_MAX_COMBINER_NR;
-       else if (soc_is_exynos4412())
-               return EXYNOS4412_MAX_COMBINER_NR;
-       else if (soc_is_exynos4212())
-               return EXYNOS4212_MAX_COMBINER_NR;
-       else
-               return EXYNOS4210_MAX_COMBINER_NR;
-}
-
-
 void __init exynos4_init_irq(void)
 {
-       unsigned int gic_bank_offset;
-
-       gic_bank_offset = soc_is_exynos4412() ? 0x4000 : 0x8000;
-
-       if (!of_have_populated_dt())
-               gic_init_bases(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU, gic_bank_offset, NULL);
-       else
-               irqchip_init();
-
-       if (!of_have_populated_dt())
-               combiner_init(S5P_VA_COMBINER_BASE, NULL,
-                             max_combiner_nr(), COMBINER_IRQ(0, 0));
-
-       gic_arch_extn.irq_set_wake = s3c_irq_wake;
+       irqchip_init();
 }
 
 void __init exynos5_init_irq(void)
 {
        irqchip_init();
-       gic_arch_extn.irq_set_wake = s3c_irq_wake;
 }
 
 struct bus_type exynos_subsys = {