diff options
| author | Abe Levkoy <alevkoy@chromium.org> | 2019-10-25 16:36:38 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-10-30 20:13:03 +0000 |
| commit | 6136a62b472f028329863e4f5adb9464d68deafa (patch) | |
| tree | 690ec695477fb2fc47d5d8835761e05f98c3b19c /board/fizz | |
| parent | 3e3135b1b9ad2ff1a0d8f1b7448fd2c2f8198adb (diff) | |
| download | chrome-ec-6136a62b472f028329863e4f5adb9464d68deafa.tar.gz | |
eSPI: Configure SLP_S3, SLP_S4 separately
Split the configuration option CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS into
separate options controlling SLP_S3 and SLP_S4. Allow volteer to
configure SLP_S3 as a GPIO and SLP_S4 as an eSPI virtual wire. Cause a
build error if virtual wires are configured, but eSPI is not.
BUG=b:139553375,b:143288478
TEST=make buildall
TEST=Build volteer with CONFIG_HOSTCMD_ESPI_VW_S4 defined but
CONFIG_HOSTCMD_ESPI undefined; observe build error
BRANCH=none
Change-Id: I8c6737e2ccb1a77a882e5fa65c6eddb342209b61
Signed-off-by: Abe Levkoy <alevkoy@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1881758
Reviewed-by: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'board/fizz')
| -rw-r--r-- | board/fizz/board.h | 8 | ||||
| -rw-r--r-- | board/fizz/gpio.inc | 5 |
2 files changed, 5 insertions, 8 deletions
diff --git a/board/fizz/board.h b/board/fizz/board.h index 28a70e546d..cabce30b3e 100644 --- a/board/fizz/board.h +++ b/board/fizz/board.h @@ -68,12 +68,8 @@ #define CONFIG_CHIPSET_HAS_PRE_INIT_CALLBACK #define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_HOSTCMD_ESPI -/* - * Eve and Poppy all have wires from GPIO to PCH but - * CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS is defined. So, those GPIOs are not used - * by EC. - */ -#define CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS +#define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 /* Charger */ #define CONFIG_CHARGE_MANAGER diff --git a/board/fizz/gpio.inc b/board/fizz/gpio.inc index c762876b29..7da0bfce71 100644 --- a/board/fizz/gpio.inc +++ b/board/fizz/gpio.inc @@ -13,9 +13,10 @@ GPIO_INT(AC_PRESENT, PIN(C, 1), GPIO_INT_BOTH, extpower_interrupt) GPIO_INT(POWER_BUTTON_L, PIN(0, 4), GPIO_INT_BOTH | GPIO_PULL_UP, power_button_interrupt) /* MECH_PWR_BTN_ODL */ GPIO_INT(PCH_SLP_S0_L, PIN(7, 5), GPIO_INT_BOTH, power_signal_interrupt) -/* Use VW signals instead of GPIOs */ -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS +#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 GPIO_INT(PCH_SLP_S3_L, PIN(7, 3), GPIO_INT_BOTH, power_signal_interrupt) +#endif +#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 GPIO_INT(PCH_SLP_S4_L, PIN(8, 6), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(PCH_SLP_SUS_L, PIN(6, 2), GPIO_INT_BOTH, power_signal_interrupt) |