ENGR00318936-1 input: keyboard: imx: add pm_stay_awake and pm_relax

There is a small window after system suspend but timer scan function
didn't finish timely, in this case,  system enter suspend without kpp
interrupt enabled and failed to resume back if key depressed.We add
pm_stay_awake and pm_relax to make sure system suspend flow abort in
this case.

Signed-off-by: Robin Gong <b38343@freescale.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c
index da0cd02b3f70..6c545bf607e7 100644
--- a/drivers/input/keyboard/imx_keypad.c
+++ b/drivers/input/keyboard/imx_keypad.c
@@ -1,7 +1,7 @@
 /*
  * Driver for the IMX keypad port.
  * Copyright (C) 2009 Alberto Panizzo <maramaopercheseimorto@gmail.com>
- * Copyright (C) 2013 Freescale Semiconductor, Inc.
+ * Copyright (C) 2014 Freescale Semiconductor, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -271,6 +271,7 @@ static void imx_keypad_check_for_events(unsigned long data)
                 reg_val |= KBD_STAT_KDIE;
                 reg_val &= ~KBD_STAT_KRIE;
                 writew(reg_val, keypad->mmio_base + KPSR);
+                pm_relax(keypad->input_dev->dev.parent);
         } else {
                 /*
                  * Some keys are still pressed. Schedule a rescan in
@@ -306,6 +307,7 @@ static irqreturn_t imx_keypad_irq_handler(int irq, void *dev_id)
         writew(reg_val, keypad->mmio_base + KPSR);
 
         if (keypad->enabled) {
+                pm_stay_awake(keypad->input_dev->dev.parent);
                 /* The matrix is supposed to be changed */
                 keypad->stable_count = 0;