summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@amd.corp-partner.google.com>2022-09-23 13:27:26 -0500
committerFelix Held <felix-coreboot@felixheld.de>2022-09-27 15:16:49 +0000
commitacc91c335b6d0e0b9162966368bdc92a59522064 (patch)
treea573f59588b207e9113ac74b8d1ab3554a3ad555
parent6b8728f3ad6a00e43ed1aeb9c741e972cbdd6549 (diff)
downloadcoreboot-acc91c335b6d0e0b9162966368bdc92a59522064.tar.gz
coreboot-acc91c335b6d0e0b9162966368bdc92a59522064.tar.bz2
coreboot-acc91c335b6d0e0b9162966368bdc92a59522064.zip
mb/google/dedede: 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: I11814016d654bc2c2e6d24b3d18fb30d5b843fe9 Signed-off-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/67805 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
-rw-r--r--src/mainboard/google/dedede/mainboard.c2
-rw-r--r--src/mainboard/google/dedede/variants/baseboard/gpio.c2
-rw-r--r--src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mainboard/google/dedede/mainboard.c b/src/mainboard/google/dedede/mainboard.c
index 4cb38c04eb8a..cc0137dda29b 100644
--- a/src/mainboard/google/dedede/mainboard.c
+++ b/src/mainboard/google/dedede/mainboard.c
@@ -36,7 +36,7 @@ static void mainboard_init(void *chip_info)
const struct pad_config *override_pads;
size_t base_num, override_num;
- base_pads = variant_base_gpio_table(&base_num);
+ base_pads = baseboard_gpio_table(&base_num);
override_pads = variant_override_gpio_table(&override_num);
gpio_configure_pads_with_override(base_pads, base_num,
diff --git a/src/mainboard/google/dedede/variants/baseboard/gpio.c b/src/mainboard/google/dedede/variants/baseboard/gpio.c
index 7a403b536c41..29ca2df68caa 100644
--- a/src/mainboard/google/dedede/variants/baseboard/gpio.c
+++ b/src/mainboard/google/dedede/variants/baseboard/gpio.c
@@ -441,7 +441,7 @@ static const struct pad_config early_gpio_table[] = {
PAD_CFG_GPI(GPP_S0, NONE, DEEP),
};
-const struct pad_config *__weak variant_base_gpio_table(size_t *num)
+const struct pad_config *baseboard_gpio_table(size_t *num)
{
*num = ARRAY_SIZE(gpio_table);
return gpio_table;
diff --git a/src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h
index fda5c31ab80b..53e740ca4859 100644
--- a/src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/google/dedede/variants/baseboard/include/baseboard/variants.h
@@ -10,7 +10,7 @@
/* The next set of functions return the gpio table and fill in the number of
* entries for each table. */
-const struct pad_config *variant_base_gpio_table(size_t *num);
+const struct pad_config *baseboard_gpio_table(size_t *num);
const struct pad_config *variant_early_gpio_table(size_t *num);
const struct pad_config *variant_sleep_gpio_table(size_t *num);
const struct pad_config *variant_override_gpio_table(size_t *num);