omap4-common: fix wake on unplug

Don't allow the device to enter deep sleep right after unplugging
an usb power-source. This allows userspace to wake the system up
if the corresponding option has been set.

Change-Id: I7a21fe7c438394cfbb923a3dc925287f292704b3
Revert "omap4-common: fix wake on unplug"

This seems to cause SODs.

This reverts commit 9805968b21d58023668553219a50931900c567b6.

Change-Id: I2cfbf44311dbe8b275679f976c592cb66667b2ae
omap4-common: fix the power-key

Add handling of a missing powerkey-state when the phone is in
deep sleep which could result in the key-press to be partially
ignored. Additionally increase wakelock-timeouts for the powerkey-
wakelock.

Change-Id: Ibccfdbc866610f067cbb563cf7fc9ecf7a7e9a03
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0