mb/google/skyrim: 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: Icebf7e11736929389227063039575a4c5ecf3840
Signed-off-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/67809
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Matt DeVillier 2022-09-23 13:33:00 -05:00 committed by Felix Held
parent b82486496d
commit 4236e2a23a
3 changed files with 5 additions and 10 deletions

View File

@ -92,7 +92,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;
variant_base_gpio_table(&base_gpios, &base_num_gpios); baseboard_gpio_table(&base_gpios, &base_num_gpios);
variant_override_gpio_table(&override_gpios, &override_num_gpios); variant_override_gpio_table(&override_gpios, &override_num_gpios);
gpio_configure_pads_with_override(base_gpios, base_num_gpios, gpio_configure_pads_with_override(base_gpios, base_num_gpios,

View File

@ -207,7 +207,7 @@ __weak void variant_pcie_gpio_table(const struct soc_amd_gpio **gpio, size_t *si
*gpio = pcie_gpio_table; *gpio = pcie_gpio_table;
} }
__weak void variant_base_gpio_table(const struct soc_amd_gpio **gpio, size_t *size) void baseboard_gpio_table(const struct soc_amd_gpio **gpio, size_t *size)
{ {
*size = ARRAY_SIZE(base_gpio_table); *size = ARRAY_SIZE(base_gpio_table);
*gpio = base_gpio_table; *gpio = base_gpio_table;

View File

@ -11,17 +11,12 @@
#define SD_DEVFN PCIE_GPP_2_1_DEVFN #define SD_DEVFN PCIE_GPP_2_1_DEVFN
#define NVME_DEVFN PCIE_GPP_2_2_DEVFN #define NVME_DEVFN PCIE_GPP_2_2_DEVFN
/* /* This function provides base GPIO configuration table. */
* This function provides base GPIO configuration table. It is typically provided by void baseboard_gpio_table(const struct soc_amd_gpio **gpio, size_t *size);
* 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.
*/
void variant_base_gpio_table(const struct soc_amd_gpio **gpio, 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().
*/ */
void variant_override_gpio_table(const struct soc_amd_gpio **gpio, size_t *size); void variant_override_gpio_table(const struct soc_amd_gpio **gpio, size_t *size);