From 6b8728f3ad6a00e43ed1aeb9c741e972cbdd6549 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Fri, 23 Sep 2022 13:34:22 -0500 Subject: mb/google/volteer: 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: Id1e1a67608454466dc65bf4c4985cf4eba84c97d Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/67807 Tested-by: build bot (Jenkins) Reviewed-by: Tim Wawrzynczak --- src/mainboard/google/volteer/mainboard.c | 2 +- src/mainboard/google/volteer/variants/baseboard/gpio.c | 2 +- .../google/volteer/variants/baseboard/include/baseboard/variants.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mainboard/google/volteer/mainboard.c b/src/mainboard/google/volteer/mainboard.c index 91fe319b92e9..38b7b5853f9a 100644 --- a/src/mainboard/google/volteer/mainboard.c +++ b/src/mainboard/google/volteer/mainboard.c @@ -120,7 +120,7 @@ static void mainboard_chip_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, override_pads, override_num); diff --git a/src/mainboard/google/volteer/variants/baseboard/gpio.c b/src/mainboard/google/volteer/variants/baseboard/gpio.c index 8d9dd6daed11..9784c8851a57 100644 --- a/src/mainboard/google/volteer/variants/baseboard/gpio.c +++ b/src/mainboard/google/volteer/variants/baseboard/gpio.c @@ -437,7 +437,7 @@ static const struct pad_config early_gpio_table[] = { PAD_CFG_GPI(GPP_A9, 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/volteer/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/volteer/variants/baseboard/include/baseboard/variants.h index 94c39d900335..da5085ec1b79 100644 --- a/src/mainboard/google/volteer/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/volteer/variants/baseboard/include/baseboard/variants.h @@ -11,7 +11,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(u8 slp_typ, size_t *num); const struct pad_config *variant_override_gpio_table(size_t *num); -- cgit v1.2.3