UPSTREAM: mb/google/fizz/variants/karma: Clear GPP_B4 when entering S5
Set GPP_B4 to low in S5 to meet touch panel power sequence
BUG=b:124197348
BRANCH=master
TEST=Verify GPP_B4 is low.
Change-Id: I23222b3150b2eb3900a2a5aa039dabde14ab8bfb
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Commit-Id: 2e2fe3cc91d2831c9962e5e96bd5739eba00ea73
Original-Change-Id: I65deb33a45fdc0c0ce64deaa29c2790029dc1d12
Original-Signed-off-by: David Wu <David_Wu@quanta.corp-partner.google.com>
Original-Reviewed-on: https://review.coreboot.org/c/coreboot/+/29796
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Zhuohao Lee <zhuohao@chromium.org>
Original-Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Original-Reviewed-by: David Wu <david_wu@quanta.corp-partner.google.com>
Original-Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1553855
Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
(cherry picked from commit 321af3f4e847e9e09540e1d6dfa2b6c8964ed4a9)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/+/1559521
Tested-by: David Wu <david_wu@quanta.corp-partner.google.com>
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Commit-Queue: Zhuohao Lee <zhuohao@chromium.org>
diff --git a/src/mainboard/google/fizz/smihandler.c b/src/mainboard/google/fizz/smihandler.c
index 3aa9ddb..2b7367a 100644
--- a/src/mainboard/google/fizz/smihandler.c
+++ b/src/mainboard/google/fizz/smihandler.c
@@ -17,6 +17,7 @@
#include <ec/google/chromeec/smm.h>
#include <soc/smm.h>
+#include <baseboard/variants.h>
#include <variant/ec.h>
void mainboard_smi_espi_handler(void)
@@ -24,8 +25,11 @@
chromeec_smi_process_events();
}
+void __weak variant_smi_sleep(u8 slp_typ) {}
+
void mainboard_smi_sleep(u8 slp_typ)
{
+ variant_smi_sleep(slp_typ);
chromeec_smi_sleep(slp_typ, MAINBOARD_EC_S3_WAKE_EVENTS,
MAINBOARD_EC_S5_WAKE_EVENTS);
}
diff --git a/src/mainboard/google/fizz/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/fizz/variants/baseboard/include/baseboard/variants.h
index 50e7ee3..40dfeeb 100644
--- a/src/mainboard/google/fizz/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/google/fizz/variants/baseboard/include/baseboard/variants.h
@@ -29,6 +29,8 @@
const struct cros_gpio *variant_cros_gpios(size_t *num);
+void variant_smi_sleep(u8 slp_typ);
+
struct nhlt;
void variant_nhlt_init(struct nhlt *nhlt);
void variant_nhlt_oem_overrides(const char **oem_id, const char **oem_table_id,
diff --git a/src/mainboard/google/fizz/variants/karma/Makefile.inc b/src/mainboard/google/fizz/variants/karma/Makefile.inc
index 0ad298b..7475522 100644
--- a/src/mainboard/google/fizz/variants/karma/Makefile.inc
+++ b/src/mainboard/google/fizz/variants/karma/Makefile.inc
@@ -2,3 +2,5 @@
ramstage-y += gpio.c
ramstage-y += nhlt.c
+
+smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
diff --git a/src/mainboard/google/fizz/variants/karma/smihandler.c b/src/mainboard/google/fizz/variants/karma/smihandler.c
new file mode 100644
index 0000000..1bfae4d
--- /dev/null
+++ b/src/mainboard/google/fizz/variants/karma/smihandler.c
@@ -0,0 +1,28 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 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 <gpio.h>
+
+#define TS_ENABLE GPP_B4
+
+void variant_smi_sleep(u8 slp_typ)
+{
+ if (slp_typ == ACPI_S5) {
+ /* Set TS to disable */
+ gpio_set(TS_ENABLE, 0);
+ }
+}
