diff options
| -rw-r--r-- | baseboard/dragonegg/baseboard.c | 2 | ||||
| -rw-r--r-- | baseboard/dragonegg/baseboard.h | 4 | ||||
| -rw-r--r-- | board/dragonegg/board.h | 1 | ||||
| -rw-r--r-- | board/dragonegg/gpio.inc | 7 |
4 files changed, 11 insertions, 3 deletions
diff --git a/baseboard/dragonegg/baseboard.c b/baseboard/dragonegg/baseboard.c index e4ed7344ab..54cc16a98d 100644 --- a/baseboard/dragonegg/baseboard.c +++ b/baseboard/dragonegg/baseboard.c @@ -84,7 +84,7 @@ const struct power_signal_info power_signal_list[] = { [X86_SLP_S0_DEASSERTED] = {GPIO_SLP_S0_L, POWER_SIGNAL_ACTIVE_HIGH | POWER_SIGNAL_DISABLE_AT_BOOT, "SLP_S0_DEASSERTED"}, -#ifdef CONFIG_HOSTCMD_ESPI_VW_SIGNALS +#ifdef CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS [X86_SLP_S3_DEASSERTED] = {VW_SLP_S3_L, POWER_SIGNAL_ACTIVE_HIGH, "SLP_S3_DEASSERTED"}, [X86_SLP_S4_DEASSERTED] = {VW_SLP_S4_L, POWER_SIGNAL_ACTIVE_HIGH, diff --git a/baseboard/dragonegg/baseboard.h b/baseboard/dragonegg/baseboard.h index 1334b1c36d..736bb321d9 100644 --- a/baseboard/dragonegg/baseboard.h +++ b/baseboard/dragonegg/baseboard.h @@ -14,6 +14,10 @@ #define CONFIG_CHIPSET_ICELAKE #define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_EXTPOWER_GPIO +#define CONFIG_HOSTCMD_ESPI +#define CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS +#define CONFIG_MKBP_EVENT +#define CONFIG_MKBP_USE_HOST_EVENT #define CONFIG_POWER_BUTTON #define CONFIG_POWER_BUTTON_X86 /* TODO(b/111155507): Don't enable SOiX for now */ diff --git a/board/dragonegg/board.h b/board/dragonegg/board.h index 039cdbbec5..e8aebe8061 100644 --- a/board/dragonegg/board.h +++ b/board/dragonegg/board.h @@ -14,7 +14,6 @@ /* Optional features */ #define CONFIG_SYSTEM_UNLOCKED /* Allow dangerous commands while in dev. */ #define CONFIG_LOW_POWER_IDLE -#define CONFIG_HOSTCMD_ESPI #undef CONFIG_UART_TX_BUF_SIZE #define CONFIG_UART_TX_BUF_SIZE 4096 diff --git a/board/dragonegg/gpio.inc b/board/dragonegg/gpio.inc index bd0f97510f..ec3b20ce48 100644 --- a/board/dragonegg/gpio.inc +++ b/board/dragonegg/gpio.inc @@ -20,7 +20,7 @@ GPIO_INT(UART1_RX, PIN(B, 0), GPIO_INT_BOTH, uart_deepsleep_interrupt) /* /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(E, 4), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SIGNALS +#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS GPIO_INT(SLP_S3_L, PIN(I, 4), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(SLP_S4_L, PIN(I, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif @@ -44,6 +44,11 @@ GPIO_INT(VOLUME_UP_L, PIN(I, 7), GPIO_INT_BOTH | GPIO_PULL_UP, button_inter GPIO_INT(ESPI_RESET_L, PIN(D, 2), GPIO_INT_FALLING | GPIO_SEL_1P8V, espi_reset_pin_asserted_interrupt) /* eSPI_reset# */ #endif +#ifdef CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS +GPIO(SLP_S3_L, PIN(I, 4), GPIO_INPUT) +GPIO(SLP_S4_L, PIN(I, 5), GPIO_INPUT) +#endif + GPIO(SYS_RESET_L, PIN(D, 1), GPIO_ODR_HIGH) /* SYS_RST_ODL */ GPIO(PCH_WAKE_L, PIN(D, 5), GPIO_ODR_HIGH) /* EC_PCH_WAKE_ODL */ GPIO(PCH_PWRBTN_L, PIN(B, 6), GPIO_ODR_HIGH) /* EC_PCH_PWR_BTN_ODL */ |