Eric Lai has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/62806 )
Change subject: mb/google/nissa/var/nivviks: Set gpio override to board_0 ......................................................................
mb/google/nissa/var/nivviks: Set gpio override to board_0
Follow the latest schematic change, gpio will match the baseboard. Return the current table as override.
BUG=b:223677877 TEST=audio is functional on board_0.
Signed-off-by: Eric Lai eric_lai@quanta.corp-partner.google.com Change-Id: I91dc2c9c8811d403c60a4b4f3a7c5ed8de4e527e --- M src/mainboard/google/brya/variants/nivviks/gpio.c 1 file changed, 10 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/06/62806/1
diff --git a/src/mainboard/google/brya/variants/nivviks/gpio.c b/src/mainboard/google/brya/variants/nivviks/gpio.c index a5f9cb8..6bedd5c 100644 --- a/src/mainboard/google/brya/variants/nivviks/gpio.c +++ b/src/mainboard/google/brya/variants/nivviks/gpio.c @@ -6,7 +6,7 @@ #include <soc/gpio.h>
/* Pad configuration in ramstage */ -static const struct pad_config override_gpio_table[] = { +static const struct pad_config board_id0_overrides[] = { /* R4 : I2S2_SCLK ==> I2S_SPK_BCLK_R */ PAD_CFG_NF(GPP_R4, NONE, DEEP, NF2), /* R5 : I2S2_SFRM ==> I2S_SPK_LRCK_R */ @@ -29,6 +29,7 @@ PAD_CFG_NF(GPP_S7, NONE, DEEP, NF2), };
+ /* Early pad configuration in bootblock */ static const struct pad_config early_gpio_table[] = { /* H12 : UART0_RTS# ==> SD_PERST_L */ @@ -58,8 +59,14 @@
const struct pad_config *variant_gpio_override_table(size_t *num) { - *num = ARRAY_SIZE(override_gpio_table); - return override_gpio_table; + const uint32_t id = board_id(); + if (id == BOARD_ID_UNKNOWN || id == 0) { + *num = ARRAY_SIZE(board_id0_overrides); + return board_id0_overrides; + } + + *num = 0; + return NULL; }
const struct pad_config *variant_early_gpio_table(size_t *num)