Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-12-02 01:19:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge https://source.denx.de/u-boot/custodians/u-boot-watchdog

Browse source 
- autoboot: make sure watchdog device(s) are handled with keyed
  autoboot (Rasmus)
- gpio_wdt: use __udelay() to avoid recursion (Rasmus)
- watchdog: max6370: use __udelay() to avoid recursion (Pali)
This commit is contained in:
Tom Rini 2022-09-27 11:05:37 -04:00
commit d779fc399c
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/autoboot.c
View file

@ -115,6 +115,7 @@ static int passwd_abort_crypt(uint64_t etime)
presskey_len++;
}
}
udelay(10000);
} while (never_timeout || get_ticks() <= etime);
return abort;
@ -206,6 +207,7 @@ static int passwd_abort_sha256(uint64_t etime)
if (slow_equals(sha, sha_env, SHA256_SUM_LEN))
abort = 1;
}
udelay(10000);
} while (!abort && get_ticks() <= etime);
free(presskey);
@ -293,6 +295,7 @@ static int passwd_abort_key(uint64_t etime)
abort = 1;
}
}
udelay(10000);
} while (!abort && get_ticks() <= etime);
return abort;

2
drivers/watchdog/gpio_wdt.c
View file

@ -31,7 +31,7 @@ static int gpio_wdt_reset(struct udevice *dev)
case HW_ALGO_LEVEL:
/* Pulse */
dm_gpio_set_value(&priv->gpio, 1);
udelay(1);
__udelay(1);
dm_gpio_set_value(&priv->gpio, 0);
break;
}

2
drivers/watchdog/max6370_wdt.c
View file

@ -72,7 +72,7 @@ static int max6370_wdt_reset(struct udevice *dev)
if (dm_gpio_is_valid(&wdt->gpio_wdi)) {
dm_gpio_set_value(&wdt->gpio_wdi, 1);
udelay(1);
__udelay(1);
dm_gpio_set_value(&wdt->gpio_wdi, 0);
} else {
val = readb(wdt->reg);