From a5e0a21ed4b62ab4d8ff09f70b751db0f46ddaac Mon Sep 17 00:00:00 2001 From: Mykola Kostenok Date: Wed, 24 May 2017 18:28:20 +0300 Subject: aspeed: Add WD2 reset support for ast-g5 Add support for WATCHDOG_RESET macro for aspeed g5 boards. With this change we can have the watchdog enabled from boot but also have u-boot pat the watchdog when dropping to the console. Signed-off-by: Mykola Kostenok [joel: tweaked commit message, fixed defines] Signed-off-by: Joel Stanley --- board/aspeed/ast-g5/ast-g5.c | 9 +++++++++ include/configs/ast-g5-ncsi.h | 2 ++ include/configs/ast-g5-phy.h | 2 ++ 3 files changed, 13 insertions(+) diff --git a/board/aspeed/ast-g5/ast-g5.c b/board/aspeed/ast-g5/ast-g5.c index da79d7b79a..e67a4bf8b2 100644 --- a/board/aspeed/ast-g5/ast-g5.c +++ b/board/aspeed/ast-g5/ast-g5.c @@ -46,3 +46,12 @@ int board_eth_init(bd_t *bd) return aspeednic_initialize(bd); } #endif + +/* Called by macro WATCHDOG_RESET */ +#if defined(CONFIG_HW_WATCHDOG) +void hw_watchdog_reset(void) +{ + /* Restart WD2 timer */ + writel(0x4755, AST_WDT2_BASE + 0x08); +} +#endif /* CONFIG_WATCHDOG */ diff --git a/include/configs/ast-g5-ncsi.h b/include/configs/ast-g5-ncsi.h index f73a8f1150..12d6684551 100644 --- a/include/configs/ast-g5-ncsi.h +++ b/include/configs/ast-g5-ncsi.h @@ -26,4 +26,6 @@ /* platform.S settings */ #define CONFIG_DRAM_ECC_SIZE 0x10000000 +#define CONFIG_HW_WATCHDOG + #endif /* __AST_G5_NCSI_CONFIG_H */ diff --git a/include/configs/ast-g5-phy.h b/include/configs/ast-g5-phy.h index 9b10d06212..62ddb841e5 100644 --- a/include/configs/ast-g5-phy.h +++ b/include/configs/ast-g5-phy.h @@ -14,6 +14,8 @@ #define CONFIG_ARCH_AST2500 #define CONFIG_SYS_LOAD_ADDR 0x83000000 +#define CONFIG_HW_WATCHDOG + #include /* arm1176/start.S */ -- cgit v1.2.1