On 09/15/2014 06:06 AM, Marek Vasut wrote:
> From: Pavel Machek <pa...@denx.de>
>
> This adds watchdog disable. It is neccessary for running Linux kernel.
>
> Signed-off-by: Pavel Machek <pa...@denx.de>
> Signed-off-by: Marek Vasut <ma...@denx.de>
> Cc: Chin Liang See <cl...@altera.com>
> Cc: Dinh Nguyen <dingu...@altera.com>
> Cc: Albert Aribaud <albert.u.b...@aribaud.net>
> Cc: Tom Rini <tr...@ti.com>
> Cc: Wolfgang Denk <w...@denx.de>
> Cc: Pavel Machek <pa...@denx.de>
> ---
> arch/arm/cpu/armv7/socfpga/misc.c | 4 ++++
> arch/arm/cpu/armv7/socfpga/reset_manager.c | 13 +++++++++++++
> arch/arm/include/asm/arch-socfpga/reset_manager.h | 2 ++
> 3 files changed, 19 insertions(+)
>
> diff --git a/arch/arm/cpu/armv7/socfpga/misc.c
> b/arch/arm/cpu/armv7/socfpga/misc.c
> index ecae393..15cd8c2 100644
> --- a/arch/arm/cpu/armv7/socfpga/misc.c
> +++ b/arch/arm/cpu/armv7/socfpga/misc.c
> @@ -8,6 +8,7 @@
> #include <asm/io.h>
> #include <miiphy.h>
> #include <netdev.h>
> +#include <asm/arch/reset_manager.h>
>
> DECLARE_GLOBAL_DATA_PTR;
>
> @@ -38,6 +39,9 @@ int overwrite_console(void)
>
> int misc_init_r(void)
> {
> + /* This is needed, otherwise kernel is rebooted by watchdog. */
> + watchdog_disable();
> +
> return 0;
> }
>
> diff --git a/arch/arm/cpu/armv7/socfpga/reset_manager.c
> b/arch/arm/cpu/armv7/socfpga/reset_manager.c
> index e320c01..07b8c4f 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
Should this define go into -> arch-socfpga/reset_manager.h ?
Dinh
> +
> +/* 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..e004343 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;
>
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
