diff options
Diffstat (limited to 'src/northbridge/amd')
| -rw-r--r-- | src/northbridge/amd/agesa/oem_s3.c | 12 | ||||
| -rw-r--r-- | src/northbridge/amd/amdmct/mct_ddr3/s3utils.c | 13 |
2 files changed, 10 insertions, 15 deletions
diff --git a/src/northbridge/amd/agesa/oem_s3.c b/src/northbridge/amd/agesa/oem_s3.c index fcf8ada4c5..c7d23ff346 100644 --- a/src/northbridge/amd/agesa/oem_s3.c +++ b/src/northbridge/amd/agesa/oem_s3.c @@ -97,15 +97,13 @@ static int spi_SaveS3info(u32 pos, u32 size, u8 *buf, u32 len) if (!flash) return -1; - flash->spi->rw = SPI_WRITE_FLAG; - spi_claim_bus(flash->spi); + spi_flash_volatile_group_begin(flash); - flash->erase(flash, pos, size); - flash->write(flash, pos, sizeof(len), &len); - 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); - flash->spi->rw = SPI_WRITE_FLAG; - spi_release_bus(flash->spi); + spi_flash_volatile_group_end(flash); return 0; #else return -1; diff --git a/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c b/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c index 97cadcb828..d3fc53b12f 100644 --- a/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c +++ b/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c @@ -1140,20 +1140,17 @@ int8_t save_mct_information_to_nvram(void) return -1; } - /* Set up SPI flash access */ - flash->spi->rw = SPI_WRITE_FLAG; - spi_claim_bus(flash->spi); + spi_flash_volatile_group_begin(flash); /* Erase and write data structure */ - flash->erase(flash, s3nv_offset, CONFIG_S3_DATA_SIZE); - flash->write(flash, s3nv_offset, sizeof(struct amd_s3_persistent_data), persistent_data); + spi_flash_erase(flash, s3nv_offset, CONFIG_S3_DATA_SIZE); + spi_flash_write(flash, s3nv_offset, + sizeof(struct amd_s3_persistent_data), persistent_data); /* Deallocate temporary data structures */ free(persistent_data); - /* Tear down SPI flash access */ - flash->spi->rw = SPI_WRITE_FLAG; - spi_release_bus(flash->spi); + spi_flash_volatile_group_end(flash); /* Allow training bypass if DIMM configuration is unchanged on next boot */ nvram = 1; |