diff options
| author | Tom Rini <[email protected]> | 2017-01-11 08:04:26 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2017-01-11 08:04:26 -0500 |
| commit | 5b30997fd26f0e13837e9ba3cd289a037b8353bd (patch) | |
| tree | df8233b2d73eff88fcdf5d0d5f62da02cf498fa1 /include/wait_bit.h | |
| parent | f401e907fcbc94adff1a8e8097c8f0a5b0aee580 (diff) | |
| parent | 7364dfe7bfca8632bfe02de5c333a64472812ebe (diff) | |
Merge tag 'xilinx-for-v2017.03' of git://www.denx.de/git/u-boot-microblaze
Xilinx changes for v2017.03
- ATF handoff
- DT syncups
- gem: Use wait_for_bit(), add simple clk support
- Simple clk driver for ZynqMP
- Other small changes
Diffstat (limited to 'include/wait_bit.h')
| -rw-r--r-- | include/wait_bit.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/wait_bit.h b/include/wait_bit.h index 066e30c118a..06ad43a122d 100644 --- a/include/wait_bit.h +++ b/include/wait_bit.h @@ -11,6 +11,7 @@ #include <common.h> #include <console.h> +#include <watchdog.h> #include <linux/errno.h> #include <asm/io.h> @@ -59,6 +60,7 @@ static inline int wait_for_bit(const char *prefix, const u32 *reg, } udelay(1); + WATCHDOG_RESET(); } debug("%s: Timeout (reg=%p mask=%08x wait_set=%i)\n", prefix, reg, mask, |