diff options
| author | Vijay Hiremath <vijay.p.hiremath@intel.com> | 2016-11-11 08:19:15 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-11-13 10:58:58 -0800 |
| commit | 9b47a0812d963c4c02d47655741f63618bd41a22 (patch) | |
| tree | bbef05891b30210b8d84d5fc9c2f054738846e75 /board/chell | |
| parent | 98402bb466e53cbe7b0d47287823126f7de0fdb8 (diff) | |
| download | chrome-ec-9b47a0812d963c4c02d47655741f63618bd41a22.tar.gz | |
skylake: Add support to S0iX based on host commands from Kernel
Picked the code from Glados branch.
Change-Id: I4bf114235c4d542dd7cf0dad6427c771e54d4611
https://chromium-review.googlesource.com/#/c/331358/
BUG=chrome-os-partner:59742
BRANCH=none
TEST=make buildall -j
Change-Id: Ib79f1209dfd9e6a9de0438cb1866bba2939e5393
Signed-off-by: Vijay Hiremath <vijay.p.hiremath@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/410036
Commit-Ready: Vijay P Hiremath <vijay.p.hiremath@intel.com>
Tested-by: Vijay P Hiremath <vijay.p.hiremath@intel.com>
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Kevin K Wong <kevin.k.wong@intel.com>
Diffstat (limited to 'board/chell')
| -rw-r--r-- | board/chell/board.c | 1 | ||||
| -rw-r--r-- | board/chell/board.h | 1 | ||||
| -rw-r--r-- | board/chell/gpio.inc | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/board/chell/board.c b/board/chell/board.c index a930e45051..2d59ab68fe 100644 --- a/board/chell/board.c +++ b/board/chell/board.c @@ -82,7 +82,6 @@ void usb1_evt(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_N_PWRGD"}, - {GPIO_PCH_SLP_S0_L, 1, "SLP_S0_DEASSERTED"}, {GPIO_PCH_SLP_S3_L, 1, "SLP_S3_DEASSERTED"}, {GPIO_PCH_SLP_S4_L, 1, "SLP_S4_DEASSERTED"}, {GPIO_PCH_SLP_SUS_L, 1, "SLP_SUS_DEASSERTED"}, diff --git a/board/chell/board.h b/board/chell/board.h index ffac383c9f..7b7033208b 100644 --- a/board/chell/board.h +++ b/board/chell/board.h @@ -163,7 +163,6 @@ enum pwm_channel { /* power signal definitions */ enum power_signal { X86_RSMRST_L_PWRGD = 0, - X86_SLP_S0_DEASSERTED, X86_SLP_S3_DEASSERTED, X86_SLP_S4_DEASSERTED, X86_SLP_SUS_DEASSERTED, diff --git a/board/chell/gpio.inc b/board/chell/gpio.inc index 2d2d61c60f..d8da255b09 100644 --- a/board/chell/gpio.inc +++ b/board/chell/gpio.inc @@ -17,7 +17,6 @@ GPIO_INT(POWER_BUTTON_L, PIN(35), GPIO_INT_BOTH, power_button_interrupt) GPIO_INT(RSMRST_L_PGOOD, PIN(63), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PCH_SLP_S4_L, PIN(200), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PCH_SLP_S3_L, PIN(206), GPIO_INT_BOTH, power_signal_interrupt) -GPIO_INT(PCH_SLP_S0_L, PIN(211), GPIO_INT_BOTH, power_signal_interrupt_S0) GPIO_INT(PCH_SLP_SUS_L, PIN(12), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PMIC_INT_L, PIN(50), GPIO_INT_FALLING, power_signal_interrupt) GPIO_INT(PD_MCU_INT, PIN(122), GPIO_INT_FALLING | GPIO_PULL_UP, pd_mcu_interrupt) @@ -56,6 +55,7 @@ GPIO(PCH_RSMRST_L, PIN(143), GPIO_OUT_LOW) GPIO(PCH_RTCRST, PIN(163), GPIO_OUT_LOW) GPIO(SYS_RESET_L, PIN(121), GPIO_ODR_HIGH) GPIO(ENTERING_RW, PIN(41), GPIO_OUT_LOW) +GPIO(PCH_SLP_S0_L, PIN(211), GPIO_INPUT) /* Devices and power */ GPIO(PP1800_DX_DMIC_EN, PIN(11), GPIO_OUT_LOW) |