From: Illia Smyrnov <x0194613@ti.com>
To: Illia Smyrnov <illia.smyrnov@ti.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-omap@vger.kernel.org
Subject: Re: [PATCH 1/3] Input: omap-keypad: Enable wakeup capability for keypad.
Date: Fri, 26 Jul 2013 19:58:14 +0300 [thread overview]
Message-ID: <51F2AAA6.6090708@ti.com> (raw)
In-Reply-To: <1374856201-11507-2-git-send-email-illia.smyrnov@ti.com>
Sorry,
this patch is incomplete and was sent by mistake.
I will sent v2
On 07/26/2013 07:29 PM, Illia Smyrnov wrote:
> Enable/disable IRQ wake in suspend/resume handlers
> to make the keypad wakeup capable.
>
> Signed-off-by: Illia Smyrnov <illia.smyrnov@ti.com>
> ---
> drivers/input/keyboard/omap4-keypad.c | 38 +++++++++++++++++++++++++++++++++
> 1 file changed, 38 insertions(+)
>
> diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c
> index 0244262..5f0a2c7 100644
> --- a/drivers/input/keyboard/omap4-keypad.c
> +++ b/drivers/input/keyboard/omap4-keypad.c
> @@ -74,6 +74,7 @@ struct omap4_keypad {
> struct input_dev *input;
>
> void __iomem *base;
> + bool irq_wake_enabled;
> unsigned int irq;
>
> unsigned int rows;
> @@ -380,6 +381,7 @@ static int omap4_keypad_probe(struct platform_device *pdev)
> goto err_free_input;
> }
>
> + device_init_wakeup(&pdev->dev, true);
> pm_runtime_put_sync(&pdev->dev);
>
> error = input_register_device(keypad_data->input);
> @@ -393,6 +395,7 @@ static int omap4_keypad_probe(struct platform_device *pdev)
>
> err_pm_disable:
> pm_runtime_disable(&pdev->dev);
> + device_init_wakeup(&pdev->dev, false);
> free_irq(keypad_data->irq, keypad_data);
> err_free_keymap:
> kfree(keypad_data->keymap);
> @@ -418,6 +421,8 @@ static int omap4_keypad_remove(struct platform_device *pdev)
>
> pm_runtime_disable(&pdev->dev);
>
> + device_init_wakeup(&pdev->dev, false);
> +
> input_unregister_device(keypad_data->input);
>
> iounmap(keypad_data->base);
> @@ -439,12 +444,45 @@ static const struct of_device_id omap_keypad_dt_match[] = {
> MODULE_DEVICE_TABLE(of, omap_keypad_dt_match);
> #endif
>
> +#ifdef CONFIG_PM_SLEEP
> +static int omap4_keypad_suspend(struct device *dev)
> +{
> + int error;
> +
> + if (device_may_wakeup(&pdev->dev)) {
> + error = enable_irq_wake(keypad_data->irq);
> + if (!error)
> + keypad_data->irq_wake_enabled = true;
> + }
> +
> + return 0;
> +}
> +
> +static int omap4_keypad_resume(struct device *dev)
> +{
> + if (device_may_wakeup(&pdev->dev) && keypad_data->irq_wake_enabled) {
> + disable_irq_wake(keypad_data->irq);
> + keypad_data->irq_wake_enabled = false;
> + }
> +
> + return 0;
> +}
> +
> +static SIMPLE_DEV_PM_OPS(omap4_keypad_pm_ops, omap4_keypad_suspend,
> + omap4_keypad_resume);
> +
> +#define OMAP4_KEYPAD_PM_OPS (&omap4_keypad_pm_ops)
> +#else
> +#define OMAP4_KEYPAD_PM_OPS NULL
> +#endif
> +
> static struct platform_driver omap4_keypad_driver = {
> .probe = omap4_keypad_probe,
> .remove = omap4_keypad_remove,
> .driver = {
> .name = "omap4-keypad",
> .owner = THIS_MODULE,
> + .pm = OMAP4_KEYPAD_PM_OPS,
> .of_match_table = of_match_ptr(omap_keypad_dt_match),
> },
> };
>
next prev parent reply other threads:[~2013-07-26 16:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-26 16:29 [PATCH 0/3] Input: omap-keypad: Wakeup capability and w/a for i689 errata Illia Smyrnov
2013-07-26 16:29 ` [PATCH 1/3] Input: omap-keypad: Enable wakeup capability for keypad Illia Smyrnov
2013-07-26 16:58 ` Illia Smyrnov [this message]
2013-07-26 16:30 ` [PATCH 2/3] Input: omap-keypad: errata i689: Correct debounce time Illia Smyrnov
2013-07-26 16:30 ` [PATCH 3/3] Input: omap-keypad: Set irq to level instead of edge Illia Smyrnov
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=51F2AAA6.6090708@ti.com \
--to=x0194613@ti.com \
--cc=dmitry.torokhov@gmail.com \
--cc=illia.smyrnov@ti.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).