diff options
| author | Tom Rini <[email protected]> | 2022-11-22 08:07:03 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-11-22 08:07:03 -0500 |
| commit | b94db9efe849200d993b7f8a4d0b024e99469599 (patch) | |
| tree | 65c81cde441b1eb0e737988ed4fb307331ab0d1f | |
| parent | 16e49a14b2af1421cbaeefb9ce8ee863e45fd71b (diff) | |
| parent | 5cbd0295392be32be3bb80da4fa3edee9a5c7287 (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-watchdog
- watchdog: designware: make reset really optional (Quentin)
- watchdog: Drop GD_FLG_WDT_READY (Stefan)
| -rw-r--r-- | drivers/watchdog/designware_wdt.c | 9 | ||||
| -rw-r--r-- | drivers/watchdog/wdt-uclass.c | 1 | ||||
| -rw-r--r-- | include/asm-generic/global_data.h | 8 |
3 files changed, 7 insertions, 11 deletions
diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index cad756aeaf2..f8df1916b5f 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -72,13 +72,13 @@ static int designware_wdt_reset(struct udevice *dev) static int designware_wdt_stop(struct udevice *dev) { struct designware_wdt_priv *priv = dev_get_priv(dev); + __maybe_unused int ret; designware_wdt_reset(dev); writel(0, priv->base + DW_WDT_CR); - if (CONFIG_IS_ENABLED(DM_RESET)) { - int ret; - + if (CONFIG_IS_ENABLED(DM_RESET) && + ofnode_read_prop(dev_ofnode(dev), "resets", &ret)) { ret = reset_assert_bulk(&priv->resets); if (ret) return ret; @@ -135,7 +135,8 @@ static int designware_wdt_probe(struct udevice *dev) priv->clk_khz = CONFIG_DW_WDT_CLOCK_KHZ; #endif - if (CONFIG_IS_ENABLED(DM_RESET)) { + if (CONFIG_IS_ENABLED(DM_RESET) && + ofnode_read_prop(dev_ofnode(dev), "resets", &ret)) { ret = reset_get_bulk(dev, &priv->resets); if (ret) goto err; diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c index 82df0ff0be5..509896a1b80 100644 --- a/drivers/watchdog/wdt-uclass.c +++ b/drivers/watchdog/wdt-uclass.c @@ -105,7 +105,6 @@ int initr_watchdog(void) init_watchdog_dev(dev); } - gd->flags |= GD_FLG_WDT_READY; return 0; } diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 88829126fb2..da17ac8cbc8 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -635,9 +635,9 @@ enum gd_flags { */ GD_FLG_LOG_READY = 0x10000, /** - * @GD_FLG_WDT_READY: watchdog is ready for use + * @GD_FLG_CYCLIC_RUNNING: cyclic_run is in progress */ - GD_FLG_WDT_READY = 0x20000, + GD_FLG_CYCLIC_RUNNING = 0x20000, /** * @GD_FLG_SKIP_LL_INIT: don't perform low-level initialization */ @@ -650,10 +650,6 @@ enum gd_flags { * @GD_FLG_FDT_CHANGED: Device tree change has been detected by tests */ GD_FLG_FDT_CHANGED = 0x100000, - /** - * @GD_FLG_CYCLIC_RUNNING: cyclic_run is in progress - */ - GD_FLG_CYCLIC_RUNNING = 0x200000, }; #endif /* __ASSEMBLY__ */ |