[coreboot-gerrit] Change in coreboot[master]: mb/google/zork: Add EC device wakeup for morphius

[Josie Nordrum (Code Review)]

Josie Nordrum has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45965 )

Change subject: mb/google/zork: Add EC device wakeup for morphius
......................................................................

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=None
TEST=None

Signed-off-by: Josie Nordrum 
Change-Id: I982f0f4b60fbaeb389774531e1dee83da77cb8a1
---
M src/mainboard/google/zork/ec.c
M src/mainboard/google/zork/variants/baseboard/include/baseboard/ec.h
M src/mainboard/google/zork/variants/morphius/include/variant/ec.h
3 files changed, 16 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/65/45965/1

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..1bb6811 100644
--- a/src/mainboard/google/zork/variants/baseboard/include/baseboard/ec.h
+++ b/src/mainboard/google/zork/variants/baseboard/include/baseboard/ec.h
@@ -38,6 +38,7 @@
 #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))

/* Log EC wake events plus EC shutdown events */
@@ -46,6 +47,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..a80e22c 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
+
+/* Enable trackpoint S3 wakeups */
+#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))
+#define MAINBOARD_EC_S3_DEVICE_EVENTS \
+	(EC_DEVICE_EVENT_MASK(EC_DEVICE_EVENT_TRACKPAD))