aboutsummaryrefslogtreecommitdiff
path: root/drivers/mtd/cfi_flash.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2022-09-18 08:34:31 -0400
committerTom Rini <trini@konsulko.com>2022-09-18 08:34:31 -0400
commitb6c50e5831f6ce3800d4b3cf3c7aa35dde8c48d9 (patch)
tree4403d1b2ff259014c01855e08191ad0d1c294741 /drivers/mtd/cfi_flash.c
parentd219fc06b30d4b1ac4fac6c40b2ca69cb5ecf642 (diff)
parent8695fbb3a7ff3640eff62f7123323b16546d5b35 (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/mtd/cfi_flash.c')
-rw-r--r--drivers/mtd/cfi_flash.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 4950410706..d34d8ee976 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -584,7 +584,7 @@ static int flash_status_check(flash_info_t *info, flash_sect_t sector,
reset_timer();
#endif
start = get_timer(0);
- WATCHDOG_RESET();
+ schedule();
while (flash_is_busy(info, sector)) {
if (get_timer(start) > tout) {
printf("Flash %s timeout at address %lx data %lx\n",
@@ -677,7 +677,7 @@ static int flash_status_poll(flash_info_t *info, void *src, void *dst,
reset_timer();
#endif
start = get_timer(0);
- WATCHDOG_RESET();
+ schedule();
while (1) {
switch (info->portwidth) {
case FLASH_CFI_8BIT: