diff options
| author | Furquan Shaikh <furquan@google.com> | 2018-07-25 22:38:11 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-07-27 08:50:53 -0700 |
| commit | 8f243ce8444e5cf1d98e52849f1e3742db77db7b (patch) | |
| tree | 13cf4b862f786dd3850944fd4cd9caabf8c092df /power | |
| parent | a7b3c658db84073b0af5e3907515ecac6c93589a (diff) | |
| download | chrome-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 'power')
| -rw-r--r-- | power/common.c | 8 | ||||
| -rw-r--r-- | power/intel_x86.c | 4 |
2 files changed, 6 insertions, 6 deletions
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 |