summaryrefslogtreecommitdiff
path: root/board/poppy
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2018-07-25 22:38:11 -0700
committerchrome-bot <chrome-bot@chromium.org>2018-07-27 08:50:53 -0700
commit8f243ce8444e5cf1d98e52849f1e3742db77db7b (patch)
tree13cf4b862f786dd3850944fd4cd9caabf8c092df /board/poppy
parenta7b3c658db84073b0af5e3907515ecac6c93589a (diff)
downloadchrome-ec-8f243ce8444e5cf1d98e52849f1e3742db77db7b.tar.gz
espi: Rename CONFIG_HOSTCMD_ESPI_VW_SIGNALS to CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS
This change renames CONFIG_HOSTCMD_ESPI_VW_SIGNALS to CONFIG_HOSTCMD_ESPI_VW_SIGNALS in order to make it clear that this config option indicates that chipset sleep signals (SLP_S3 and SLP_S4) are tranmitted over virtual wires instead of physical lines with eSPI. BUG=b:111859300 BRANCH=None TEST=make -j buildall Change-Id: Iab4423abc9102164d4f43296a279c24355445341 Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://chromium-review.googlesource.com/1151048 Commit-Ready: Furquan Shaikh <furquan@chromium.org> Tested-by: Furquan Shaikh <furquan@chromium.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Jett Rink <jettrink@chromium.org>
Diffstat (limited to 'board/poppy')
-rw-r--r--board/poppy/board.c2
-rw-r--r--board/poppy/board.h2
-rw-r--r--board/poppy/gpio.inc4
3 files changed, 4 insertions, 4 deletions
diff --git a/board/poppy/board.c b/board/poppy/board.c
index 87ad189015..e20685e40f 100644
--- a/board/poppy/board.c
+++ b/board/poppy/board.c
@@ -167,7 +167,7 @@ const struct power_signal_info power_signal_list[] = {
POWER_SIGNAL_ACTIVE_HIGH | POWER_SIGNAL_DISABLE_AT_BOOT,
"SLP_S0_DEASSERTED"},
#endif
-#ifdef CONFIG_HOSTCMD_ESPI_VW_SIGNALS
+#ifdef CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS
{VW_SLP_S3_L, POWER_SIGNAL_ACTIVE_HIGH, "SLP_S3_DEASSERTED"},
{VW_SLP_S4_L, POWER_SIGNAL_ACTIVE_HIGH, "SLP_S4_DEASSERTED"},
#else
diff --git a/board/poppy/board.h b/board/poppy/board.h
index 357c1a13f7..948f4ec7f8 100644
--- a/board/poppy/board.h
+++ b/board/poppy/board.h
@@ -62,7 +62,7 @@
#define CONFIG_CHIPSET_HAS_PLATFORM_PMIC_RESET
#define CONFIG_CHIPSET_RESET_HOOK
#define CONFIG_HOSTCMD_ESPI
-#define CONFIG_HOSTCMD_ESPI_VW_SIGNALS
+#define CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS
/* Battery */
#define CONFIG_BATTERY_CUT_OFF
diff --git a/board/poppy/gpio.inc b/board/poppy/gpio.inc
index dd88af7d3e..57c142600b 100644
--- a/board/poppy/gpio.inc
+++ b/board/poppy/gpio.inc
@@ -14,14 +14,14 @@ GPIO_INT(USB_C1_PD_INT_ODL, PIN(C, 5), GPIO_INT_FALLING, tcpc_alert_event)
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_SIGNALS
+#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS
#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
GPIO_INT(PCH_SLP_S4_L, PIN(8, 6), GPIO_INT_BOTH, power_signal_interrupt)
-#endif /* !CONFIG_HOSTCMD_ESPI_VW_SIGNALS */
+#endif /* !CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS */
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)