From 04c2dd827b5887561b182653e47545d19b934c46 Mon Sep 17 00:00:00 2001 From: Macpaul Lin Date: Tue, 12 Apr 2011 13:04:02 +0800 Subject: [PATCH] ftwdt010_wdt: move header to include/faraday and enhance 1. Move header to include/faraday 2. Fix include path in ftwdt010_wdt.c 3. Fix function prototype and declaration to - ftwdt010_wdt_settimeout - ftwdt010_wdt_reset - ftwdt010_wdt_disable 4. Add "#if definde (CONFIG_HW_WATCHDOG)" let user have flexibilty to choose which better to his product. Signed-off-by: Macpaul Lin --- drivers/watchdog/ftwdt010_wdt.c | 12 +++++++----- {drivers/watchdog => include/faraday}/ftwdt010_wdt.h | 3 +++ 2 files changed, 10 insertions(+), 5 deletions(-) rename {drivers/watchdog => include/faraday}/ftwdt010_wdt.h (98%) diff --git a/drivers/watchdog/ftwdt010_wdt.c b/drivers/watchdog/ftwdt010_wdt.c index 6e0617b6a2..c9cb53ed4f 100644 --- a/drivers/watchdog/ftwdt010_wdt.c +++ b/drivers/watchdog/ftwdt010_wdt.c @@ -29,13 +29,13 @@ #include #include #include -#include "ftwdt010_wdt.h" +#include /* * Set the watchdog time interval. * Counter is 32 bit. */ -static int ftwdt010_wdt_settimeout(unsigned int timeout) +int ftwdt010_wdt_settimeout(unsigned int timeout) { unsigned int reg; @@ -61,7 +61,7 @@ static int ftwdt010_wdt_settimeout(unsigned int timeout) return 0; } -void ftwdt010_wdt_reset() +void ftwdt010_wdt_reset(void) { struct ftwdt010_wdt *wd = (struct ftwdt010_wdt *)CONFIG_FTWDT010_BASE; @@ -75,7 +75,7 @@ void ftwdt010_wdt_reset() writel((FTWDT010_WDCR_RST | FTWDT010_WDCR_ENABLE), &wd->wdcr); } -void ftwdt010_wdt_disable() +void ftwdt010_wdt_disable(void) { struct ftwdt010_wdt *wd = (struct ftwdt010_wdt *)CONFIG_FTWDT010_BASE; @@ -90,7 +90,8 @@ void ftwdt010_wdt_disable() writel(0, &wd->wdcr); } -void hw_watchdog_reset() +#if defined(CONFIG_HW_WATCHDOG) +void hw_watchdog_reset(void) { ftwdt010_wdt_reset(); } @@ -100,3 +101,4 @@ void hw_watchdog_init(void) /* set timer in ms */ ftwdt010_wdt_settimeout(CONFIG_FTWDT010_HW_TIMEOUT * 1000); } +#endif diff --git a/drivers/watchdog/ftwdt010_wdt.h b/include/faraday/ftwdt010_wdt.h similarity index 98% rename from drivers/watchdog/ftwdt010_wdt.h rename to include/faraday/ftwdt010_wdt.h index 8f4fd68bd7..31ca768111 100644 --- a/drivers/watchdog/ftwdt010_wdt.h +++ b/include/faraday/ftwdt010_wdt.h @@ -100,4 +100,7 @@ struct ftwdt010_wdt { */ #define FTWDT010_TIMEOUT_FACTOR (CONFIG_SYS_CLK_FREQ / 1000) /* 1 ms */ +void ftwdt010_wdt_reset(void); +void ftwdt010_wdt_disable(void); + #endif /* __FTWDT010_H */ -- 2.25.1