diff --git a/src/mainboard/google/cyan/acpi/superio.asl b/src/mainboard/google/cyan/acpi/superio.asl
index 34ae34829f..f2a7fc0296 100644
--- a/src/mainboard/google/cyan/acpi/superio.asl
+++ b/src/mainboard/google/cyan/acpi/superio.asl
@@ -23,8 +23,8 @@
 #define SIO_EC_ENABLE_PS2K       /* Enable PS/2 Keyboard */
 
 /* Override default IRQ settings */
-#define SIO_EC_PS2K_IRQ Interrupt(ResourceConsumer, Edge, ActiveLow){\
-                                                     BOARD_I8042_IRQ}
+#define SIO_EC_PS2K_IRQ GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,\
+				 "\\_SB.GPNC") { BOARD_I8042_GPIO_INDEX }
 
 /* ACPI code for EC SuperIO functions */
 #include <ec/google/chromeec/acpi/superio.asl>
diff --git a/src/mainboard/google/cyan/onboard.h b/src/mainboard/google/cyan/onboard.h
index 1347d41a07..19b61dfbca 100644
--- a/src/mainboard/google/cyan/onboard.h
+++ b/src/mainboard/google/cyan/onboard.h
@@ -30,16 +30,11 @@
  * GPSE_SIZE = 86
  */
 
-/*
- * gpio based irq for kbd, 17th index in North Bank
- * MAX_DIRECT_IRQ + GPSW_SIZE + 18
- */
-/* ToDO: change kbd irq to gpio bank index */
-#define BOARD_I8042_IRQ			182
 #define BOARD_TOUCH_IRQ			184
 #define BOARD_PRE_EVT_TOUCH_IRQ		156
 
-
+/* KBD: Gpio index in N bank */
+#define BOARD_I8042_GPIO_INDEX		17
 /* SCI: Gpio index in N bank */
 #define BOARD_SCI_GPIO_INDEX		15
 /* Trackpad: Gpio index in N bank */