diff options
| author | Jett Rink <jettrink@chromium.org> | 2018-05-21 12:01:40 -0600 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-05-23 09:13:49 -0700 |
| commit | 4d23d995c3a915cdcd2129b382c6f276e159aa44 (patch) | |
| tree | 05939f2fa7aaccc647d7d4ff175445caf23a8d7d /power | |
| parent | 11bd4c0f4d11357ab830982d7dec164813c886dd (diff) | |
| download | chrome-ec-4d23d995c3a915cdcd2129b382c6f276e159aa44.tar.gz | |
espi: rename remaining eSPI options
Change prefix from CONFIG_ESPI to CONFIG_HOSTCMD_ESPI for consistency.
BRANCH=none
BUG=chromium:818804
TEST=Full stack builds and works on yorp (espi) and grunt (lpc)
Change-Id: I8b6e7eea515d14a0ba9030647cec738d95aea587
Signed-off-by: Jett Rink <jettrink@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1067513
Reviewed-by: Randall Spangler <rspangler@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 0979b577af..68b8b896aa 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_ESPI_VW_SIGNALS +#ifdef CONFIG_HOSTCMD_ESPI_VW_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_ESPI_VW_SIGNALS +#ifdef CONFIG_HOSTCMD_ESPI_VW_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_ESPI_VW_SIGNALS +#ifdef CONFIG_HOSTCMD_ESPI_VW_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_ESPI_VW_SIGNALS +#ifdef CONFIG_HOSTCMD_ESPI_VW_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 934da65fd3..7a2601c8ec 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_ESPI_VW_SIGNALS +#ifdef CONFIG_HOSTCMD_ESPI_VW_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_ESPI_VW_SIGNALS +#ifdef CONFIG_HOSTCMD_ESPI_VW_SIGNALS if (espi_signal_is_vw(sleep_sig[state])) return espi_vw_get_wire(sleep_sig[state]); else |