aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2013-11-19 19:23:44 -0500
committerLinus Walleij <linus.walleij@linaro.org>2013-11-25 03:03:40 -0500
commit03621b60529edfbeb32d199fa754da19574cfefc (patch)
treeac11c747a5d5954e4b65644725eb017d5412bc15 /drivers
parent664734c012e6f3a88b2da4c586002cd62a277003 (diff)
gpio: em: Enable mask on suspend
Now when lazy interrupt disable has been enabled in the driver then extend the code to set IRQCHIP_MASK_ON_SUSPEND which tells the core that only IRQs marked as wakeups need to stay enabled during Suspend-to-RAM. Tested on the KZM9D board with GPIO-keys. Signed-off-by: Magnus Damm <damm@opensource.se> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpio/gpio-em.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
index 225eda662c6c..be7e3b92f986 100644
--- a/drivers/gpio/gpio-em.c
+++ b/drivers/gpio/gpio-em.c
@@ -338,7 +338,7 @@ static int em_gio_probe(struct platform_device *pdev)
338 irq_chip->irq_mask = em_gio_irq_disable; 338 irq_chip->irq_mask = em_gio_irq_disable;
339 irq_chip->irq_unmask = em_gio_irq_enable; 339 irq_chip->irq_unmask = em_gio_irq_enable;
340 irq_chip->irq_set_type = em_gio_irq_set_type; 340 irq_chip->irq_set_type = em_gio_irq_set_type;
341 irq_chip->flags = IRQCHIP_SKIP_SET_WAKE; 341 irq_chip->flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND;
342 342
343 p->irq_domain = irq_domain_add_simple(pdev->dev.of_node, 343 p->irq_domain = irq_domain_add_simple(pdev->dev.of_node,
344 pdata->number_of_pins, 344 pdata->number_of_pins,