add wakeup_button module which reliably wakes up the device

diff --git a/patches/kernel-suspend.patch b/patches/kernel-suspend.patch
index d7922a6..2922973 100644 (file)
--- a/patches/kernel-suspend.patch
+++ b/patches/kernel-suspend.patch
@@ -1,5 +1,18 @@
+diff --git a/kernel/power/Makefile b/kernel/power/Makefile
+index 9b224e1..2f2b431 100644
+--- a/kernel/power/Makefile
++++ b/kernel/power/Makefile
+@@ -10,7 +10,7 @@ obj-$(CONFIG_HIBERNATION)    += hibernate.o snapshot.o swap.o user.o \
+                                  block_io.o
+ obj-$(CONFIG_WAKELOCK)                += wakelock.o
+ obj-$(CONFIG_USER_WAKELOCK)   += userwakelock.o
+-obj-$(CONFIG_EARLYSUSPEND)    += earlysuspend.o
++obj-$(CONFIG_EARLYSUSPEND)    += earlysuspend.o wakeup_button.o
+ obj-$(CONFIG_CONSOLE_EARLYSUSPEND)    += consoleearlysuspend.o
+ obj-$(CONFIG_FB_EARLYSUSPEND) += fbearlysuspend.o
+ obj-$(CONFIG_SUSPEND_TIME)    += suspend_time.o
 diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
-index 63774df..091ded0 100644
+index 63774df..0646b15 100644
 --- a/kernel/power/suspend.c
 +++ b/kernel/power/suspend.c
 @@ -94,7 +94,9 @@ static int suspend_prepare(void)
@@ -22,7 +35,13 @@ index 63774df..091ded0 100644
        return error;
  }
  
-@@ -253,7 +257,9 @@ static void suspend_finish(void)
+@@ -250,10 +254,15 @@ int suspend_devices_and_enter(suspend_state_t state)
+  */
+ static void suspend_finish(void)
+ {
++#ifdef CONFIG_EARLYSUSPEND
++      request_suspend_state(PM_SUSPEND_ON);
++#endif
        suspend_thaw_processes();
        usermodehelper_enable();
        pm_notifier_call_chain(PM_POST_SUSPEND);
@@ -32,3 +51,75 @@ index 63774df..091ded0 100644
  }
  
  /**
+diff --git a/kernel/power/wakeup_button.c b/kernel/power/wakeup_button.c
+new file mode 100644
+index 0000000..dcc3158
+--- /dev/null
++++ b/kernel/power/wakeup_button.c
+@@ -0,0 +1,66 @@
++/*
++ * wakeup_button.c - Power Button which is pushed on resume from standby.
++ *
++ * Copyright (c) 2011 Stefan Seidel
++ *
++ * This file is released under the GPLv2 or later.
++ */
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/earlysuspend.h>
++#include <linux/input.h>
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Stefan Seidel <android@stefanseidel.info>");
++MODULE_DESCRIPTION("Sets up a virtual input device and sends a power key event during early resume. Needed for some to make Android on x86 wake up properly.");
++
++static struct input_dev *input;
++
++static void wakeup_button_early_suspend(struct early_suspend *h)
++{
++      return;
++}
++
++static void wakeup_button_early_resume(struct early_suspend *h)
++{
++      printk("Early resume, push virtual power button!\n");
++      input_report_key(input, KEY_POWER, 1);
++      input_sync(input);
++      input_report_key(input, KEY_POWER, 0);
++      input_sync(input);
++}
++
++static struct early_suspend wakeup_button_early_suspend_handlers = {
++      .level = EARLY_SUSPEND_LEVEL_BLANK_SCREEN - 1, // very late resume
++      .suspend = wakeup_button_early_suspend,
++      .resume = wakeup_button_early_resume
++};
++
++static int __init wakeup_button_init(void)
++{
++      int error;
++      printk("Registering Android Wakeup Button.\n");
++      input = input_allocate_device();
++      input->name = "Wakeup Button";
++      input->id.bustype = BUS_USB; // use BUS_USB here so that Android registers this as an external key
++      input->evbit[0] = BIT_MASK(EV_KEY);
++      set_bit(KEY_POWER, input->keybit);
++      error = input_register_device(input);
++      if (error) {
++              input_free_device(input);
++      } else {
++              register_early_suspend(&wakeup_button_early_suspend_handlers);
++      }
++      return error;
++}
++
++static void __exit wakeup_button_exit(void)
++{
++      printk("Unregistering Android Wakeup Button.\n");
++      unregister_early_suspend(&wakeup_button_early_suspend_handlers);
++      input_unregister_device(input);
++      return;
++}
++
++module_init(wakeup_button_init);
++module_exit(wakeup_button_exit);