diff options
| author | Tom Rini <[email protected]> | 2021-08-31 19:11:15 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-08-31 19:11:15 -0400 |
| commit | e2e5eec6ce1c2cb496a2a5e019a175a9fbdbed2a (patch) | |
| tree | a7f70892693eb02a9e23529c8ded4aea98af64a1 /include | |
| parent | df6cf3d809fe543651e6bdf133baaa8b9841fe0f (diff) | |
| parent | 4171c574721f3790b416b57d6a536cf3238d5849 (diff) | |
Merge branch 'next' of https://gitlab.denx.de/u-boot/custodians/u-boot-marvell into next
- Handling all DM watchdogs in watchdog_reset() (Rasmus)
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/global_data.h | 6 | ||||
| -rw-r--r-- | include/wdt.h | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index a4cf7fd58cc..16fd305a65c 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -447,12 +447,6 @@ struct global_data { */ fdt_addr_t translation_offset; #endif -#if CONFIG_IS_ENABLED(WDT) - /** - * @watchdog_dev: watchdog device - */ - struct udevice *watchdog_dev; -#endif #ifdef CONFIG_GENERATE_ACPI_TABLE /** * @acpi_ctx: ACPI context pointer diff --git a/include/wdt.h b/include/wdt.h index bc242c2eb26..baaa9db08a0 100644 --- a/include/wdt.h +++ b/include/wdt.h @@ -38,6 +38,14 @@ int wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags); int wdt_stop(struct udevice *dev); /* + * Stop all registered watchdog devices. + * + * @return: 0 if ok, first error encountered otherwise (but wdt_stop() + * is still called on following devices) + */ +int wdt_stop_all(void); + +/* * Reset the timer, typically restoring the counter to * the value configured by start() * |