diff options
| author | Tom Rini <trini@konsulko.com> | 2022-09-18 08:34:31 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-09-18 08:34:31 -0400 |
| commit | b6c50e5831f6ce3800d4b3cf3c7aa35dde8c48d9 (patch) | |
| tree | 4403d1b2ff259014c01855e08191ad0d1c294741 /drivers/spi | |
| parent | d219fc06b30d4b1ac4fac6c40b2ca69cb5ecf642 (diff) | |
| parent | 8695fbb3a7ff3640eff62f7123323b16546d5b35 (diff) | |
Merge branch 'next' of https://source.denx.de/u-boot/custodians/u-boot-watchdog into next
- Migrate watchdog reset to cyclic infrastructure (Stefan)
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/mtk_snfi_spi.c | 2 | ||||
| -rw-r--r-- | drivers/spi/octeon_spi.c | 2 | ||||
| -rw-r--r-- | drivers/spi/stm32_qspi.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/mtk_snfi_spi.c b/drivers/spi/mtk_snfi_spi.c index 65d0ce0981..5ea62776b4 100644 --- a/drivers/spi/mtk_snfi_spi.c +++ b/drivers/spi/mtk_snfi_spi.c @@ -202,7 +202,7 @@ static int mtk_snfi_exec_op(struct spi_slave *slave, int addr_sh; int ret; - WATCHDOG_RESET(); + schedule(); ret = mtk_snfi_mac_reset(priv); if (ret) diff --git a/drivers/spi/octeon_spi.c b/drivers/spi/octeon_spi.c index c2a7ee232b..4bc38beaa6 100644 --- a/drivers/spi/octeon_spi.c +++ b/drivers/spi/octeon_spi.c @@ -126,7 +126,7 @@ static void octeon_spi_wait_ready(struct udevice *dev) do { mpi_sts = readq(base + MPI_STS); - WATCHDOG_RESET(); + schedule(); } while (mpi_sts & MPI_STS_BUSY); debug("%s(%s)\n", __func__, dev->name); diff --git a/drivers/spi/stm32_qspi.c b/drivers/spi/stm32_qspi.c index ceba413727..90c207d518 100644 --- a/drivers/spi/stm32_qspi.c +++ b/drivers/spi/stm32_qspi.c @@ -172,7 +172,7 @@ static int _stm32_qspi_wait_cmd(struct stm32_qspi_priv *priv, static void _stm32_qspi_read_fifo(u8 *val, void __iomem *addr) { *val = readb(addr); - WATCHDOG_RESET(); + schedule(); } static void _stm32_qspi_write_fifo(u8 *val, void __iomem *addr) |