irq_domain/mips: Allow irq_domain on MIPS

This patch makes IRQ_DOMAIN usable on MIPS.  It uses an ugly workaround
to preserve current behaviour so that MIPS has time to add irq_domain
registration to the irq controller drivers.  The workaround will be
removed in Linux v3.6

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mips@linux-mips.org

1 files changed, 12 insertions, 0 deletions

diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 25a498eb98a3..af48e59bc2ff 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -411,6 +411,18 @@ unsigned int irq_create_of_mapping(struct device_node *controller,
 
         domain = controller ? irq_find_host(controller) : irq_default_domain;
         if (!domain) {
+#ifdef CONFIG_MIPS
+                /*
+                 * Workaround to avoid breaking interrupt controller drivers
+                 * that don't yet register an irq_domain.  This is temporary
+                 * code. ~~~gcl, Feb 24, 2012
+                 *
+                 * Scheduled for removal in Linux v3.6.  That should be enough
+                 * time.
+                 */
+                if (intsize > 0)
+                        return intspec[0];
+#endif
                 printk(KERN_WARNING "irq: no irq domain found for %s !\n",
                        controller->full_name);
                 return 0;