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

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: If99e15bef2173c44cecaa8fdeaa69381bd0e499a </div>
<div style="display:none"> Gerrit-Change-Number: 28386 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Stefan Reinauer <reinauer@chromium.org> </div>