diff options
| author | Tom Rini <trini@konsulko.com> | 2022-01-09 07:56:31 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-01-09 07:56:31 -0500 |
| commit | 0dadad6d7c5769d6258baeaf1b8db843b0dfa01f (patch) | |
| tree | 53825eeb3b8474d6dce270eb7d84c3afe875ba1b /drivers/sysreset/sysreset_watchdog.c | |
| parent | 2a4b89a8ff69c3bbc7a2798e8b195d5489be95c1 (diff) | |
| parent | 4c8d067bc520fc2ce6dcd7c5833b090f22c67185 (diff) | |
Merge tag 'u-boot-amlogic-20220107' of https://source.denx.de/u-boot/custodians/u-boot-amlogic into next
- disable CONFIG_NET_RANDOM_ETHADDR when unnecessary on amlogic based configs
- meson64_android: add board specific env settings, in order to support VIM3/L for android
- add changes to support VIM3/L android boot by using meson64_android.h config
Diffstat (limited to 'drivers/sysreset/sysreset_watchdog.c')
| -rw-r--r-- | drivers/sysreset/sysreset_watchdog.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/sysreset/sysreset_watchdog.c b/drivers/sysreset/sysreset_watchdog.c index 35efcac59dd..8a659ee9b97 100644 --- a/drivers/sysreset/sysreset_watchdog.c +++ b/drivers/sysreset/sysreset_watchdog.c @@ -20,9 +20,16 @@ static int wdt_reboot_request(struct udevice *dev, enum sysreset_t type) struct wdt_reboot_plat *plat = dev_get_plat(dev); int ret; - ret = wdt_expire_now(plat->wdt, 0); - if (ret) - return ret; + switch (type) { + case SYSRESET_COLD: + case SYSRESET_WARM: + ret = wdt_expire_now(plat->wdt, 0); + if (ret) + return ret; + break; + default: + return -ENOSYS; + } return -EINPROGRESS; } |