mb/google/skyrim: Swap eSPI_CS_L and SOC_DISABLE_DISP_BL

The eSPI CS function only exists on AGPIO30.

We will need to rework all boards to make eSPI function.

I also fixed the comments on the other eSPI pins.

BUG=b:226635441
TEST=Build skyrim

Signed-off-by: Raul E Rangel <rrangel@chromium.org>
Change-Id: Ib03c0a7dcad31d10dd4bad0d10a0184ab84aef9a
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63093
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Raul E Rangel 2022-03-24 16:51:21 -06:00 committed by Felix Held
parent f8daf86282
commit cc1426b1cd
1 changed files with 10 additions and 10 deletions

View File

@ -46,7 +46,7 @@ static const struct soc_amd_gpio base_gpio_table[] = {
PAD_NF(GPIO_20, I2C3_SDA, PULL_NONE), PAD_NF(GPIO_20, I2C3_SDA, PULL_NONE),
/* WLAN_DISABLE */ /* WLAN_DISABLE */
PAD_GPO(GPIO_21, LOW), PAD_GPO(GPIO_21, LOW),
/* ESPI_ALERT_D1 */ /* ESPI_ALERT_L */
PAD_NF(GPIO_22, ESPI_ALERT_D1, PULL_NONE), PAD_NF(GPIO_22, ESPI_ALERT_D1, PULL_NONE),
/* AC_PRES */ /* AC_PRES */
PAD_NF(GPIO_23, AC_PRES, PULL_UP), PAD_NF(GPIO_23, AC_PRES, PULL_UP),
@ -60,8 +60,8 @@ static const struct soc_amd_gpio base_gpio_table[] = {
/* GPIO_28: Not available */ /* GPIO_28: Not available */
/* EN_PP3300_TCHSCR */ /* EN_PP3300_TCHSCR */
PAD_GPO(GPIO_29, HIGH), PAD_GPO(GPIO_29, HIGH),
/* SOC_DISABLE_DISP_BL */ /* ESPI_CS_L */
PAD_GPO(GPIO_30, LOW), PAD_NF(GPIO_30, ESPI_CS_L, PULL_NONE),
/* Unused */ /* Unused */
PAD_NC(GPIO_31), PAD_NC(GPIO_31),
/* LPC_RST_L */ /* LPC_RST_L */
@ -75,21 +75,21 @@ static const struct soc_amd_gpio base_gpio_table[] = {
/* GPIO_43 - GPIO_66: Not available */ /* GPIO_43 - GPIO_66: Not available */
/* GPIO_67 */ /* GPIO_67 */
PAD_GPI(GPIO_67, PULL_NONE), PAD_GPI(GPIO_67, PULL_NONE),
/* SPI1_DATA2 */ /* ESPI1_DATA2 */
PAD_NF(GPIO_68, SPI1_DAT2, PULL_NONE), PAD_NF(GPIO_68, SPI1_DAT2, PULL_NONE),
/* SPI1_DATA3 */ /* ESPI1_DATA3 */
PAD_NF(GPIO_69, SPI1_DAT3, PULL_NONE), PAD_NF(GPIO_69, SPI1_DAT3, PULL_NONE),
/* ESPI_CS_L */ /* SOC_DISABLE_DISP_BL */
PAD_NF(GPIO_74, SPI1_CS1_L, PULL_NONE), PAD_GPO(GPIO_74, LOW),
/* TCHSCR_REPORT_EN */ /* TCHSCR_REPORT_EN */
PAD_GPO(GPIO_76, LOW), PAD_GPO(GPIO_76, LOW),
/* SPI1_CLK */ /* ESPI_CLK */
PAD_NF(GPIO_77, SPI1_CLK, PULL_NONE), PAD_NF(GPIO_77, SPI1_CLK, PULL_NONE),
/* EN_PP3300_CAM */ /* EN_PP3300_CAM */
PAD_GPO(GPIO_78, HIGH), PAD_GPO(GPIO_78, HIGH),
/* SPI1_DATA1 */ /* ESPI1_DATA1 */
PAD_NF(GPIO_80, SPI1_DAT1, PULL_NONE), PAD_NF(GPIO_80, SPI1_DAT1, PULL_NONE),
/* SPI1_DATA0 */ /* ESPI1_DATA0 */
PAD_NF(GPIO_81, SPI1_DAT0, PULL_NONE), PAD_NF(GPIO_81, SPI1_DAT0, PULL_NONE),
/* EC_SOC_INT_ODL */ /* EC_SOC_INT_ODL */
PAD_GPI(GPIO_84, PULL_NONE), PAD_GPI(GPIO_84, PULL_NONE),