diff options
Diffstat (limited to 'board')
| -rw-r--r-- | board/aleena/board.h | 2 | ||||
| -rw-r--r-- | board/bip/board.h | 1 | ||||
| -rw-r--r-- | board/casta/board.h | 1 | ||||
| -rw-r--r-- | board/cheza/board.h | 1 | ||||
| -rw-r--r-- | board/elm/board.h | 1 | ||||
| -rw-r--r-- | board/flapjack/board.h | 1 | ||||
| -rw-r--r-- | board/jerry/board.h | 1 | ||||
| -rw-r--r-- | board/kukui/board.h | 1 | ||||
| -rw-r--r-- | board/nocturne/board.c | 20 | ||||
| -rw-r--r-- | board/nocturne/board.h | 1 | ||||
| -rw-r--r-- | board/nocturne_fp/board.h | 1 | ||||
| -rw-r--r-- | board/npcx_evb_arm/board.h | 1 | ||||
| -rw-r--r-- | board/oak/board.h | 1 | ||||
| -rw-r--r-- | board/rainier/board.h | 1 | ||||
| -rw-r--r-- | board/rowan/board.h | 1 | ||||
| -rw-r--r-- | board/scarlet/board.h | 1 |
16 files changed, 16 insertions, 20 deletions
diff --git a/board/aleena/board.h b/board/aleena/board.h index aeb75404a6..3c5cf048b7 100644 --- a/board/aleena/board.h +++ b/board/aleena/board.h @@ -29,6 +29,8 @@ /* KB backlight driver */ #define CONFIG_LED_DRIVER_LM3630A +#define CONFIG_MKBP_USE_GPIO + /* Motion sensing drivers */ #define CONFIG_ACCELGYRO_BMI160 #define CONFIG_ACCELGYRO_BMI160_INT_EVENT TASK_EVENT_CUSTOM(4) diff --git a/board/bip/board.h b/board/bip/board.h index 3a618e982e..a7671902f9 100644 --- a/board/bip/board.h +++ b/board/bip/board.h @@ -29,6 +29,7 @@ #undef CONFIG_PWM_KBLIGHT /* Old hardware does not support dedicated EC->AP interrupt for MKBP */ +#undef CONFIG_MKBP_USE_GPIO #define CONFIG_MKBP_USE_HOST_EVENT #undef CONFIG_UART_TX_BUF_SIZE diff --git a/board/casta/board.h b/board/casta/board.h index 554a36e3f0..c99ae1e696 100644 --- a/board/casta/board.h +++ b/board/casta/board.h @@ -37,6 +37,7 @@ #define CONFIG_STEINHART_HART_3V3_13K7_47K_4050B #define CONFIG_STEINHART_HART_3V3_51K1_47K_4050B #define CONFIG_MKBP_EVENT +#undef CONFIG_MKBP_USE_GPIO #define CONFIG_MKBP_USE_HOST_EVENT /* Battery W/A */ diff --git a/board/cheza/board.h b/board/cheza/board.h index d005f624d1..174cce0c15 100644 --- a/board/cheza/board.h +++ b/board/cheza/board.h @@ -55,6 +55,7 @@ #define CONFIG_HOSTCMD_SECTION_SORTED /* Host commands are sorted. */ #define CONFIG_MKBP_EVENT #define CONFIG_KEYBOARD_PROTOCOL_MKBP +#define CONFIG_MKBP_USE_GPIO #define CONFIG_BOARD_VERSION_GPIO #define CONFIG_POWER_BUTTON diff --git a/board/elm/board.h b/board/elm/board.h index b2036896e4..8d1283244c 100644 --- a/board/elm/board.h +++ b/board/elm/board.h @@ -65,6 +65,7 @@ #define CONFIG_LID_SWITCH #define CONFIG_LOW_POWER_IDLE #define CONFIG_MKBP_EVENT +#define CONFIG_MKBP_USE_GPIO #define CONFIG_POWER_BUTTON #define CONFIG_POWER_COMMON #define CONFIG_USB_CHARGER diff --git a/board/flapjack/board.h b/board/flapjack/board.h index a281d4fdec..acdce43d54 100644 --- a/board/flapjack/board.h +++ b/board/flapjack/board.h @@ -202,6 +202,7 @@ #define CONFIG_KEYBOARD_PROTOCOL_MKBP #define CONFIG_MKBP_EVENT +#define CONFIG_MKBP_USE_GPIO /* Define the MKBP events which are allowed to wakeup AP in S3. */ #define CONFIG_MKBP_WAKEUP_MASK \ (EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON) |\ diff --git a/board/jerry/board.h b/board/jerry/board.h index ad8fdceeb8..da5de695df 100644 --- a/board/jerry/board.h +++ b/board/jerry/board.h @@ -37,6 +37,7 @@ #define CONFIG_LED_POWER_ACTIVE_LOW #define CONFIG_LOW_POWER_IDLE #define CONFIG_LOW_POWER_S0 +#define CONFIG_MKBP_USE_GPIO #define CONFIG_POWER_BUTTON #define CONFIG_POWER_BUTTON_ACTIVE_STATE 1 #define CONFIG_POWER_COMMON diff --git a/board/kukui/board.h b/board/kukui/board.h index 76196b8a12..6e1ef13b61 100644 --- a/board/kukui/board.h +++ b/board/kukui/board.h @@ -192,6 +192,7 @@ #define CONFIG_KEYBOARD_PROTOCOL_MKBP #define CONFIG_MKBP_EVENT +#define CONFIG_MKBP_USE_GPIO /* Define the MKBP events which are allowed to wakeup AP in S3. */ #define CONFIG_MKBP_WAKEUP_MASK \ (EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON) |\ diff --git a/board/nocturne/board.c b/board/nocturne/board.c index 3b170dd06f..de373e417f 100644 --- a/board/nocturne/board.c +++ b/board/nocturne/board.c @@ -402,26 +402,6 @@ void board_hibernate(void) ; } -static int mkbp_uses_gpio(void) -{ - return board_get_version() >= 2; -} - -void mkbp_set_host_active(int active) -{ - if (mkbp_uses_gpio()) - mkbp_set_host_active_via_gpio(active); - - /* - * Always send the host event for compatibility. - * On board versions 2 and newer, the firmware is configured - * to not actually trigger an SCI on MKBP events. This means that - * the EC can send host event notifications without concern for the - * board version and expect the right thing to happen. - */ - mkbp_set_host_active_via_event(active); -} - static void board_init(void) { /* Enable USB Type-C interrupts. */ diff --git a/board/nocturne/board.h b/board/nocturne/board.h index fcd9adb5fd..15464dfba7 100644 --- a/board/nocturne/board.h +++ b/board/nocturne/board.h @@ -86,6 +86,7 @@ /* MKBP */ #define CONFIG_MKBP_EVENT #define CONFIG_KEYBOARD_PROTOCOL_MKBP +#define CONFIG_MKBP_USE_GPIO /* Sensors */ #define CONFIG_ALS diff --git a/board/nocturne_fp/board.h b/board/nocturne_fp/board.h index 5d3807c709..82fa7805b7 100644 --- a/board/nocturne_fp/board.h +++ b/board/nocturne_fp/board.h @@ -87,6 +87,7 @@ #undef CONFIG_LID_SWITCH #define CONFIG_LOW_POWER_IDLE #define CONFIG_MKBP_EVENT +#define CONFIG_MKBP_USE_GPIO #define CONFIG_PRINTF_LEGACY_LI_FORMAT #define CONFIG_SHA256 #define CONFIG_SHA256_UNROLLED diff --git a/board/npcx_evb_arm/board.h b/board/npcx_evb_arm/board.h index c6c09b1c58..0b3ab503e9 100644 --- a/board/npcx_evb_arm/board.h +++ b/board/npcx_evb_arm/board.h @@ -22,6 +22,7 @@ #define CONFIG_I2C_MASTER #define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_MKBP /* Instead of 8042 protocol of keyboard */ +#define CONFIG_MKBP_USE_GPIO #define CONFIG_POWER_BUTTON #define CONFIG_VBOOT_HASH #define CONFIG_PWM_KBLIGHT diff --git a/board/oak/board.h b/board/oak/board.h index 3e8dbd0698..b84b852679 100644 --- a/board/oak/board.h +++ b/board/oak/board.h @@ -83,6 +83,7 @@ #define CONFIG_LID_SWITCH #define CONFIG_LOW_POWER_IDLE #define CONFIG_MKBP_EVENT +#define CONFIG_MKBP_USE_GPIO #define CONFIG_POWER_BUTTON #define CONFIG_POWER_COMMON #define CONFIG_USB_CHARGER diff --git a/board/rainier/board.h b/board/rainier/board.h index 7c56a8c2c7..2fc5ac63a1 100644 --- a/board/rainier/board.h +++ b/board/rainier/board.h @@ -129,6 +129,7 @@ #define CONFIG_KEYBOARD_PROTOCOL_MKBP #define CONFIG_MKBP_EVENT +#define CONFIG_MKBP_USE_GPIO /* Define the MKBP events which are allowed to wakeup AP in S3. */ #define CONFIG_MKBP_WAKEUP_MASK \ (EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON) |\ diff --git a/board/rowan/board.h b/board/rowan/board.h index 839dbdf262..95f34d9e3d 100644 --- a/board/rowan/board.h +++ b/board/rowan/board.h @@ -70,6 +70,7 @@ #define CONFIG_LID_SWITCH #define CONFIG_LOW_POWER_IDLE #define CONFIG_MKBP_EVENT +#define CONFIG_MKBP_USE_GPIO #define CONFIG_POWER_BUTTON #define CONFIG_POWER_COMMON #define CONFIG_USB_CHARGER diff --git a/board/scarlet/board.h b/board/scarlet/board.h index c5698fd096..e440ef4948 100644 --- a/board/scarlet/board.h +++ b/board/scarlet/board.h @@ -179,6 +179,7 @@ #define CONFIG_KEYBOARD_PROTOCOL_MKBP #define CONFIG_MKBP_EVENT +#define CONFIG_MKBP_USE_GPIO /* Define the MKBP events which are allowed to wakeup AP in S3. */ #define CONFIG_MKBP_WAKEUP_MASK \ (EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON) |\ |