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/fizz | |
| 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/fizz')
| -rw-r--r-- | board/fizz/board.c | 2 | ||||
| -rw-r--r-- | board/fizz/board.h | 9 | ||||
| -rw-r--r-- | board/fizz/gpio.inc | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/board/fizz/board.c b/board/fizz/board.c index e74908a6a5..15d550d680 100644 --- a/board/fizz/board.c +++ b/board/fizz/board.c @@ -122,7 +122,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_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/fizz/board.h b/board/fizz/board.h index f10bbc8162..f749682e7e 100644 --- a/board/fizz/board.h +++ b/board/fizz/board.h @@ -65,9 +65,12 @@ #define CONFIG_CHIPSET_HAS_PRE_INIT_CALLBACK #define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_HOSTCMD_ESPI -/* Eve and Poppy all have wires from GPIO to PCH but CONFIG_ESPI_VW_SIGNALS - * is defined. So, those GPIOs are not used by EC. */ -#define CONFIG_ESPI_VW_SIGNALS +/* + * 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. + */ +#define CONFIG_HOSTCMD_ESPI_VW_SIGNALS /* Charger */ #define CONFIG_CHARGE_MANAGER diff --git a/board/fizz/gpio.inc b/board/fizz/gpio.inc index 75c7130bf5..b5c2087d20 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_ESPI_VW_SIGNALS +#ifndef CONFIG_HOSTCMD_ESPI_VW_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 |