summaryrefslogtreecommitdiff
path: root/board/akemi
diff options
context:
space:
mode:
authorAbe Levkoy <alevkoy@chromium.org>2019-10-25 16:36:38 -0600
committerCommit Bot <commit-bot@chromium.org>2019-10-30 20:13:03 +0000
commit6136a62b472f028329863e4f5adb9464d68deafa (patch)
tree690ec695477fb2fc47d5d8835761e05f98c3b19c /board/akemi
parent3e3135b1b9ad2ff1a0d8f1b7448fd2c2f8198adb (diff)
downloadchrome-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/akemi')
-rw-r--r--board/akemi/gpio.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/board/akemi/gpio.inc b/board/akemi/gpio.inc
index b1cf284a1c..14c44fd4f6 100644
--- a/board/akemi/gpio.inc
+++ b/board/akemi/gpio.inc
@@ -16,8 +16,10 @@ 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
+#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_S4
GPIO_INT(SLP_S4_L, PIN(D, 4), GPIO_INT_BOTH, power_signal_interrupt)
#endif
GPIO_INT(PG_EC_RSMRST_L, PIN(E, 2), GPIO_INT_BOTH, intel_x86_rsmrst_signal_interrupt)