[coreboot-gerrit] Change in coreboot[master]: chromeec: PS2K node can't be under SIO node

[Patrick Georgi (Code Review)]

Hello Stefan Reinauer,

I'd like you to do a code review. Please visit

https://review.coreboot.org/27328

to review the following change.

Change subject: chromeec: PS2K node can't be under SIO node
......................................................................

chromeec: PS2K node can't be under SIO node

Some operating systems won't find the keyboard if it is under
the SIO node.

Signed-off-by: Stefan Reinauer 
BRANCH=none
BUG=none
TEST=Boot Windows, observe that keyboard is working

Change-Id: I76b1ca9bf9243ffa861bed9c356a45377e7f43ef
Reviewed-on: https://chromium-review.googlesource.com/895364
Commit-Ready: Stefan Reinauer 
Tested-by: Stefan Reinauer 
Reviewed-by: Stefan Reinauer 
---
M src/ec/google/chromeec/acpi/superio.asl
1 file changed, 28 insertions(+), 28 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/28/27328/1

diff --git a/src/ec/google/chromeec/acpi/superio.asl b/src/ec/google/chromeec/acpi/superio.asl
index 7cd6523..051eff3 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, EISAID("PNP0303"))
+	Name (_CID, EISAID("PNP030B"))
+
+	Method (_STA, 0, NotSerialized) {
+		Return (0x0F)
+	}
+
+	Name (_CRS, ResourceTemplate()
    {
-		Name (_UID, 0)
-		Name (_ADR, 0)
-		Name (_HID, EISAID("PNP0303"))
-		Name (_CID, 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,21 +166,8 @@
 #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}
-#endif
-			}
-			EndDependentFn ()
-		})
-	}
-#endif
+		}
+		EndDependentFn ()
+	})
 }
+#endif