Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754440AbaF0WDI (ORCPT ); Fri, 27 Jun 2014 18:03:08 -0400 Received: from ms93773.hosts.iptox.net ([95.128.200.132]:50213 "EHLO ms93773.hosts.iptox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752844AbaF0WDG (ORCPT ); Fri, 27 Jun 2014 18:03:06 -0400 X-Greylist: delayed 457 seconds by postgrey-1.27 at vger.kernel.org; Fri, 27 Jun 2014 18:03:05 EDT From: =?UTF-8?q?Lukas=20M=C3=A4rdian?= To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Lukas=20M=C3=A4rdian?= , "H. Nikolaus Schaller" Subject: [PATCH] gpio_keys, twl4030-pwrbutton: stay awake for 1sec on resume Date: Fri, 27 Jun 2014 23:55:18 +0200 Message-Id: <1403906118-23517-1-git-send-email-lukas@goldelico.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This gives the userspace (Replicant) a chance to fully handle the pm_wakeup_event, before autosleep suspends the system alltogether again. This fixes suspend/resume on the OpenPhoenux GTA04, in combination with the Replicant 4.2.2 userspace, which needs to execute this to stay awake: 'echo on > /sys/power/state' Signed-off-by: Lukas Märdian Signed-off-by: H. Nikolaus Schaller --- drivers/input/keyboard/gpio_keys.c | 7 ++----- drivers/input/misc/twl4030-pwrbutton.c | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index 2db1324..be8c62e 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c @@ -345,9 +345,6 @@ static void gpio_keys_gpio_work_func(struct work_struct *work) container_of(work, struct gpio_button_data, work); gpio_keys_gpio_report_event(bdata); - - if (bdata->button->wakeup) - pm_relax(bdata->input->dev.parent); } static void gpio_keys_gpio_timer(unsigned long _data) @@ -364,7 +361,7 @@ static irqreturn_t gpio_keys_gpio_isr(int irq, void *dev_id) BUG_ON(irq != bdata->irq); if (bdata->button->wakeup) - pm_stay_awake(bdata->input->dev.parent); + pm_wakeup_event(bdata->input->dev.parent, 1000); if (bdata->timer_debounce) mod_timer(&bdata->timer, jiffies + msecs_to_jiffies(bdata->timer_debounce)); @@ -402,7 +399,7 @@ static irqreturn_t gpio_keys_irq_isr(int irq, void *dev_id) if (!bdata->key_pressed) { if (bdata->button->wakeup) - pm_wakeup_event(bdata->input->dev.parent, 0); + pm_wakeup_event(bdata->input->dev.parent, 1000); input_event(input, EV_KEY, button->code, 1); input_sync(input); diff --git a/drivers/input/misc/twl4030-pwrbutton.c b/drivers/input/misc/twl4030-pwrbutton.c index fb3b63b..8622e43 100644 --- a/drivers/input/misc/twl4030-pwrbutton.c +++ b/drivers/input/misc/twl4030-pwrbutton.c @@ -41,7 +41,7 @@ static irqreturn_t powerbutton_irq(int irq, void *_pwr) err = twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &value, STS_HW_CONDITIONS); if (!err) { - pm_wakeup_event(pwr->dev.parent, 0); + pm_wakeup_event(pwr->dev.parent, 1000); input_report_key(pwr, KEY_POWER, value & PWR_PWRON_IRQ); input_sync(pwr); } else { -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/