aboutsummaryrefslogtreecommitdiff
path: root/src/ec/google
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2017-12-14 12:51:48 -0800
committerMartin Roth <martinroth@google.com>2018-09-02 03:08:27 +0000
commit77ad581ce90476c42eb01ddca43afe4ffb7f5cc2 (patch)
treeda7ebf1f0895421504191a91eecb4bfa5e304a2d /src/ec/google
parent5cc9ef414f513fa3a08fc464976da3b710cadddc (diff)
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> Reviewed-on: https://review.coreboot.org/28386 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src/ec/google')
-rw-r--r--src/ec/google/chromeec/acpi/superio.asl56
1 files changed, 28 insertions, 28 deletions
diff --git a/src/ec/google/chromeec/acpi/superio.asl b/src/ec/google/chromeec/acpi/superio.asl
index 6c9cb2cdea..c521a3a894 100644
--- a/src/ec/google/chromeec/acpi/superio.asl
+++ b/src/ec/google/chromeec/acpi/superio.asl
@@ -131,43 +131,43 @@ Device (SIO) {
})
}
#endif
+}
#ifdef SIO_EC_ENABLE_PS2K
- Device (PS2K) // Keyboard
- {
- Name (_UID, 0)
- Name (_ADR, 0)
- Name (_HID, "GOOG000A")
- Name (_CID, Package() { EISAID("PNP0303"), EISAID("PNP030B") } )
+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)
- }
+ Method (_STA, 0, NotSerialized) {
+ Return (0x0F)
+ }
- Name (_CRS, ResourceTemplate()
- {
- IO (Decode16, 0x60, 0x60, 0x01, 0x01)
- IO (Decode16, 0x64, 0x64, 0x01, 0x01)
+ Name (_CRS, ResourceTemplate()
+ {
+ IO (Decode16, 0x60, 0x60, 0x01, 0x01)
+ IO (Decode16, 0x64, 0x64, 0x01, 0x01)
#ifdef SIO_EC_PS2K_IRQ
- SIO_EC_PS2K_IRQ
+ SIO_EC_PS2K_IRQ
#else
- IRQ (Edge, ActiveHigh, Exclusive) {1}
+ IRQ (Edge, ActiveHigh, Exclusive) {1}
#endif
- })
+ })
- Name (_PRS, ResourceTemplate()
- {
- StartDependentFn (0, 0) {
- IO (Decode16, 0x60, 0x60, 0x01, 0x01)
- IO (Decode16, 0x64, 0x64, 0x01, 0x01)
+ 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
+ SIO_EC_PS2K_IRQ
#else
- IRQ (Edge, ActiveHigh, Exclusive) {1}
-#endif
- }
- EndDependentFn ()
- })
- }
+ IRQ (Edge, ActiveHigh, Exclusive) {1}
#endif
+ }
+ EndDependentFn ()
+ })
}
+#endif