Merge tag 'platform-drivers-x86-v3.20-1' of git://git.infradead.org/users/dvhart...

[firefly-linux-kernel-4.4.55.git] / drivers / irqchip / irq-omap-intc.c

diff --git a/drivers/irqchip/irq-omap-intc.c b/drivers/irqchip/irq-omap-intc.c
index c03f140acbaebf9b29c55548833ffe60a7163907..a569c6dbd1d16ee92bffabb6e45f9a6a2cbed4be 100644 (file)
--- a/drivers/irqchip/irq-omap-intc.c
+++ b/drivers/irqchip/irq-omap-intc.c
@@ -364,14 +364,6 @@ out:
                omap_ack_irq(NULL);
 }
 
-void __init omap2_init_irq(void)
-{
-       omap_nr_irqs = 96;
-       omap_nr_pending = 3;
-       omap_init_irq(OMAP24XX_IC_BASE, NULL);
-       set_handle_irq(omap_intc_handle_irq);
-}
-
 void __init omap3_init_irq(void)
 {
        omap_nr_irqs = 96;
@@ -380,14 +372,6 @@ void __init omap3_init_irq(void)
        set_handle_irq(omap_intc_handle_irq);
 }
 
-void __init ti81xx_init_irq(void)
-{
-       omap_nr_irqs = 96;
-       omap_nr_pending = 4;
-       omap_init_irq(OMAP34XX_IC_BASE, NULL);
-       set_handle_irq(omap_intc_handle_irq);
-}
-
 static int __init intc_of_init(struct device_node *node,
                             struct device_node *parent)
 {
@@ -399,7 +383,9 @@ static int __init intc_of_init(struct device_node *node,
        if (WARN_ON(!node))
                return -ENODEV;
 
-       if (of_device_is_compatible(node, "ti,am33xx-intc")) {
+       if (of_device_is_compatible(node, "ti,dm814-intc") ||
+           of_device_is_compatible(node, "ti,dm816-intc") ||
+           of_device_is_compatible(node, "ti,am33xx-intc")) {
                omap_nr_irqs = 128;
                omap_nr_pending = 4;
        }
@@ -415,4 +401,6 @@ static int __init intc_of_init(struct device_node *node,
 
 IRQCHIP_DECLARE(omap2_intc, "ti,omap2-intc", intc_of_init);
 IRQCHIP_DECLARE(omap3_intc, "ti,omap3-intc", intc_of_init);
+IRQCHIP_DECLARE(dm814x_intc, "ti,dm814-intc", intc_of_init);
+IRQCHIP_DECLARE(dm816x_intc, "ti,dm816-intc", intc_of_init);
 IRQCHIP_DECLARE(am33xx_intc, "ti,am33xx-intc", intc_of_init);