aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/pinctrl-nomadik.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-10-11 05:30:25 -0400
committerLinus Walleij <linus.walleij@linaro.org>2013-10-16 03:59:55 -0400
commit494336f3a6eabeede8ce07b73f5023ff4f7c745d (patch)
tree190ee8d585e263ae7439634a612445faa9ef511a /drivers/pinctrl/pinctrl-nomadik.c
parentd468bf9ecaabd3bf3a6134e5a369ced82b1d1ca1 (diff)
pinctrl: nomadik: mark GPIO lines used for IRQ
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: Enric Balletbo i Serra <eballetbo@gmail.com> Cc: Grant Likely <grant.likely@linaro.org> Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> Cc: Stephen Warren <swarren@wwwdotorg.org> Cc: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-nomadik.c')
-rw-r--r--drivers/pinctrl/pinctrl-nomadik.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c
index d7c3ae300fa7..7111c3b59130 100644
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@ -634,6 +634,10 @@ static unsigned int nmk_gpio_irq_startup(struct irq_data *d)
634{ 634{
635 struct nmk_gpio_chip *nmk_chip = irq_data_get_irq_chip_data(d); 635 struct nmk_gpio_chip *nmk_chip = irq_data_get_irq_chip_data(d);
636 636
637 if (gpio_lock_as_irq(&nmk_chip->chip, d->hwirq))
638 dev_err(nmk_chip->chip.dev,
639 "unable to lock HW IRQ %lu for IRQ\n",
640 d->hwirq);
637 clk_enable(nmk_chip->clk); 641 clk_enable(nmk_chip->clk);
638 nmk_gpio_irq_unmask(d); 642 nmk_gpio_irq_unmask(d);
639 return 0; 643 return 0;
@@ -645,6 +649,7 @@ static void nmk_gpio_irq_shutdown(struct irq_data *d)
645 649
646 nmk_gpio_irq_mask(d); 650 nmk_gpio_irq_mask(d);
647 clk_disable(nmk_chip->clk); 651 clk_disable(nmk_chip->clk);
652 gpio_unlock_as_irq(&nmk_chip->chip, d->hwirq);
648} 653}
649 654
650static struct irq_chip nmk_gpio_irq_chip = { 655static struct irq_chip nmk_gpio_irq_chip = {