<p>Matt DeVillier has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/21177">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">google/cyan: Use GpioInt for Keyboard IRQ<br><br>Cherry-pick from Chromium commit a162348.<br><br>Remove the hard coded IRQ number for the keyboard interrupt.<br>IRQ number can change based upon the gpio bank index ordering.<br>Hence pass the gpio bank and index number so that kernel calculates<br>the IRQ number.<br><br>Original-Change-Id: Icfe5c3995007164bf617575b541758c18ee63a1d<br>Original-Signed-off-by: Jagadish Krishnamoorthy <jagadish.krishnamoorthy@intel.com><br>Original-Reviewed-by: Duncan Laurie <dlaurie@chromium.org><br><br>Change-Id: I81ff19e3060c533ee76023c7651f741294e9db30<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, 4 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/77/21177/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 34ae348..f2a7fc0 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 Interrupt(ResourceConsumer, Edge, ActiveLow){\<br>-                                                     BOARD_I8042_IRQ}<br>+#define SIO_EC_PS2K_IRQ GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,\<br>+                              "\\_SB.GPNC") { BOARD_I8042_GPIO_INDEX }<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 1347d41..19b61df 100644<br>--- a/src/mainboard/google/cyan/onboard.h<br>+++ b/src/mainboard/google/cyan/onboard.h<br>@@ -30,16 +30,11 @@<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> #define BOARD_PRE_EVT_TOUCH_IRQ           156<br> <br>-<br>+/* KBD: Gpio index in N bank */<br>+#define BOARD_I8042_GPIO_INDEX            17<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/21177">change 21177</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/21177"/><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: I81ff19e3060c533ee76023c7651f741294e9db30 </div>
<div style="display:none"> Gerrit-Change-Number: 21177 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Matt DeVillier <matt.devillier@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Aaron Durbin <adurbin@chromium.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jagadish Krishnamoorthy <jagadish.krishnamoorthy@intel.com> </div>
<div style="display:none"> Gerrit-Reviewer: Martin Roth <martinroth@google.com> </div>