summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2013-04-22 11:23:16 +0200
committerMichal Simek <michal.simek@xilinx.com>2013-04-30 11:22:43 +0200
commit0f21f98dd4d6bff72df4eeaca4163779896cb336 (patch)
tree796651fceccc2d19ce2ba1e38156491dca8d6b0c /arch
parent8848668e136cccb30229b5e1484d41e0b5a6830a (diff)
downloadtalos-obmc-uboot-0f21f98dd4d6bff72df4eeaca4163779896cb336.tar.gz
talos-obmc-uboot-0f21f98dd4d6bff72df4eeaca4163779896cb336.zip
watchdog: Add support for Xilinx Microblaze watchdog
Watchdog can be used on Microblaze, PPC and Zynq hw designs. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/microblaze/include/asm/processor.h4
-rw-r--r--arch/microblaze/lib/board.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h
index 2c4d5ffc5c..d33faeb7d1 100644
--- a/arch/microblaze/include/asm/processor.h
+++ b/arch/microblaze/include/asm/processor.h
@@ -31,4 +31,8 @@ extern char __text_start[];
/* Microblaze board initialization function */
void board_init(void);
+/* Watchdog functions */
+extern int hw_watchdog_init(void);
+extern void hw_watchdog_disable(void);
+
#endif /* __ASM_MICROBLAZE_PROCESSOR_H */
diff --git a/arch/microblaze/lib/board.c b/arch/microblaze/lib/board.c
index a7c2f76233..815fb5a0c9 100644
--- a/arch/microblaze/lib/board.c
+++ b/arch/microblaze/lib/board.c
@@ -61,6 +61,9 @@ init_fnc_t *init_sequence[] = {
serial_init,
console_init_f,
interrupts_init,
+#ifdef CONFIG_XILINX_TB_WATCHDOG
+ hw_watchdog_init,
+#endif
timer_init,
NULL,
};
OpenPOWER on IntegriCloud