3 files changed, 24 insertions, 27 deletions

diff --git a/drivers/irqchip/exynos-combiner.c b/drivers/irqchip/exynos-combiner.c
index 868ed40cb6bf..40e6440348ff 100644
--- a/drivers/irqchip/exynos-combiner.c
+++ b/drivers/irqchip/exynos-combiner.c
@@ -171,8 +171,7 @@ static struct irq_domain_ops combiner_irq_domain_ops = {
 
 static void __init combiner_init(void __iomem *combiner_base,
                                  struct device_node *np,
-                                 unsigned int max_nr,
-                                 int irq_base)
+                                 unsigned int max_nr)
 {
         int i, irq;
         unsigned int nr_irq;
@@ -186,7 +185,7 @@ static void __init combiner_init(void __iomem *combiner_base,
                 return;
         }
 
-        combiner_irq_domain = irq_domain_add_simple(np, nr_irq, irq_base,
+        combiner_irq_domain = irq_domain_add_linear(np, nr_irq,
                                 &combiner_irq_domain_ops, combiner_data);
         if (WARN_ON(!combiner_irq_domain)) {
                 pr_warning("%s: irq domain init failed\n", __func__);
@@ -207,7 +206,6 @@ static int __init combiner_of_init(struct device_node *np,
 {
         void __iomem *combiner_base;
         unsigned int max_nr = 20;
-        int irq_base = -1;
 
         combiner_base = of_iomap(np, 0);
         if (!combiner_base) {
@@ -221,14 +219,7 @@ static int __init combiner_of_init(struct device_node *np,
                         __func__, max_nr);
         }
 
-        /* 
-         * FIXME: This is a hardwired COMBINER_IRQ(0,0). Once all devices
-         * get their IRQ from DT, remove this in order to get dynamic
-         * allocation.
-         */
-        irq_base = 160;
-
-        combiner_init(combiner_base, np, max_nr, irq_base);
+        combiner_init(combiner_base, np, max_nr);
 
         return 0;
 }
diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
index 2f404ba61c6c..8777065012a5 100644
--- a/drivers/irqchip/irq-renesas-irqc.c
+++ b/drivers/irqchip/irq-renesas-irqc.c
@@ -81,15 +81,12 @@ static void irqc_irq_disable(struct irq_data *d)
         iowrite32(BIT(hw_irq), p->cpu_int_base + IRQC_EN_STS);
 }
 
-#define INTC_IRQ_SENSE_VALID 0x10
-#define INTC_IRQ_SENSE(x) (x + INTC_IRQ_SENSE_VALID)
-
 static unsigned char irqc_sense[IRQ_TYPE_SENSE_MASK + 1] = {
-        [IRQ_TYPE_LEVEL_LOW] = INTC_IRQ_SENSE(0x01),
-        [IRQ_TYPE_LEVEL_HIGH] = INTC_IRQ_SENSE(0x02),
-        [IRQ_TYPE_EDGE_FALLING] = INTC_IRQ_SENSE(0x04), /* Synchronous */
-        [IRQ_TYPE_EDGE_RISING] = INTC_IRQ_SENSE(0x08), /* Synchronous */
-        [IRQ_TYPE_EDGE_BOTH] = INTC_IRQ_SENSE(0x0c),  /* Synchronous */
+        [IRQ_TYPE_LEVEL_LOW]    = 0x01,
+        [IRQ_TYPE_LEVEL_HIGH]   = 0x02,
+        [IRQ_TYPE_EDGE_FALLING] = 0x04, /* Synchronous */
+        [IRQ_TYPE_EDGE_RISING]  = 0x08, /* Synchronous */
+        [IRQ_TYPE_EDGE_BOTH]    = 0x0c, /* Synchronous */
 };
 
 static int irqc_irq_set_type(struct irq_data *d, unsigned int type)
@@ -101,12 +98,12 @@ static int irqc_irq_set_type(struct irq_data *d, unsigned int type)
 
         irqc_dbg(&p->irq[hw_irq], "sense");
 
-        if (!(value & INTC_IRQ_SENSE_VALID))
+        if (!value)
                 return -EINVAL;
 
         tmp = ioread32(p->iomem + IRQC_CONFIG(hw_irq));
         tmp &= ~0x3f;
-        tmp |= value ^ INTC_IRQ_SENSE_VALID;
+        tmp |= value;
         iowrite32(tmp, p->iomem + IRQC_CONFIG(hw_irq));
         return 0;
 }
@@ -212,10 +209,8 @@ static int irqc_probe(struct platform_device *pdev)
         irq_chip->name = name;
         irq_chip->irq_mask = irqc_irq_disable;
         irq_chip->irq_unmask = irqc_irq_enable;
-        irq_chip->irq_enable = irqc_irq_enable;
-        irq_chip->irq_disable = irqc_irq_disable;
         irq_chip->irq_set_type = irqc_irq_set_type;
-        irq_chip->flags = IRQCHIP_SKIP_SET_WAKE;
+        irq_chip->flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND;
 
         p->irq_domain = irq_domain_add_simple(pdev->dev.of_node,
                                               p->number_of_irqs,
diff --git a/drivers/irqchip/irq-versatile-fpga.c b/drivers/irqchip/irq-versatile-fpga.c
index 47a52ab580d8..3ae2bb8d9cf2 100644
--- a/drivers/irqchip/irq-versatile-fpga.c
+++ b/drivers/irqchip/irq-versatile-fpga.c
@@ -9,6 +9,7 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
+#include <linux/of_irq.h>
 
 #include <asm/exception.h>
 #include <asm/mach/irq.h>
@@ -167,8 +168,12 @@ void __init fpga_irq_init(void __iomem *base, const char *name, int irq_start,
                         f->used_irqs++;
                 }
 
-        pr_info("FPGA IRQ chip %d \"%s\" @ %p, %u irqs\n",
+        pr_info("FPGA IRQ chip %d \"%s\" @ %p, %u irqs",
                 fpga_irq_id, name, base, f->used_irqs);
+        if (parent_irq != -1)
+                pr_cont(", parent IRQ: %d\n", parent_irq);
+        else
+                pr_cont("\n");
 
         fpga_irq_id++;
 }
@@ -180,6 +185,7 @@ int __init fpga_irq_of_init(struct device_node *node,
         void __iomem *base;
         u32 clear_mask;
         u32 valid_mask;
+        int parent_irq;
 
         if (WARN_ON(!node))
                 return -ENODEV;
@@ -193,7 +199,12 @@ int __init fpga_irq_of_init(struct device_node *node,
         if (of_property_read_u32(node, "valid-mask", &valid_mask))
                 valid_mask = 0;
 
-        fpga_irq_init(base, node->name, 0, -1, valid_mask, node);
+        /* Some chips are cascaded from a parent IRQ */
+        parent_irq = irq_of_parse_and_map(node, 0);
+        if (!parent_irq)
+                parent_irq = -1;
+
+        fpga_irq_init(base, node->name, 0, parent_irq, valid_mask, node);
 
         writel(clear_mask, base + IRQ_ENABLE_CLEAR);
         writel(clear_mask, base + FIQ_ENABLE_CLEAR);