diff mbox

input: qt1070: add power management ops

Message ID 1376379826-28808-1-git-send-email-voice.shen@atmel.com
State New, archived
Headers show

Commit Message

Bo Shen Aug. 13, 2013, 7:43 a.m. UTC
Add power management ops for qt1070, it maybe a wakeup source

Signed-off-by: Bo Shen <voice.shen@atmel.com>
---
 drivers/input/keyboard/qt1070.c |   25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

Comments

Nicolas Ferre Aug. 14, 2013, 6:52 a.m. UTC | #1
On 13/08/2013 09:43, Bo Shen :
> Add power management ops for qt1070, it maybe a wakeup source
>
> Signed-off-by: Bo Shen <voice.shen@atmel.com>

Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

> ---
>   drivers/input/keyboard/qt1070.c |   25 +++++++++++++++++++++++++
>   1 file changed, 25 insertions(+)
>
> diff --git a/drivers/input/keyboard/qt1070.c b/drivers/input/keyboard/qt1070.c
> index 42b773b..deefe5a 100644
> --- a/drivers/input/keyboard/qt1070.c
> +++ b/drivers/input/keyboard/qt1070.c
> @@ -243,6 +243,30 @@ static int qt1070_remove(struct i2c_client *client)
>   	return 0;
>   }
>
> +#ifdef CONFIG_PM_SLEEP
> +static int qt1070_suspend(struct device *dev)
> +{
> +	struct qt1070_data *data = dev_get_drvdata(dev);
> +
> +	if (device_may_wakeup(dev))
> +		enable_irq_wake(data->irq);
> +
> +	return 0;
> +}
> +
> +static int qt1070_resume(struct device *dev)
> +{
> +	struct qt1070_data *data = dev_get_drvdata(dev);
> +
> +	if (device_may_wakeup(dev))
> +		disable_irq_wake(data->irq);
> +
> +	return 0;
> +}
> +#endif
> +
> +static SIMPLE_DEV_PM_OPS(qt1070_pm_ops, qt1070_suspend, qt1070_resume);
> +
>   static const struct i2c_device_id qt1070_id[] = {
>   	{ "qt1070", 0 },
>   	{ },
> @@ -253,6 +277,7 @@ static struct i2c_driver qt1070_driver = {
>   	.driver	= {
>   		.name	= "qt1070",
>   		.owner	= THIS_MODULE,
> +		.pm	= &qt1070_pm_ops,
>   	},
>   	.id_table	= qt1070_id,
>   	.probe		= qt1070_probe,
>
Bo Shen Oct. 14, 2013, 5:45 a.m. UTC | #2
Hi Dmitry,

On 8/14/2013 14:52, Nicolas Ferre wrote:
> On 13/08/2013 09:43, Bo Shen :
>> Add power management ops for qt1070, it maybe a wakeup source
>>
>> Signed-off-by: Bo Shen <voice.shen@atmel.com>
>
> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Would this patch be applied with Nicolas' ACK?

Best Regards,
Bo Shen

>> ---
>>   drivers/input/keyboard/qt1070.c |   25 +++++++++++++++++++++++++
>>   1 file changed, 25 insertions(+)
>>
>> diff --git a/drivers/input/keyboard/qt1070.c
>> b/drivers/input/keyboard/qt1070.c
>> index 42b773b..deefe5a 100644
>> --- a/drivers/input/keyboard/qt1070.c
>> +++ b/drivers/input/keyboard/qt1070.c
>> @@ -243,6 +243,30 @@ static int qt1070_remove(struct i2c_client *client)
>>       return 0;
>>   }
>>
>> +#ifdef CONFIG_PM_SLEEP
>> +static int qt1070_suspend(struct device *dev)
>> +{
>> +    struct qt1070_data *data = dev_get_drvdata(dev);
>> +
>> +    if (device_may_wakeup(dev))
>> +        enable_irq_wake(data->irq);
>> +
>> +    return 0;
>> +}
>> +
>> +static int qt1070_resume(struct device *dev)
>> +{
>> +    struct qt1070_data *data = dev_get_drvdata(dev);
>> +
>> +    if (device_may_wakeup(dev))
>> +        disable_irq_wake(data->irq);
>> +
>> +    return 0;
>> +}
>> +#endif
>> +
>> +static SIMPLE_DEV_PM_OPS(qt1070_pm_ops, qt1070_suspend, qt1070_resume);
>> +
>>   static const struct i2c_device_id qt1070_id[] = {
>>       { "qt1070", 0 },
>>       { },
>> @@ -253,6 +277,7 @@ static struct i2c_driver qt1070_driver = {
>>       .driver    = {
>>           .name    = "qt1070",
>>           .owner    = THIS_MODULE,
>> +        .pm    = &qt1070_pm_ops,
>>       },
>>       .id_table    = qt1070_id,
>>       .probe        = qt1070_probe,
>>
>
>

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
dmitry.torokhov@gmail.com Oct. 16, 2013, 6:31 a.m. UTC | #3
Hi Bo,

On Mon, Oct 14, 2013 at 01:45:24PM +0800, Bo Shen wrote:
> Hi Dmitry,
> 
> On 8/14/2013 14:52, Nicolas Ferre wrote:
> >On 13/08/2013 09:43, Bo Shen :
> >>Add power management ops for qt1070, it maybe a wakeup source
> >>
> >>Signed-off-by: Bo Shen <voice.shen@atmel.com>
> >
> >Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> 
> Would this patch be applied with Nicolas' ACK?

This patch is already in mainline:

commit 3719b54bc62318db7dd8ac7c39a09dfb991a208f
Author: Bo Shen <voice.shen@atmel.com>
Date:   Tue Aug 13 09:46:40 2013 -0700

    Input: qt1070 - add power management ops

    Add power management ops for qt1070, it may be a wakeup source.

    Signed-off-by: Bo Shen <voice.shen@atmel.com>
    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

Thanks.
diff mbox

Patch

diff --git a/drivers/input/keyboard/qt1070.c b/drivers/input/keyboard/qt1070.c
index 42b773b..deefe5a 100644
--- a/drivers/input/keyboard/qt1070.c
+++ b/drivers/input/keyboard/qt1070.c
@@ -243,6 +243,30 @@  static int qt1070_remove(struct i2c_client *client)
 	return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int qt1070_suspend(struct device *dev)
+{
+	struct qt1070_data *data = dev_get_drvdata(dev);
+
+	if (device_may_wakeup(dev))
+		enable_irq_wake(data->irq);
+
+	return 0;
+}
+
+static int qt1070_resume(struct device *dev)
+{
+	struct qt1070_data *data = dev_get_drvdata(dev);
+
+	if (device_may_wakeup(dev))
+		disable_irq_wake(data->irq);
+
+	return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(qt1070_pm_ops, qt1070_suspend, qt1070_resume);
+
 static const struct i2c_device_id qt1070_id[] = {
 	{ "qt1070", 0 },
 	{ },
@@ -253,6 +277,7 @@  static struct i2c_driver qt1070_driver = {
 	.driver	= {
 		.name	= "qt1070",
 		.owner	= THIS_MODULE,
+		.pm	= &qt1070_pm_ops,
 	},
 	.id_table	= qt1070_id,
 	.probe		= qt1070_probe,