Merge tag 'u-boot-at91-2023.07-a' of https://source.denx.de/u-boot/custodians/u-boot...

[platform/kernel/u-boot.git] / include / watchdog.h

diff --git a/include/watchdog.h b/include/watchdog.h
index 3a357de..ac5f11e 100644 (file)
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -10,7 +10,8 @@
 #ifndef _WATCHDOG_H_
 #define _WATCHDOG_H_
 
-#if !defined(__ASSEMBLY__)
+#include <cyclic.h>
+
 /*
  * Reset the watchdog timer, always returns 0
  *
@@ -18,7 +19,6 @@
  * and the legacy arch/<arch>/board.c code.
  */
 int init_func_watchdog_reset(void);
-#endif
 
 #if defined(CONFIG_WATCHDOG) || defined(CONFIG_HW_WATCHDOG)
 #define INIT_FUNC_WATCHDOG_INIT        init_func_watchdog_init,
@@ -33,55 +33,14 @@ int init_func_watchdog_reset(void);
 #endif
 
 /*
- * Hardware watchdog
- */
-#ifdef CONFIG_HW_WATCHDOG
-       #if defined(__ASSEMBLY__)
-               #define WATCHDOG_RESET bl hw_watchdog_reset
-       #else
-               extern void hw_watchdog_reset(void);
-
-               #define WATCHDOG_RESET hw_watchdog_reset
-       #endif /* __ASSEMBLY__ */
-#else
-       /*
-        * Maybe a software watchdog?
-        */
-       #if defined(CONFIG_WATCHDOG)
-               #if defined(__ASSEMBLY__)
-                       #define WATCHDOG_RESET bl watchdog_reset
-               #else
-                       /* Don't require the watchdog to be enabled in SPL */
-                       #if defined(CONFIG_SPL_BUILD) &&                \
-                               !defined(CONFIG_SPL_WATCHDOG_SUPPORT)
-                               #define WATCHDOG_RESET() {}
-                       #else
-                               extern void watchdog_reset(void);
-
-                               #define WATCHDOG_RESET watchdog_reset
-                       #endif
-               #endif
-       #else
-               /*
-                * No hardware or software watchdog.
-                */
-               #if defined(__ASSEMBLY__)
-                       #define WATCHDOG_RESET /*XXX DO_NOT_DEL_THIS_COMMENT*/
-               #else
-                       #define WATCHDOG_RESET() {}
-               #endif /* __ASSEMBLY__ */
-       #endif /* CONFIG_WATCHDOG && !__ASSEMBLY__ */
-#endif /* CONFIG_HW_WATCHDOG */
-
-/*
  * Prototypes from $(CPU)/cpu.c.
  */
 
-#if defined(CONFIG_HW_WATCHDOG) && !defined(__ASSEMBLY__)
+#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
        void hw_watchdog_init(void);
 #endif
 
-#if defined(CONFIG_MPC85xx) && !defined(__ASSEMBLY__)
+#if defined(CONFIG_MPC85xx)
        void init_85xx_watchdog(void);
 #endif
 #endif /* _WATCHDOG_H_ */