Merge branch 'mark-irqs' into devel

Conflicts:
	drivers/gpio/gpio-em.c

1 files changed, 23 insertions, 0 deletions

diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
index be7e3b92f986..1e98a9873967 100644
--- a/drivers/gpio/gpio-em.c
+++ b/drivers/gpio/gpio-em.c
@@ -99,6 +99,27 @@ static void em_gio_irq_enable(struct irq_data *d)
         em_gio_write(p, GIO_IEN, BIT(irqd_to_hwirq(d)));
 }
 
+static unsigned int em_gio_irq_startup(struct irq_data *d)
+{
+        struct em_gio_priv *p = irq_data_get_irq_chip_data(d);
+
+        if (gpio_lock_as_irq(&p->gpio_chip, irqd_to_hwirq(d)))
+                dev_err(p->gpio_chip.dev,
+                        "unable to lock HW IRQ %lu for IRQ\n",
+                        irqd_to_hwirq(d));
+        em_gio_irq_enable(d);
+        return 0;
+}
+
+static void em_gio_irq_shutdown(struct irq_data *d)
+{
+        struct em_gio_priv *p = irq_data_get_irq_chip_data(d);
+
+        em_gio_irq_disable(d);
+        gpio_unlock_as_irq(&p->gpio_chip, irqd_to_hwirq(d));
+}
+
+
 #define GIO_ASYNC(x) (x + 8)
 
 static unsigned char em_gio_sense_table[IRQ_TYPE_SENSE_MASK + 1] = {
@@ -338,6 +359,8 @@ static int em_gio_probe(struct platform_device *pdev)
         irq_chip->irq_mask = em_gio_irq_disable;
         irq_chip->irq_unmask = em_gio_irq_enable;
         irq_chip->irq_set_type = em_gio_irq_set_type;
+        irq_chip->irq_startup = em_gio_irq_startup;
+        irq_chip->irq_shutdown = em_gio_irq_shutdown;
         irq_chip->flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND;
 
         p->irq_domain = irq_domain_add_simple(pdev->dev.of_node,