mb/google/zork: 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: Iaa3c9404919fd6c43596d7b27cfab43a1a5b0b21
Signed-off-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/67808
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
This commit is contained in:
Matt DeVillier 2022-09-23 13:36:36 -05:00 committed by Felix Held
parent fdcf698a89
commit 4a16be91dd
4 changed files with 7 additions and 13 deletions

View File

@ -112,7 +112,7 @@ static void mainboard_configure_gpios(void)
size_t base_num_gpios, override_num_gpios; size_t base_num_gpios, override_num_gpios;
const struct soc_amd_gpio *base_gpios, *override_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); override_gpios = variant_override_gpio_table(&override_num_gpios);
gpio_configure_pads_with_override(base_gpios, base_num_gpios, override_gpios, gpio_configure_pads_with_override(base_gpios, base_num_gpios, override_gpios,

View File

@ -160,8 +160,7 @@ static const struct soc_amd_gpio gpio_set_stage_ram[] = {
PAD_GPO(GPIO_144, LOW), PAD_GPO(GPIO_144, LOW),
}; };
const __weak const struct soc_amd_gpio *baseboard_gpio_table(size_t *size)
struct soc_amd_gpio *variant_base_gpio_table(size_t *size)
{ {
*size = ARRAY_SIZE(gpio_set_stage_ram); *size = ARRAY_SIZE(gpio_set_stage_ram);
return gpio_set_stage_ram; return gpio_set_stage_ram;

View File

@ -172,8 +172,7 @@ static const struct soc_amd_gpio gpio_set_stage_ram[] = {
PAD_GPO(GPIO_144, LOW), PAD_GPO(GPIO_144, LOW),
}; };
const __weak const struct soc_amd_gpio *baseboard_gpio_table(size_t *size)
struct soc_amd_gpio *variant_base_gpio_table(size_t *size)
{ {
*size = ARRAY_SIZE(gpio_set_stage_ram); *size = ARRAY_SIZE(gpio_set_stage_ram);
return gpio_set_stage_ram; return gpio_set_stage_ram;

View File

@ -11,16 +11,12 @@
#include <soc/platform_descriptors.h> #include <soc/platform_descriptors.h>
const struct soc_amd_gpio *variant_early_gpio_table(size_t *size); const struct soc_amd_gpio *variant_early_gpio_table(size_t *size);
/*
* This function provides base GPIO configuration table. It is typically provided by /* This function provides base GPIO configuration table. */
* baseboard using a weak implementation. If GPIO configuration for a variant differs const struct soc_amd_gpio *baseboard_gpio_table(size_t *size);
* 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 allows variant to override any GPIOs that are different than the base GPIO * This function allows variant to override any GPIOs that are different than the base GPIO
* configuration provided by variant_base_gpio_table(). * configuration provided by baseboard_gpio_table().
*/ */
const struct soc_amd_gpio *variant_override_gpio_table(size_t *size); const struct soc_amd_gpio *variant_override_gpio_table(size_t *size);