diff options
| author | Sonic Zhang <sonic.zhang@analog.com> | 2013-04-07 18:02:37 +0800 |
|---|---|---|
| committer | Sonic Zhang <sonic.zhang@analog.com> | 2013-05-13 16:30:26 +0800 |
| commit | e9a389a18477c1c57a0b30e9ea8f4d38c6e26e63 (patch) | |
| tree | 4e0c9e5c15d316a8e16c10c428e44e41bf58e1b5 /arch/blackfin/cpu/initcode.c | |
| parent | 13262d4cdab79b6ee8d9c6089f84132a4c9372a4 (diff) | |
| download | talos-obmc-uboot-e9a389a18477c1c57a0b30e9ea8f4d38c6e26e63.tar.gz talos-obmc-uboot-e9a389a18477c1c57a0b30e9ea8f4d38c6e26e63.zip | |
blackfin: Move blackfin watchdog driver out of the blackfin arch folder.
- Enable hw_watchdog_init() in watchdog.h if CONFIG_HW_WATCHDOG is defined.
- Move blackfin hw watchdog driver to the generic driver folder.
- Call hw_watchdog_init() from blackfin board init code.
- Reuse macro CONFIG_WATCHDOG_TIMEOUT_MSECS
- Update README.watchdog accordingly
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Diffstat (limited to 'arch/blackfin/cpu/initcode.c')
| -rw-r--r-- | arch/blackfin/cpu/initcode.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/blackfin/cpu/initcode.c b/arch/blackfin/cpu/initcode.c index 8ef0b92c23..078209fc24 100644 --- a/arch/blackfin/cpu/initcode.c +++ b/arch/blackfin/cpu/initcode.c @@ -13,6 +13,7 @@ #include <config.h> #include <asm/blackfin.h> +#include <asm/mach-common/bits/watchdog.h> #include <asm/mach-common/bits/bootrom.h> #include <asm/mach-common/bits/core.h> @@ -468,9 +469,11 @@ program_early_devices(ADI_BOOT_DATA *bs, uint *sdivB, uint *divB, uint *vcoB) bfin_write_SEC_GCTL(0x1); bfin_write_SEC_CCTL(0x1); #endif + bfin_write_WDOG_CTL(WDDIS); + SSYNC(); bfin_write_WDOG_CNT(MSEC_TO_SCLK(CONFIG_HW_WATCHDOG_TIMEOUT_INITCODE)); #if CONFIG_BFIN_BOOT_MODE != BFIN_BOOT_UART - bfin_write_WDOG_CTL(0); + bfin_write_WDOG_CTL(WDEN); #endif serial_putc('f'); } |
