summaryrefslogtreecommitdiff
path: root/src/mainboard/google
diff options
context:
space:
mode:
authorJosie Nordrum <JosieNordrum@google.com>2020-09-24 16:55:17 -0600
committerFurquan Shaikh <furquan@google.com>2020-10-07 18:41:08 +0000
commit02d4b7278dca17316c5f9ff4222764cdab9b8992 (patch)
tree2b8c2589f0652126d338f12ae69334954f0bd739 /src/mainboard/google
parent326a499f6fd81bb4a48618cc6fbe3340f4adb37e (diff)
downloadcoreboot-02d4b7278dca17316c5f9ff4222764cdab9b8992.tar.xz
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>
Diffstat (limited to 'src/mainboard/google')
-rw-r--r--src/mainboard/google/zork/ec.c1
-rw-r--r--src/mainboard/google/zork/variants/baseboard/include/baseboard/ec.h3
-rw-r--r--src/mainboard/google/zork/variants/morphius/include/variant/ec.h11
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))