diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2020-06-28 21:56:46 +0300 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2021-01-10 11:39:28 +0000 |
| commit | 999e441338e44f7c131e7ffa915ef965424d8739 (patch) | |
| tree | 33003df61e6b1b55ed47fe09ac5ed19dc333b028 /src/soc/intel | |
| parent | a9766c7adaaa442fc3c42ca4f31fe4050cfa653d (diff) | |
soc/intel: Replace acpi_init_gnvs()
Rename these to soc_fill_gnvs() and move the callsite away
from mb/.
Change-Id: I760c36f65c6122103f2be98fc11ee13832c2772e
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48716
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Wim Vervoorn <wvervoorn@eltan.com>
Reviewed-by: Frans Hendriks <fhendriks@eltan.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/intel')
| -rw-r--r-- | src/soc/intel/baytrail/acpi.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/baytrail/southcluster.c | 1 | ||||
| -rw-r--r-- | src/soc/intel/braswell/acpi.c | 3 | ||||
| -rw-r--r-- | src/soc/intel/denverton_ns/acpi.c | 3 | ||||
| -rw-r--r-- | src/soc/intel/xeon_sp/skx/soc_acpi.c | 2 |
5 files changed, 7 insertions, 4 deletions
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(); diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c index 2899888df4..caeae39512 100644 --- a/src/soc/intel/braswell/acpi.c +++ b/src/soc/intel/braswell/acpi.c @@ -59,7 +59,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; @@ -370,6 +370,7 @@ void southcluster_inject_dsdt(const struct device *device) if (!gnvs) return; + soc_fill_gnvs(gnvs); mainboard_fill_gnvs(gnvs); acpi_inject_nvsa(); diff --git a/src/soc/intel/denverton_ns/acpi.c b/src/soc/intel/denverton_ns/acpi.c index 6730bffd2c..8ef2faa7c0 100644 --- a/src/soc/intel/denverton_ns/acpi.c +++ b/src/soc/intel/denverton_ns/acpi.c @@ -60,7 +60,7 @@ static acpi_cstate_t cstate_map[] = { } }; -void acpi_init_gnvs(struct global_nvs *gnvs) +void soc_fill_gnvs(struct global_nvs *gnvs) { /* CPU core count */ gnvs->pcnt = dev_count_cpu(); @@ -247,6 +247,7 @@ void southcluster_inject_dsdt(const struct device *device) if (!gnvs) return; + soc_fill_gnvs(gnvs); mainboard_fill_gnvs(gnvs); acpi_inject_nvsa(); } diff --git a/src/soc/intel/xeon_sp/skx/soc_acpi.c b/src/soc/intel/xeon_sp/skx/soc_acpi.c index af52674e9f..a7050f002c 100644 --- a/src/soc/intel/xeon_sp/skx/soc_acpi.c +++ b/src/soc/intel/xeon_sp/skx/soc_acpi.c @@ -28,7 +28,7 @@ unsigned long acpi_fill_mcfg(unsigned long current) return current; } -void acpi_init_gnvs(struct global_nvs *gnvs) +void soc_fill_gnvs(struct global_nvs *gnvs) { /* CPU core count */ gnvs->pcnt = dev_count_cpu(); |