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/wheatley | |
| 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/wheatley')
| -rw-r--r-- | board/wheatley/board.c | 2 | ||||
| -rw-r--r-- | board/wheatley/board.h | 2 | ||||
| -rw-r--r-- | board/wheatley/gpio.inc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/board/wheatley/board.c b/board/wheatley/board.c index 8693423018..4d0227cb89 100644 --- a/board/wheatley/board.c +++ b/board/wheatley/board.c @@ -102,7 +102,7 @@ void tablet_mode_interrupt(enum gpio_signal signal) const struct power_signal_info power_signal_list[] = { {GPIO_RSMRST_L_PGOOD, POWER_SIGNAL_ACTIVE_HIGH, "RSMRST_N_PWRGD"}, {GPIO_PCH_SLP_S0_L, POWER_SIGNAL_ACTIVE_HIGH, "SLP_S0_DEASSERTED"}, -#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/wheatley/board.h b/board/wheatley/board.h index ffd4e98f97..e88a958714 100644 --- a/board/wheatley/board.h +++ b/board/wheatley/board.h @@ -151,7 +151,7 @@ /* Features of eSPI */ #undef CONFIG_HOSTCMD_ESPI -#undef CONFIG_ESPI_VW_SIGNALS /* Use VW signals instead of GPIOs */ +#undef CONFIG_HOSTCMD_ESPI_VW_SIGNALS /* Use VW signals instead of GPIOs */ #ifndef __ASSEMBLER__ diff --git a/board/wheatley/gpio.inc b/board/wheatley/gpio.inc index b038880a2a..6198b4bf94 100644 --- a/board/wheatley/gpio.inc +++ b/board/wheatley/gpio.inc @@ -16,7 +16,7 @@ GPIO_INT(POWER_BUTTON_L, PIN(9, 7), GPIO_INT_BOTH, power_ /* RSMRST from PMIC */ GPIO_INT(RSMRST_L_PGOOD, PIN(7, 2), GPIO_INT_BOTH, power_signal_interrupt) /* A36 - PWRGD for ROP_EC_RSMRST_L */ /* Use VW signals instead of GPIOs */ -#ifndef CONFIG_ESPI_VW_SIGNALS +#ifndef CONFIG_HOSTCMD_ESPI_VW_SIGNALS GPIO_INT(PCH_SLP_S4_L, PIN(5, 0), GPIO_INT_BOTH, power_signal_interrupt) /* A25 - GPIO50 for SLP_S4_L */ GPIO_INT(PCH_SLP_S3_L, PIN(4, 0), GPIO_INT_BOTH, power_signal_interrupt) /* B21 - TA1 for SLP_S3_L */ #endif |