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 /power | |
| 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 'power')
| -rw-r--r-- | power/intel_x86.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/power/intel_x86.h b/power/intel_x86.h index ef71bf5a75..794ac28af5 100644 --- a/power/intel_x86.h +++ b/power/intel_x86.h @@ -27,11 +27,14 @@ #endif /* GPIO for power signal */ -#ifdef CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS +#ifdef CONFIG_HOSTCMD_ESPI_VW_SLP_S3 #define SLP_S3_SIGNAL_L VW_SLP_S3_L -#define SLP_S4_SIGNAL_L VW_SLP_S4_L #else #define SLP_S3_SIGNAL_L GPIO_PCH_SLP_S3_L +#endif +#ifdef CONFIG_HOSTCMD_ESPI_VW_SLP_S4 +#define SLP_S4_SIGNAL_L VW_SLP_S4_L +#else #define SLP_S4_SIGNAL_L GPIO_PCH_SLP_S4_L #endif |