Furquan Shaikh would like Aaron Durbin to review this change.
mb/google/zork: set GPIOs to wake-up from touchpad
This allows the system to wake from the touchpad if the touchpad
is powered in S3.
BUG=b:154676993
TEST=enter S3 with the follow-on patch and verify that the system
can wake from S3.
Signed-off-by: Martin Roth <martinroth@chromium.org>
Change-Id: I222f1de9a25a8aa24d56fde09a487cbf3737446f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/+/2207784
Tested-by: Furquan Shaikh <furquan@chromium.org>
Commit-Queue: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@google.com>
---
M src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
M src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
2 files changed, 4 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/42726/1
diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
index 50c842b..d8a3714 100644
--- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
+++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
@@ -101,6 +101,7 @@
PAD_NF(GPIO_2, WAKE_L, PULL_UP),
/* PEN_DETECT_ODL */
PAD_GPI(GPIO_4, PULL_UP),
+ PAD_WAKE(GPIO_4, PULL_UP, EDGE_LOW, S3_S4_S5),
/* PEN_POWER_EN - Enabled*/
PAD_GPO(GPIO_5, HIGH),
/* EN_PWR_TOUCHPAD */
@@ -110,8 +111,8 @@
/* I2S_LRCLK - Bit banged in depthcharge */
PAD_NF(GPIO_8, ACP_I2S_LRCLK, PULL_NONE),
/* TOUCHPAD_INT_ODL */
- /* TODO: Make sure driver sets as wake source */
PAD_GPI(GPIO_9, PULL_UP),
+ PAD_WAKE(GPIO_9, PULL_UP, EDGE_LOW, S3_S4_S5),
/* S0iX SLP - (unused - goes to EC & FPMCU */
PAD_GPI(GPIO_10, PULL_UP),
/* EC_IN_RW_OD */
diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
index d3f7ae3..bac5333 100644
--- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
+++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
@@ -97,6 +97,7 @@
PAD_NF(GPIO_2, WAKE_L, PULL_UP),
/* PEN_DETECT_ODL */
PAD_GPI(GPIO_4, PULL_UP),
+ PAD_WAKE(GPIO_4, PULL_UP, EDGE_LOW, S3_S4_S5),
/* PEN_POWER_EN - Enabled*/
PAD_GPO(GPIO_5, HIGH),
/* FPMCU_INT_L */
@@ -107,8 +108,8 @@
/* I2S_LRCLK - Bit banged in depthcharge */
PAD_NF(GPIO_8, ACP_I2S_LRCLK, PULL_NONE),
/* TOUCHPAD_INT_ODL */
- /* TODO: Make sure driver sets as wake source */
PAD_GPI(GPIO_9, PULL_UP),
+ PAD_WAKE(GPIO_9, PULL_UP, EDGE_LOW, S3_S4_S5),
/* S0iX SLP - (unused - goes to EC & FPMCU */
PAD_GPI(GPIO_10, PULL_UP),
/* FPMCU_RST_L */
To view, visit change 42726. To unsubscribe, or for help writing mail filters, visit settings.