diff options
| author | Matt DeVillier <matt.devillier@amd.corp-partner.google.com> | 2022-11-11 10:56:07 -0600 |
|---|---|---|
| committer | Martin L Roth <gaumless@gmail.com> | 2022-11-13 15:38:12 +0000 |
| commit | bfad0b0651474d4219e1455026a917081c072ac0 (patch) | |
| tree | e6a5b583c0380d98accc131ea31ab79283ee3669 /src/mainboard | |
| parent | c3583173ecffd6041d51337b50715579e79475bb (diff) | |
mb/google/zork: rename baseboard GPIO table getter for clarity
Rename variant_pcie_gpio_table() to baseboard_pcie_gpio_table(), since
the GPIO table comes from the baseboard (and is not overridden by any
variant).
Drop the __weak qualifier as this function is not overridden.
This is similar to the change made for skyrim in CB:67809
Change-Id: Idd8ea3446ab7940b21265a3ed8080ba4029c4ff7
Signed-off-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69453
Reviewed-by: Martin Roth <martin.roth@amd.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src/mainboard')
4 files changed, 5 insertions, 5 deletions
diff --git a/src/mainboard/google/zork/bootblock.c b/src/mainboard/google/zork/bootblock.c index 96cbe4d0ec..022a5e0904 100644 --- a/src/mainboard/google/zork/bootblock.c +++ b/src/mainboard/google/zork/bootblock.c @@ -12,5 +12,5 @@ void bootblock_mainboard_early_init(void) gpios = variant_bootblock_gpio_table(&num_gpios, acpi_get_sleep_type()); gpio_configure_pads(gpios, num_gpios); - variant_pcie_gpio_configure(); + baseboard_pcie_gpio_configure(); } diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c index 6dc3595d63..70e456ccb5 100644 --- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c +++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c @@ -248,7 +248,7 @@ static void wifi_power_reset_configure_pre_v3(void) gpio_set(GPIO_42, 1); } -__weak void variant_pcie_gpio_configure(void) +void baseboard_pcie_gpio_configure(void) { static const struct soc_amd_gpio pcie_gpio_table[] = { /* PCIE_RST1_L - Variable timings (May remove) */ diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c index 8d264c8476..455684e595 100644 --- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c +++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c @@ -258,7 +258,7 @@ static void wifi_power_reset_configure_pre_v3(void) gpio_set(GPIO_42, 1); } -__weak void variant_pcie_gpio_configure(void) +void baseboard_pcie_gpio_configure(void) { static const struct soc_amd_gpio pcie_gpio_table[] = { /* NVME_AUX_RESET_L */ diff --git a/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h index 11926d102e..c76ca026ae 100644 --- a/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h @@ -47,8 +47,8 @@ void variant_audio_update(void); void variant_bluetooth_update(void); /* Update touchscreen configuration in devicetree during ramstage. */ void variant_touchscreen_update(void); -/* Configure PCIe GPIOs as per variant sequencing requirements. */ -void variant_pcie_gpio_configure(void); +/* Configure PCIe GPIOs as per baseboard sequencing requirements. */ +void baseboard_pcie_gpio_configure(void); /* Per variant FSP-S initialization, default implementation in baseboard and * overridable by the variant. */ |