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 /board/poppy | |
| 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 'board/poppy')
| -rw-r--r-- | board/poppy/board.c | 2 | ||||
| -rw-r--r-- | board/poppy/board.h | 2 | ||||
| -rw-r--r-- | board/poppy/gpio.inc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/board/poppy/board.c b/board/poppy/board.c index ca03776a05..87ad189015 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_ESPI_VW_SIGNALS +#ifdef CONFIG_HOSTCMD_ESPI_VW_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 6ed87c9e86..59cc20ee6b 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_ESPI_VW_SIGNALS +#define CONFIG_HOSTCMD_ESPI_VW_SIGNALS /* Battery */ #define CONFIG_BATTERY_CUT_OFF diff --git a/board/poppy/gpio.inc b/board/poppy/gpio.inc index f771ef9161..dd88af7d3e 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_ESPI_VW_SIGNALS +#ifndef CONFIG_HOSTCMD_ESPI_VW_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_ESPI_VW_SIGNALS */ +#endif /* !CONFIG_HOSTCMD_ESPI_VW_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) |