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/poppy | |
| 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/poppy')
| -rw-r--r-- | board/poppy/board.h | 3 | ||||
| -rw-r--r-- | board/poppy/gpio.inc | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/board/poppy/board.h b/board/poppy/board.h index a98b84d48e..0896685d96 100644 --- a/board/poppy/board.h +++ b/board/poppy/board.h @@ -65,7 +65,8 @@ #define CONFIG_CHIPSET_HAS_PLATFORM_PMIC_RESET #define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_HOSTCMD_ESPI -#define CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS +#define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 +#define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 /* Battery */ #define CONFIG_BATTERY_CUT_OFF diff --git a/board/poppy/gpio.inc b/board/poppy/gpio.inc index 57c142600b..940d498a19 100644 --- a/board/poppy/gpio.inc +++ b/board/poppy/gpio.inc @@ -13,15 +13,16 @@ GPIO_INT(USB_C1_PD_INT_ODL, PIN(C, 5), GPIO_INT_FALLING, tcpc_alert_event) #ifdef CONFIG_POWER_S0IX GPIO_INT(PCH_SLP_S0_L, PIN(7, 5), GPIO_INT_BOTH, power_signal_interrupt) #endif -/* Use VW signals instead of GPIOs */ -#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS +#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 #ifdef BOARD_LUX GPIO_INT(PCH_SLP_S3_L, PIN(2, 2), GPIO_INT_BOTH, power_signal_interrupt) #else GPIO_INT(PCH_SLP_S3_L, PIN(7, 3), GPIO_INT_BOTH, power_signal_interrupt) #endif +#endif /* CONFIG_HOSTCMD_ESPI_VW_SLP_S3 */ +#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 GPIO_INT(PCH_SLP_S4_L, PIN(8, 6), GPIO_INT_BOTH, power_signal_interrupt) -#endif /* !CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS */ +#endif GPIO_INT(PCH_SLP_SUS_L, PIN(6, 2), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(RSMRST_L_PGOOD, PIN(B, 0), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PMIC_DPWROK, PIN(C, 7), GPIO_INT_BOTH, power_signal_interrupt) |