summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Yilun Lin <yllin@chromium.org>2021-06-25 11:48:42 +0800
committerCommit Bot <commit-bot@chromium.org>2021-06-30 09:27:35 +0000
commitb5920dc038c24311dda0522c879fcff6a2d93e85 (patch)
tree883082d09399afc60f9ba155e087a12fda72d090
parent4237423bee265252480a9d68e3c20b30b99071d4 (diff)
downloadchrome-ec-b5920dc038c24311dda0522c879fcff6a2d93e85.tar.gz
kukui: move common mkbp wake events to baseboard.h
also, kodama(detachable) missed MODE_CHANGE event, add it back. BUG=none TEST=make buildall BRANCH=kukui,icarus Change-Id: Id7139ef64caf28720d389d8c048bfd724b42ba95 Signed-off-by: Eric Yilun Lin <yllin@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2987231 Reviewed-by: Eric Yilun Lin <yllin@google.com> Commit-Queue: Eric Yilun Lin <yllin@google.com> Tested-by: Eric Yilun Lin <yllin@google.com>
Diffstat
-rw-r--r--baseboard/kukui/baseboard.h12
-rw-r--r--board/burnet/board.h4
-rw-r--r--board/cerise/board.h4
-rw-r--r--board/damu/board.h4
-rw-r--r--board/fennel/board.h4
-rw-r--r--board/icarus/board.h4
-rw-r--r--board/jacuzzi/board.h4
-rw-r--r--board/kakadu/board.h6
-rw-r--r--board/kappa/board.h4
-rw-r--r--board/katsu/board.h6
-rw-r--r--board/kodama/board.h3
-rw-r--r--board/kukui/board.h6
-rw-r--r--board/makomo/board.h4
-rw-r--r--board/stern/board.h4
-rw-r--r--board/willow/board.h4
15 files changed, 12 insertions, 61 deletions
diff --git a/baseboard/kukui/baseboard.h b/baseboard/kukui/baseboard.h
index cad0e81243..34a73e24ef 100644
--- a/baseboard/kukui/baseboard.h
+++ b/baseboard/kukui/baseboard.h
@@ -114,6 +114,18 @@
#define CONFIG_TABLET_MODE_SWITCH
#define PD_OPERATING_POWER_MW 30000
+
+#define CONFIG_MKBP_HOST_EVENT_WAKEUP_MASK \
+ (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON))
+
+#else /* !VARIANT_KUKUI_JACUZZI */
+
+#define CONFIG_MKBP_HOST_EVENT_WAKEUP_MASK \
+ (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON) |\
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE))
+
#endif /* VARIANT_KUKUI_JACUZZI */
/*
diff --git a/board/burnet/board.h b/board/burnet/board.h
index ee57daef75..31e76d892f 100644
--- a/board/burnet/board.h
+++ b/board/burnet/board.h
@@ -86,10 +86,6 @@
#define CONFIG_KEYBOARD_PROTOCOL_MKBP
#define CONFIG_MKBP_EVENT
#define CONFIG_MKBP_USE_GPIO
-/* Define the MKBP events which are allowed to wakeup AP in S3. */
-#define CONFIG_MKBP_HOST_EVENT_WAKEUP_MASK \
- (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\
- EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON))
#ifndef __ASSEMBLER__
diff --git a/board/cerise/board.h b/board/cerise/board.h
index 1fc1a23741..15ae4c5180 100644
--- a/board/cerise/board.h
+++ b/board/cerise/board.h
@@ -88,10 +88,6 @@
#define CONFIG_KEYBOARD_PROTOCOL_MKBP
#define CONFIG_MKBP_EVENT
#define CONFIG_MKBP_USE_GPIO
-/* Define the MKBP events which are allowed to wakeup AP in S3. */
-#define CONFIG_MKBP_HOST_EVENT_WAKEUP_MASK \
- (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\
- EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON))
#ifndef __ASSEMBLER__
diff --git a/board/damu/board.h b/board/damu/board.h
index bd81b717bf..b271f9283d 100644
--- a/board/damu/board.h
+++ b/board/damu/board.h
@@ -87,10 +87,6 @@
#define CONFIG_KEYBOARD_PROTOCOL_MKBP
#define CONFIG_MKBP_EVENT
#define CONFIG_MKBP_USE_GPIO
-/* Define the MKBP events which are allowed to wakeup AP in S3. */
-#define CONFIG_MKBP_HOST_EVENT_WAKEUP_MASK \
- (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\
- EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON))
#ifndef __ASSEMBLER__
diff --git a/board/fennel/board.h b/board/fennel/board.h
index d152912f7a..6f24ede6ea 100644
--- a/board/fennel/board.h
+++ b/board/fennel/board.h
@@ -90,10 +90,6 @@
#define CONFIG_KEYBOARD_PROTOCOL_MKBP
#define CONFIG_MKBP_EVENT
#define CONFIG_MKBP_USE_GPIO
-/* Define the MKBP events which are allowed to wakeup AP in S3. */
-#define CONFIG_MKBP_HOST_EVENT_WAKEUP_MASK \
- (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\
- EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON))
#ifndef __ASSEMBLER__
diff --git a/board/icarus/board.h b/board/icarus/board.h
index 230e60b156..8529f257b7 100644
--- a/board/icarus/board.h
+++ b/board/icarus/board.h
@@ -60,10 +60,6 @@
#define CONFIG_KEYBOARD_PROTOCOL_MKBP
#define CONFIG_MKBP_EVENT
#define CONFIG_MKBP_USE_GPIO
-/* Define the MKBP events which are allowed to wakeup AP in S3. */
-#define CONFIG_MKBP_HOST_EVENT_WAKEUP_MASK \
- (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\
- EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON))
#define CONFIG_LED_ONOFF_STATES
diff --git a/board/jacuzzi/board.h b/board/jacuzzi/board.h
index 4af817f961..da98822c9b 100644
--- a/board/jacuzzi/board.h
+++ b/board/jacuzzi/board.h
@@ -98,10 +98,6 @@
#define CONFIG_KEYBOARD_PROTOCOL_MKBP
#define CONFIG_MKBP_EVENT
#define CONFIG_MKBP_USE_GPIO
-/* Define the MKBP events which are allowed to wakeup AP in S3. */
-#define CONFIG_MKBP_HOST_EVENT_WAKEUP_MASK \
- (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\
- EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON))
#define CONFIG_LED_ONOFF_STATES
diff --git a/board/kakadu/board.h b/board/kakadu/board.h
index 1a7d8c3507..4e054dac93 100644
--- a/board/kakadu/board.h
+++ b/board/kakadu/board.h
@@ -61,12 +61,6 @@
/* Route sbs host requests to virtual battery driver */
#define VIRTUAL_BATTERY_ADDR_FLAGS 0x0B
-/* Define the host events which are allowed to wakeup AP in S3. */
-#define CONFIG_MKBP_HOST_EVENT_WAKEUP_MASK \
- (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\
- EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON) |\
- EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE))
-
/* MKBP */
#define CONFIG_MKBP_INPUT_DEVICES
#define CONFIG_MKBP_EVENT
diff --git a/board/kappa/board.h b/board/kappa/board.h
index d0ef7b623b..4840399ccf 100644
--- a/board/kappa/board.h
+++ b/board/kappa/board.h
@@ -56,10 +56,6 @@
#define CONFIG_KEYBOARD_PROTOCOL_MKBP
#define CONFIG_MKBP_EVENT
#define CONFIG_MKBP_USE_GPIO
-/* Define the MKBP events which are allowed to wakeup AP in S3. */
-#define CONFIG_MKBP_HOST_EVENT_WAKEUP_MASK \
- (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\
- EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON))
#ifndef __ASSEMBLER__
diff --git a/board/katsu/board.h b/board/katsu/board.h
index bdc552a9c5..aa6e386d8f 100644
--- a/board/katsu/board.h
+++ b/board/katsu/board.h
@@ -58,12 +58,6 @@
/* Route sbs host requests to virtual battery driver */
#define VIRTUAL_BATTERY_ADDR_FLAGS 0x0B
-/* Define the host events which are allowed to wakeup AP in S3. */
-#define CONFIG_MKBP_HOST_EVENT_WAKEUP_MASK \
- (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\
- EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON) |\
- EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE))
-
/* MKBP */
#define CONFIG_MKBP_INPUT_DEVICES
#define CONFIG_MKBP_EVENT
diff --git a/board/kodama/board.h b/board/kodama/board.h
index 98e9b219ac..0c1416063c 100644
--- a/board/kodama/board.h
+++ b/board/kodama/board.h
@@ -64,9 +64,6 @@
/* Define the host events which are allowed to wakeup AP in S3. */
#define CONFIG_MKBP_INPUT_DEVICES
-#define CONFIG_MKBP_HOST_EVENT_WAKEUP_MASK \
- (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\
- EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON))
#define PD_OPERATING_POWER_MW 15000
diff --git a/board/kukui/board.h b/board/kukui/board.h
index bbb66d4e41..e771c9891d 100644
--- a/board/kukui/board.h
+++ b/board/kukui/board.h
@@ -87,12 +87,6 @@
/* Route sbs host requests to virtual battery driver */
#define VIRTUAL_BATTERY_ADDR_FLAGS 0x0B
-/* Define the host events which are allowed to wakeup AP in S3. */
-#define CONFIG_MKBP_HOST_EVENT_WAKEUP_MASK \
- (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\
- EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON) |\
- EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE))
-
/* MKBP */
#define CONFIG_MKBP_INPUT_DEVICES
#define CONFIG_MKBP_EVENT
diff --git a/board/makomo/board.h b/board/makomo/board.h
index 67fc07e960..1073d29e2a 100644
--- a/board/makomo/board.h
+++ b/board/makomo/board.h
@@ -90,10 +90,6 @@
#define CONFIG_KEYBOARD_PROTOCOL_MKBP
#define CONFIG_MKBP_EVENT
#define CONFIG_MKBP_USE_GPIO
-/* Define the MKBP events which are allowed to wakeup AP in S3. */
-#define CONFIG_MKBP_HOST_EVENT_WAKEUP_MASK \
- (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\
- EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON))
#ifndef __ASSEMBLER__
diff --git a/board/stern/board.h b/board/stern/board.h
index 890f5b70a2..cd3fa307c3 100644
--- a/board/stern/board.h
+++ b/board/stern/board.h
@@ -87,10 +87,6 @@
#define CONFIG_KEYBOARD_PROTOCOL_MKBP
#define CONFIG_MKBP_EVENT
#define CONFIG_MKBP_USE_GPIO
-/* Define the MKBP events which are allowed to wakeup AP in S3. */
-#define CONFIG_MKBP_HOST_EVENT_WAKEUP_MASK \
- (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\
- EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON))
#ifndef __ASSEMBLER__
diff --git a/board/willow/board.h b/board/willow/board.h
index b9531b0805..5ef970e252 100644
--- a/board/willow/board.h
+++ b/board/willow/board.h
@@ -83,10 +83,6 @@
#define CONFIG_KEYBOARD_PROTOCOL_MKBP
#define CONFIG_MKBP_EVENT
#define CONFIG_MKBP_USE_GPIO
-/* Define the MKBP events which are allowed to wakeup AP in S3. */
-#define CONFIG_MKBP_HOST_EVENT_WAKEUP_MASK \
- (EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN) |\
- EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON))
#define CONFIG_LED_ONOFF_STATES
View Lorry Controller Status