From 28f30a138a9a77e48668a58cfc338a07de68620e Mon Sep 17 00:00:00 2001 From: Marshall Dawson Date: Wed, 8 Nov 2017 16:32:15 -0700 Subject: [PATCH] amd/common/spi: Update flash driver usage Fix how the SPI driver is accessed in spi_SaveS3info. This code has been unused to date. Change-Id: Ie2b97c13079fd049f6e02f3ff8fa630ed880343f Signed-off-by: Marshall Dawson Reviewed-on: https://review.coreboot.org/22406 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth Reviewed-by: Aaron Durbin --- src/soc/amd/common/spi.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/soc/amd/common/spi.c b/src/soc/amd/common/spi.c index 31b686de3b..44c86e6fb9 100644 --- a/src/soc/amd/common/spi.c +++ b/src/soc/amd/common/spi.c @@ -16,24 +16,24 @@ #include #include #include +#include "s3_resume.h" void spi_SaveS3info(u32 pos, u32 size, u8 *buf, u32 len) { - struct spi_flash *flash; + struct spi_flash flash; spi_init(); - flash = spi_flash_probe(0, 0); - if (!flash) { + if (spi_flash_probe(0, 0, &flash)) { printk(BIOS_DEBUG, "Could not find SPI device\n"); /* Dont make flow stop. */ return; } - spi_flash_volatile_group_begin(flash); + spi_flash_volatile_group_begin(&flash); - spi_flash_erase(flash, pos, size); - spi_flash_write(flash, pos, sizeof(len), &len); - spi_flash_write(flash, pos + sizeof(len), len, buf); + spi_flash_erase(&flash, pos, size); + spi_flash_write(&flash, pos, sizeof(len), &len); + spi_flash_write(&flash, pos + sizeof(len), len, buf); - spi_flash_volatile_group_end(flash); + spi_flash_volatile_group_end(&flash); }