diff options
author | Anson Huang <b20788@freescale.com> | 2013-09-03 21:43:48 -0400 |
---|---|---|
committer | Nitin Garg <nitin.garg@freescale.com> | 2014-04-16 09:01:40 -0400 |
commit | 8e5ab16eda34e47ddbd2602cd24a8f382f761db2 (patch) | |
tree | d5e07546fd747388d42de78b8c6055c1a2aceb69 | |
parent | 051ab905d161badd25dbed3b2413f7a524683756 (diff) |
ENGR00277955-1 keyboard: gpio_keys: support wakeup system from freeze mode
To support wakeup system from freeze mode of suspend,
device's irq can NOT be disabled during devices suspend,
so we need to add IRQF_NO_SUSPEND flag to irqflags.
Signed-off-by: Anson Huang <b20788@freescale.com>
-rw-r--r-- | drivers/input/keyboard/gpio_keys.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index b29ca651a395..0296ca4c7647 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c | |||
@@ -3,6 +3,7 @@ | |||
3 | * | 3 | * |
4 | * Copyright 2005 Phil Blundell | 4 | * Copyright 2005 Phil Blundell |
5 | * Copyright 2010, 2011 David Jander <david@protonic.nl> | 5 | * Copyright 2010, 2011 David Jander <david@protonic.nl> |
6 | * Copyright (C) 2013 Freescale Semiconductor, Inc. | ||
6 | * | 7 | * |
7 | * This program is free software; you can redistribute it and/or modify | 8 | * This program is free software; you can redistribute it and/or modify |
8 | * it under the terms of the GNU General Public License version 2 as | 9 | * it under the terms of the GNU General Public License version 2 as |
@@ -472,6 +473,8 @@ static int gpio_keys_setup_key(struct platform_device *pdev, | |||
472 | 473 | ||
473 | isr = gpio_keys_gpio_isr; | 474 | isr = gpio_keys_gpio_isr; |
474 | irqflags = IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING; | 475 | irqflags = IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING; |
476 | if (bdata->button->wakeup) | ||
477 | irqflags |= IRQF_NO_SUSPEND; | ||
475 | 478 | ||
476 | } else { | 479 | } else { |
477 | if (!button->irq) { | 480 | if (!button->irq) { |