From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marek Vasut Date: Mon, 15 Sep 2014 13:06:03 +0200 Subject: [U-Boot] [PATCH 10/35] arm: socfpga: Add watchdog disable for socfpga In-Reply-To: <1410779188-6880-1-git-send-email-marex@denx.de> References: <1410779188-6880-1-git-send-email-marex@denx.de> Message-ID: <1410779188-6880-11-git-send-email-marex@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de From: Pavel Machek This adds watchdog disable. It is neccessary for running Linux kernel. Signed-off-by: Pavel Machek Signed-off-by: Marek Vasut Cc: Chin Liang See Cc: Dinh Nguyen Cc: Albert Aribaud Cc: Tom Rini Cc: Wolfgang Denk Cc: Pavel Machek --- 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 #include #include +#include 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 + +/* Disable the watchdog (toggle reset to watchdog) */ +void watchdog_disable(void) +{ + /* assert reset for watchdog */ + setbits_le32(&reset_manager_base->per_mod_reset, + (1<per_mod_reset, + (1<