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>

src/include/acpi/acpi_gnvs.h

@@ -32,7 +32,6 @@ void southbridge_inject_dsdt(const struct device *device);
  */
 
 void acpi_create_gnvs(struct global_nvs *gnvs);
-void acpi_init_gnvs(struct global_nvs *gnvs);
 
 void soc_fill_gnvs(struct global_nvs *gnvs);
 void mainboard_fill_gnvs(struct global_nvs *gnvs);

src/mainboard/bostentech/gbyt4/acpi_tables.c

@@ -7,8 +7,6 @@
 
 void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
 	/* Enable USB ports in S3 */
 	gnvs->s3u0 = 1;
 	gnvs->s3u1 = 1;

src/mainboard/facebook/fbg1701/acpi_tables.c

@@ -8,8 +8,6 @@
 
 void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
 	/* Enable USB ports in S3 */
 	gnvs->s3u0 = 1;
 	gnvs->s3u1 = 1;

src/mainboard/google/cyan/acpi_tables.c

@@ -8,8 +8,6 @@
 
 void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
 	/* Enable USB ports in S3 */
 	gnvs->s3u0 = 1;
 	gnvs->s3u1 = 1;

src/mainboard/google/rambi/acpi_tables.c

@@ -7,8 +7,6 @@
 
 void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
 	/* Enable USB ports in S3 */
 	gnvs->s3u0 = 1;
 	gnvs->s3u1 = 1;

src/mainboard/intel/harcuvar/acpi_tables.c

@@ -10,8 +10,6 @@
 
 void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
 	/* Disable USB ports in S5 */
 	gnvs->s5u0 = 0;
 	gnvs->s5u1 = 0;

src/mainboard/intel/strago/acpi_tables.c

@@ -12,8 +12,6 @@
 
 void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
 	/* Enable USB ports in S3 */
 	gnvs->s3u0 = 1;
 	gnvs->s3u1 = 1;

src/mainboard/ocp/tiogapass/acpi_tables.c

@@ -1,12 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <acpi/acpi.h>
-#include <acpi/acpi_gnvs.h>
-
-void mainboard_fill_gnvs(struct global_nvs *gnvs)
-{
-	acpi_init_gnvs(gnvs);
-}
 
 void mainboard_fill_fadt(acpi_fadt_t *fadt)
 {

src/mainboard/portwell/m107/acpi_tables.c

@@ -8,8 +8,6 @@
 
 void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
 	/* Enable USB ports in S3 */
 	gnvs->s3u0 = 1;
 	gnvs->s3u1 = 1;

src/mainboard/protectli/vault_bsw/acpi_tables.c

@@ -8,9 +8,6 @@
 
 void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-
-	acpi_init_gnvs(gnvs);
-
 	/* Enable USB ports in S3 */
 	gnvs->s3u0 = 1;
 	gnvs->s3u1 = 1;

src/mainboard/scaleway/tagada/acpi_tables.c

@@ -6,8 +6,6 @@
 
 void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	acpi_init_gnvs(gnvs);
-
 	/* Disable USB ports in S5 */
 	gnvs->s5u0 = 0;
 	gnvs->s5u1 = 0;

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;

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();

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();

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();
 }

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();