aboutsummaryrefslogtreecommitdiff
path: root/src/ec
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@chromium.org>2018-02-02 10:08:22 -0800
committerPatrick Georgi <pgeorgi@google.com>2018-02-02 21:48:25 +0000
commit2177ccfac9a85f3ef431884a4a59b136c34cb5cd (patch)
tree17caa69febaf55c8a6195de0207ae2319ee4ff0e /src/ec
parent9dc5600f860107f78b6da5d6717650587617b902 (diff)
ec/google/chromeec: Remove wake flag from keyboard IRQ
The keyboard IRQ was changed to ExclusiveAndWake in order to support waking from suspend-to-idle (S0ix) with commit f611fcfacac5be14a51e04ae4d0b1e25cd5439c0 http://review.coreboot.org/11712 However this is triggering a kernel panic on Windows 10 because it apparently does not like legacy device interrupts to to be set as wake capable. This change is no longer necessary because the linux kernel was changed to always treat the keyboard as wake capable: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/input/serio/i8042.c?id=f13b2065de8147a1652b830ea5db961cf80c09df Change-Id: I26e27de68095f8d176108f39312338522d7cfba0 Signed-off-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-on: https://review.coreboot.org/23563 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Furquan Shaikh <furquan@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/ec')
-rw-r--r--src/ec/google/chromeec/acpi/superio.asl4
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 0f06e30cb3..7cd65239a7 100644
--- a/src/ec/google/chromeec/acpi/superio.asl
+++ b/src/ec/google/chromeec/acpi/superio.asl
@@ -151,7 +151,7 @@ Device (SIO) {
#ifdef SIO_EC_PS2K_IRQ
SIO_EC_PS2K_IRQ
#else
- IRQ (Edge, ActiveHigh, ExclusiveAndWake) {1}
+ IRQ (Edge, ActiveHigh, Exclusive) {1}
#endif
})
@@ -163,7 +163,7 @@ Device (SIO) {
#ifdef SIO_EC_PS2K_IRQ
SIO_EC_PS2K_IRQ
#else
- IRQ (Edge, ActiveHigh, ExclusiveAndWake) {1}
+ IRQ (Edge, ActiveHigh, Exclusive) {1}
#endif
}
EndDependentFn ()