ARM: Orion: DT support for IRQ and GPIO Controllers

Both IRQ and GPIO controllers can now be represented in DT.  The IRQ
controllers are setup first, and then the GPIO controllers. Interrupts
for GPIO lines are placed directly after the main interrupts in the
interrupt space.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@googlemail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Josh Coombs <josh.coombs@gmail.com>
Tested-by: Simon Baatz <gmbnomis@gmail.com>

1 files changed, 40 insertions, 0 deletions

diff --git a/arch/arm/plat-orion/irq.c b/arch/arm/plat-orion/irq.c
index 2d5b9c1ef389..d751964def4c 100644
--- a/arch/arm/plat-orion/irq.c
+++ b/arch/arm/plat-orion/irq.c
@@ -11,8 +11,12 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/irq.h>
+#include <linux/irqdomain.h>
 #include <linux/io.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <plat/irq.h>
+#include <plat/gpio.h>
 
 void __init orion_irq_init(unsigned int irq_start, void __iomem *maskaddr)
 {
@@ -32,3 +36,39 @@ void __init orion_irq_init(unsigned int irq_start, void __iomem *maskaddr)
         irq_setup_generic_chip(gc, IRQ_MSK(32), IRQ_GC_INIT_MASK_CACHE,
                                IRQ_NOREQUEST, IRQ_LEVEL | IRQ_NOPROBE);
 }
+
+#ifdef CONFIG_OF
+static int __init orion_add_irq_domain(struct device_node *np,
+                                       struct device_node *interrupt_parent)
+{
+        int i = 0, irq_gpio;
+        void __iomem *base;
+
+        do {
+                base = of_iomap(np, i);
+                if (base) {
+                        orion_irq_init(i * 32, base);
+                        i++;
+                }
+        } while (base);
+
+        irq_domain_add_legacy(np, i * 32, 0, 0,
+                              &irq_domain_simple_ops, NULL);
+
+        irq_gpio = i * 32;
+        orion_gpio_of_init(irq_gpio);
+
+        return 0;
+}
+
+static const struct of_device_id orion_irq_match[] = {
+        { .compatible = "marvell,orion-intc",
+          .data = orion_add_irq_domain, },
+        {},
+};
+
+void __init orion_dt_init_irq(void)
+{
+        of_irq_init(orion_irq_match);
+}
+#endif