Merge tag 'ktest-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[cascardo/linux.git] / drivers / gpio / gpio-mvebu.c

diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c
index 3b1fd1c..d425094 100644 (file)
--- a/drivers/gpio/gpio-mvebu.c
+++ b/drivers/gpio/gpio-mvebu.c
@@ -44,6 +44,7 @@
 #include <linux/of_device.h>
 #include <linux/clk.h>
 #include <linux/pinctrl/consumer.h>
+#include <linux/irqchip/chained_irq.h>
 
 /*
  * GPIO unit register offsets.
@@ -438,12 +439,15 @@ static int mvebu_gpio_irq_set_type(struct irq_data *d, unsigned int type)
 static void mvebu_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
 {
        struct mvebu_gpio_chip *mvchip = irq_get_handler_data(irq);
+       struct irq_chip *chip = irq_desc_get_chip(desc);
        u32 cause, type;
        int i;
 
        if (mvchip == NULL)
                return;
 
+       chained_irq_enter(chip, desc);
+
        cause = readl_relaxed(mvebu_gpioreg_data_in(mvchip)) &
                readl_relaxed(mvebu_gpioreg_level_mask(mvchip));
        cause |= readl_relaxed(mvebu_gpioreg_edge_cause(mvchip)) &
@@ -466,8 +470,11 @@ static void mvebu_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
                        polarity ^= 1 << i;
                        writel_relaxed(polarity, mvebu_gpioreg_in_pol(mvchip));
                }
+
                generic_handle_irq(irq);
        }
+
+       chained_irq_exit(chip, desc);
 }
 
 #ifdef CONFIG_DEBUG_FS