Merge tag 'regmap-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[karo-tx-linux.git] / drivers / gpio / gpio-bcm-kona.c

diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c
index 54c18c220a60575d0ebc63f952937d816132f89c..233d088ac59fd69e389c8b759fab75bb5af231eb 100644 (file)
--- a/drivers/gpio/gpio-bcm-kona.c
+++ b/drivers/gpio/gpio-bcm-kona.c
@@ -449,12 +449,34 @@ static void bcm_kona_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
        chained_irq_exit(chip, desc);
 }
 
+static unsigned int bcm_kona_gpio_irq_startup(struct irq_data *d)
+{
+       struct bcm_kona_gpio *kona_gpio = irq_data_get_irq_chip_data(d);
+
+       if (gpio_lock_as_irq(&kona_gpio->gpio_chip, d->hwirq))
+               dev_err(kona_gpio->gpio_chip.dev,
+                       "unable to lock HW IRQ %lu for IRQ\n",
+                       d->hwirq);
+       bcm_kona_gpio_irq_unmask(d);
+       return 0;
+}
+
+static void bcm_kona_gpio_irq_shutdown(struct irq_data *d)
+{
+       struct bcm_kona_gpio *kona_gpio = irq_data_get_irq_chip_data(d);
+
+       bcm_kona_gpio_irq_mask(d);
+       gpio_unlock_as_irq(&kona_gpio->gpio_chip, d->hwirq);
+}
+
 static struct irq_chip bcm_gpio_irq_chip = {
        .name = "bcm-kona-gpio",
        .irq_ack = bcm_kona_gpio_irq_ack,
        .irq_mask = bcm_kona_gpio_irq_mask,
        .irq_unmask = bcm_kona_gpio_irq_unmask,
        .irq_set_type = bcm_kona_gpio_irq_set_type,
+       .irq_startup = bcm_kona_gpio_irq_startup,
+       .irq_shutdown = bcm_kona_gpio_irq_shutdown,
 };
 
 static struct __initconst of_device_id bcm_kona_gpio_of_match[] = {