Merge branch 'mark-irqs' into devel

Conflicts:
	drivers/gpio/gpio-em.c

1 files changed, 22 insertions, 0 deletions

diff --git a/drivers/gpio/gpio-lynxpoint.c b/drivers/gpio/gpio-lynxpoint.c
index c283cd3b247a..66b18535b5ae 100644
--- a/drivers/gpio/gpio-lynxpoint.c
+++ b/drivers/gpio/gpio-lynxpoint.c
@@ -301,6 +301,26 @@ static void lp_irq_disable(struct irq_data *d)
         spin_unlock_irqrestore(&lg->lock, flags);
 }
 
+static unsigned int lp_irq_startup(struct irq_data *d)
+{
+        struct lp_gpio *lg = irq_data_get_irq_chip_data(d);
+
+        if (gpio_lock_as_irq(&lg->chip, irqd_to_hwirq(d)))
+                dev_err(lg->chip.dev,
+                        "unable to lock HW IRQ %lu for IRQ\n",
+                        irqd_to_hwirq(d));
+        lp_irq_enable(d);
+        return 0;
+}
+
+static void lp_irq_shutdown(struct irq_data *d)
+{
+        struct lp_gpio *lg = irq_data_get_irq_chip_data(d);
+
+        lp_irq_disable(d);
+        gpio_unlock_as_irq(&lg->chip, irqd_to_hwirq(d));
+}
+
 static struct irq_chip lp_irqchip = {
         .name = "LP-GPIO",
         .irq_mask = lp_irq_mask,
@@ -308,6 +328,8 @@ static struct irq_chip lp_irqchip = {
         .irq_enable = lp_irq_enable,
         .irq_disable = lp_irq_disable,
         .irq_set_type = lp_irq_type,
+        .irq_startup = lp_irq_startup,
+        .irq_shutdown = lp_irq_shutdown,
         .flags = IRQCHIP_SKIP_SET_WAKE,
 };