linux-mips
[Top] [All Lists]

[PATCH] gpio: vr41xx: mark GPIO lines used for IRQ

To: linux-gpio@vger.kernel.org
Subject: [PATCH] gpio: vr41xx: mark GPIO lines used for IRQ
From: Linus Walleij <linus.walleij@linaro.org>
Date: Fri, 24 Jan 2014 00:07:57 +0100
Cc: Alexandre Courbot <acourbot@nvidia.com>, Linus Walleij <linus.walleij@linaro.org>, Ralf Baechle <ralf@linux-mips.org>, linux-mips@linux-mips.org
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
When an IRQ is started on a GPIO line, mark this GPIO as IRQ in
the gpiolib so we can keep track of the usage centrally.

Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
It would be much appreciated if one of the MIPS people could
test this patch, thanks in advance. (I did compile-test it
with a MIPS cross compiler.)
---
 drivers/gpio/gpio-vr41xx.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
index b983bc079102..c6728cee0cfd 100644
--- a/drivers/gpio/gpio-vr41xx.c
+++ b/drivers/gpio/gpio-vr41xx.c
@@ -80,6 +80,7 @@ static DEFINE_SPINLOCK(giu_lock);
 static unsigned long giu_flags;
 
 static void __iomem *giu_base;
+static struct gpio_chip vr41xx_gpio_chip;
 
 #define giu_read(offset)               readw(giu_base + (offset))
 #define giu_write(offset, value)       writew((value), giu_base + (offset))
@@ -134,12 +135,31 @@ static void unmask_giuint_low(struct irq_data *d)
        giu_set(GIUINTENL, 1 << GPIO_PIN_OF_IRQ(d->irq));
 }
 
+static unsigned int startup_giuint(struct irq_data *data)
+{
+       if (gpio_lock_as_irq(&vr41xx_gpio_chip, data->hwirq))
+               dev_err(vr41xx_gpio_chip.dev,
+                       "unable to lock HW IRQ %lu for IRQ\n",
+                       data->hwirq);
+       /* Satisfy the .enable semantics by unmasking the line */
+       unmask_giuint_low(data);
+       return 0;
+}
+
+static void shutdown_giuint(struct irq_data *data)
+{
+       mask_giuint_low(data);
+       gpio_unlock_as_irq(&vr41xx_gpio_chip, data->hwirq);
+}
+
 static struct irq_chip giuint_low_irq_chip = {
        .name           = "GIUINTL",
        .irq_ack        = ack_giuint_low,
        .irq_mask       = mask_giuint_low,
        .irq_mask_ack   = mask_ack_giuint_low,
        .irq_unmask     = unmask_giuint_low,
+       .irq_startup    = startup_giuint,
+       .irq_shutdown   = shutdown_giuint,
 };
 
 static void ack_giuint_high(struct irq_data *d)
-- 
1.8.4.2


<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH] gpio: vr41xx: mark GPIO lines used for IRQ, Linus Walleij <=