Skip to content
Snippets Groups Projects
Commit 04c2dd82 authored by Macpaul Lin's avatar Macpaul Lin Committed by Wolfgang Denk
Browse files

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: default avatarMacpaul Lin <macpaul@andestech.com>
parent 418e046d
No related branches found
No related tags found
No related merge requests found
...@@ -29,13 +29,13 @@ ...@@ -29,13 +29,13 @@
#include <common.h> #include <common.h>
#include <watchdog.h> #include <watchdog.h>
#include <asm/io.h> #include <asm/io.h>
#include "ftwdt010_wdt.h" #include <faraday/ftwdt010_wdt.h>
/* /*
* Set the watchdog time interval. * Set the watchdog time interval.
* Counter is 32 bit. * Counter is 32 bit.
*/ */
static int ftwdt010_wdt_settimeout(unsigned int timeout) int ftwdt010_wdt_settimeout(unsigned int timeout)
{ {
unsigned int reg; unsigned int reg;
...@@ -61,7 +61,7 @@ static int ftwdt010_wdt_settimeout(unsigned int timeout) ...@@ -61,7 +61,7 @@ static int ftwdt010_wdt_settimeout(unsigned int timeout)
return 0; return 0;
} }
void ftwdt010_wdt_reset() void ftwdt010_wdt_reset(void)
{ {
struct ftwdt010_wdt *wd = (struct ftwdt010_wdt *)CONFIG_FTWDT010_BASE; struct ftwdt010_wdt *wd = (struct ftwdt010_wdt *)CONFIG_FTWDT010_BASE;
...@@ -75,7 +75,7 @@ void ftwdt010_wdt_reset() ...@@ -75,7 +75,7 @@ void ftwdt010_wdt_reset()
writel((FTWDT010_WDCR_RST | FTWDT010_WDCR_ENABLE), &wd->wdcr); 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; struct ftwdt010_wdt *wd = (struct ftwdt010_wdt *)CONFIG_FTWDT010_BASE;
...@@ -90,7 +90,8 @@ void ftwdt010_wdt_disable() ...@@ -90,7 +90,8 @@ void ftwdt010_wdt_disable()
writel(0, &wd->wdcr); writel(0, &wd->wdcr);
} }
void hw_watchdog_reset() #if defined(CONFIG_HW_WATCHDOG)
void hw_watchdog_reset(void)
{ {
ftwdt010_wdt_reset(); ftwdt010_wdt_reset();
} }
...@@ -100,3 +101,4 @@ void hw_watchdog_init(void) ...@@ -100,3 +101,4 @@ void hw_watchdog_init(void)
/* set timer in ms */ /* set timer in ms */
ftwdt010_wdt_settimeout(CONFIG_FTWDT010_HW_TIMEOUT * 1000); ftwdt010_wdt_settimeout(CONFIG_FTWDT010_HW_TIMEOUT * 1000);
} }
#endif
...@@ -100,4 +100,7 @@ struct ftwdt010_wdt { ...@@ -100,4 +100,7 @@ struct ftwdt010_wdt {
*/ */
#define FTWDT010_TIMEOUT_FACTOR (CONFIG_SYS_CLK_FREQ / 1000) /* 1 ms */ #define FTWDT010_TIMEOUT_FACTOR (CONFIG_SYS_CLK_FREQ / 1000) /* 1 ms */
void ftwdt010_wdt_reset(void);
void ftwdt010_wdt_disable(void);
#endif /* __FTWDT010_H */ #endif /* __FTWDT010_H */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment