[U-Boot] [PATCH] arm:kirkwood: Add hardware watchdog support for Marvell Kirkwood boards

[Tom]

Simon Kagstrom wrote:
> Initialize by calling kw_watchdog_init() with the number of seconds for
> the watchdog to timeout.
> 
> Signed-off-by: Simon Kagstrom <simon.kagstrom at netinsight.net>
> ---
>  cpu/arm926ejs/kirkwood/timer.c      |   29 +++++++++++++++++++++++++++++
>  include/asm-arm/arch-kirkwood/cpu.h |    2 ++
>  2 files changed, 31 insertions(+), 0 deletions(-)
> 
> diff --git a/cpu/arm926ejs/kirkwood/timer.c b/cpu/arm926ejs/kirkwood/timer.c
> index 817ff42..f3397e7 100644
> --- a/cpu/arm926ejs/kirkwood/timer.c
> +++ b/cpu/arm926ejs/kirkwood/timer.c
> @@ -25,6 +25,7 @@
>  #include <asm/arch/kirkwood.h>
>  
>  #define UBOOT_CNTR	0	/* counter to use for uboot timer */
> +#define WATCHDOG_CNTR	2
>  
>  /* Timer reload and current value registers */
>  struct kwtmr_val {
> @@ -166,3 +167,31 @@ int timer_init(void)
>  
>  	return 0;
>  }
> +
> +#if defined(CONFIG_HW_WATCHDOG)
> +static unsigned long watchdog_timeout = 5;
> +void hw_watchdog_reset(void)
> +{
> +	unsigned long time = CONFIG_SYS_TCLK * watchdog_timeout;
> +
> +	writel(time, CNTMR_VAL_REG(WATCHDOG_CNTR));
> +}
> +
> +void kw_watchdog_init(unsigned long timeout_secs)
> +{
> +	struct kwcpu_registers *cpureg =
> +		(struct kwcpu_registers *)KW_CPU_REG_BASE;
> +	unsigned int cntmrctrl;
> +
> +	watchdog_timeout = timeout_secs;
> +	/* Enable CPU reset if watchdog expires */
> +	cpureg->rstoutn_mask |= WATCHDOG_CNTR;
> +	hw_watchdog_reset();
> +
> +	/* Enable the watchdog */
> +	cntmrctrl = readl(CNTMR_CTRL_REG);
> +	cntmrctrl |= CTCR_ARM_TIMER_EN(WATCHDOG_CNTR);
> +	cntmrctrl |= CTCR_ARM_TIMER_AUTO_EN(WATCHDOG_CNTR);
> +	writel(cntmrctrl, CNTMR_CTRL_REG);
> +}
> +#endif
> diff --git a/include/asm-arm/arch-kirkwood/cpu.h b/include/asm-arm/arch-kirkwood/cpu.h
> index b3022a3..df49c3f 100644
> --- a/include/asm-arm/arch-kirkwood/cpu.h
> +++ b/include/asm-arm/arch-kirkwood/cpu.h
> @@ -165,5 +165,7 @@ int kw_config_mpp(unsigned int mpp0_7, unsigned int mpp8_15,
>  		unsigned int mpp32_39, unsigned int mpp40_47,
>  		unsigned int mpp48_55);
>  unsigned int kw_winctrl_calcsize(unsigned int sizeval);
> +void kw_watchdog_init(unsigned long timeout_secs);
> +

You should add hw_watchdog_reset to H the file or declare it static.

You may want to add #define stubs to handle the ifndef CONFIG_HW_WATCHDOG.

Tom

>  #endif /* __ASSEMBLY__ */
>  #endif /* _KWCPU_H */