Kyösti Mälkki has uploaded this change for review.
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>
---
M src/soc/intel/braswell/acpi.c
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/48704/1
diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c
index 9c4e83a..5880d1b 100644
--- a/src/soc/intel/braswell/acpi.c
+++ b/src/soc/intel/braswell/acpi.c
@@ -69,6 +69,12 @@
/* 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)
@@ -367,12 +373,6 @@
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);
To view, visit change 48704. To unsubscribe, or for help writing mail filters, visit settings.