From a99c9e39bf2822ea2d6ae492b29b2c08c7c28759 Mon Sep 17 00:00:00 2001 From: Karthikeyan Ramasubramanian Date: Thu, 14 Jul 2022 14:52:00 -0600 Subject: soc/amd/sabrina, mb/google/skyrim: Call espi_switch_to_spi1_pads Skyrim uses second SPI pads for ESPI. Switch to it initialize ESPI in verstage. BUG=b:217414563 TEST=Build Skyrim BIOS image. Ensure that ESPI init is successful in PSP verstage. Change-Id: I6e3462e95c50d256b6c159ae1d854dd69a538bb0 Signed-off-by: Karthikeyan Ramasubramanian Reviewed-on: https://review.coreboot.org/c/coreboot/+/65862 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held Reviewed-by: Raul Rangel Reviewed-by: Martin L Roth --- src/mainboard/google/skyrim/verstage.c | 3 +++ src/soc/amd/sabrina/Makefile.inc | 1 + 2 files changed, 4 insertions(+) diff --git a/src/mainboard/google/skyrim/verstage.c b/src/mainboard/google/skyrim/verstage.c index 8aaf70cd6e..5c176a507f 100644 --- a/src/mainboard/google/skyrim/verstage.c +++ b/src/mainboard/google/skyrim/verstage.c @@ -6,6 +6,7 @@ #include #include #include +#include #include void verstage_mainboard_early_init(void) @@ -25,6 +26,8 @@ void verstage_mainboard_espi_init(void) variant_espi_gpio_table(&gpios, &num_gpios); gpio_configure_pads(gpios, num_gpios); + + espi_switch_to_spi1_pads(); } void verstage_mainboard_tpm_init(void) diff --git a/src/soc/amd/sabrina/Makefile.inc b/src/soc/amd/sabrina/Makefile.inc index a94e19693f..19e756a37a 100644 --- a/src/soc/amd/sabrina/Makefile.inc +++ b/src/soc/amd/sabrina/Makefile.inc @@ -19,6 +19,7 @@ bootblock-y += reset.c bootblock-y += uart.c verstage-y += i2c.c +verstage-y += espi_util.c verstage_x86-y += gpio.c verstage_x86-y += reset.c verstage_x86-y += uart.c -- cgit v1.2.3