|
@@ -10,6 +10,8 @@
|
|
|
|
|
|
#include <linux/sched.h>
|
|
|
#include <linux/sysdev.h>
|
|
|
+#include <linux/of.h>
|
|
|
+#include <linux/of_irq.h>
|
|
|
|
|
|
#include <asm/mach/map.h>
|
|
|
#include <asm/mach/irq.h>
|
|
@@ -218,13 +220,26 @@ static void exynos4_gic_irq_fix_base(struct irq_data *d)
|
|
|
(gic_bank_offset * smp_processor_id());
|
|
|
}
|
|
|
|
|
|
+#ifdef CONFIG_OF
|
|
|
+static const struct of_device_id exynos4_dt_irq_match[] = {
|
|
|
+ { .compatible = "arm,cortex-a9-gic", .data = gic_of_init, },
|
|
|
+ {},
|
|
|
+};
|
|
|
+#endif
|
|
|
+
|
|
|
void __init exynos4_init_irq(void)
|
|
|
{
|
|
|
int irq;
|
|
|
|
|
|
gic_bank_offset = soc_is_exynos4412() ? 0x4000 : 0x8000;
|
|
|
|
|
|
- gic_init(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU);
|
|
|
+ if (!of_have_populated_dt())
|
|
|
+ gic_init(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU);
|
|
|
+#ifdef CONFIG_OF
|
|
|
+ else
|
|
|
+ of_irq_init(exynos4_dt_irq_match);
|
|
|
+#endif
|
|
|
+
|
|
|
gic_arch_extn.irq_eoi = exynos4_gic_irq_fix_base;
|
|
|
gic_arch_extn.irq_unmask = exynos4_gic_irq_fix_base;
|
|
|
gic_arch_extn.irq_mask = exynos4_gic_irq_fix_base;
|