summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
Diffstat (limited to 'board')
-rw-r--r--board/freescale/mx6sl_arm2/mx6sl_arm2.c5
-rw-r--r--board/freescale/mx6sl_evk/mx6sl_evk.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/board/freescale/mx6sl_arm2/mx6sl_arm2.c b/board/freescale/mx6sl_arm2/mx6sl_arm2.c
index f14b2b6..8abfd4e 100644
--- a/board/freescale/mx6sl_arm2/mx6sl_arm2.c
+++ b/board/freescale/mx6sl_arm2/mx6sl_arm2.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
@@ -1004,8 +1005,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
@@ -1025,6 +1024,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
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