diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-04-22 17:26:41 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2014-04-26 15:45:26 -0400 |
commit | 880ff3e2255c05bac0d2010719da42a26fdbb185 (patch) | |
tree | da8d129fb44dcce60dbd6dec948bf8862f8e9960 | |
parent | fbf04d814d0a57b0eead41efd70b3fbe903201d9 (diff) |
ARM: orion: remove no longer needed DT IRQ code
Following the move of the Orion5x Device Tree support to use
irqchip_init() for the interrupt controller probing, the
plat-orion/irq.c code for DT-probing of the interrupt controller is no
longer necessary, so we can get rid of it.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Link: https://lkml.kernel.org/r/1398202002-28530-38-git-send-email-thomas.petazzoni@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r-- | arch/arm/plat-orion/include/plat/irq.h | 1 | ||||
-rw-r--r-- | arch/arm/plat-orion/irq.c | 32 |
2 files changed, 0 insertions, 33 deletions
diff --git a/arch/arm/plat-orion/include/plat/irq.h b/arch/arm/plat-orion/include/plat/irq.h index 50547e417936..96be19e9bd93 100644 --- a/arch/arm/plat-orion/include/plat/irq.h +++ b/arch/arm/plat-orion/include/plat/irq.h | |||
@@ -12,5 +12,4 @@ | |||
12 | #define __PLAT_IRQ_H | 12 | #define __PLAT_IRQ_H |
13 | 13 | ||
14 | void orion_irq_init(unsigned int irq_start, void __iomem *maskaddr); | 14 | void orion_irq_init(unsigned int irq_start, void __iomem *maskaddr); |
15 | void __init orion_dt_init_irq(void); | ||
16 | #endif | 15 | #endif |
diff --git a/arch/arm/plat-orion/irq.c b/arch/arm/plat-orion/irq.c index 27ec18b53595..8c1fc06007c0 100644 --- a/arch/arm/plat-orion/irq.c +++ b/arch/arm/plat-orion/irq.c | |||
@@ -38,35 +38,3 @@ void __init orion_irq_init(unsigned int irq_start, void __iomem *maskaddr) | |||
38 | irq_setup_generic_chip(gc, IRQ_MSK(32), IRQ_GC_INIT_MASK_CACHE, | 38 | irq_setup_generic_chip(gc, IRQ_MSK(32), IRQ_GC_INIT_MASK_CACHE, |
39 | IRQ_NOREQUEST, IRQ_LEVEL | IRQ_NOPROBE); | 39 | IRQ_NOREQUEST, IRQ_LEVEL | IRQ_NOPROBE); |
40 | } | 40 | } |
41 | |||
42 | #ifdef CONFIG_OF | ||
43 | static int __init orion_add_irq_domain(struct device_node *np, | ||
44 | struct device_node *interrupt_parent) | ||
45 | { | ||
46 | int i = 0; | ||
47 | void __iomem *base; | ||
48 | |||
49 | do { | ||
50 | base = of_iomap(np, i); | ||
51 | if (base) { | ||
52 | orion_irq_init(i * 32, base + 0x04); | ||
53 | i++; | ||
54 | } | ||
55 | } while (base); | ||
56 | |||
57 | irq_domain_add_legacy(np, i * 32, 0, 0, | ||
58 | &irq_domain_simple_ops, NULL); | ||
59 | return 0; | ||
60 | } | ||
61 | |||
62 | static const struct of_device_id orion_irq_match[] = { | ||
63 | { .compatible = "marvell,orion-intc", | ||
64 | .data = orion_add_irq_domain, }, | ||
65 | {}, | ||
66 | }; | ||
67 | |||
68 | void __init orion_dt_init_irq(void) | ||
69 | { | ||
70 | of_irq_init(orion_irq_match); | ||
71 | } | ||
72 | #endif | ||