<p>Matt DeVillier has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/21209">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Revert "google/cyan: Use GpioInt for Keyboard IRQ"<br><br>This reverts commit 3d4f04f6b1c802c2c2126b6a6cc97fb5b49ec0bd.<br><br>The kernel-side changes needed to support this won't be merged<br>into the mailing kernel until 4.13 (currently in linux-next).<br><br>My previous testing was with a daily build of ChromiumOS which<br>already had the required kernel changes so I missed the breakage.<br><br>TEST: Boot cyan on mailine kernel 4.12.x (or earlier),<br>observe keyboard now functional again.<br><br>Change-Id: Idef57d1cc7cafaa15768c96febb8f9fd7a81c292<br>Signed-off-by: Matt DeVillier <matt.devillier@gmail.com><br>---<br>M src/mainboard/google/cyan/acpi/superio.asl<br>M src/mainboard/google/cyan/onboard.h<br>2 files changed, 9 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/09/21209/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/mainboard/google/cyan/acpi/superio.asl b/src/mainboard/google/cyan/acpi/superio.asl<br>index f2a7fc0..34ae348 100644<br>--- a/src/mainboard/google/cyan/acpi/superio.asl<br>+++ b/src/mainboard/google/cyan/acpi/superio.asl<br>@@ -23,8 +23,8 @@<br> #define SIO_EC_ENABLE_PS2K       /* Enable PS/2 Keyboard */<br> <br> /* Override default IRQ settings */<br>-#define SIO_EC_PS2K_IRQ GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,\<br>-                                "\\_SB.GPNC") { BOARD_I8042_GPIO_INDEX }<br>+#define SIO_EC_PS2K_IRQ Interrupt(ResourceConsumer, Edge, ActiveLow){\<br>+                                                     BOARD_I8042_IRQ}<br> <br> /* ACPI code for EC SuperIO functions */<br> #include <ec/google/chromeec/acpi/superio.asl><br>diff --git a/src/mainboard/google/cyan/onboard.h b/src/mainboard/google/cyan/onboard.h<br>index c891aa8..706f306 100644<br>--- a/src/mainboard/google/cyan/onboard.h<br>+++ b/src/mainboard/google/cyan/onboard.h<br>@@ -30,10 +30,15 @@<br>  * GPSE_SIZE = 86<br>  */<br> <br>+/*<br>+ * gpio based irq for kbd, 17th index in North Bank<br>+ * MAX_DIRECT_IRQ + GPSW_SIZE + 18<br>+ */<br>+/* ToDO: change kbd irq to gpio bank index */<br>+#define BOARD_I8042_IRQ                        182<br> #define BOARD_TOUCH_IRQ                   184<br> <br>-/* KBD: Gpio index in N bank */<br>-#define BOARD_I8042_GPIO_INDEX               17<br>+<br> /* SCI: Gpio index in N bank */<br> #define BOARD_SCI_GPIO_INDEX          15<br> /* Trackpad: Gpio index in N bank */<br></pre><p>To view, visit <a href="https://review.coreboot.org/21209">change 21209</a>. To unsubscribe, 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/21209"/><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: Idef57d1cc7cafaa15768c96febb8f9fd7a81c292 </div>
<div style="display:none"> Gerrit-Change-Number: 21209 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Matt DeVillier <matt.devillier@gmail.com> </div>