diff options
| author | Karthikeyan Ramasubramanian <kramasub@chromium.org> | 2018-12-11 10:10:21 -0700 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2018-12-12 14:39:40 +0000 |
| commit | 82d6f90c5f5f3ede9e57503550fbe4408c59de3d (patch) | |
| tree | 9aa017bec90ebc30777f2b106d10e42e8ac3aa15 /src/mainboard/google/octopus | |
| parent | 303a4bfd4a0df01c329683322466da46129313b1 (diff) | |
mb/google/octopus/ampton: Fix the TRACKPAD_INT_ODL GPIO configuration
Update the TRACKPAD_INT1_1V8_ODL GPIO configuration so that it acts as a
wakeup source
BUG=b:119598593
BRANCH=octopus
TEST=Ensure that the system wakes up on trackpad events. Ensure that the
suspend_stress_test runs successfully for 25 iterations.
Change-Id: I28292682cf9c8037abb87d265e49a60139550db2
Signed-off-by: Karthikeyan Ramasubramanian <kramasub@codeaurora.org>
Reviewed-on: https://review.coreboot.org/c/30171
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Justin TerAvest <teravest@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src/mainboard/google/octopus')
| -rw-r--r-- | src/mainboard/google/octopus/variants/ampton/gpio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mainboard/google/octopus/variants/ampton/gpio.c b/src/mainboard/google/octopus/variants/ampton/gpio.c index 893e0fa47e..f34645d065 100644 --- a/src/mainboard/google/octopus/variants/ampton/gpio.c +++ b/src/mainboard/google/octopus/variants/ampton/gpio.c @@ -195,7 +195,8 @@ static const struct pad_config gpio_table[] = { PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_133, NONE, DEEP, NF1, HIZCRx1, DISPUPD),/* HV_EDP_HPD */ PAD_NC(GPIO_134, NONE),/* GPIO_134 -- EC_AP_INT_ODL */ - PAD_CFG_GPI_APIC_IOS(GPIO_135, NONE, DEEP, LEVEL, INVERT, HIZCRx1, DISPUPD),/* GPIO_135 -- TRACKPAD_INT1_1V8_ODL */ + /* GPIO_135 -- TRACKPAD_INT1_1V8_ODL */ + PAD_CFG_GPI_IRQ_WAKE(GPIO_135, NONE, DEEP, LEVEL, INVERT), PAD_CFG_GPI_APIC_IOS(GPIO_136, NONE, DEEP, LEVEL, INVERT, TxDRxE, DISPUPD),/* GPIO_136 -- PMIC_PCH_INT_ODL */ PAD_CFG_GPI_APIC_IOS(GPIO_137, NONE, DEEP, EDGE_BOTH, INVERT, HIZCRx1, DISPUPD),/* GPIO_137 -- HP_INT_ODL */ @@ -204,7 +205,7 @@ static const struct pad_config gpio_table[] = { PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_140, 0, DEEP, NONE, Tx1RxDCRx0, DISPUPD),/* GPIO_140 -- PEN_RESET */ // Also we may be able to use eSPI WAKE# Virtual Wire instead PAD_CFG_GPI_SCI_IOS(GPIO_141, NONE, DEEP, EDGE_SINGLE, INVERT, IGNORE, DISPUPD),/* GPIO_141 -- EC_PCH_WAKE_ODL */ - PAD_CFG_GPI_SCI_LOW(GPIO_142, NONE, DEEP, LEVEL),/* GPIO_142 -- TRACKPAD_INT2_1V8_ODL */ + PAD_NC(GPIO_142, UP_20K),/* GPIO_142 -- TRACKPAD_INT2_1V8_ODL(unused) */ PAD_NC(GPIO_143, UP_20K), /* GPIO_143 - NC */ PAD_NC(GPIO_144, UP_20K), /* GPIO_144 - PEN_EJECT */ PAD_NC(GPIO_145, UP_20K), /* GPIO_145 - PEN_EJECT */ |