From 2e2fe3cc91d2831c9962e5e96bd5739eba00ea73 Mon Sep 17 00:00:00 2001 From: David Wu Date: Thu, 22 Nov 2018 20:38:47 +0800 Subject: 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: I65deb33a45fdc0c0ce64deaa29c2790029dc1d12 Signed-off-by: David Wu Reviewed-on: https://review.coreboot.org/c/coreboot/+/29796 Tested-by: build bot (Jenkins) Reviewed-by: Zhuohao Lee Reviewed-by: Patrick Georgi Reviewed-by: David Wu Reviewed-by: Furquan Shaikh --- src/mainboard/google/fizz/smihandler.c | 4 ++++ .../baseboard/include/baseboard/variants.h | 2 ++ .../google/fizz/variants/karma/Makefile.inc | 2 ++ .../google/fizz/variants/karma/smihandler.c | 28 ++++++++++++++++++++++ 4 files changed, 36 insertions(+) create mode 100644 src/mainboard/google/fizz/variants/karma/smihandler.c diff --git a/src/mainboard/google/fizz/smihandler.c b/src/mainboard/google/fizz/smihandler.c index 3aa9ddb53a..2b7367ad34 100644 --- a/src/mainboard/google/fizz/smihandler.c +++ b/src/mainboard/google/fizz/smihandler.c @@ -17,6 +17,7 @@ #include #include +#include #include void mainboard_smi_espi_handler(void) @@ -24,8 +25,11 @@ void mainboard_smi_espi_handler(void) 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 50e7ee37c3..40dfeebc23 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 pad_config *variant_early_gpio_table(size_t *num); 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 0ad298b5f4..747552267d 100644 --- a/src/mainboard/google/fizz/variants/karma/Makefile.inc +++ b/src/mainboard/google/fizz/variants/karma/Makefile.inc @@ -2,3 +2,5 @@ bootblock-y += gpio.c 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 0000000000..1bfae4dfe7 --- /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 +#include +#include + +#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); + } +} -- cgit v1.2.3