From 999e441338e44f7c131e7ffa915ef965424d8739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Sun, 28 Jun 2020 21:56:46 +0300 Subject: soc/intel: Replace acpi_init_gnvs() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename these to soc_fill_gnvs() and move the callsite away from mb/. Change-Id: I760c36f65c6122103f2be98fc11ee13832c2772e Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/48716 Reviewed-by: Arthur Heymans Reviewed-by: Wim Vervoorn Reviewed-by: Frans Hendriks Tested-by: build bot (Jenkins) --- src/soc/intel/baytrail/acpi.c | 2 +- src/soc/intel/baytrail/southcluster.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src/soc/intel/baytrail') diff --git a/src/soc/intel/baytrail/acpi.c b/src/soc/intel/baytrail/acpi.c index 35b26d3abf..cf031b9650 100644 --- a/src/soc/intel/baytrail/acpi.c +++ b/src/soc/intel/baytrail/acpi.c @@ -56,7 +56,7 @@ static acpi_cstate_t cstate_map[] = { } }; -void acpi_init_gnvs(struct global_nvs *gnvs) +void soc_fill_gnvs(struct global_nvs *gnvs) { /* Set unknown wake source */ gnvs->pm1i = -1; diff --git a/src/soc/intel/baytrail/southcluster.c b/src/soc/intel/baytrail/southcluster.c index 60047b9e66..aeb3775f23 100644 --- a/src/soc/intel/baytrail/southcluster.c +++ b/src/soc/intel/baytrail/southcluster.c @@ -489,6 +489,7 @@ static void southcluster_inject_dsdt(const struct device *device) if (!gnvs) return; + soc_fill_gnvs(gnvs); mainboard_fill_gnvs(gnvs); acpi_inject_nvsa(); -- cgit v1.2.3