scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-12 19:04:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

espi: rename remaining eSPI options

Browse Source 
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>
This commit is contained in:
Jett Rink
2018-05-21 12:01:40 -06:00
committed by chrome-bot
parent 11bd4c0f4d
commit 4d23d995c3
29 changed files with 85 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
board/atlas/board.h
View File

@@ -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
#define CONFIG_KEYBOARD_BOARD_CONFIG
#define CONFIG_KEYBOARD_COL2_INVERTED
#define CONFIG_KEYBOARD_PROTOCOL_8042

2
board/eve/board.h
View File

@@ -67,7 +67,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
#define CONFIG_KEYBOARD_BOARD_CONFIG
#define CONFIG_KEYBOARD_COL2_INVERTED
#define CONFIG_KEYBOARD_PROTOCOL_8042

2
board/fizz/board.c
View File

@@ -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

9
board/fizz/board.h
View File

@@ -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

2
board/fizz/gpio.inc
View File

@@ -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

2
board/it83xx_evb/gpio.inc
View File

@@ -9,7 +9,7 @@
* Note: Those with interrupt handlers must be declared first. */
GPIO_INT(POWER_BUTTON_L, PIN(E, 4), GPIO_INT_BOTH | GPIO_PULL_UP, power_button_interrupt)
#ifndef CONFIG_ESPI_VW_SIGNALS
#ifndef CONFIG_HOSTCMD_ESPI_VW_SIGNALS
GPIO_INT(PCH_PLTRST_L, PIN(E, 3), GPIO_INT_BOTH | GPIO_PULL_UP, lpcrst_interrupt)
#endif
GPIO_INT(LID_OPEN, PIN(E, 2), GPIO_INT_BOTH | GPIO_PULL_DOWN, lid_interrupt)

10
board/mchpevb1/board.h
View File

@@ -100,7 +100,7 @@
* Values in MHz are 20, 25, 33, 50, and 66
*/
/* KBL + EVB fly-wire hook up only supports 20MHz */
#define CONFIG_ESPI_EC_MAX_FREQ 20
#define CONFIG_HOSTCMD_ESPI_EC_MAX_FREQ 20
/*
* EC eSPI slave advertises IO lanes
@@ -110,7 +110,7 @@
* 3 = Single, Dual, and Quad
*/
/* KBL + EVB fly-wire hook up only support Single mode */
#define CONFIG_ESPI_EC_MODE 0
#define CONFIG_HOSTCMD_ESPI_EC_MODE 0
/*
* Bit map of eSPI channels EC advertises
@@ -119,13 +119,13 @@
* bit[2] = 1 OOB channel
* bit[3] = 1 Flash channel
*/
#define CONFIG_ESPI_EC_CHAN_BITMAP 0x0F
#define CONFIG_HOSTCMD_ESPI_EC_CHAN_BITMAP 0x0F
/*
* MEC17xx EVB + KBL RVP3 board uses eSPI default of
* Platform Reset being a virtual wire.
*/
#define CONFIG_ESPI_PLTRST_IS_VWIRE
#define CONFIG_HOSTCMD_ESPI_PLTRST_IS_VWIRE
#define CONFIG_MCHP_ESPI_VW_SAVE_ON_SLEEP
@@ -172,7 +172,7 @@
#define CONFIG_CHIPSET_RESET_HOOK
#define CONFIG_HOSTCMD_ESPI
#define CONFIG_ESPI_VW_SIGNALS
#define CONFIG_HOSTCMD_ESPI_VW_SIGNALS
#define CONFIG_CLOCK_CRYSTAL
#define CONFIG_EXTPOWER_GPIO

2
board/mchpevb1/gpio.inc
View File

@@ -25,7 +25,7 @@
#define GPIO_BOTH_EDGES_PU (GPIO_INT_BOTH | GPIO_PULL_UP)
/* Only needed if CONFIG_HOSTCMD_ESPI is not set, using LPC interface to PCH */
#ifndef CONFIG_ESPI_PLTRST_IS_VWIRE
#ifndef CONFIG_HOSTCMD_ESPI_PLTRST_IS_VWIRE
GPIO_INT(PCH_PLTRST_L, PIN(064), GPIO_BOTH_EDGES_PU, lpcrst_interrupt)
#endif

2
board/nami/board.h
View File

@@ -73,7 +73,7 @@
#define CONFIG_CHIPSET_HAS_PRE_INIT_CALLBACK
#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

2
board/nautilus/board.c
View File

@@ -119,7 +119,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

2
board/nautilus/board.h
View File

@@ -63,7 +63,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

2
board/nautilus/gpio.inc
View File

@@ -14,7 +14,7 @@ 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
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

2
board/npcx7_evb/board.h
View File

@@ -22,7 +22,7 @@
#define CONFIG_I2C
/* Features of eSPI */
#define CONFIG_HOSTCMD_ESPI
#define CONFIG_ESPI_VW_SIGNALS /* Use VW signals instead of GPIOs */
#define CONFIG_HOSTCMD_ESPI_VW_SIGNALS /* Use VW signals instead of GPIOs */
/* Optional features */
#define CONFIG_BOARD_VERSION_GPIO

2
board/poppy/board.c
View File

@@ -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

2
board/poppy/board.h
View File

@@ -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

4
board/poppy/gpio.inc
View File

@@ -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)

2
board/reef_it8320/gpio.inc
View File

@@ -20,7 +20,7 @@ GPIO_INT(PCH_SLP_S0_L, PIN(B, 7), GPIO_INT_BOTH, power_signal_interrupt) /*
#endif
GPIO_INT(SUSPWRNACK, PIN(E, 1), GPIO_INT_BOTH, power_signal_interrupt) /* SUSPWRNACK */
GPIO_INT(LID_OPEN, PIN(E, 2), GPIO_INT_BOTH, lid_interrupt) /* LID_OPEN */
#ifndef CONFIG_ESPI_VW_SIGNALS
#ifndef CONFIG_HOSTCMD_ESPI_VW_SIGNALS
GPIO_INT(PCH_PLTRST_L, PIN(E, 3), GPIO_INT_BOTH | GPIO_PULL_UP, lpcrst_interrupt) /* PLT_RST_L */
#endif
GPIO_INT(POWER_BUTTON_L, PIN(E, 4), GPIO_INT_BOTH, power_button_interrupt) /* MECH_PWR_BTN_ODL */

2
board/wheatley/board.c
View File

@@ -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

2
board/wheatley/board.h
View File

@@ -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__

2
board/wheatley/gpio.inc
View File

@@ -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

8
board/zoombini/board.c
View File

@@ -22,9 +22,9 @@
#include "driver/sync.h"
#include "driver/tcpm/ps8xxx.h"
#include "ec_commands.h"
#ifdef CONFIG_ESPI_VW_SIGNALS
#ifdef CONFIG_HOSTCMD_ESPI_VW_SIGNALS
#include "espi.h"
#endif /* defined(CONFIG_ESPI_VW_SIGNALS) */
#endif /* defined(CONFIG_HOSTCMD_ESPI_VW_SIGNALS) */
#include "extpower.h"
#include "gpio.h"
#include "hooks.h"
@@ -165,13 +165,13 @@ const struct power_signal_info power_signal_list[] = {
{GPIO_PCH_SLP_S0_L,
POWER_SIGNAL_ACTIVE_HIGH | POWER_SIGNAL_DISABLE_AT_BOOT,
"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
{GPIO_PCH_SLP_S3_L, POWER_SIGNAL_ACTIVE_HIGH, "SLP_S3_DEASSERTED"},
{GPIO_PCH_SLP_S4_L, POWER_SIGNAL_ACTIVE_HIGH, "SLP_S4_DEASSERTED"},
#endif /* defined(CONFIG_ESPI_VW_SIGNALS) */
#endif /* defined(CONFIG_HOSTCMD_ESPI_VW_SIGNALS) */
{GPIO_PCH_SLP_SUS_L, POWER_SIGNAL_ACTIVE_HIGH, "SLP_SUS_DEASSERTED"},
{GPIO_RSMRST_L_PGOOD, POWER_SIGNAL_ACTIVE_HIGH, "RSMRST_L_PGOOD"},
{GPIO_PMIC_DPWROK, POWER_SIGNAL_ACTIVE_HIGH, "PMIC_DPWROK"},

2
board/zoombini/board.h
View File

@@ -38,7 +38,7 @@
#define CONFIG_ADC
#define CONFIG_HOSTCMD_ESPI
/* TODO(aaboagye): Uncomment when Si arrives. */
/* #define CONFIG_ESPI_VW_SIGNALS */
/* #define CONFIG_HOSTCMD_ESPI_VW_SIGNALS */
#define CONFIG_I2C
#define CONFIG_PWM

4
board/zoombini/gpio.inc
View File

@@ -25,10 +25,10 @@ GPIO_INT(AC_PRESENT, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, extpowe
/* Power Signals. */
GPIO_INT(PCH_SLP_S0_L, PIN(A, 4), GPIO_INT_BOTH, power_signal_interrupt)
#ifndef CONFIG_ESPI_VW_SIGNALS
#ifndef CONFIG_HOSTCMD_ESPI_VW_SIGNALS
GPIO_INT(PCH_SLP_S3_L, PIN(A, 6), GPIO_INT_BOTH, power_signal_interrupt)
GPIO_INT(PCH_SLP_S4_L, PIN(A, 3), GPIO_INT_BOTH, power_signal_interrupt)
#endif /* defined(CONFIG_ESPI_VW_SIGNALS) */
#endif /* defined(CONFIG_HOSTCMD_ESPI_VW_SIGNALS) */
GPIO_INT(PCH_SLP_SUS_L, PIN(D, 4), GPIO_INT_BOTH, power_signal_interrupt)
/* TODO(aaboagye): Internal PU may be needed later on... */
GPIO_INT(RSMRST_L_PGOOD, PIN(E, 2), GPIO_INT_BOTH, power_signal_interrupt)

6
chip/it83xx/lpc.c
View File

@@ -377,7 +377,7 @@ void lpc_clear_acpi_status_mask(uint8_t mask)
pm_set_status(LPC_ACPI_CMD, mask, 0);
}
#ifndef CONFIG_ESPI_VW_SIGNALS
#ifndef CONFIG_HOSTCMD_ESPI_VW_SIGNALS
int lpc_get_pltrst_asserted(void)
{
return !gpio_get_level(GPIO_PCH_PLTRST_L);
@@ -677,7 +677,7 @@ static void lpc_init(void)
*/
IT83XX_GCTRL_SPCTRL1 |= 0xC2;
#ifndef CONFIG_ESPI_VW_SIGNALS
#ifndef CONFIG_HOSTCMD_ESPI_VW_SIGNALS
gpio_enable_interrupt(GPIO_PCH_PLTRST_L);
#endif
@@ -715,7 +715,7 @@ static void lpc_init(void)
*/
DECLARE_HOOK(HOOK_INIT, lpc_init, HOOK_PRIO_INIT_LPC);
#ifndef CONFIG_ESPI_VW_SIGNALS
#ifndef CONFIG_HOSTCMD_ESPI_VW_SIGNALS
void lpcrst_interrupt(enum gpio_signal signal)
{
if (lpc_get_pltrst_asserted())

20
chip/mchp/espi.c
View File

@@ -1471,32 +1471,32 @@ void espi_init(void)
gpio_config_module(MODULE_LPC, 1);
/* Override Boot-ROM configuration */
#ifdef CONFIG_ESPI_EC_CHAN_BITMAP
MCHP_ESPI_IO_CAP0 = CONFIG_ESPI_EC_CHAN_BITMAP;
#ifdef CONFIG_HOSTCMD_ESPI_EC_CHAN_BITMAP
MCHP_ESPI_IO_CAP0 = CONFIG_HOSTCMD_ESPI_EC_CHAN_BITMAP;
#endif
#ifdef CONFIG_ESPI_EC_MAX_FREQ
#ifdef CONFIG_HOSTCMD_ESPI_EC_MAX_FREQ
MCHP_ESPI_IO_CAP1 &= ~(MCHP_ESPI_CAP1_MAX_FREQ_MASK);
#if CONFIG_ESPI_EC_MAX_FREQ == 25
#if CONFIG_HOSTCMD_ESPI_EC_MAX_FREQ == 25
MCHP_ESPI_IO_CAP1 |= MCHP_ESPI_CAP1_MAX_FREQ_25M;
#elif CONFIG_ESPI_EC_MAX_FREQ == 33
#elif CONFIG_HOSTCMD_ESPI_EC_MAX_FREQ == 33
MCHP_ESPI_IO_CAP1 |= MCHP_ESPI_CAP1_MAX_FREQ_33M;
#elif CONFIG_ESPI_EC_MAX_FREQ == 50
#elif CONFIG_HOSTCMD_ESPI_EC_MAX_FREQ == 50
MCHP_ESPI_IO_CAP1 |= MCHP_ESPI_CAP1_MAX_FREQ_50M;
#elif CONFIG_ESPI_EC_MAX_FREQ == 66
#elif CONFIG_HOSTCMD_ESPI_EC_MAX_FREQ == 66
MCHP_ESPI_IO_CAP1 |= MCHP_ESPI_CAP1_MAX_FREQ_66M;
#else
MCHP_ESPI_IO_CAP1 |= MCHP_ESPI_CAP1_MAX_FREQ_20M;
#endif
#endif
#ifdef CONFIG_ESPI_EC_MODE
#ifdef CONFIG_HOSTCMD_ESPI_EC_MODE
MCHP_ESPI_IO_CAP1 &= ~(MCHP_ESPI_CAP1_IO_MASK);
MCHP_ESPI_IO_CAP1 |= ((CONFIG_ESPI_EC_MODE)
MCHP_ESPI_IO_CAP1 |= ((CONFIG_HOSTCMD_ESPI_EC_MODE)
<< MCHP_ESPI_CAP1_IO_BITPOS);
#endif
#ifdef CONFIG_ESPI_PLTRST_IS_VWIRE
#ifdef CONFIG_HOSTCMD_ESPI_PLTRST_IS_VWIRE
MCHP_ESPI_IO_PLTRST_SRC = MCHP_ESPI_PLTRST_SRC_VW;
#else
MCHP_ESPI_IO_PLTRST_SRC = MCHP_ESPI_PLTRST_SRC_PIN;

2
chip/mchp/lpc.c
View File

@@ -816,7 +816,7 @@ int lpc_get_pltrst_asserted(void)
#ifdef CONFIG_HOSTCMD_ESPI
/*
* eSPI PLTRST# a VWire or side-band signal
* Controlled by CONFIG_ESPI_PLTRST_IS_VWIRE
* Controlled by CONFIG_HOSTCMD_ESPI_PLTRST_IS_VWIRE
*/
return espi_vw_get_wire(VW_PLTRST_L);
#else

57
include/config.h
View File

@@ -1173,35 +1173,6 @@
*/
#undef CONFIG_EMULATED_SYSRQ
/* Use Virtual Wire signals instead of GPIO with eSPI interface */
#undef CONFIG_ESPI_VW_SIGNALS
/* MCHP next two items are EC eSPI slave configuration */
/* Maximum clock frequence eSPI EC slave advertises
* Values in MHz are 20, 25, 33, 50, and 66
*/
#undef CONFIG_ESPI_EC_MAX_FREQ
/* EC eSPI slave advertises IO lanes
* 0 = Single
* 1 = Single and Dual
* 2 = Single and Quad
* 3 = Single, Dual, and Quad
*/
#undef CONFIG_ESPI_EC_MODE
/* Bit map of eSPI channels EC advertises
* bit[0] = 1 Peripheral channel
* bit[1] = 1 Virtual Wire channel
* bit[2] = 1 OOB channel
* bit[3] = 1 Flash channel
*/
#undef CONFIG_ESPI_EC_CHAN_BITMAP
/* Use Virtual Wire for Platform Reset instead of a sideband signal */
#undef CONFIG_ESPI_PLTRST_IS_VWIRE
/* Include code for handling external power */
#define CONFIG_EXTPOWER
@@ -2084,6 +2055,34 @@
/* Support host command interface over eSPI bus. */
#undef CONFIG_HOSTCMD_ESPI
/* Use Virtual Wire signals instead of GPIO with eSPI interface */
#undef CONFIG_HOSTCMD_ESPI_VW_SIGNALS
/* MCHP next two items are EC eSPI slave configuration */
/* Maximum clock frequence eSPI EC slave advertises
* Values in MHz are 20, 25, 33, 50, and 66
*/
#undef CONFIG_HOSTCMD_ESPI_EC_MAX_FREQ
/* EC eSPI slave advertises IO lanes
* 0 = Single
* 1 = Single and Dual
* 2 = Single and Quad
* 3 = Single, Dual, and Quad
*/
#undef CONFIG_HOSTCMD_ESPI_EC_MODE
/* Bit map of eSPI channels EC advertises
* bit[0] = 1 Peripheral channel
* bit[1] = 1 Virtual Wire channel
* bit[2] = 1 OOB channel
* bit[3] = 1 Flash channel
*/
#undef CONFIG_HOSTCMD_ESPI_EC_CHAN_BITMAP
/* Use Virtual Wire for Platform Reset instead of a sideband signal */
#undef CONFIG_HOSTCMD_ESPI_PLTRST_IS_VWIRE
/* Base address of low power RAM. */
#undef CONFIG_LPRAM_BASE

8
power/common.c
View File

@@ -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);

4
power/intel_x86.c
View File

@@ -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