[U-Boot] [PATCH] watchdog disable for socfpga

Marek Vasut
2014-09-09T12:20:23Z

On Tuesday, September 09, 2014 at 02:03:28 PM, Pavel Machek wrote:
> This adds watchdog disable. It is neccessary for running Linux kernel.

Why do we not enable WDT in Linux instead ? Also, I recall there was a call to
explicitly enable the L4 watchdog, so why do we not get rid of that instead ?

> Signed-off-by: Pavel Machek <pavel@denx.de>
>
> diff --git a/arch/arm/cpu/armv7/socfpga/reset_manager.c
> b/arch/arm/cpu/armv7/socfpga/reset_manager.c index e320c01..5503059 100644
> --- a/arch/arm/cpu/armv7/socfpga/reset_manager.c
> +++ b/arch/arm/cpu/armv7/socfpga/reset_manager.c
> @@ -14,6 +14,19 @@ DECLARE_GLOBAL_DATA_PTR;
> static const struct socfpga_reset_manager *reset_manager_base =
> (void *)SOCFPGA_RSTMGR_ADDRESS;
>
> +#define RSTMGR_PERMODRST_L4WD0_LSB 6
> +
> +/* Disable the watchdog (toggle reset to watchdog) */
> +void watchdog_disable(void)
> +{
> + /* assert reset for watchdog */
> + setbits_le32(&reset_manager_base->per_mod_reset,
> + (1<<RSTMGR_PERMODRST_L4WD0_LSB));
> + /* deassert watchdog from reset (watchdog in not running state) */
> + clrbits_le32(&reset_manager_base->per_mod_reset,
> + (1<<RSTMGR_PERMODRST_L4WD0_LSB));
> +}
> +
> /*
> * Write the reset manager register to cause reset
> */
> diff --git a/arch/arm/include/asm/arch-socfpga/reset_manager.h
> b/arch/arm/include/asm/arch-socfpga/reset_manager.h index 3e95476..eb95c5b
> 100644
> --- a/arch/arm/include/asm/arch-socfpga/reset_manager.h
> +++ b/arch/arm/include/asm/arch-socfpga/reset_manager.h
> @@ -10,6 +10,8 @@
> void reset_cpu(ulong addr);
> void reset_deassert_peripherals_handoff(void);
>
> +void watchdog_disable(void);
> +
> struct socfpga_reset_manager {
> u32 status;
> u32 ctrl;

Best regards,
Marek Vasut