[coreboot-gerrit] Change in coreboot[master]: mb/google/poppy/var/nocturne: Provide override for ec eventinfo

[Furquan Shaikh (Code Review)]

Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/28984


Change subject: mb/google/poppy/var/nocturne: Provide override for ec eventinfo
......................................................................

mb/google/poppy/var/nocturne: Provide override for ec eventinfo

This change implements the callback to provide google_chromeec_event_info
structure in nocturne variant and sets MKBP SCI based on board id.

BUG=b:112366846,b:112112483,b:112111610

Change-Id: Ifcc10aefc8f450214bd64dfffaf8854ada43f323
Signed-off-by: Furquan Shaikh <furquan at google.com>
---
M src/mainboard/google/poppy/variants/nocturne/Makefile.inc
A src/mainboard/google/poppy/variants/nocturne/ec.c
M src/mainboard/google/poppy/variants/nocturne/include/variant/ec.h
3 files changed, 39 insertions(+), 1 deletion(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/84/28984/1

diff --git a/src/mainboard/google/poppy/variants/nocturne/Makefile.inc b/src/mainboard/google/poppy/variants/nocturne/Makefile.inc
index c17a49c..f202ef1 100644
--- a/src/mainboard/google/poppy/variants/nocturne/Makefile.inc
+++ b/src/mainboard/google/poppy/variants/nocturne/Makefile.inc
@@ -20,3 +20,5 @@
 ramstage-y += gpio.c
 ramstage-y += nhlt.c
 ramstage-y += mainboard.c
+
+smm-y += ec.c
diff --git a/src/mainboard/google/poppy/variants/nocturne/ec.c b/src/mainboard/google/poppy/variants/nocturne/ec.c
new file mode 100644
index 0000000..13c4a42
--- /dev/null
+++ b/src/mainboard/google/poppy/variants/nocturne/ec.c
@@ -0,0 +1,37 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2016 Google Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <arch/acpi.h>
+#include <baseboard/variants.h>
+#include <boardid.h>
+#include <ec/google/chromeec/ec.h>
+
+#include <variant/ec.h>
+
+const struct google_chromeec_event_info *variant_get_event_info(void)
+{
+	static struct google_chromeec_event_info info = {
+		.log_events = MAINBOARD_EC_LOG_EVENTS,
+		.sci_events = MAINBOARD_EC_SCI_EVENTS,
+		.s3_wake_events = MAINBOARD_EC_S3_WAKE_EVENTS,
+		.s5_wake_events = MAINBOARD_EC_S5_WAKE_EVENTS,
+		.s0ix_wake_events = MAINBOARD_EC_S0IX_WAKE_EVENTS,
+	};
+
+	if (board_id() <= 2)
+		info.sci_events |= EC_HOST_EVENT_MASK(EC_HOST_EVENT_MKBP);
+
+	return &info;
+}
diff --git a/src/mainboard/google/poppy/variants/nocturne/include/variant/ec.h b/src/mainboard/google/poppy/variants/nocturne/include/variant/ec.h
index ba481e4..46e848b 100644
--- a/src/mainboard/google/poppy/variants/nocturne/include/variant/ec.h
+++ b/src/mainboard/google/poppy/variants/nocturne/include/variant/ec.h
@@ -34,7 +34,6 @@
 	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_START)    |\
 	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_STOP)     |\
 	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_PD_MCU)            |\
-	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_MKBP)              |\
 	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE))
 
 #define MAINBOARD_EC_SMI_EVENTS \

-- 
To view, visit https://review.coreboot.org/28984
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifcc10aefc8f450214bd64dfffaf8854ada43f323
Gerrit-Change-Number: 28984
Gerrit-PatchSet: 1
Gerrit-Owner: Furquan Shaikh <furquan at google.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20181010/cdf9845d/attachment-0001.html>