summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Wawrzynczak <twawrzynczak@chromium.org>2020-02-05 17:57:12 -0700
committerCommit Bot <commit-bot@chromium.org>2020-02-06 22:37:42 +0000
commit425549603979939829dace5e081a4975ea414afc (patch)
tree5e437fad8f83942a2679bfd0bcc636b7d339657f
parent1b886ec3bb3a8212ea0902956382b4fed503bfd9 (diff)
downloadchrome-ec-425549603979939829dace5e081a4975ea414afc.tar.gz
hatch: Define CONFIG_MKBP_EVENT_WAKEUP_MASK as 0
This allows the AP to set MKBP wake masks, which will enable the EC to wake the system from suspend states. The default is 0, which means that the AP gets to choose which events will wake it from suspend. BUG=b:148976961 BRANCH=firmware-hatch-12672.B TEST=Verify 'ectool mkbpwakemask set event 0x400' succeeds. Also verify with corresponding coreboot CL that the system can wake from suspend when a DP-capable monitor is plugged in. Change-Id: I238721b0384699fec74a86002b1e7ca289ee3c8c Signed-off-by: Tim Wawrzynczak <twawrzynczak@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2042112 Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org> Commit-Queue: Paul Fagerburg <pfagerburg@chromium.org>
-rw-r--r--baseboard/hatch/baseboard.h4
-rw-r--r--board/kohaku/board.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/baseboard/hatch/baseboard.h b/baseboard/hatch/baseboard.h
index 063b401f28..200480e152 100644
--- a/baseboard/hatch/baseboard.h
+++ b/baseboard/hatch/baseboard.h
@@ -70,6 +70,10 @@
#define CONFIG_MKBP_EVENT
#define CONFIG_MKBP_USE_GPIO_AND_HOST_EVENT
#define CONFIG_DYNAMIC_MOTION_SENSOR_COUNT
+
+/* Don't wake up from suspend on any MKBP event */
+#define CONFIG_MKBP_EVENT_WAKEUP_MASK 0
+
/* I2C_PORT_ACCEL needs to be defined for i2c transactions */
#define I2C_PORT_ACCEL I2C_PORT_SENSOR
diff --git a/board/kohaku/board.h b/board/kohaku/board.h
index ed955e3dbc..d51609da38 100644
--- a/board/kohaku/board.h
+++ b/board/kohaku/board.h
@@ -26,9 +26,6 @@
#undef CONFIG_UART_TX_BUF_SIZE
#define CONFIG_UART_TX_BUF_SIZE 4096
-/* Don't wake up from suspend on any MKBP event */
-#define CONFIG_MKBP_EVENT_WAKEUP_MASK 0
-
/* Keyboard features */
#define CONFIG_PWM_KBLIGHT