summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrobbie zhang <robbie.zhang@intel.com>2015-08-21 12:56:04 -0700
committerPatrick Georgi <pgeorgi@google.com>2015-08-29 07:31:23 +0000
commit17d2fb8dc191933d7c1edceeee145ed000df11a5 (patch)
tree4c62f325bbeb387d3b2504b56cbd44649035a724
parentbcd99301b8e2e312cb6a6a4d3adf749167fb84f9 (diff)
downloadcoreboot-17d2fb8dc191933d7c1edceeee145ed000df11a5.tar.xz
intel/kunimitsu: clean up ec smi and make EC_SMI_L functional
forward port of "glados: make EC_SMI_L functional", commit 50ed38feba58f BUG=None BRANCH=None TEST=Built and booted kunimitsu. CQ-DEPEND=CL:295012 Change-Id: I41daeb8b729f2de117b5d57c460925437460e50a Signed-off-by: Patrick Georgi <patrick@georgi-clan.de> Original-Commit-Id: d9308c0b8eb05c756d88dc0c3d761c9e76d07e08 Original-Change-Id: Ia90c70d21af75d0f0da2af2b4437ccf26659a157 Original-Signed-off-by: robbie zhang <robbie.zhang@intel.com> Original-Reviewed-on: https://chromium-review.googlesource.com/295045 Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org> Original-Tested-by: Wenkai Du <wenkai.du@intel.com> Reviewed-on: http://review.coreboot.org/11428 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r--src/mainboard/intel/kunimitsu/ec.h4
-rw-r--r--src/mainboard/intel/kunimitsu/smihandler.c5
2 files changed, 4 insertions, 5 deletions
diff --git a/src/mainboard/intel/kunimitsu/ec.h b/src/mainboard/intel/kunimitsu/ec.h
index 9da9d9f0b2..9c8a9d1491 100644
--- a/src/mainboard/intel/kunimitsu/ec.h
+++ b/src/mainboard/intel/kunimitsu/ec.h
@@ -22,11 +22,11 @@
#define MAINBOARD_EC_H
#include <ec/google/chromeec/ec_commands.h>
+#include <soc/gpio.h>
/* GPP_E16 is EC_SCI_L */
#define EC_SCI_GPI 16 /* TODO: Update this */
-/* GPP_E15 is EC_SMI_L */
-#define EC_SMI_GPI 15 /* TODO: Update this */
+#define EC_SMI_GPI GPP_E15
#define MAINBOARD_EC_SCI_EVENTS \
(EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_CLOSED) |\
diff --git a/src/mainboard/intel/kunimitsu/smihandler.c b/src/mainboard/intel/kunimitsu/smihandler.c
index 0529ba18e8..fe8e70cbcb 100644
--- a/src/mainboard/intel/kunimitsu/smihandler.c
+++ b/src/mainboard/intel/kunimitsu/smihandler.c
@@ -74,10 +74,9 @@ static u8 mainboard_smi_ec(void)
return cmd;
}
-/* gpi_sts is GPIO 47:32 */
-void mainboard_smi_gpi(u32 gpi_sts)
+void mainboard_smi_gpi_handler(const struct gpi_status *sts)
{
- if (gpi_sts & (1 << EC_SMI_GPI)) {
+ if (gpi_status_get(sts, EC_SMI_GPI)) {
/* Process all pending events */
while (mainboard_smi_ec() != 0)
;