summaryrefslogtreecommitdiff
path: root/src/mainboard/google/guybrush/bootblock.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/google/guybrush/bootblock.c')
-rw-r--r--src/mainboard/google/guybrush/bootblock.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/mainboard/google/guybrush/bootblock.c b/src/mainboard/google/guybrush/bootblock.c
index bffcb0cfdc..1154444fa4 100644
--- a/src/mainboard/google/guybrush/bootblock.c
+++ b/src/mainboard/google/guybrush/bootblock.c
@@ -31,8 +31,8 @@ void mb_set_up_early_espi(void)
void bootblock_mainboard_early_init(void)
{
uint32_t dword;
- size_t base_num_gpios, override_num_gpios;
- const struct soc_amd_gpio *base_gpios, *override_gpios;
+ size_t num_gpios, override_num_gpios;
+ const struct soc_amd_gpio *gpios, *override_gpios;
/* Beware that the bit definitions for LPC_LDRQ0_PU_EN and LPC_LDRQ0_PD_EN are swapped
on Picasso and older compared to Renoir/Cezanne and newer */
@@ -50,11 +50,12 @@ void bootblock_mainboard_early_init(void)
if (CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK))
return;
- base_gpios = variant_early_gpio_table(&base_num_gpios);
- override_gpios = variant_early_override_gpio_table(&override_num_gpios);
+ gpios = variant_espi_gpio_table(&num_gpios);
+ gpio_configure_pads(gpios, num_gpios);
- gpio_configure_pads_with_override(base_gpios, base_num_gpios,
- override_gpios, override_num_gpios);
+ gpios = variant_early_gpio_table(&num_gpios);
+ override_gpios = variant_early_override_gpio_table(&override_num_gpios);
+ gpio_configure_pads_with_override(gpios, num_gpios, override_gpios, override_num_gpios);
/* Set a timer to make sure there's enough delay for
* the Fibocom 350 PCIe init