summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--board/atlas/board.h2
-rw-r--r--board/dragonegg/board.h2
-rw-r--r--board/eve/board.h2
-rw-r--r--board/fizz/board.c2
-rw-r--r--board/fizz/board.h6
-rw-r--r--board/fizz/gpio.inc2
-rw-r--r--board/it83xx_evb/gpio.inc2
-rw-r--r--board/mchpevb1/board.h2
-rw-r--r--board/nami/board.h2
-rw-r--r--board/nautilus/board.c2
-rw-r--r--board/nautilus/board.h2
-rw-r--r--board/nautilus/gpio.inc2
-rw-r--r--board/npcx7_evb/board.h2
-rw-r--r--board/poppy/board.c2
-rw-r--r--board/poppy/board.h2
-rw-r--r--board/poppy/gpio.inc4
-rw-r--r--board/rammus/board.c2
-rw-r--r--board/rammus/board.h2
-rw-r--r--board/rammus/gpio.inc2
-rw-r--r--board/reef_it8320/gpio.inc2
-rw-r--r--board/zoombini/board.c8
-rw-r--r--board/zoombini/board.h2
-rw-r--r--board/zoombini/gpio.inc4
-rw-r--r--include/config.h7
-rw-r--r--power/common.c8
-rw-r--r--power/intel_x86.c4
26 files changed, 41 insertions, 38 deletions
diff --git a/board/atlas/board.h b/board/atlas/board.h
index 1675fc27cf..4d863adda9 100644
--- a/board/atlas/board.h
+++ b/board/atlas/board.h
@@ -62,7 +62,7 @@
#define CONFIG_CHIPSET_RESET_HOOK
#define CONFIG_CPU_PROCHOT_ACTIVE_LOW
#define CONFIG_HOSTCMD_ESPI
-#define CONFIG_HOSTCMD_ESPI_VW_SIGNALS
+#define CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS
#define CONFIG_KEYBOARD_BOARD_CONFIG
#define CONFIG_KEYBOARD_COL2_INVERTED
#define CONFIG_KEYBOARD_PROTOCOL_8042
diff --git a/board/dragonegg/board.h b/board/dragonegg/board.h
index 5c207d0fb0..d9b166e1ad 100644
--- a/board/dragonegg/board.h
+++ b/board/dragonegg/board.h
@@ -17,7 +17,7 @@
#define CONFIG_LOW_POWER_IDLE
#define CONFIG_HOSTCMD_ESPI
-#define CONFIG_HOSTCMD_ESPI_VW_SIGNALS
+#define CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS
#undef CONFIG_UART_TX_BUF_SIZE
#define CONFIG_UART_TX_BUF_SIZE 4096
diff --git a/board/eve/board.h b/board/eve/board.h
index 5ab76fe4cd..ac2fb94172 100644
--- a/board/eve/board.h
+++ b/board/eve/board.h
@@ -67,7 +67,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
#define CONFIG_KEYBOARD_BOARD_CONFIG
#define CONFIG_KEYBOARD_COL2_INVERTED
#define CONFIG_KEYBOARD_PROTOCOL_8042
diff --git a/board/fizz/board.c b/board/fizz/board.c
index 7e4135be47..fdc4a5620e 100644
--- a/board/fizz/board.c
+++ b/board/fizz/board.c
@@ -126,7 +126,7 @@ void vbus0_evt(enum gpio_signal signal)
/* power signal list. Must match order of enum power_signal. */
const struct power_signal_info power_signal_list[] = {
{GPIO_PCH_SLP_S0_L, POWER_SIGNAL_ACTIVE_HIGH, "SLP_S0_DEASSERTED"},
-#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/fizz/board.h b/board/fizz/board.h
index 30b2ef8276..fd6646fec1 100644
--- a/board/fizz/board.h
+++ b/board/fizz/board.h
@@ -68,10 +68,10 @@
#define CONFIG_HOSTCMD_ESPI
/*
* Eve and Poppy all have wires from GPIO to PCH but
- * CONFIG_HOSTCMD_ESPI_VW_SIGNALS is defined. So, those GPIOs are not used by
- * EC.
+ * CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS is defined. So, those GPIOs are not used
+ * by EC.
*/
-#define CONFIG_HOSTCMD_ESPI_VW_SIGNALS
+#define CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS
/* Charger */
#define CONFIG_CHARGE_MANAGER
diff --git a/board/fizz/gpio.inc b/board/fizz/gpio.inc
index b5c2087d20..c762876b29 100644
--- a/board/fizz/gpio.inc
+++ b/board/fizz/gpio.inc
@@ -14,7 +14,7 @@ GPIO_INT(POWER_BUTTON_L, PIN(0, 4), GPIO_INT_BOTH | GPIO_PULL_UP, power_button_i
GPIO_INT(PCH_SLP_S0_L, PIN(7, 5), GPIO_INT_BOTH, power_signal_interrupt)
/* Use VW signals instead of GPIOs */
-#ifndef CONFIG_HOSTCMD_ESPI_VW_SIGNALS
+#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS
GPIO_INT(PCH_SLP_S3_L, PIN(7, 3), GPIO_INT_BOTH, power_signal_interrupt)
GPIO_INT(PCH_SLP_S4_L, PIN(8, 6), GPIO_INT_BOTH, power_signal_interrupt)
#endif
diff --git a/board/it83xx_evb/gpio.inc b/board/it83xx_evb/gpio.inc
index d68c0d28d2..51438277d0 100644
--- a/board/it83xx_evb/gpio.inc
+++ b/board/it83xx_evb/gpio.inc
@@ -9,7 +9,7 @@
* Note: Those with interrupt handlers must be declared first. */
GPIO_INT(POWER_BUTTON_L, PIN(E, 4), GPIO_INT_BOTH | GPIO_PULL_UP, power_button_interrupt)
-#ifndef CONFIG_HOSTCMD_ESPI_VW_SIGNALS
+#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS
GPIO_INT(PCH_PLTRST_L, PIN(E, 3), GPIO_INT_BOTH | GPIO_PULL_UP, lpcrst_interrupt)
#endif
GPIO_INT(LID_OPEN, PIN(E, 2), GPIO_INT_BOTH | GPIO_PULL_DOWN, lid_interrupt)
diff --git a/board/mchpevb1/board.h b/board/mchpevb1/board.h
index 2683d980be..9cc28a38fd 100644
--- a/board/mchpevb1/board.h
+++ b/board/mchpevb1/board.h
@@ -172,7 +172,7 @@
#define CONFIG_CHIPSET_RESET_HOOK
#define CONFIG_HOSTCMD_ESPI
-#define CONFIG_HOSTCMD_ESPI_VW_SIGNALS
+#define CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS
#define CONFIG_CLOCK_CRYSTAL
#define CONFIG_EXTPOWER_GPIO
diff --git a/board/nami/board.h b/board/nami/board.h
index f0764e1c72..bc0ed4e73b 100644
--- a/board/nami/board.h
+++ b/board/nami/board.h
@@ -76,7 +76,7 @@
#define CONFIG_CHIPSET_HAS_PRE_INIT_CALLBACK
#define CONFIG_CHIPSET_RESET_HOOK
#define CONFIG_HOSTCMD_ESPI
-#define CONFIG_HOSTCMD_ESPI_VW_SIGNALS
+#define CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS
#define CONFIG_HOSTCMD_FLASH_SPI_INFO
/* Battery */
diff --git a/board/nautilus/board.c b/board/nautilus/board.c
index 57b9de2388..39d46283e5 100644
--- a/board/nautilus/board.c
+++ b/board/nautilus/board.c
@@ -119,7 +119,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/nautilus/board.h b/board/nautilus/board.h
index 80e2111774..c7e91afbf2 100644
--- a/board/nautilus/board.h
+++ b/board/nautilus/board.h
@@ -63,7 +63,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/nautilus/gpio.inc b/board/nautilus/gpio.inc
index 0d6f04e977..61d37cbcae 100644
--- a/board/nautilus/gpio.inc
+++ b/board/nautilus/gpio.inc
@@ -14,7 +14,7 @@ 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
GPIO_INT(PCH_SLP_S3_L, PIN(7, 3), GPIO_INT_BOTH, power_signal_interrupt)
GPIO_INT(PCH_SLP_S4_L, PIN(8, 6), GPIO_INT_BOTH, power_signal_interrupt)
#endif
diff --git a/board/npcx7_evb/board.h b/board/npcx7_evb/board.h
index 9080615006..7bdb0d5aa0 100644
--- a/board/npcx7_evb/board.h
+++ b/board/npcx7_evb/board.h
@@ -22,7 +22,7 @@
#define CONFIG_I2C
/* Features of eSPI */
#define CONFIG_HOSTCMD_ESPI
-#define CONFIG_HOSTCMD_ESPI_VW_SIGNALS /* Use VW signals instead of GPIOs */
+#define CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS /* Use VW signals instead of GPIOs */
/* Optional features */
#define CONFIG_BOARD_VERSION_GPIO
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)
diff --git a/board/rammus/board.c b/board/rammus/board.c
index 57b9de2388..39d46283e5 100644
--- a/board/rammus/board.c
+++ b/board/rammus/board.c
@@ -119,7 +119,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/rammus/board.h b/board/rammus/board.h
index 80e2111774..c7e91afbf2 100644
--- a/board/rammus/board.h
+++ b/board/rammus/board.h
@@ -63,7 +63,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/rammus/gpio.inc b/board/rammus/gpio.inc
index 0d6f04e977..61d37cbcae 100644
--- a/board/rammus/gpio.inc
+++ b/board/rammus/gpio.inc
@@ -14,7 +14,7 @@ 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
GPIO_INT(PCH_SLP_S3_L, PIN(7, 3), GPIO_INT_BOTH, power_signal_interrupt)
GPIO_INT(PCH_SLP_S4_L, PIN(8, 6), GPIO_INT_BOTH, power_signal_interrupt)
#endif
diff --git a/board/reef_it8320/gpio.inc b/board/reef_it8320/gpio.inc
index 6d029c1cde..6c07d19f38 100644
--- a/board/reef_it8320/gpio.inc
+++ b/board/reef_it8320/gpio.inc
@@ -20,7 +20,7 @@ GPIO_INT(PCH_SLP_S0_L, PIN(B, 7), GPIO_INT_BOTH, power_signal_interrupt) /*
#endif
GPIO_INT(SUSPWRNACK, PIN(E, 1), GPIO_INT_BOTH, power_signal_interrupt) /* SUSPWRNACK */
GPIO_INT(LID_OPEN, PIN(E, 2), GPIO_INT_BOTH, lid_interrupt) /* LID_OPEN */
-#ifndef CONFIG_HOSTCMD_ESPI_VW_SIGNALS
+#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS
GPIO_INT(PCH_PLTRST_L, PIN(E, 3), GPIO_INT_BOTH | GPIO_PULL_UP, lpcrst_interrupt) /* PLT_RST_L */
#endif
GPIO_INT(POWER_BUTTON_L, PIN(E, 4), GPIO_INT_BOTH, power_button_interrupt) /* MECH_PWR_BTN_ODL */
diff --git a/board/zoombini/board.c b/board/zoombini/board.c
index 9d264b1fbf..0fd3f28518 100644
--- a/board/zoombini/board.c
+++ b/board/zoombini/board.c
@@ -22,9 +22,9 @@
#include "driver/sync.h"
#include "driver/tcpm/ps8xxx.h"
#include "ec_commands.h"
-#ifdef CONFIG_HOSTCMD_ESPI_VW_SIGNALS
+#ifdef CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS
#include "espi.h"
-#endif /* defined(CONFIG_HOSTCMD_ESPI_VW_SIGNALS) */
+#endif /* defined(CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS) */
#include "extpower.h"
#include "gpio.h"
#include "hooks.h"
@@ -165,13 +165,13 @@ const struct power_signal_info power_signal_list[] = {
{GPIO_PCH_SLP_S0_L,
POWER_SIGNAL_ACTIVE_HIGH | POWER_SIGNAL_DISABLE_AT_BOOT,
"SLP_S0_DEASSERTED"},
-#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
{GPIO_PCH_SLP_S3_L, POWER_SIGNAL_ACTIVE_HIGH, "SLP_S3_DEASSERTED"},
{GPIO_PCH_SLP_S4_L, POWER_SIGNAL_ACTIVE_HIGH, "SLP_S4_DEASSERTED"},
-#endif /* defined(CONFIG_HOSTCMD_ESPI_VW_SIGNALS) */
+#endif /* defined(CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS) */
{GPIO_PCH_SLP_SUS_L, POWER_SIGNAL_ACTIVE_HIGH, "SLP_SUS_DEASSERTED"},
{GPIO_RSMRST_L_PGOOD, POWER_SIGNAL_ACTIVE_HIGH, "RSMRST_L_PGOOD"},
{GPIO_PMIC_DPWROK, POWER_SIGNAL_ACTIVE_HIGH, "PMIC_DPWROK"},
diff --git a/board/zoombini/board.h b/board/zoombini/board.h
index 34fbddbae6..582412d9fb 100644
--- a/board/zoombini/board.h
+++ b/board/zoombini/board.h
@@ -38,7 +38,7 @@
#define CONFIG_ADC
#define CONFIG_HOSTCMD_ESPI
/* TODO(aaboagye): Uncomment when Si arrives. */
-/* #define CONFIG_HOSTCMD_ESPI_VW_SIGNALS */
+/* #define CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS */
#define CONFIG_I2C
#define CONFIG_PWM
diff --git a/board/zoombini/gpio.inc b/board/zoombini/gpio.inc
index 53e72dfc4f..7d41d17148 100644
--- a/board/zoombini/gpio.inc
+++ b/board/zoombini/gpio.inc
@@ -25,10 +25,10 @@ GPIO_INT(AC_PRESENT, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, extpowe
/* Power Signals. */
GPIO_INT(PCH_SLP_S0_L, PIN(A, 4), GPIO_INT_BOTH, power_signal_interrupt)
-#ifndef CONFIG_HOSTCMD_ESPI_VW_SIGNALS
+#ifndef CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS
GPIO_INT(PCH_SLP_S3_L, PIN(A, 6), GPIO_INT_BOTH, power_signal_interrupt)
GPIO_INT(PCH_SLP_S4_L, PIN(A, 3), GPIO_INT_BOTH, power_signal_interrupt)
-#endif /* defined(CONFIG_HOSTCMD_ESPI_VW_SIGNALS) */
+#endif /* defined(CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS) */
GPIO_INT(PCH_SLP_SUS_L, PIN(D, 4), GPIO_INT_BOTH, power_signal_interrupt)
/* TODO(aaboagye): Internal PU may be needed later on... */
GPIO_INT(RSMRST_L_PGOOD, PIN(E, 2), GPIO_INT_BOTH, power_signal_interrupt)
diff --git a/include/config.h b/include/config.h
index 0d363c4e57..a8fd542b49 100644
--- a/include/config.h
+++ b/include/config.h
@@ -2162,8 +2162,11 @@
/* Support host command interface over eSPI bus. */
#undef CONFIG_HOSTCMD_ESPI
-/* Use Virtual Wire signals instead of GPIO with eSPI interface */
-#undef CONFIG_HOSTCMD_ESPI_VW_SIGNALS
+/*
+ * SLP signals (SLP_S3 and SLP_S4) use virtual wires intead of physical pins
+ * with eSPI interface.
+ */
+#undef CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS
/* MCHP next two items are EC eSPI slave configuration */
/* Maximum clock frequence eSPI EC slave advertises
diff --git a/power/common.c b/power/common.c
index f52416c93f..718607f25c 100644
--- a/power/common.c
+++ b/power/common.c
@@ -75,7 +75,7 @@ static int pause_in_s5;
static int power_signal_get_level(enum gpio_signal signal)
{
-#ifdef CONFIG_HOSTCMD_ESPI_VW_SIGNALS
+#ifdef CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS
/* Check signal is from GPIOs or VWs */
if (espi_signal_is_vw(signal))
return espi_vw_get_wire(signal);
@@ -85,7 +85,7 @@ static int power_signal_get_level(enum gpio_signal signal)
int power_signal_disable_interrupt(enum gpio_signal signal)
{
-#ifdef CONFIG_HOSTCMD_ESPI_VW_SIGNALS
+#ifdef CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS
/* Check signal is from GPIOs or VWs */
if (espi_signal_is_vw(signal))
return espi_vw_disable_wire_int(signal);
@@ -95,7 +95,7 @@ int power_signal_disable_interrupt(enum gpio_signal signal)
int power_signal_enable_interrupt(enum gpio_signal signal)
{
-#ifdef CONFIG_HOSTCMD_ESPI_VW_SIGNALS
+#ifdef CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS
/* Check signal is from GPIOs or VWs */
if (espi_signal_is_vw(signal))
return espi_vw_enable_wire_int(signal);
@@ -112,7 +112,7 @@ int power_signal_is_asserted(const struct power_signal_info *s)
#ifdef CONFIG_BRINGUP
static const char *power_signal_get_name(enum gpio_signal signal)
{
-#ifdef CONFIG_HOSTCMD_ESPI_VW_SIGNALS
+#ifdef CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS
/* Check signal is from GPIOs or VWs */
if (espi_signal_is_vw(signal))
return espi_vw_get_wire_name(signal);
diff --git a/power/intel_x86.c b/power/intel_x86.c
index 15c1cf1b4a..f090d784c7 100644
--- a/power/intel_x86.c
+++ b/power/intel_x86.c
@@ -45,7 +45,7 @@ enum sys_sleep_state {
};
static const int sleep_sig[] = {
-#ifdef CONFIG_HOSTCMD_ESPI_VW_SIGNALS
+#ifdef CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS
[SYS_SLEEP_S3] = VW_SLP_S3_L,
[SYS_SLEEP_S4] = VW_SLP_S4_L,
#else
@@ -98,7 +98,7 @@ DECLARE_HOOK(HOOK_BATTERY_SOC_CHANGE, power_up_inhibited_cb, HOOK_PRIO_DEFAULT);
/* Get system sleep state through GPIOs or VWs */
static inline int chipset_get_sleep_signal(enum sys_sleep_state state)
{
-#ifdef CONFIG_HOSTCMD_ESPI_VW_SIGNALS
+#ifdef CONFIG_HOSTCMD_ESPI_VW_SLP_SIGNALS
if (espi_signal_is_vw(sleep_sig[state]))
return espi_vw_get_wire(sleep_sig[state]);
else
View Lorry Controller Status