[PATCH] i8042 / PM: Allow PC keyboard to wake up from suspend-to-idle

[Rafael J. Wysocki]

From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>

If they keyboard interrupt is registered, mark the i8042 platform
device as wakeup-capable and check the user space wakeup setting in
i8042_pm_suspend() and i8042_pm_resume() to enable or disable,
respectively, the keyboard interrupt to wake up the system.

This makes it possible to use the PC keyboard to wake up the system
from suspend-to-idle after writing "enabled" to the i8042 device's
power/wakeup sysfs attribute.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
---
 drivers/input/serio/i8042.c |    6 ++++++
 1 file changed, 6 insertions(+)

Index: linux-pm/drivers/input/serio/i8042.c
===================================================================
--- linux-pm.orig/drivers/input/serio/i8042.c
+++ linux-pm/drivers/input/serio/i8042.c
@@ -1163,12 +1163,17 @@ static int i8042_controller_resume(bool
 static int i8042_pm_suspend(struct device *dev)
 {
 	i8042_controller_reset(true);
+	if (device_may_wakeup(&i8042_platform_device->dev))
+		enable_irq_wake(I8042_KBD_IRQ);
 
 	return 0;
 }
 
 static int i8042_pm_resume(struct device *dev)
 {
+	if (device_may_wakeup(&i8042_platform_device->dev))
+		disable_irq_wake(I8042_KBD_IRQ);
+
 	/*
 	 * On resume from S2R we always try to reset the controller
 	 * to bring it in a sane state. (In case of S2D we expect
@@ -1406,6 +1411,7 @@ static int __init i8042_setup_kbd(void)
 	if (error)
 		goto err_free_irq;
 
+	device_set_wakeup_capable(&i8042_platform_device->dev, true);
 	i8042_kbd_irq_registered = true;
 	return 0;
 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/