Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

microblaze: Fix watchdog initialization

Browse source 
The patch:
"blackfin: Move blackfin watchdog driver out of the blackfin arch folder."
(sha1: e9a389a184)
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>
This commit is contained in:
Michal Simek 2013-10-16 09:06:32 +02:00 committed by Tom Rini
parent 100ea07e33
commit 8c4dba1a5e
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/microblaze/include/asm/processor.h
View file

@ -16,7 +16,6 @@ extern char __text_start[];
void board_init(void);
/* Watchdog functions */
extern int hw_watchdog_init(void);
extern void hw_watchdog_disable(void);
#endif /* __ASM_MICROBLAZE_PROCESSOR_H */

6
arch/microblaze/lib/board.c
View file

@ -46,9 +46,6 @@ init_fnc_t *init_sequence[] = {
serial_init,
console_init_f,
interrupts_init,
#ifdef CONFIG_XILINX_TB_WATCHDOG
hw_watchdog_init,
#endif
timer_init,
NULL,
};
@ -97,6 +94,9 @@ void board_init_f(ulong not_used)
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)

6
drivers/watchdog/xilinx_tb_wdt.c
View file

@ -54,7 +54,7 @@ static void hw_watchdog_isr(void *arg)
hw_watchdog_reset();
}
int hw_watchdog_init(void)
void hw_watchdog_init(void)
{
int ret;
@ -65,7 +65,5 @@ int hw_watchdog_init(void)
ret = install_interrupt_handler(CONFIG_WATCHDOG_IRQ,
hw_watchdog_isr, NULL);
if (ret)
return 1;
return 0;
puts("Watchdog IRQ registration failed.");
}