Rob Barnes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/63659 )
Change subject: mb/google/nipperkin: Remove EC_ENABLE_MKBP_DEVICE ......................................................................
mb/google/nipperkin: Remove EC_ENABLE_MKBP_DEVICE
Remove EC_ENABLE_MKBP_DEVICE on Nipperkin because it is not needed. Move EC_ENABLE_MKBP_DEVICE to be enabled on dewatt only. Add EC_ENABLE_LID_SWITCH to nipperkin because MKBP will no longer provide lid events.
CONFIG_MKBP_INPUT_DEVICES must also be disabled on nipperkin EC, otherwise power button will not function.
BUG=b:228259884 BRANCH=guybrush TEST=Power button, lid and keyboard tested on Nipperkin
Cq-Depend: chromium:3587973 Change-Id: Idd508fe93f15d5d752945208a0d2a07a64d2635f Signed-off-by: Rob Barnes robbarnes@google.com --- M src/mainboard/google/guybrush/variants/baseboard/include/baseboard/ec.h M src/mainboard/google/guybrush/variants/dewatt/include/variant/ec.h M src/mainboard/google/guybrush/variants/nipperkin/include/variant/ec.h 3 files changed, 6 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/63659/1
diff --git a/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/ec.h b/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/ec.h index 34e2edd..f057cca 100644 --- a/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/ec.h +++ b/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/ec.h @@ -54,9 +54,6 @@ /* Set GPI for SCI */ #define EC_SCI_GPI GEVENT_24 /* eSPI system event -> GPE 24 */
-/* Enable MKBP for buttons and switches */ -#define EC_ENABLE_MKBP_DEVICE - /* Provide wake pin for EC */ #define EC_ENABLE_WAKE_PIN GEVENT_3 /* AGPIO 22 -> GPE 3 */
diff --git a/src/mainboard/google/guybrush/variants/dewatt/include/variant/ec.h b/src/mainboard/google/guybrush/variants/dewatt/include/variant/ec.h index 3b4950b..7eaf4d5 100644 --- a/src/mainboard/google/guybrush/variants/dewatt/include/variant/ec.h +++ b/src/mainboard/google/guybrush/variants/dewatt/include/variant/ec.h @@ -2,5 +2,8 @@
#include <baseboard/ec.h>
+/* Enable MKBP for buttons and switches */ +#define EC_ENABLE_MKBP_DEVICE + /* Enable Tablet switch */ #define EC_ENABLE_TBMC_DEVICE diff --git a/src/mainboard/google/guybrush/variants/nipperkin/include/variant/ec.h b/src/mainboard/google/guybrush/variants/nipperkin/include/variant/ec.h index 9e61a44..8fd54e6 100644 --- a/src/mainboard/google/guybrush/variants/nipperkin/include/variant/ec.h +++ b/src/mainboard/google/guybrush/variants/nipperkin/include/variant/ec.h @@ -1,3 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
#include <baseboard/ec.h> + +/* Enable LID switch for EC */ +#define EC_ENABLE_LID_SWITCH