mb/google/guybrush: rename baseboard GPIO table getter for clarity

Rename variant_base_gpio_table() to baseboard_gpio_table(), since the
GPIO table comes from the baseboard, and is overridden by a separate
table from the variant.

Drop the __weak qualifier as this function is not overridden.

Change-Id: Ib8439e664defeafd2d08cffb74c997ab69230231
Signed-off-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/67806
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>

3 files changed, 4 insertions, 9 deletions

diff --git a/src/mainboard/google/guybrush/mainboard.c b/src/mainboard/google/guybrush/mainboard.c
index f6f7ccb81d46..9a1c24d82cc4 100644
--- a/src/mainboard/google/guybrush/mainboard.c
+++ b/src/mainboard/google/guybrush/mainboard.c
@@ -106,7 +106,7 @@ static void mainboard_configure_gpios(void)
 	size_t base_num_gpios, override_num_gpios;
 	const struct soc_amd_gpio *base_gpios, *override_gpios;
 
-	base_gpios = variant_base_gpio_table(&base_num_gpios);
+	base_gpios = baseboard_gpio_table(&base_num_gpios);
 	override_gpios = variant_override_gpio_table(&override_num_gpios);
 
 	gpio_configure_pads_with_override(base_gpios, base_num_gpios, override_gpios,
diff --git a/src/mainboard/google/guybrush/variants/baseboard/gpio.c b/src/mainboard/google/guybrush/variants/baseboard/gpio.c
index cfbabc110037..ccea5731f173 100644
--- a/src/mainboard/google/guybrush/variants/baseboard/gpio.c
+++ b/src/mainboard/google/guybrush/variants/baseboard/gpio.c
@@ -298,7 +298,7 @@ const struct soc_amd_gpio *__weak variant_bootblock_gpio_table(size_t *size)
 	return bootblock_gpio_table;
 }
 
-const struct soc_amd_gpio *__weak variant_base_gpio_table(size_t *size)
+const struct soc_amd_gpio  *baseboard_gpio_table(size_t *size)
 {
 	*size = ARRAY_SIZE(base_gpio_table);
 	return base_gpio_table;
diff --git a/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/variants.h
index b2457d6cb057..bf694438bb87 100644
--- a/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/google/guybrush/variants/baseboard/include/baseboard/variants.h
@@ -12,13 +12,8 @@
 #define WWAN_DEVFN	PCIE_GPP_2_2_DEVFN
 #define NVME_DEVFN	PCIE_GPP_2_3_DEVFN
 
-/*
- * This function provides base GPIO configuration table. It is typically provided by
- * baseboard using a weak implementation. If GPIO configuration for a variant differs
- * significantly from the baseboard, then the variant can also provide a strong implementation
- * of this function.
- */
-const struct soc_amd_gpio *variant_base_gpio_table(size_t *size);
+/* This function provides base GPIO configuration table. */
+const struct soc_amd_gpio *baseboard_gpio_table(size_t *size);
 /*
  * These functions allow variants to override any GPIOs that are different than the base GPIO
  * configuration provided without having to replace the entire file.