X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fwatchdog.h;h=ac5f11e376fa090fe45e4185a43864d04aa6db0f;hb=6786ce1ce14feb4d02854a0c04bc0cce505be46e;hp=52f4c506b0404886a7e2a91fd40e0b96a0bf3b77;hpb=7e09145ea2e985511c660bdf567b61614acd75b3;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/watchdog.h b/include/watchdog.h
index 52f4c50..ac5f11e 100644
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2001
  * Erik Theisen,  Wave 7 Optics, etheisen@mindspring.com.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
@@ -11,7 +10,8 @@
 #ifndef _WATCHDOG_H_
 #define _WATCHDOG_H_
 
-#if !defined(__ASSEMBLY__)
+#include <cyclic.h>
+
 /*
  * Reset the watchdog timer, always returns 0
  *
@@ -19,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,
@@ -34,49 +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
-			extern void watchdog_reset(void);
-
-			#define WATCHDOG_RESET watchdog_reset
-		#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_ */