diff options
author | Uwe Poeche <uwe.poeche@siemens.com> | 2019-07-17 14:27:13 +0200 |
---|---|---|
committer | Martin Roth <martinroth@google.com> | 2019-07-23 15:51:04 +0000 |
commit | 17362bee850a01a3d1ddef11a39640b762a3f0a9 (patch) | |
tree | c95b740030844cf806257cecfbbebed89e9fe4df /src/drivers | |
parent | 868c8074b585e8465c315b0fbcafb940eaec27b7 (diff) | |
download | coreboot-17362bee850a01a3d1ddef11a39640b762a3f0a9.tar.gz coreboot-17362bee850a01a3d1ddef11a39640b762a3f0a9.tar.bz2 coreboot-17362bee850a01a3d1ddef11a39640b762a3f0a9.zip |
include/spi-generic: Append unit to macro names
This patch appends a unit (milliseconds) to time-out macro names for
better understanding the code which is using the macros.
Change-Id: Ibc4beda2660a83fd5f0ed325b2ee3148c6d96639
Signed-off-by: Uwe Poeche <uwe.poeche@siemens.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34384
Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/drivers')
-rw-r--r-- | src/drivers/spi/adesto.c | 3 | ||||
-rw-r--r-- | src/drivers/spi/amic.c | 3 | ||||
-rw-r--r-- | src/drivers/spi/atmel.c | 3 | ||||
-rw-r--r-- | src/drivers/spi/eon.c | 3 | ||||
-rw-r--r-- | src/drivers/spi/gigadevice.c | 3 | ||||
-rw-r--r-- | src/drivers/spi/macronix.c | 3 | ||||
-rw-r--r-- | src/drivers/spi/spansion.c | 3 | ||||
-rw-r--r-- | src/drivers/spi/spi_flash.c | 3 | ||||
-rw-r--r-- | src/drivers/spi/sst.c | 8 | ||||
-rw-r--r-- | src/drivers/spi/stmicro.c | 3 | ||||
-rw-r--r-- | src/drivers/spi/winbond.c | 3 |
11 files changed, 25 insertions, 13 deletions
diff --git a/src/drivers/spi/adesto.c b/src/drivers/spi/adesto.c index 4e1043edb7e9..c74fd701c9f3 100644 --- a/src/drivers/spi/adesto.c +++ b/src/drivers/spi/adesto.c @@ -181,7 +181,8 @@ static int adesto_write(const struct spi_flash *flash, u32 offset, size_t len, goto out; } - ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT); + ret = spi_flash_cmd_wait_ready(flash, + SPI_FLASH_PROG_TIMEOUT_MS); if (ret) goto out; diff --git a/src/drivers/spi/amic.c b/src/drivers/spi/amic.c index b580dc3df0f2..6e1234baa789 100644 --- a/src/drivers/spi/amic.c +++ b/src/drivers/spi/amic.c @@ -155,7 +155,8 @@ static int amic_write(const struct spi_flash *flash, u32 offset, size_t len, goto out; } - ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT); + ret = spi_flash_cmd_wait_ready(flash, + SPI_FLASH_PROG_TIMEOUT_MS); if (ret) goto out; diff --git a/src/drivers/spi/atmel.c b/src/drivers/spi/atmel.c index 58a2862eebed..ac7f0d92e77d 100644 --- a/src/drivers/spi/atmel.c +++ b/src/drivers/spi/atmel.c @@ -137,7 +137,8 @@ static int atmel_write(const struct spi_flash *flash, u32 offset, size_t len, goto out; } - ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT); + ret = spi_flash_cmd_wait_ready(flash, + SPI_FLASH_PROG_TIMEOUT_MS); if (ret) goto out; diff --git a/src/drivers/spi/eon.c b/src/drivers/spi/eon.c index f3cf70ef1b8e..c6fdba17b816 100644 --- a/src/drivers/spi/eon.c +++ b/src/drivers/spi/eon.c @@ -270,7 +270,8 @@ static int eon_write(const struct spi_flash *flash, goto out; } - ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT); + ret = spi_flash_cmd_wait_ready(flash, + SPI_FLASH_PROG_TIMEOUT_MS); if (ret) { printk(BIOS_WARNING, "SF: EON Page Program timeout\n"); goto out; diff --git a/src/drivers/spi/gigadevice.c b/src/drivers/spi/gigadevice.c index 1ff594a24a2e..71433cc1ede9 100644 --- a/src/drivers/spi/gigadevice.c +++ b/src/drivers/spi/gigadevice.c @@ -212,7 +212,8 @@ static int gigadevice_write(const struct spi_flash *flash, u32 offset, goto out; } - ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT); + ret = spi_flash_cmd_wait_ready(flash, + SPI_FLASH_PROG_TIMEOUT_MS); if (ret) goto out; diff --git a/src/drivers/spi/macronix.c b/src/drivers/spi/macronix.c index 5a97b8f79440..a41e96f67133 100644 --- a/src/drivers/spi/macronix.c +++ b/src/drivers/spi/macronix.c @@ -249,7 +249,8 @@ static int macronix_write(const struct spi_flash *flash, u32 offset, size_t len, break; } - ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT); + ret = spi_flash_cmd_wait_ready(flash, + SPI_FLASH_PROG_TIMEOUT_MS); if (ret) break; diff --git a/src/drivers/spi/spansion.c b/src/drivers/spi/spansion.c index 4a241baf0904..c3a071e95614 100644 --- a/src/drivers/spi/spansion.c +++ b/src/drivers/spi/spansion.c @@ -264,7 +264,8 @@ static int spansion_write(const struct spi_flash *flash, u32 offset, size_t len, break; } - ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT); + ret = spi_flash_cmd_wait_ready(flash, + SPI_FLASH_PROG_TIMEOUT_MS); if (ret) break; diff --git a/src/drivers/spi/spi_flash.c b/src/drivers/spi/spi_flash.c index a81306e386c6..cfa500e6dd66 100644 --- a/src/drivers/spi/spi_flash.c +++ b/src/drivers/spi/spi_flash.c @@ -232,7 +232,8 @@ int spi_flash_cmd_erase(const struct spi_flash *flash, u32 offset, size_t len) if (ret) goto out; - ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PAGE_ERASE_TIMEOUT); + ret = spi_flash_cmd_wait_ready(flash, + SPI_FLASH_PAGE_ERASE_TIMEOUT_MS); if (ret) goto out; } diff --git a/src/drivers/spi/sst.c b/src/drivers/spi/sst.c index abe3f2ace69e..429afa095dfc 100644 --- a/src/drivers/spi/sst.c +++ b/src/drivers/spi/sst.c @@ -179,7 +179,7 @@ sst_byte_write(const struct spi_flash *flash, u32 offset, const void *buf) if (ret) return ret; - return spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT); + return spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT_MS); } static int sst_write_256(const struct spi_flash *flash, u32 offset, size_t len, @@ -239,7 +239,8 @@ static int sst_write_256(const struct spi_flash *flash, u32 offset, size_t len, break; } - ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT); + ret = spi_flash_cmd_wait_ready(flash, + SPI_FLASH_PROG_TIMEOUT_MS); if (ret) break; @@ -294,7 +295,8 @@ static int sst_write_ai(const struct spi_flash *flash, u32 offset, size_t len, break; } - ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT); + ret = spi_flash_cmd_wait_ready(flash, + SPI_FLASH_PROG_TIMEOUT_MS); if (ret) break; diff --git a/src/drivers/spi/stmicro.c b/src/drivers/spi/stmicro.c index 6625764268ac..98f6e4e5b242 100644 --- a/src/drivers/spi/stmicro.c +++ b/src/drivers/spi/stmicro.c @@ -331,7 +331,8 @@ static int stmicro_write(const struct spi_flash *flash, goto out; } - ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT); + ret = spi_flash_cmd_wait_ready(flash, + SPI_FLASH_PROG_TIMEOUT_MS); if (ret) goto out; diff --git a/src/drivers/spi/winbond.c b/src/drivers/spi/winbond.c index 9e9bb00464fa..3e0a2669d92b 100644 --- a/src/drivers/spi/winbond.c +++ b/src/drivers/spi/winbond.c @@ -326,7 +326,8 @@ static int winbond_write(const struct spi_flash *flash, u32 offset, size_t len, goto out; } - ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT); + ret = spi_flash_cmd_wait_ready(flash, + SPI_FLASH_PROG_TIMEOUT_MS); if (ret) goto out; |