mb/google/zork: Add EC device wakeup for morphius
Add support for trackpoint wakeup from S3 by adding device events to
mainboard and defining for morphius.
BUG=b:160345665
BRANCH=zork
TEST=tested trackpoint wake from S3 on morphius DVT
Signed-off-by: Josie Nordrum <josienordrum@google.com>
Change-Id: I982f0f4b60fbaeb389774531e1dee83da77cb8a1
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45965
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
diff --git a/src/mainboard/google/zork/ec.c b/src/mainboard/google/zork/ec.c
index d770d27..f4f441c 100644
--- a/src/mainboard/google/zork/ec.c
+++ b/src/mainboard/google/zork/ec.c
@@ -11,6 +11,7 @@
.log_events = MAINBOARD_EC_LOG_EVENTS,
.sci_events = MAINBOARD_EC_SCI_EVENTS,
.s3_wake_events = MAINBOARD_EC_S3_WAKE_EVENTS,
+ .s3_device_events = MAINBOARD_EC_S3_DEVICE_EVENTS,
.s5_wake_events = MAINBOARD_EC_S5_WAKE_EVENTS,
};
diff --git a/src/mainboard/google/zork/variants/baseboard/include/baseboard/ec.h b/src/mainboard/google/zork/variants/baseboard/include/baseboard/ec.h
index ff42989..dc06a78 100644
--- a/src/mainboard/google/zork/variants/baseboard/include/baseboard/ec.h
+++ b/src/mainboard/google/zork/variants/baseboard/include/baseboard/ec.h
@@ -46,6 +46,9 @@
EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_SHUTDOWN) |\
EC_HOST_EVENT_MASK(EC_HOST_EVENT_PANIC))
+/* EC device events to enable and log in S3 */
+#define MAINBOARD_EC_S3_DEVICE_EVENTS 0
+
/* Enable LID switch */
#define EC_ENABLE_LID_SWITCH
#define EC_ENABLE_WAKE_PIN EC_WAKE_GPI
diff --git a/src/mainboard/google/zork/variants/morphius/include/variant/ec.h b/src/mainboard/google/zork/variants/morphius/include/variant/ec.h
index 04dfba4..3afa327 100644
--- a/src/mainboard/google/zork/variants/morphius/include/variant/ec.h
+++ b/src/mainboard/google/zork/variants/morphius/include/variant/ec.h
@@ -7,3 +7,14 @@
/* Enable DPTC support */
#define EC_ENABLE_AMD_DPTC_SUPPORT
+
+#undef MAINBOARD_EC_S3_WAKE_EVENTS
+#undef MAINBOARD_EC_S3_DEVICE_EVENTS
+#define MAINBOARD_EC_S3_WAKE_EVENTS \
+ (MAINBOARD_EC_S5_WAKE_EVENTS |\
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEY_PRESSED) |\
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_DEVICE) |\
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE))
+/* Enable trackpoint S3 wakeups */
+#define MAINBOARD_EC_S3_DEVICE_EVENTS \
+ (EC_DEVICE_EVENT_MASK(EC_DEVICE_EVENT_TRACKPAD))