diff --git a/board/it8380dev/board.h b/board/it8380dev/board.h
index 27899a67b8..2655c8ec74 100644
--- a/board/it8380dev/board.h
+++ b/board/it8380dev/board.h
@@ -14,7 +14,6 @@
 #define CONFIG_FANS 1
 #define CONFIG_I2C
 #define CONFIG_I2C_MASTER
-#define CONFIG_IT83XX_KEYBOARD_KSI_WUC_INT
 #define CONFIG_IT83XX_LPC_ACCESS_INT
 #define CONFIG_IT83XX_SMCLK2_ON_GPC7
 #define CONFIG_KEYBOARD_BOARD_CONFIG
diff --git a/chip/it83xx/gpio.c b/chip/it83xx/gpio.c
index cdfa32c9a3..41e18ed13c 100644
--- a/chip/it83xx/gpio.c
+++ b/chip/it83xx/gpio.c
@@ -466,7 +466,7 @@ static void __gpio_irq(void)
 	/* Determine interrupt number. */
 	int irq = intc_get_ec_int();
 
-#if defined(HAS_TASK_KEYSCAN) && defined(CONFIG_IT83XX_KEYBOARD_KSI_WUC_INT)
+#ifdef HAS_TASK_KEYSCAN
 	if (irq == IT83XX_IRQ_WKINTC) {
 		keyboard_raw_interrupt();
 		return;
diff --git a/chip/it83xx/intc.c b/chip/it83xx/intc.c
index 4bfa1686b7..432eb7b34d 100644
--- a/chip/it83xx/intc.c
+++ b/chip/it83xx/intc.c
@@ -23,11 +23,6 @@ void intc_cpu_int_group_5(void)
 	case IT83XX_IRQ_KBC_IN:
 		lpc_kbc_ibf_interrupt();
 		break;
-#endif
-#if defined(HAS_TASK_KEYSCAN) && !defined(CONFIG_IT83XX_KEYBOARD_KSI_WUC_INT)
-	case IT83XX_IRQ_KB_MATRIX:
-		keyboard_raw_interrupt();
-		break;
 #endif
 	default:
 		break;
diff --git a/chip/it83xx/keyboard_raw.c b/chip/it83xx/keyboard_raw.c
index 343574e51a..42f877ffcc 100644
--- a/chip/it83xx/keyboard_raw.c
+++ b/chip/it83xx/keyboard_raw.c
@@ -35,7 +35,6 @@ void keyboard_raw_init(void)
 	/* KSO[15:8] pins low. */
 	IT83XX_KBS_KSOH1 = 0x00;
 
-#ifdef CONFIG_IT83XX_KEYBOARD_KSI_WUC_INT
 	/* KSI[0-7] falling-edge triggered is selected */
 	IT83XX_WUC_WUEMR3 = 0xFF;
 
@@ -46,10 +45,6 @@ void keyboard_raw_init(void)
 
 	/* Enable WUC for KSI[0-7] */
 	IT83XX_WUC_WUENR3 = 0xFF;
-#else
-	task_clear_pending_irq(IT83XX_IRQ_KB_MATRIX);
-#endif
-
 }
 
 /*
@@ -57,14 +52,9 @@ void keyboard_raw_init(void)
  */
 void keyboard_raw_task_start(void)
 {
-#ifdef CONFIG_IT83XX_KEYBOARD_KSI_WUC_INT
 	IT83XX_WUC_WUESR3 = 0xFF;
 	task_clear_pending_irq(IT83XX_IRQ_WKINTC);
 	task_enable_irq(IT83XX_IRQ_WKINTC);
-#else
-	task_clear_pending_irq(IT83XX_IRQ_KB_MATRIX);
-	task_enable_irq(IT83XX_IRQ_KB_MATRIX);
-#endif
 }
 
 /*
@@ -104,20 +94,11 @@ test_mockable int keyboard_raw_read_rows(void)
 void keyboard_raw_enable_interrupt(int enable)
 {
 	if (enable) {
-#ifdef CONFIG_IT83XX_KEYBOARD_KSI_WUC_INT
 		IT83XX_WUC_WUESR3 = 0xFF;
 		task_clear_pending_irq(IT83XX_IRQ_WKINTC);
 		task_enable_irq(IT83XX_IRQ_WKINTC);
-#else
-		task_clear_pending_irq(IT83XX_IRQ_KB_MATRIX);
-		task_enable_irq(IT83XX_IRQ_KB_MATRIX);
-#endif
 	} else {
-#ifdef CONFIG_IT83XX_KEYBOARD_KSI_WUC_INT
 		task_disable_irq(IT83XX_IRQ_WKINTC);
-#else
-		task_disable_irq(IT83XX_IRQ_KB_MATRIX);
-#endif
 	}
 }
 
@@ -126,11 +107,8 @@ void keyboard_raw_enable_interrupt(int enable)
  */
 void keyboard_raw_interrupt(void)
 {
-#ifdef CONFIG_IT83XX_KEYBOARD_KSI_WUC_INT
-	task_disable_irq(IT83XX_IRQ_WKINTC);
-#else
-	task_disable_irq(IT83XX_IRQ_KB_MATRIX);
-#endif
+	IT83XX_WUC_WUESR3 = 0xFF;
+	task_clear_pending_irq(IT83XX_IRQ_WKINTC);
 
 	/* Wake the scan task */
 	task_wake(TASK_ID_KEYSCAN);
diff --git a/include/config.h b/include/config.h
index 225aaedf4d..cd3fb890f2 100644
--- a/include/config.h
+++ b/include/config.h
@@ -1173,9 +1173,6 @@
  */
 #undef CONFIG_IT83XX_ILM_BLOCK_SIZE
 
-/* Enable Wake-up control interrupt from KSI */
-#undef CONFIG_IT83XX_KEYBOARD_KSI_WUC_INT
-
 /* LPC cycle can wake-up EC from doze / deep doze mode if define it. */
 #undef CONFIG_IT83XX_LPC_ACCESS_INT