diff options
| author | Karthikeyan Ramasubramanian <kramasub@google.com> | 2021-06-01 23:45:34 -0600 |
|---|---|---|
| committer | Werner Zeh <werner.zeh@siemens.com> | 2021-06-07 05:18:41 +0000 |
| commit | fcb9716db51ed239fcf2b870b6b5e439e2ffe5c6 (patch) | |
| tree | 0fd88bdc47d1eceb0f412924c3591c88dcbc4d7f /src/mainboard/google/guybrush | |
| parent | 260f0f93efa809d6aab5220253ca74410d0027c2 (diff) | |
mb/google/guybrush/var/guybrush: Update GPIO configuration
Some of the GPIOs are either re-purposed for different use-cases or are
unused in upcoming board phase (board version 2). Update the GPIO
configuration accordingly. Here are the GPIOs that are updated:
GPIO Board Id 1 Board Id 2
=============================================
GPIO31 TP183 EN_SPKR
GPIO69 EN_SPKR SD_AUX_REST_L
GPIO70 SD_AUX_RESET_L Unused TP27
GPIO74 RAM_ID_CHAN_SEL Unused TP49
BUG=b:189327557, b:188542649, b:188542497
TEST=Build Guybrush mainboard. Verify Audio is audible and SD card is
detected fine in Board ID 1.
Change-Id: I31523b3e03d2b59577f33eae548747834cfc98aa
Signed-off-by: Karthikeyan Ramasubramanian <kramasub@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55148
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src/mainboard/google/guybrush')
| -rw-r--r-- | src/mainboard/google/guybrush/variants/baseboard/gpio.c | 14 | ||||
| -rw-r--r-- | src/mainboard/google/guybrush/variants/guybrush/gpio.c | 8 |
2 files changed, 14 insertions, 8 deletions
diff --git a/src/mainboard/google/guybrush/variants/baseboard/gpio.c b/src/mainboard/google/guybrush/variants/baseboard/gpio.c index c89ded2345..eb42ab505f 100644 --- a/src/mainboard/google/guybrush/variants/baseboard/gpio.c +++ b/src/mainboard/google/guybrush/variants/baseboard/gpio.c @@ -64,8 +64,8 @@ static const struct soc_amd_gpio base_gpio_table[] = { PAD_GPO(GPIO_29, LOW), /* ESPI_CS_L */ PAD_NF(GPIO_30, ESPI_CS_L, PULL_NONE), - /* SPI_CS3_L */ - PAD_NF(GPIO_31, SPI_CS3_L, PULL_NONE), + /* EN_SPKR */ + PAD_GPO(GPIO_31, HIGH), /* EN_PWR_FP */ PAD_GPO(GPIO_32, HIGH), /* GPIO_33 - GPIO_39: Not available */ @@ -79,13 +79,13 @@ static const struct soc_amd_gpio base_gpio_table[] = { PAD_GPI(GPIO_67, PULL_NONE), /* EN_PP3300_TCHSCR */ PAD_GPO(GPIO_68, LOW), - /* EN_SPKR */ - PAD_GPO(GPIO_69, HIGH), /* SD_AUX_RESET_L */ - PAD_GPO(GPIO_70, HIGH), + PAD_GPO(GPIO_69, HIGH), + /* Unused TP27 */ + PAD_NC(GPIO_70), /* GPIO_71 - GPIO_73: Not available */ - /* RAM_ID_CHAN_SEL */ - PAD_GPI(GPIO_74, PULL_NONE), + /* Unused TP49 */ + PAD_NC(GPIO_74), /* RAM_ID_2 / DEV_BEEP_LRCLK */ PAD_GPI(GPIO_75, PULL_NONE), /* EN_PP3300_CAM */ diff --git a/src/mainboard/google/guybrush/variants/guybrush/gpio.c b/src/mainboard/google/guybrush/variants/guybrush/gpio.c index 64afa60fae..05c1542124 100644 --- a/src/mainboard/google/guybrush/variants/guybrush/gpio.c +++ b/src/mainboard/google/guybrush/variants/guybrush/gpio.c @@ -8,8 +8,14 @@ /* This table is used by guybrush variant with board version < 2. */ static const struct soc_amd_gpio bid1_gpio_table[] = { + /* Unused TP183 */ + PAD_NC(GPIO_31), /* EN_SPKR */ - PAD_GPO(GPIO_69, LOW), + PAD_GPO(GPIO_69, HIGH), + /* SD_AUX_RESET_L */ + PAD_GPO(GPIO_70, HIGH), + /* RAM_ID_CHAN_SEL */ + PAD_GPI(GPIO_74, PULL_NONE), }; const struct soc_amd_gpio *variant_override_gpio_table(size_t *size) |