irqchip: crossbar: Convert dra7 crossbar to stacked domains

Support for the TI crossbar used on the DRA7 family of chips
is implemented as an ugly hack on the side of the GIC.

Converting it to stacked domains makes it slightly more
palatable, as it results in a cleanup.

Unfortunately, as the DT bindings failed to acknowledge the
fact that this is actually yet another interrupt controller
(the third, actually), we have yet another breakage. Oh well.

Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Link: https://lkml.kernel.org/r/1426088629-15377-3-git-send-email-marc.zyngier@arm.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

9 files changed, 149 insertions, 125 deletions

diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
index 03750af3b49a..170fbf953e5d 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
@@ -454,7 +454,6 @@
         mcp_rtc: rtc@6f {
                 compatible = "microchip,mcp7941x";
                 reg = <0x6f>;
-                interrupt-parent = <&gic>;
                 interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_LOW>;  /* IRQ_SYS_1N */
 
                 pinctrl-names = "default";
@@ -477,7 +476,7 @@
 
 &uart3 {
         status = "okay";
-        interrupts-extended = <&gic GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>,
+        interrupts-extended = <&crossbar_mpu GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>,
                               <&dra7_pmx_core 0x248>;
 
         pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index 746cddb1b8f5..789ee58ba47e 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -446,7 +446,7 @@
         status = "okay";
         pinctrl-names = "default";
         pinctrl-0 = <&uart1_pins>;
-        interrupts-extended = <&gic GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>,
+        interrupts-extended = <&crossbar_mpu GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>,
                               <&dra7_pmx_core 0x3e0>;
 };
 
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 5827fedafd43..850f949d409a 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -13,14 +13,13 @@
 #include "skeleton.dtsi"
 
 #define MAX_SOURCES 400
-#define DIRECT_IRQ(irq) (MAX_SOURCES + irq)
 
 / {
         #address-cells = <1>;
         #size-cells = <1>;
 
         compatible = "ti,dra7xx";
-        interrupt-parent = <&gic>;
+        interrupt-parent = <&crossbar_mpu>;
 
         aliases {
                 i2c0 = &i2c1;
@@ -50,18 +49,19 @@
                              <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
                              <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
                              <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
+                interrupt-parent = <&gic>;
         };
 
         gic: interrupt-controller@48211000 {
                 compatible = "arm,cortex-a15-gic";
                 interrupt-controller;
                 #interrupt-cells = <3>;
-                arm,routable-irqs = <192>;
                 reg = <0x48211000 0x1000>,
                       <0x48212000 0x1000>,
                       <0x48214000 0x2000>,
                       <0x48216000 0x2000>;
                 interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
+                interrupt-parent = <&gic>;
         };
 
         /*
@@ -91,8 +91,8 @@
                 ti,hwmods = "l3_main_1", "l3_main_2";
                 reg = <0x44000000 0x1000000>,
                       <0x45000000 0x1000>;
-                interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI DIRECT_IRQ(10) IRQ_TYPE_LEVEL_HIGH>;
+                interrupts-extended = <&crossbar_mpu GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
+                                      <&gic GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
 
                 prm: prm@4ae06000 {
                         compatible = "ti,dra7-prm";
@@ -344,7 +344,7 @@
                 uart1: serial@4806a000 {
                         compatible = "ti,omap4-uart";
                         reg = <0x4806a000 0x100>;
-                        interrupts-extended = <&gic GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts-extended = <&crossbar_mpu GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "uart1";
                         clock-frequency = <48000000>;
                         status = "disabled";
@@ -355,7 +355,7 @@
                 uart2: serial@4806c000 {
                         compatible = "ti,omap4-uart";
                         reg = <0x4806c000 0x100>;
-                        interrupts-extended = <&gic GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "uart2";
                         clock-frequency = <48000000>;
                         status = "disabled";
@@ -366,7 +366,7 @@
                 uart3: serial@48020000 {
                         compatible = "ti,omap4-uart";
                         reg = <0x48020000 0x100>;
-                        interrupts-extended = <&gic GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "uart3";
                         clock-frequency = <48000000>;
                         status = "disabled";
@@ -377,7 +377,7 @@
                 uart4: serial@4806e000 {
                         compatible = "ti,omap4-uart";
                         reg = <0x4806e000 0x100>;
-                        interrupts-extended = <&gic GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "uart4";
                         clock-frequency = <48000000>;
                         status = "disabled";
@@ -388,7 +388,7 @@
                 uart5: serial@48066000 {
                         compatible = "ti,omap4-uart";
                         reg = <0x48066000 0x100>;
-                        interrupts-extended = <&gic GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "uart5";
                         clock-frequency = <48000000>;
                         status = "disabled";
@@ -399,7 +399,7 @@
                 uart6: serial@48068000 {
                         compatible = "ti,omap4-uart";
                         reg = <0x48068000 0x100>;
-                        interrupts-extended = <&gic GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "uart6";
                         clock-frequency = <48000000>;
                         status = "disabled";
@@ -410,7 +410,7 @@
                 uart7: serial@48420000 {
                         compatible = "ti,omap4-uart";
                         reg = <0x48420000 0x100>;
-                        interrupts-extended = <&gic GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "uart7";
                         clock-frequency = <48000000>;
                         status = "disabled";
@@ -419,7 +419,7 @@
                 uart8: serial@48422000 {
                         compatible = "ti,omap4-uart";
                         reg = <0x48422000 0x100>;
-                        interrupts-extended = <&gic GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "uart8";
                         clock-frequency = <48000000>;
                         status = "disabled";
@@ -428,7 +428,7 @@
                 uart9: serial@48424000 {
                         compatible = "ti,omap4-uart";
                         reg = <0x48424000 0x100>;
-                        interrupts-extended = <&gic GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "uart9";
                         clock-frequency = <48000000>;
                         status = "disabled";
@@ -437,7 +437,7 @@
                 uart10: serial@4ae2b000 {
                         compatible = "ti,omap4-uart";
                         reg = <0x4ae2b000 0x100>;
-                        interrupts-extended = <&gic GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "uart10";
                         clock-frequency = <48000000>;
                         status = "disabled";
@@ -1337,9 +1337,12 @@
                         status = "disabled";
                 };
 
-                crossbar_mpu: crossbar@4a020000 {
+                crossbar_mpu: crossbar@4a002a48 {
                         compatible = "ti,irq-crossbar";
                         reg = <0x4a002a48 0x130>;
+                        interrupt-controller;
+                        interrupt-parent = <&gic>;
+                        #interrupt-cells = <3>;
                         ti,max-irqs = <160>;
                         ti,max-crossbar-sources = <MAX_SOURCES>;
                         ti,reg-size = <2>;
diff --git a/arch/arm/boot/dts/dra72-evm.dts b/arch/arm/boot/dts/dra72-evm.dts
index 4d8711713610..2373054f588d 100644
--- a/arch/arm/boot/dts/dra72-evm.dts
+++ b/arch/arm/boot/dts/dra72-evm.dts
@@ -160,7 +160,6 @@
                 pinctrl-0 = <&tps65917_pins_default>;
 
                 interrupts = <GIC_SPI 2 IRQ_TYPE_NONE>;  /* IRQ_SYS_1N */
-                interrupt-parent = <&gic>;
                 interrupt-controller;
                 #interrupt-cells = <2>;
 
diff --git a/arch/arm/boot/dts/dra72x.dtsi b/arch/arm/boot/dts/dra72x.dtsi
index e5a3d23a3df1..e782bf1dd863 100644
--- a/arch/arm/boot/dts/dra72x.dtsi
+++ b/arch/arm/boot/dts/dra72x.dtsi
@@ -25,6 +25,7 @@
 
         pmu {
                 compatible = "arm,cortex-a15-pmu";
-                interrupts = <GIC_SPI DIRECT_IRQ(131) IRQ_TYPE_LEVEL_HIGH>;
+                interrupt-parent = <&gic>;
+                interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
         };
 };
diff --git a/arch/arm/boot/dts/dra74x.dtsi b/arch/arm/boot/dts/dra74x.dtsi
index 10173fab1a15..0fc758db55f5 100644
--- a/arch/arm/boot/dts/dra74x.dtsi
+++ b/arch/arm/boot/dts/dra74x.dtsi
@@ -41,8 +41,9 @@
 
         pmu {
                 compatible = "arm,cortex-a15-pmu";
-                interrupts = <GIC_SPI DIRECT_IRQ(131) IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI DIRECT_IRQ(132) IRQ_TYPE_LEVEL_HIGH>;
+                interrupt-parent = <&gic>;
+                interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>;
         };
 
         ocp {
diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c
index cee0fe1ee6ff..cf7aafb27fd1 100644
--- a/arch/arm/mach-omap2/omap4-common.c
+++ b/arch/arm/mach-omap2/omap4-common.c
@@ -22,7 +22,6 @@
 #include <linux/of_platform.h>
 #include <linux/export.h>
 #include <linux/irqchip/arm-gic.h>
-#include <linux/irqchip/irq-crossbar.h>
 #include <linux/of_address.h>
 #include <linux/reboot.h>
 #include <linux/genalloc.h>
@@ -292,8 +291,5 @@ void __init omap_gic_of_init(void)
 
 skip_errata_init:
         omap_wakeupgen_init();
-#ifdef CONFIG_IRQ_CROSSBAR
-        irqcrossbar_init();
-#endif
         irqchip_init();
 }
diff --git a/drivers/irqchip/irq-crossbar.c b/drivers/irqchip/irq-crossbar.c
index bbbaf5de65d2..692fe2bc8197 100644
--- a/drivers/irqchip/irq-crossbar.c
+++ b/drivers/irqchip/irq-crossbar.c
@@ -11,11 +11,12 @@
  */
 #include <linux/err.h>
 #include <linux/io.h>
+#include <linux/irqdomain.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/slab.h>
-#include <linux/irqchip/arm-gic.h>
-#include <linux/irqchip/irq-crossbar.h>
+
+#include "irqchip.h"
 
 #define IRQ_FREE        -1
 #define IRQ_RESERVED    -2
@@ -24,6 +25,7 @@
 
 /**
  * struct crossbar_device - crossbar device description
+ * @lock: spinlock serializing access to @irq_map
  * @int_max: maximum number of supported interrupts
  * @safe_map: safe default value to initialize the crossbar
  * @max_crossbar_sources: Maximum number of crossbar sources
@@ -33,6 +35,7 @@
  * @write: register write function pointer
  */
 struct crossbar_device {
+        raw_spinlock_t lock;
         uint int_max;
         uint safe_map;
         uint max_crossbar_sources;
@@ -44,72 +47,101 @@ struct crossbar_device {
 
 static struct crossbar_device *cb;
 
-static inline void crossbar_writel(int irq_no, int cb_no)
+static void crossbar_writel(int irq_no, int cb_no)
 {
         writel(cb_no, cb->crossbar_base + cb->register_offsets[irq_no]);
 }
 
-static inline void crossbar_writew(int irq_no, int cb_no)
+static void crossbar_writew(int irq_no, int cb_no)
 {
         writew(cb_no, cb->crossbar_base + cb->register_offsets[irq_no]);
 }
 
-static inline void crossbar_writeb(int irq_no, int cb_no)
+static void crossbar_writeb(int irq_no, int cb_no)
 {
         writeb(cb_no, cb->crossbar_base + cb->register_offsets[irq_no]);
 }
 
-static inline int get_prev_map_irq(int cb_no)
-{
-        int i;
-
-        for (i = cb->int_max - 1; i >= 0; i--)
-                if (cb->irq_map[i] == cb_no)
-                        return i;
-
-        return -ENODEV;
-}
+static struct irq_chip crossbar_chip = {
+        .name                   = "CBAR",
+        .irq_eoi                = irq_chip_eoi_parent,
+        .irq_mask               = irq_chip_mask_parent,
+        .irq_unmask             = irq_chip_unmask_parent,
+        .irq_retrigger          = irq_chip_retrigger_hierarchy,
+        .irq_set_wake           = irq_chip_set_wake_parent,
+#ifdef CONFIG_SMP
+        .irq_set_affinity       = irq_chip_set_affinity_parent,
+#endif
+};
 
-static inline int allocate_free_irq(int cb_no)
+static int allocate_gic_irq(struct irq_domain *domain, unsigned virq,
+                            irq_hw_number_t hwirq)
 {
+        struct of_phandle_args args;
         int i;
+        int err;
 
+        raw_spin_lock(&cb->lock);
         for (i = cb->int_max - 1; i >= 0; i--) {
                 if (cb->irq_map[i] == IRQ_FREE) {
-                        cb->irq_map[i] = cb_no;
-                        return i;
+                        cb->irq_map[i] = hwirq;
+                        break;
                 }
         }
+        raw_spin_unlock(&cb->lock);
 
-        return -ENODEV;
-}
+        if (i < 0)
+                return -ENODEV;
 
-static inline bool needs_crossbar_write(irq_hw_number_t hw)
-{
-        int cb_no;
+        args.np = domain->parent->of_node;
+        args.args_count = 3;
+        args.args[0] = 0;       /* SPI */
+        args.args[1] = i;
+        args.args[2] = IRQ_TYPE_LEVEL_HIGH;
 
-        if (hw > GIC_IRQ_START) {
-                cb_no = cb->irq_map[hw - GIC_IRQ_START];
-                if (cb_no != IRQ_RESERVED && cb_no != IRQ_SKIP)
-                        return true;
-        }
+        err = irq_domain_alloc_irqs_parent(domain, virq, 1, &args);
+        if (err)
+                cb->irq_map[i] = IRQ_FREE;
+        else
+                cb->write(i, hwirq);
 
-        return false;
+        return err;
 }
 
-static int crossbar_domain_map(struct irq_domain *d, unsigned int irq,
-                               irq_hw_number_t hw)
+static int crossbar_domain_alloc(struct irq_domain *d, unsigned int virq,
+                                 unsigned int nr_irqs, void *data)
 {
-        if (needs_crossbar_write(hw))
-                cb->write(hw - GIC_IRQ_START, cb->irq_map[hw - GIC_IRQ_START]);
+        struct of_phandle_args *args = data;
+        irq_hw_number_t hwirq;
+        int i;
+
+        if (args->args_count != 3)
+                return -EINVAL; /* Not GIC compliant */
+        if (args->args[0] != 0)
+                return -EINVAL; /* No PPI should point to this domain */
+
+        hwirq = args->args[1];
+        if ((hwirq + nr_irqs) > cb->max_crossbar_sources)
+                return -EINVAL; /* Can't deal with this */
+
+        for (i = 0; i < nr_irqs; i++) {
+                int err = allocate_gic_irq(d, virq + i, hwirq + i);
+
+                if (err)
+                        return err;
+
+                irq_domain_set_hwirq_and_chip(d, virq + i, hwirq + i,
+                                              &crossbar_chip, NULL);
+        }
 
         return 0;
 }
 
 /**
- * crossbar_domain_unmap - unmap a crossbar<->irq connection
- * @d: domain of irq to unmap
- * @irq: virq number
+ * crossbar_domain_free - unmap/free a crossbar<->irq connection
+ * @domain: domain of irq to unmap
+ * @virq: virq number
+ * @nr_irqs: number of irqs to free
  *
  * We do not maintain a use count of total number of map/unmap
  * calls for a particular irq to find out if a irq can be really
@@ -117,14 +149,20 @@ static int crossbar_domain_map(struct irq_domain *d, unsigned int irq,
  * after which irq is anyways unusable. So an explicit map has to be called
  * after that.
  */
-static void crossbar_domain_unmap(struct irq_domain *d, unsigned int irq)
+static void crossbar_domain_free(struct irq_domain *domain, unsigned int virq,
+                                 unsigned int nr_irqs)
 {
-        irq_hw_number_t hw = irq_get_irq_data(irq)->hwirq;
+        int i;
 
-        if (needs_crossbar_write(hw)) {
-                cb->irq_map[hw - GIC_IRQ_START] = IRQ_FREE;
-                cb->write(hw - GIC_IRQ_START, cb->safe_map);
+        raw_spin_lock(&cb->lock);
+        for (i = 0; i < nr_irqs; i++) {
+                struct irq_data *d = irq_domain_get_irq_data(domain, virq + i);
+
+                irq_domain_reset_irq_data(d);
+                cb->irq_map[d->hwirq] = IRQ_FREE;
+                cb->write(d->hwirq, cb->safe_map);
         }
+        raw_spin_unlock(&cb->lock);
 }
 
 static int crossbar_domain_xlate(struct irq_domain *d,
@@ -133,44 +171,22 @@ static int crossbar_domain_xlate(struct irq_domain *d,
                                  unsigned long *out_hwirq,
                                  unsigned int *out_type)
 {
-        int ret;
-        int req_num = intspec[1];
-        int direct_map_num;
-
-        if (req_num >= cb->max_crossbar_sources) {
-                direct_map_num = req_num - cb->max_crossbar_sources;
-                if (direct_map_num < cb->int_max) {
-                        ret = cb->irq_map[direct_map_num];
-                        if (ret == IRQ_RESERVED || ret == IRQ_SKIP) {
-                                /* We use the interrupt num as h/w irq num */
-                                ret = direct_map_num;
-                                goto found;
-                        }
-                }
-
-                pr_err("%s: requested crossbar number %d > max %d\n",
-                       __func__, req_num, cb->max_crossbar_sources);
-                return -EINVAL;
-        }
-
-        ret = get_prev_map_irq(req_num);
-        if (ret >= 0)
-                goto found;
-
-        ret = allocate_free_irq(req_num);
-
-        if (ret < 0)
-                return ret;
-
-found:
-        *out_hwirq = ret + GIC_IRQ_START;
+        if (d->of_node != controller)
+                return -EINVAL; /* Shouldn't happen, really... */
+        if (intsize != 3)
+                return -EINVAL; /* Not GIC compliant */
+        if (intspec[0] != 0)
+                return -EINVAL; /* No PPI should point to this domain */
+
+        *out_hwirq = intspec[1];
+        *out_type = intspec[2];
         return 0;
 }
 
-static const struct irq_domain_ops routable_irq_domain_ops = {
-        .map = crossbar_domain_map,
-        .unmap = crossbar_domain_unmap,
-        .xlate = crossbar_domain_xlate
+static const struct irq_domain_ops crossbar_domain_ops = {
+        .alloc  = crossbar_domain_alloc,
+        .free   = crossbar_domain_free,
+        .xlate  = crossbar_domain_xlate,
 };
 
 static int __init crossbar_of_init(struct device_node *node)
@@ -293,7 +309,8 @@ static int __init crossbar_of_init(struct device_node *node)
                 cb->write(i, cb->safe_map);
         }
 
-        register_routable_domain_ops(&routable_irq_domain_ops);
+        raw_spin_lock_init(&cb->lock);
+
         return 0;
 
 err_reg_offset:
@@ -309,18 +326,37 @@ err_cb:
         return ret;
 }
 
-static const struct of_device_id crossbar_match[] __initconst = {
-        { .compatible = "ti,irq-crossbar" },
-        {}
-};
-
-int __init irqcrossbar_init(void)
+static int __init irqcrossbar_init(struct device_node *node,
+                                   struct device_node *parent)
 {
-        struct device_node *np;
-        np = of_find_matching_node(NULL, crossbar_match);
-        if (!np)
+        struct irq_domain *parent_domain, *domain;
+        int err;
+
+        if (!parent) {
+                pr_err("%s: no parent, giving up\n", node->full_name);
                 return -ENODEV;
+        }
+
+        parent_domain = irq_find_host(parent);
+        if (!parent_domain) {
+                pr_err("%s: unable to obtain parent domain\n", node->full_name);
+                return -ENXIO;
+        }
+
+        err = crossbar_of_init(node);
+        if (err)
+                return err;
+
+        domain = irq_domain_add_hierarchy(parent_domain, 0,
+                                          cb->max_crossbar_sources,
+                                          node, &crossbar_domain_ops,
+                                          NULL);
+        if (!domain) {
+                pr_err("%s: failed to allocated domain\n", node->full_name);
+                return -ENOMEM;
+        }
 
-        crossbar_of_init(np);
         return 0;
 }
+
+IRQCHIP_DECLARE(ti_irqcrossbar, "ti,irq-crossbar", irqcrossbar_init);
diff --git a/include/linux/irqchip/irq-crossbar.h b/include/linux/irqchip/irq-crossbar.h
deleted file mode 100644
index e5537b81df8d..000000000000
--- a/include/linux/irqchip/irq-crossbar.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- *  drivers/irqchip/irq-crossbar.h
- *
- *  Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-int irqcrossbar_init(void);