[coreboot-gerrit] Change in coreboot[master]: soc/intel/braswell: Refactor acpi_init_gnvs()

[Nico Huber (Code Review)]

Nico Huber has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48704 )

Change subject: soc/intel/braswell: Refactor acpi_init_gnvs()
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48704
Reviewed-by: Arthur Heymans 
Reviewed-by: Angel Pons 
Tested-by: build bot (Jenkins) 
---
M src/soc/intel/braswell/acpi.c
1 file changed, 6 insertions(+), 6 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Arthur Heymans: Looks good to me, approved
  Angel Pons: Looks good to me, approved

diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c
index bdba583..6150222 100644
--- a/src/soc/intel/braswell/acpi.c
+++ b/src/soc/intel/braswell/acpi.c
@@ -70,6 +70,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)
@@ -368,12 +374,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);