diff options
author | Duncan Laurie <dlaurie@chromium.org> | 2015-09-21 15:00:20 -0700 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2015-09-28 09:32:50 +0000 |
commit | f611fcfacac5be14a51e04ae4d0b1e25cd5439c0 (patch) | |
tree | bdc76bd98606ee5eea0c8d9ae8c1915dca9408ca /src | |
parent | 34ce438e6fc6ccab926141e462216e0430097507 (diff) |
ec: superio: Report keyboard IRQ as wake capable
In order to wake from S0ix the kernel needs to know that the
keyboard interrupt is wake capable. Using IRQNoFlags does not
allow the wake capability to be reported.
For normal S3 this does not matter as the EC is the one handling
the keyboard wake event. For S0ix the EC does not need to be
involved in this particular wake event.
BUG=chrome-os-partner:43079
BRANCH=none
TEST=echo freeze > /sys/power/state and wake from keyboard
Change-Id: I7175d2ea98f8a671765897de295df7b933151fc4
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 645f1cd96c35f42aa7c40ff473b15feb619b0373
Original-Change-Id: Ia89c30c51be9db7b814b81261463d938885325fd
Original-Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/301441
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/11712
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/ec/google/chromeec/acpi/superio.asl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ec/google/chromeec/acpi/superio.asl b/src/ec/google/chromeec/acpi/superio.asl index 39e60a3b96..b27f6d604a 100644 --- a/src/ec/google/chromeec/acpi/superio.asl +++ b/src/ec/google/chromeec/acpi/superio.asl @@ -155,7 +155,7 @@ Device (SIO) { #ifdef SIO_EC_PS2K_IRQ SIO_EC_PS2K_IRQ #else - IRQNoFlags () {1} + IRQ (Edge, ActiveHigh, ExclusiveAndWake) {1} #endif }) @@ -167,7 +167,7 @@ Device (SIO) { #ifdef SIO_EC_PS2K_IRQ SIO_EC_PS2K_IRQ #else - IRQNoFlags () {1} + IRQ (Edge, ActiveHigh, ExclusiveAndWake) {1} #endif } EndDependentFn () |