microblaze: Fix watchdog initialization

The patch: "blackfin: Move blackfin watchdog driver out of the blackfin arch folder." (sha1: e9a389a18477c1c57a0b30e9ea8f4d38c6e26e63) changed hw_watchdog_init() prototype which didn't match with Microblaze one. This patch fixes the driver and Microblaze initialization. Signed-off-by: Michal Simek <michal.simek@xilinx.com>

microblaze: Fix watchdog initialization
The patch: "blackfin: Move blackfin watchdog driver out of the blackfin arch folder." (sha1: e9a389a18477c1c57a0b30e9ea8f4d38c6e26e63) changed hw_watchdog_init() prototype which didn't match with Microblaze one. This patch fixes the driver and Microblaze initialization. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Michal Simek · Tom Rini
1 parent 100ea07e33
Showing 3 changed files with 5 additions and 8 deletions Side-by-side Diff
arch/microblaze/include/asm/processor.h
arch/microblaze/lib/board.c
drivers/watchdog/xilinx_tb_wdt.c
@@ -16,7 +16,6 @@
 void board_init(void);
  
 /* Watchdog functions */
-extern int hw_watchdog_init(void);
 extern void hw_watchdog_disable(void);
  
 #endif /* __ASM_MICROBLAZE_PROCESSOR_H */
@@ -46,9 +46,6 @@
 	serial_init,
 	console_init_f,
 	interrupts_init,
-#ifdef CONFIG_XILINX_TB_WATCHDOG
-	hw_watchdog_init,
-#endif
 	timer_init,
 	NULL,
 };
@@ -97,6 +94,9 @@
  
 	serial_initialize();
  
+#ifdef CONFIG_XILINX_TB_WATCHDOG
+	hw_watchdog_init();
+#endif
 	for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
 		WATCHDOG_RESET();
 		if ((*init_fnc_ptr) () != 0)
@@ -54,7 +54,7 @@
 	hw_watchdog_reset();
 }
  
-int hw_watchdog_init(void)
+void hw_watchdog_init(void)
 {
 	int ret;
  
@@ -65,8 +65,6 @@
 	ret = install_interrupt_handler(CONFIG_WATCHDOG_IRQ,
 						hw_watchdog_isr, NULL);
 	if (ret)
-		return 1;
-
-	return 0;
+		puts("Watchdog IRQ registration failed.");
 }
...	...	@@ -16,7 +16,6 @@
16	16	void board_init(void);
17	17
18	18	/* Watchdog functions */
19		-extern int hw_watchdog_init(void);
20	19	extern void hw_watchdog_disable(void);
21	20
22	21	#endif /* __ASM_MICROBLAZE_PROCESSOR_H */
...	...	@@ -46,9 +46,6 @@
46	46	serial_init,
47	47	console_init_f,
48	48	interrupts_init,
49		-#ifdef CONFIG_XILINX_TB_WATCHDOG
50		- hw_watchdog_init,
51		-#endif
52	49	timer_init,
53	50	NULL,
54	51	};
...	...	@@ -97,6 +94,9 @@
97	94
98	95	serial_initialize();
99	96
	97	+#ifdef CONFIG_XILINX_TB_WATCHDOG
	98	+ hw_watchdog_init();
	99	+#endif
100	100	for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
101	101	WATCHDOG_RESET();
102	102	if ((*init_fnc_ptr) () != 0)
...	...	@@ -54,7 +54,7 @@
54	54	hw_watchdog_reset();
55	55	}
56	56
57		-int hw_watchdog_init(void)
	57	+void hw_watchdog_init(void)
58	58	{
59	59	int ret;
60	60
...	...	@@ -65,8 +65,6 @@
65	65	ret = install_interrupt_handler(CONFIG_WATCHDOG_IRQ,
66	66	hw_watchdog_isr, NULL);
67	67	if (ret)
68		- return 1;
69		-
70		- return 0;
	68	+ puts("Watchdog IRQ registration failed.");
71	69	}