summaryrefslogtreecommitdiff
path: root/src/soc/intel
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2020-06-29 02:47:45 +0300
committerNico Huber <nico.h@gmx.de>2021-01-10 11:23:07 +0000
commit46e37c6343a1f4fa325d0ab66385d3acae4ffa12 (patch)
treeb3d62267ff834a83e7271a6aa7ddbd23524295bf /src/soc/intel
parent82f6b932e904429c1903e2c13345451340f7c51b (diff)
soc/intel/braswell: Refactor acpi_init_gnvs()
Move GNVS details to different function, called from acpi_create_gnvs(). Change-Id: Ief02c078fe37753c0d29418394a351105a1aacc8 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/48704 Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/intel')
-rw-r--r--src/soc/intel/braswell/acpi.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c
index bdba5830a6..615022270f 100644
--- a/src/soc/intel/braswell/acpi.c
+++ b/src/soc/intel/braswell/acpi.c
@@ -70,6 +70,12 @@ void acpi_init_gnvs(struct global_nvs *gnvs)
/* Top of Low Memory (start of resource allocation) */
gnvs->tolm = nc_read_top_of_low_memory();
+
+ /* Fill in the Wi-Fi Region ID */
+ if (CONFIG(HAVE_REGULATORY_DOMAIN))
+ gnvs->cid1 = wifi_regulatory_domain();
+ else
+ gnvs->cid1 = WRDD_DEFAULT_REGULATORY_DOMAIN;
}
int acpi_sci_irq(void)
@@ -368,12 +374,6 @@ void southcluster_inject_dsdt(const struct device *device)
if (gnvs) {
acpi_create_gnvs(gnvs);
- /* Fill in the Wi-Fi Region ID */
- if (CONFIG(HAVE_REGULATORY_DOMAIN))
- gnvs->cid1 = wifi_regulatory_domain();
- else
- gnvs->cid1 = WRDD_DEFAULT_REGULATORY_DOMAIN;
-
/* Add it to DSDT */
acpigen_write_scope("\\");
acpigen_write_name_dword("NVSA", (u32) gnvs);