Martin Roth has uploaded this change for review.
chromeec: PS2K node can't be under SIO node
Some operating systems won't find the keyboard if it is under
the SIO node.
BRANCH=none
BUG=none
TEST=Boot Windows, observe that keyboard is working
Original-Signed-off-by: Stefan Reinauer <reinauer@google.com>
Original-Change-Id: I76b1ca9bf9243ffa861bed9c356a45377e7f43ef
Original-Reviewed-on: https://chromium-review.googlesource.com/895364
Change-Id: If99e15bef2173c44cecaa8fdeaa69381bd0e499a
Signed-off-by: Martin Roth <martinroth@chromium.org>
---
M src/ec/google/chromeec/acpi/superio.asl
1 file changed, 28 insertions(+), 22 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/28386/1
diff --git a/src/ec/google/chromeec/acpi/superio.asl b/src/ec/google/chromeec/acpi/superio.asl
index 6c9cb2c..0f37570 100644
--- a/src/ec/google/chromeec/acpi/superio.asl
+++ b/src/ec/google/chromeec/acpi/superio.asl
@@ -131,21 +131,34 @@
})
}
#endif
+}
#ifdef SIO_EC_ENABLE_PS2K
- Device (PS2K) // Keyboard
+Device (PS2K) // Keyboard
+{
+ Name (_UID, 0)
+ Name (_ADR, 0)
+ Name (_HID, "GOOG000A")
+ Name (_CID, Package() { EISAID("PNP0303"), EISAID("PNP030B") } )
+
+ Method (_STA, 0, NotSerialized) {
+ Return (0x0F)
+ }
+
+ Name (_CRS, ResourceTemplate()
{
- Name (_UID, 0)
- Name (_ADR, 0)
- Name (_HID, "GOOG000A")
- Name (_CID, Package() { EISAID("PNP0303"), EISAID("PNP030B") } )
+ IO (Decode16, 0x60, 0x60, 0x01, 0x01)
+ IO (Decode16, 0x64, 0x64, 0x01, 0x01)
+#ifdef SIO_EC_PS2K_IRQ
+ SIO_EC_PS2K_IRQ
+#else
+ IRQ (Edge, ActiveHigh, Exclusive) {1}
+#endif
+ })
- Method (_STA, 0, NotSerialized) {
- Return (0x0F)
- }
-
- Name (_CRS, ResourceTemplate()
- {
+ Name (_PRS, ResourceTemplate()
+ {
+ StartDependentFn (0, 0) {
IO (Decode16, 0x60, 0x60, 0x01, 0x01)
IO (Decode16, 0x64, 0x64, 0x01, 0x01)
#ifdef SIO_EC_PS2K_IRQ
@@ -153,17 +166,10 @@
#else
IRQ (Edge, ActiveHigh, Exclusive) {1}
#endif
- })
-
- Name (_PRS, ResourceTemplate()
- {
- StartDependentFn (0, 0) {
- IO (Decode16, 0x60, 0x60, 0x01, 0x01)
- IO (Decode16, 0x64, 0x64, 0x01, 0x01)
-#ifdef SIO_EC_PS2K_IRQ
- SIO_EC_PS2K_IRQ
-#else
- IRQ (Edge, ActiveHigh, Exclusive) {1}
+ }
+ EndDependentFn ()
+ })
+}
#endif
}
EndDependentFn ()
To view, visit change 28386. To unsubscribe, or for help writing mail filters, visit settings.