diff options
-rw-r--r-- | board/pyro/board.c | 1 | ||||
-rw-r--r-- | board/pyro/board.h | 3 | ||||
-rw-r--r-- | board/pyro/gpio.inc | 2 | ||||
-rw-r--r-- | board/snappy/board.c | 1 | ||||
-rw-r--r-- | board/snappy/board.h | 3 | ||||
-rw-r--r-- | board/snappy/gpio.inc | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/board/pyro/board.c b/board/pyro/board.c index 5a9175d95a..3df13841e0 100644 --- a/board/pyro/board.c +++ b/board/pyro/board.c @@ -117,7 +117,6 @@ void tablet_mode_interrupt(enum gpio_signal signal) /* power signal list. Must match order of enum power_signal. */ const struct power_signal_info power_signal_list[] = { {GPIO_RSMRST_L_PGOOD, 1, "RSMRST_L"}, - {GPIO_PCH_SLP_S0_L, 1, "PMU_SLP_S0_N"}, {GPIO_PCH_SLP_S3_L, 1, "SLP_S3_DEASSERTED"}, {GPIO_PCH_SLP_S4_L, 1, "SLP_S4_DEASSERTED"}, {GPIO_SUSPWRNACK, 1, "SUSPWRNACK_DEASSERTED"}, diff --git a/board/pyro/board.h b/board/pyro/board.h index c3e6ea1455..11462cc94b 100644 --- a/board/pyro/board.h +++ b/board/pyro/board.h @@ -116,6 +116,8 @@ #define CONFIG_POWER_BUTTON #define CONFIG_POWER_BUTTON_X86 #define CONFIG_POWER_COMMON +#define CONFIG_POWER_S0IX +#define CONFIG_POWER_TRACK_HOST_SLEEP_STATE /* EC */ #define CONFIG_ADC @@ -228,7 +230,6 @@ enum pwm_channel { enum power_signal { X86_RSMRST_N = 0, - X86_SLP_S0_N, X86_SLP_S3_N, X86_SLP_S4_N, X86_SUSPWRDNACK, diff --git a/board/pyro/gpio.inc b/board/pyro/gpio.inc index e280955a52..8ea100042b 100644 --- a/board/pyro/gpio.inc +++ b/board/pyro/gpio.inc @@ -21,7 +21,6 @@ GPIO_INT(USB_C0_CABLE_DET, PIN(C, 5), GPIO_INT_RISING, anx74xx_cable_det_interru GPIO_INT(PCH_SLP_S4_L, PIN(8, 6), GPIO_INT_BOTH, power_signal_interrupt) /* SLP_S4_L */ GPIO_INT(PCH_SLP_S3_L, PIN(7, 3), GPIO_INT_BOTH, power_signal_interrupt) /* SLP_S3_L */ -GPIO_INT(PCH_SLP_S0_L, PIN(7, 5), GPIO_INT_BOTH, power_signal_interrupt) /* SLP_S0_L */ GPIO_INT(SUSPWRNACK, PIN(7, 2), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(RSMRST_L_PGOOD, PIN(6, 0), GPIO_INT_BOTH, power_signal_interrupt) /* PMIC_EC_RSMRST_ODL */ GPIO_INT(ALL_SYS_PGOOD, PIN(5, 0), GPIO_INT_BOTH, power_signal_interrupt) /* PMIC_EC_PWROK_OD */ @@ -65,6 +64,7 @@ GPIO(EC_I2C_POWER_SCL, PIN(D, 1), GPIO_INPUT) GPIO(PCH_SMI_L, PIN(A, 6), GPIO_ODR_HIGH | GPIO_SEL_1P8V) /* EC_SMI_ODL */ GPIO(PCH_SCI_L, PIN(A, 7), GPIO_ODR_HIGH | GPIO_SEL_1P8V) /* EC_SCI_ODL */ +GPIO(PCH_SLP_S0_L, PIN(7, 5), GPIO_INPUT) /* SLP_S0_L */ /* * BRD_ID1 is a an ADC pin which will be used to measure multiple values. diff --git a/board/snappy/board.c b/board/snappy/board.c index 5ae425f6bb..d27a03da9c 100644 --- a/board/snappy/board.c +++ b/board/snappy/board.c @@ -117,7 +117,6 @@ void tablet_mode_interrupt(enum gpio_signal signal) /* power signal list. Must match order of enum power_signal. */ const struct power_signal_info power_signal_list[] = { {GPIO_RSMRST_L_PGOOD, 1, "RSMRST_L"}, - {GPIO_PCH_SLP_S0_L, 1, "PMU_SLP_S0_N"}, {GPIO_PCH_SLP_S3_L, 1, "SLP_S3_DEASSERTED"}, {GPIO_PCH_SLP_S4_L, 1, "SLP_S4_DEASSERTED"}, {GPIO_SUSPWRNACK, 1, "SUSPWRNACK_DEASSERTED"}, diff --git a/board/snappy/board.h b/board/snappy/board.h index d58e2d986f..8995dd5044 100644 --- a/board/snappy/board.h +++ b/board/snappy/board.h @@ -115,6 +115,8 @@ #define CONFIG_POWER_BUTTON #define CONFIG_POWER_BUTTON_X86 #define CONFIG_POWER_COMMON +#define CONFIG_POWER_S0IX +#define CONFIG_POWER_TRACK_HOST_SLEEP_STATE /* EC */ #define CONFIG_ADC @@ -226,7 +228,6 @@ enum pwm_channel { enum power_signal { X86_RSMRST_N = 0, - X86_SLP_S0_N, X86_SLP_S3_N, X86_SLP_S4_N, X86_SUSPWRDNACK, diff --git a/board/snappy/gpio.inc b/board/snappy/gpio.inc index 79c33f067d..ba2f1c4a31 100644 --- a/board/snappy/gpio.inc +++ b/board/snappy/gpio.inc @@ -21,7 +21,6 @@ GPIO_INT(USB_C0_CABLE_DET, PIN(C, 5), GPIO_INT_RISING, anx74xx_cable_det_interru GPIO_INT(PCH_SLP_S4_L, PIN(8, 6), GPIO_INT_BOTH, power_signal_interrupt) /* SLP_S4_L */ GPIO_INT(PCH_SLP_S3_L, PIN(7, 3), GPIO_INT_BOTH, power_signal_interrupt) /* SLP_S3_L */ -GPIO_INT(PCH_SLP_S0_L, PIN(7, 5), GPIO_INT_BOTH, power_signal_interrupt) /* SLP_S0_L */ GPIO_INT(SUSPWRNACK, PIN(7, 2), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(RSMRST_L_PGOOD, PIN(6, 0), GPIO_INT_BOTH, power_signal_interrupt) /* PMIC_EC_RSMRST_ODL */ GPIO_INT(ALL_SYS_PGOOD, PIN(5, 0), GPIO_INT_BOTH, power_signal_interrupt) /* PMIC_EC_PWROK_OD */ @@ -65,6 +64,7 @@ GPIO(EC_I2C_POWER_SCL, PIN(D, 1), GPIO_INPUT) GPIO(PCH_SMI_L, PIN(A, 6), GPIO_ODR_HIGH | GPIO_SEL_1P8V) /* EC_SMI_ODL */ GPIO(PCH_SCI_L, PIN(A, 7), GPIO_ODR_HIGH | GPIO_SEL_1P8V) /* EC_SCI_ODL */ +GPIO(PCH_SLP_S0_L, PIN(7, 5), GPIO_INPUT) /* SLP_S0_L */ /* * BRD_ID1 is a an ADC pin which will be used to measure multiple values. |