1 files changed, 19 insertions, 13 deletions

diff --git a/arch/arm/mach-s5pv310/irq-combiner.c b/arch/arm/mach-s5pv310/irq-combiner.c
index c3f88c3faf6c..1ea4a9e83bbe 100644
--- a/arch/arm/mach-s5pv310/irq-combiner.c
+++ b/arch/arm/mach-s5pv310/irq-combiner.c
@@ -24,29 +24,32 @@ static DEFINE_SPINLOCK(irq_controller_lock);
 
 struct combiner_chip_data {
         unsigned int irq_offset;
+        unsigned int irq_mask;
         void __iomem *base;
 };
 
 static struct combiner_chip_data combiner_data[MAX_COMBINER_NR];
 
-static inline void __iomem *combiner_base(unsigned int irq)
+static inline void __iomem *combiner_base(struct irq_data *data)
 {
-        struct combiner_chip_data *combiner_data = get_irq_chip_data(irq);
+        struct combiner_chip_data *combiner_data =
+                irq_data_get_irq_chip_data(data);
+
         return combiner_data->base;
 }
 
-static void combiner_mask_irq(unsigned int irq)
+static void combiner_mask_irq(struct irq_data *data)
 {
-        u32 mask = 1 << (irq % 32);
+        u32 mask = 1 << (data->irq % 32);
 
-        __raw_writel(mask, combiner_base(irq) + COMBINER_ENABLE_CLEAR);
+        __raw_writel(mask, combiner_base(data) + COMBINER_ENABLE_CLEAR);
 }
 
-static void combiner_unmask_irq(unsigned int irq)
+static void combiner_unmask_irq(struct irq_data *data)
 {
-        u32 mask = 1 << (irq % 32);
+        u32 mask = 1 << (data->irq % 32);
 
-        __raw_writel(mask, combiner_base(irq) + COMBINER_ENABLE_SET);
+        __raw_writel(mask, combiner_base(data) + COMBINER_ENABLE_SET);
 }
 
 static void combiner_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
@@ -57,11 +60,12 @@ static void combiner_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
         unsigned long status;
 
         /* primary controller ack'ing */
-        chip->ack(irq);
+        chip->irq_ack(&desc->irq_data);
 
         spin_lock(&irq_controller_lock);
         status = __raw_readl(chip_data->base + COMBINER_INT_STATUS);
         spin_unlock(&irq_controller_lock);
+        status &= chip_data->irq_mask;
 
         if (status == 0)
                 goto out;
@@ -76,13 +80,13 @@ static void combiner_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
 
  out:
         /* primary controller unmasking */
-        chip->unmask(irq);
+        chip->irq_unmask(&desc->irq_data);
 }
 
 static struct irq_chip combiner_chip = {
         .name           = "COMBINER",
-        .mask           = combiner_mask_irq,
-        .unmask         = combiner_unmask_irq,
+        .irq_mask       = combiner_mask_irq,
+        .irq_unmask     = combiner_unmask_irq,
 };
 
 void __init combiner_cascade_irq(unsigned int combiner_nr, unsigned int irq)
@@ -104,10 +108,12 @@ void __init combiner_init(unsigned int combiner_nr, void __iomem *base,
 
         combiner_data[combiner_nr].base = base;
         combiner_data[combiner_nr].irq_offset = irq_start;
+        combiner_data[combiner_nr].irq_mask = 0xff << ((combiner_nr % 4) << 3);
 
         /* Disable all interrupts */
 
-        __raw_writel(0xffffffff, base + COMBINER_ENABLE_CLEAR);
+        __raw_writel(combiner_data[combiner_nr].irq_mask,
+                     base + COMBINER_ENABLE_CLEAR);
 
         /* Setup the Linux IRQ subsystem */