scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-12-27 18:25:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

include: Add default state for ESPI and VW_SIGNALS

Browse Source 
Add the default undefined state for CONFIG_ESPI and rename
CONFIG_VW_SIGNALS to CONFIG_ESPI_VW_SIGNALS.

BUG=chrome-os-partner:58666
BRANCH=none
TEST=pass presubmit checks

Change-Id: I45242d545915c16bb46f751532a01ab937cee5f0
Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/400032
Reviewed-by: Shawn N <shawnn@chromium.org>
This commit is contained in:
Duncan Laurie
2016-10-18 14:30:28 -07:00
committed by chrome-bot
parent e6549481c7
commit b8050224e5
6 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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, 1, "RSMRST_N_PWRGD"},
{GPIO_PCH_SLP_S0_L, 1, "SLP_S0_DEASSERTED"},
#ifdef CONFIG_VW_SIGNALS
#ifdef CONFIG_ESPI_VW_SIGNALS
{VW_SLP_S3_L, 1, "SLP_S3_DEASSERTED"},
{VW_SLP_S4_L, 1, "SLP_S4_DEASSERTED"},
#else

2
board/wheatley/board.h
View File

@@ -150,7 +150,7 @@
/* Features of eSPI */
#undef CONFIG_ESPI /* Use eSPI protocol for host interface of x86 CPU */
#undef CONFIG_VW_SIGNALS /* Use VW signals instead of GPIOs */
#undef CONFIG_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_VW_SIGNALS
#ifndef CONFIG_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

6
include/config.h
View File

@@ -838,6 +838,12 @@
/* Support EC chip internal data EEPROM */
#undef CONFIG_EEPROM
/* Support for eSPI for host communication */
#undef CONFIG_ESPI
/* Use Virtual Wire signals instead of GPIO with eSPI interface */
#undef CONFIG_ESPI_VW_SIGNALS
/* Include code for handling external power */
#define CONFIG_EXTPOWER

6
power/common.c
View File

@@ -77,7 +77,7 @@ static int power_signal_get_level(enum gpio_signal signal)
#ifdef CONFIG_POWER_S0IX
return chipset_get_ps_debounced_level(signal);
#else
#ifdef CONFIG_VW_SIGNALS
#ifdef CONFIG_ESPI_VW_SIGNALS
/* Check signal is from GPIOs or VWs */
if ((int)signal > VW_SIGNAL_BASE)
return espi_vw_get_wire(signal);
@@ -88,7 +88,7 @@ static int power_signal_get_level(enum gpio_signal signal)
static int power_signal_enable_interrupt(enum gpio_signal signal)
{
#ifdef CONFIG_VW_SIGNALS
#ifdef CONFIG_ESPI_VW_SIGNALS
/* Check signal is from GPIOs or VWs */
if ((int)signal > VW_SIGNAL_BASE)
return espi_vw_enable_wire_int(signal);
@@ -461,7 +461,7 @@ DECLARE_HOOK(HOOK_AC_CHANGE, power_ac_change, HOOK_PRIO_DEFAULT);
/*****************************************************************************/
/* Interrupts */
#if defined(CONFIG_BRINGUP) && defined(CONFIG_VW_SIGNALS)
#if defined(CONFIG_BRINGUP) && defined(CONFIG_ESPI_VW_SIGNALS)
#error "Not support CONFIG_BRINGUP since gpio_get_name func"
#endif

2
power/skylake.c
View File

@@ -65,7 +65,7 @@ enum sys_sleep_state {
/* Get system sleep state through GPIOs or VWs */
static int chipset_get_sleep_signal(enum sys_sleep_state state)
{
#ifdef CONFIG_VW_SIGNALS
#ifdef CONFIG_ESPI_VW_SIGNALS
if (state == SYS_SLEEP_S4)
return espi_vw_get_wire(VW_SLP_S4_L);
else if (state == SYS_SLEEP_S3)