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/volteer | |
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/volteer')
-rw-r--r-- | board/volteer/board.h | 1 | ||||
-rw-r--r-- | board/volteer/gpio.inc | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/board/volteer/board.h b/board/volteer/board.h index 00cbd12451..9a636da471 100644 --- a/board/volteer/board.h +++ b/board/volteer/board.h @@ -61,7 +61,6 @@ #define GPIO_PCH_SYS_PWROK GPIO_EC_PCH_SYS_PWROK #define GPIO_PCH_SLP_S0_L GPIO_SLP_S0_L #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L -#define GPIO_PCH_SLP_S4_L GPIO_SLP_S4_L #define GPIO_PG_EC_DSW_PWROK GPIO_DSW_PWROK #define GPIO_POWER_BUTTON_L GPIO_H1_EC_PWR_BTN_ODL #define GPIO_RSMRST_L_PGOOD GPIO_PG_EC_RSMRST_ODL diff --git a/board/volteer/gpio.inc b/board/volteer/gpio.inc index 852431eea1..fee9e6f0c6 100644 --- a/board/volteer/gpio.inc +++ b/board/volteer/gpio.inc @@ -16,15 +16,12 @@ GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, ex /* Power sequencing interrupts */ GPIO_INT(SLP_S0_L, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS +#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif GPIO_INT(SLP_SUS_L, PIN(D, 7), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PG_EC_RSMRST_ODL, PIN(E, 2), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(DSW_PWROK, PIN(C, 7), GPIO_INT_BOTH, power_signal_interrupt) -/* TODO(b/139553375): This signal is virtual; need to change code to support - * virtual S4 with physical S3. */ -UNIMPLEMENTED(SLP_S4_L) /* Sensor Interrupts */ |