summaryrefslogtreecommitdiff
path: root/board/freescale/mx6sl_evk
diff options
context:
space:
mode:
authorRobby Cai <R63905@freescale.com>2012-08-23 15:47:20 +0800
committerRobby Cai <R63905@freescale.com>2012-08-24 16:37:40 +0800
commit439a5e37ab1ac43b55b80df92ffcf05fabc3b3f6 (patch)
tree0cd6df2b89207a1173bd76e61929f2d23f1239f6 /board/freescale/mx6sl_evk
parent7ada9f6b7da6b07545d2a5d81704a565e1b6dfeb (diff)
downloadu-boot-imx-439a5e37ab1ac43b55b80df92ffcf05fabc3b3f6.zip
u-boot-imx-439a5e37ab1ac43b55b80df92ffcf05fabc3b3f6.tar.gz
u-boot-imx-439a5e37ab1ac43b55b80df92ffcf05fabc3b3f6.tar.bz2
ENGR00221135: imx6x: clear PowerDown Enable bit of WDOG1_WMCR
From IC spec: --- The Power down Counter inside WDOG-1 will be enabled out of reset. This counter has a fixed time-out value of 16 seconds, after which it will drive the WDOG-1 signal low. To prevent this, the software must disable this counter by clearing the PDE bit of Watchdog Miscellaneous Control Register (WDOG_WMCR) within 16 seconds of reset de-assertion. Once disabled, this counter cannot be enabled again until the next system reset occurs. This feature is provided to prevent the hanging up of cores after reset, as WDOG-1 is not enabled out of reset. --- NOTE for the last sentence: This feature requires a dedicated WDOG_B pin for it. The fact that changing the IOMUX configuration can alter the WDOG_B functionality (GPIO by default) is not ideal as it defeats the purpose of this feature. But it still takes effect when the muxed pin is configured as WDOG_B within 16 seconds. Clear PDE bit to avoid WDOG_B (aka, WDOG-1) assertion. Tested on MX6SL. May add this for other MX6x. Signed-off-by: Robby Cai <R63905@freescale.com>
Diffstat (limited to 'board/freescale/mx6sl_evk')
-rw-r--r--board/freescale/mx6sl_evk/mx6sl_evk.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/board/freescale/mx6sl_evk/mx6sl_evk.c b/board/freescale/mx6sl_evk/mx6sl_evk.c
index 63705ea..85c3b61 100644
--- a/board/freescale/mx6sl_evk/mx6sl_evk.c
+++ b/board/freescale/mx6sl_evk/mx6sl_evk.c
@@ -31,6 +31,7 @@
#include <asm/arch/iomux-v3.h>
#include <asm/arch/regs-anadig.h>
#include <asm/errno.h>
+#include <imx_wdog.h>
#ifdef CONFIG_MXC_FEC
#include <miiphy.h>
#endif
@@ -973,8 +974,6 @@ void setup_pmic_voltages(void)
val |= BF_ANADIG_REG_CORE_REG1_TRG(0x1f);
REG_WR(ANATOP_BASE_ADDR, HW_ANADIG_REG_CORE, val);
- /*clear PowerDown Enable bit of WDOG1_WMCR */
- writew(0, WDOG1_BASE_ADDR + 0x08);
printf("hw_anadig_reg_core=%x\n",
REG_RD(ANATOP_BASE_ADDR, HW_ANADIG_REG_CORE));
#endif
@@ -994,6 +993,8 @@ int board_init(void)
/* address of boot parameters */
gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
+ wdog_preconfig(WDOG1_BASE_ADDR);
+
setup_uart();
#ifdef CONFIG_MXC_FEC