asurada: enable keyboard

BUG=b:150341271
TEST=`ksstate on`, verify key press shows on ec console
BRANCH=none

Change-Id: Iea6102caa085ba65498fc32f80d7a0c3cd51d17d
Signed-off-by: Ting Shen <phoenixshen@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2148987
Reviewed-by: Eric Yilun Lin <yllin@chromium.org>
Commit-Queue: Ting Shen <phoenixshen@chromium.org>
Tested-by: Ting Shen <phoenixshen@chromium.org>

3 files changed, 7 insertions, 30 deletions

diff --git a/board/asurada/board.h b/board/asurada/board.h
index 32cfd3fffb..b31db22f78 100644
--- a/board/asurada/board.h
+++ b/board/asurada/board.h
@@ -40,11 +40,11 @@
 /* Chipset */
 
 /* Keyboard */
-/*
- * #define CONFIG_KEYBOARD_BOARD_CONFIG
- * #define CONFIG_KEYBOARD_PROTOCOL_MKBP
- * #define CONFIG_MKBP_USE_GPIO
- */
+#define CONFIG_CMD_KEYBOARD
+#define CONFIG_KEYBOARD_BOARD_CONFIG
+#define CONFIG_KEYBOARD_COL2_INVERTED
+#define CONFIG_KEYBOARD_PROTOCOL_MKBP
+#define CONFIG_MKBP_USE_GPIO
 
 /* I2C */
 #define CONFIG_I2C
diff --git a/board/asurada/ec.tasklist b/board/asurada/ec.tasklist
index e294460eca..c551e9c1fe 100644
--- a/board/asurada/ec.tasklist
+++ b/board/asurada/ec.tasklist
@@ -14,4 +14,5 @@
 	TASK_ALWAYS(CHARGER, charger_task, NULL, VENTI_TASK_STACK_SIZE) \
 	TASK_ALWAYS(HOSTCMD, host_command_task, NULL, 1024) \
 	TASK_ALWAYS(CONSOLE, console_task, NULL, LARGER_TASK_STACK_SIZE) \
+	TASK_NOTEST(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \
 
diff --git a/board/asurada/gpio.inc b/board/asurada/gpio.inc
index 749a577b83..9acd819bf0 100644
--- a/board/asurada/gpio.inc
+++ b/board/asurada/gpio.inc
@@ -39,6 +39,7 @@ GPIO_INT(VOLUME_UP_L,        PIN(D, 5), GPIO_INT_BOTH | GPIO_PULL_UP,
 /* Power Sequencing Signals */
 
 /* MKBP event synchronization */
+GPIO(EC_INT_L,               PIN(E, 6), GPIO_ODR_HIGH) /* EC_AP_INT_ODL */
 
 /* USB and USBC Signals */
 
@@ -96,7 +97,6 @@ UNIMPLEMENTED_GPIO(AP_SPI_EC_CLK,          PIN(M, 4))
 UNIMPLEMENTED_GPIO(EC_RST_ODL,             PIN(L, 1))
 UNIMPLEMENTED_GPIO(SET_VMC_VOLT_AT_1V8,    PIN(D, 4))
 UNIMPLEMENTED_GPIO(AP_EC_WATCHDOG_L,       PIN(C, 7))
-UNIMPLEMENTED_GPIO(EC_AP_INT_ODL,          PIN(E, 6))
 UNIMPLEMENTED_GPIO(EC_PMIC_EN_ODL,         PIN(D, 0))
 UNIMPLEMENTED_GPIO(USB_C0_PPC_INT_ODL,     PIN(D, 1))
 UNIMPLEMENTED_GPIO(EN_PP3000_VMC_PMU,      PIN(D, 2))
@@ -108,33 +108,9 @@ UNIMPLEMENTED_GPIO(EC_LED_PWM3,            PIN(A, 3))
 UNIMPLEMENTED_GPIO(PG_PP5000_A_ODL,        PIN(A, 6))
 UNIMPLEMENTED_GPIO(USB_A0_FAULT_ODL,       PIN(A, 7))
 UNIMPLEMENTED_GPIO(USB_C1_MUX_INT_ODL,     PIN(E, 5))
-UNIMPLEMENTED_GPIO(KSO_01,                 PIN(KSO, 1))
-UNIMPLEMENTED_GPIO(KSO_00,                 PIN(KSO, 0))
-UNIMPLEMENTED_GPIO(EC_KSO_02_INV,          PIN(KSO, 2))
-UNIMPLEMENTED_GPIO(KSO_03,                 PIN(KSO, 3))
-UNIMPLEMENTED_GPIO(KSO_04,                 PIN(KSO, 4))
-UNIMPLEMENTED_GPIO(KSO_05,                 PIN(KSO, 5))
-UNIMPLEMENTED_GPIO(KSO_06,                 PIN(KSO, 6))
-UNIMPLEMENTED_GPIO(KSO_07,                 PIN(KSO, 7))
-UNIMPLEMENTED_GPIO(KSO_08,                 PIN(KSO, 8))
-UNIMPLEMENTED_GPIO(KSO_09,                 PIN(KSO, 9))
-UNIMPLEMENTED_GPIO(KSO_10,                 PIN(KSO, 10))
 UNIMPLEMENTED_GPIO(EN_PP1800_U,            PIN(D, 7))
-UNIMPLEMENTED_GPIO(KSO_11,                 PIN(KSO, 11))
-UNIMPLEMENTED_GPIO(KSO_12,                 PIN(KSO, 12))
-UNIMPLEMENTED_GPIO(KSO_13,                 PIN(KSO, 13))
-UNIMPLEMENTED_GPIO(KSO_14,                 PIN(KSO, 14))
-UNIMPLEMENTED_GPIO(RSVD,                   PIN(KSO, 15))
 UNIMPLEMENTED_GPIO(CHARGER_PROCHOT_ODL,    PIN(C, 3))
 UNIMPLEMENTED_GPIO(ENTERING_RW,            PIN(C, 5)) /* EC_ENTERING_RW */
-UNIMPLEMENTED_GPIO(KSI_00,                 PIN(KSI, 0))
-UNIMPLEMENTED_GPIO(KSI_01,                 PIN(KSI, 1))
-UNIMPLEMENTED_GPIO(EC_KSI_02,              PIN(KSI, 2))
-UNIMPLEMENTED_GPIO(EC_KSI_03,              PIN(KSI, 3))
-UNIMPLEMENTED_GPIO(KSI_04,                 PIN(KSI, 4))
-UNIMPLEMENTED_GPIO(KSI_05,                 PIN(KSI, 5))
-UNIMPLEMENTED_GPIO(KSI_06,                 PIN(KSI, 6))
-UNIMPLEMENTED_GPIO(KSI_07,                 PIN(KSI, 7))
 UNIMPLEMENTED_GPIO(EC_TEMP_SENSOR_SUBPMIC, PIN(I, 0))
 UNIMPLEMENTED_GPIO(EC_BOARD_ID0,           PIN(I, 1))
 UNIMPLEMENTED_GPIO(EC_BOARD_ID1,           PIN(I, 2))