3 files changed, 15 insertions, 0 deletions
diff --git a/src/mainboard/google/zork/ec.c b/src/mainboard/google/zork/ec.c
index d770d27040..f4f441c7a1 100644
--- a/src/mainboard/google/zork/ec.c
+++ b/src/mainboard/google/zork/ec.c
@@ -11,6 +11,7 @@ void mainboard_ec_init(void)
 		.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 ff42989286..dc06a7843f 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 04dfba43b9..3afa327935 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))