From: Lee Jones <lee.jones@linaro.org> To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, Jonas Aaberg <jonas.aberg@stericsson.com>, Dmitry Torokhov <dmitry.torokhov@gmail.com>, linux-input@vger.kernel.org, Philippe Langlais <philippe.langlais@linaro.org> Subject: [PATCH 1/2] input: gpio-keys: Disable hardware on suspend Date: Thu, 11 Oct 2012 15:15:26 +0100 [thread overview] Message-ID: <1349964927-18619-1-git-send-email-lee.jones@linaro.org> (raw) From: Jonas Aaberg <jonas.aberg@stericsson.com> Disable hardware if active when suspending if the hw can not wake the system from suspend. Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: linux-input@vger.kernel.org Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org> Reviewed-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com> --- drivers/input/keyboard/gpio_keys.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index cbb1add..7947315 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c @@ -46,6 +46,8 @@ struct gpio_keys_drvdata { struct input_dev *input; struct mutex disable_lock; unsigned int n_buttons; + bool enabled; + bool enable_after_suspend; int (*enable)(struct device *dev); void (*disable)(struct device *dev); struct gpio_button_data data[0]; @@ -524,6 +526,7 @@ static int gpio_keys_open(struct input_dev *input) { struct gpio_keys_drvdata *ddata = input_get_drvdata(input); + ddata->enabled = true; return ddata->enable ? ddata->enable(input->dev.parent) : 0; } @@ -533,6 +536,7 @@ static void gpio_keys_close(struct input_dev *input) if (ddata->disable) ddata->disable(input->dev.parent); + ddata->enabled = false; } /* @@ -674,6 +678,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) ddata->n_buttons = pdata->nbuttons; ddata->enable = pdata->enable; ddata->disable = pdata->disable; + ddata->enabled = false; mutex_init(&ddata->disable_lock); platform_set_drvdata(pdev, ddata); @@ -789,6 +794,10 @@ static int gpio_keys_suspend(struct device *dev) if (bdata->button->wakeup) enable_irq_wake(bdata->irq); } + } else { + ddata->enable_after_suspend = ddata->enabled; + if (ddata->enabled) + gpio_keys_close(ddata->input); } return 0; @@ -807,6 +816,10 @@ static int gpio_keys_resume(struct device *dev) if (gpio_is_valid(bdata->button->gpio)) gpio_keys_gpio_report_event(bdata); } + + if (!device_may_wakeup(dev) && ddata->enable_after_suspend) + gpio_keys_open(ddata->input); + input_sync(ddata->input); return 0; -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: lee.jones@linaro.org (Lee Jones) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/2] input: gpio-keys: Disable hardware on suspend Date: Thu, 11 Oct 2012 15:15:26 +0100 [thread overview] Message-ID: <1349964927-18619-1-git-send-email-lee.jones@linaro.org> (raw) From: Jonas Aaberg <jonas.aberg@stericsson.com> Disable hardware if active when suspending if the hw can not wake the system from suspend. Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: linux-input at vger.kernel.org Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org> Reviewed-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com> --- drivers/input/keyboard/gpio_keys.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index cbb1add..7947315 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c @@ -46,6 +46,8 @@ struct gpio_keys_drvdata { struct input_dev *input; struct mutex disable_lock; unsigned int n_buttons; + bool enabled; + bool enable_after_suspend; int (*enable)(struct device *dev); void (*disable)(struct device *dev); struct gpio_button_data data[0]; @@ -524,6 +526,7 @@ static int gpio_keys_open(struct input_dev *input) { struct gpio_keys_drvdata *ddata = input_get_drvdata(input); + ddata->enabled = true; return ddata->enable ? ddata->enable(input->dev.parent) : 0; } @@ -533,6 +536,7 @@ static void gpio_keys_close(struct input_dev *input) if (ddata->disable) ddata->disable(input->dev.parent); + ddata->enabled = false; } /* @@ -674,6 +678,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) ddata->n_buttons = pdata->nbuttons; ddata->enable = pdata->enable; ddata->disable = pdata->disable; + ddata->enabled = false; mutex_init(&ddata->disable_lock); platform_set_drvdata(pdev, ddata); @@ -789,6 +794,10 @@ static int gpio_keys_suspend(struct device *dev) if (bdata->button->wakeup) enable_irq_wake(bdata->irq); } + } else { + ddata->enable_after_suspend = ddata->enabled; + if (ddata->enabled) + gpio_keys_close(ddata->input); } return 0; @@ -807,6 +816,10 @@ static int gpio_keys_resume(struct device *dev) if (gpio_is_valid(bdata->button->gpio)) gpio_keys_gpio_report_event(bdata); } + + if (!device_may_wakeup(dev) && ddata->enable_after_suspend) + gpio_keys_open(ddata->input); + input_sync(ddata->input); return 0; -- 1.7.9.5
next reply other threads:[~2012-10-11 14:15 UTC|newest] Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-10-11 14:15 Lee Jones [this message] 2012-10-11 14:15 ` [PATCH 1/2] input: gpio-keys: Disable hardware on suspend Lee Jones 2012-10-11 14:15 ` [PATCH 2/2] input: gpio-keys: Add runtime support Lee Jones 2012-10-11 14:15 ` Lee Jones 2012-10-11 14:22 ` Shubhrajyoti Datta 2012-10-11 14:22 ` Shubhrajyoti Datta 2012-10-11 15:21 ` Lee Jones 2012-10-11 15:21 ` Lee Jones 2012-10-11 15:21 ` Lee Jones 2012-10-12 21:09 ` Linus Walleij 2012-10-12 21:09 ` Linus Walleij 2012-10-25 7:57 ` Lee Jones 2012-10-25 7:57 ` Lee Jones 2012-10-25 8:01 ` Linus Walleij 2012-10-25 8:01 ` Linus Walleij 2012-10-25 8:21 ` Lee Jones 2012-10-25 8:21 ` Lee Jones 2012-10-25 8:30 ` Dmitry Torokhov 2012-10-25 8:30 ` Dmitry Torokhov 2012-10-25 9:47 ` Lee Jones 2012-10-25 9:47 ` Lee Jones 2012-10-25 9:47 ` Lee Jones 2012-10-13 6:17 ` [PATCH 1/2] input: gpio-keys: Disable hardware on suspend Dmitry Torokhov 2012-10-13 6:17 ` Dmitry Torokhov 2012-11-22 13:23 Lee Jones 2012-11-22 13:23 ` Lee Jones 2012-11-22 13:23 ` Lee Jones 2012-11-25 8:32 ` Dmitry Torokhov 2012-11-25 8:32 ` Dmitry Torokhov 2012-11-26 9:05 ` Lee Jones 2012-11-26 9:05 ` Lee Jones 2012-11-26 9:32 ` Dmitry Torokhov 2012-11-26 9:32 ` Dmitry Torokhov 2012-12-01 17:01 ` Linus Walleij 2012-12-01 17:01 ` Linus Walleij
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1349964927-18619-1-git-send-email-lee.jones@linaro.org \ --to=lee.jones@linaro.org \ --cc=arnd@arndb.de \ --cc=dmitry.torokhov@gmail.com \ --cc=jonas.aberg@stericsson.com \ --cc=linus.walleij@stericsson.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-input@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=philippe.langlais@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.