summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorRobin Gong <b38343@freescale.com>2014-08-15 09:45:22 +0800
committerRobin Gong <b38343@freescale.com>2014-08-26 14:38:41 +0800
commit12631a3faba80f58f24086d6d9b561ab9b808025 (patch)
tree1b6b35cdf8aa9921482bc8c7c8bf0479e329180f /arch/arm
parent404fd02e96d33840f58f83f88815e2a259cdc532 (diff)
downloadu-boot-imx-12631a3faba80f58f24086d6d9b561ab9b808025.zip
u-boot-imx-12631a3faba80f58f24086d6d9b561ab9b808025.tar.gz
u-boot-imx-12631a3faba80f58f24086d6d9b561ab9b808025.tar.bz2
ENGR00326277-2 imx6: watchdog: use WDOG_B mode for wdog reset in ldo-bypass mode
In ldo-bypass mode, we need trigger WDOG_B pin to reset pmic in ldo-bypass mode. Signed-off-by: Robin Gong <b38343@freescale.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/cpu/armv7/mx6/soc.c22
-rw-r--r--arch/arm/include/asm/arch-mx6/sys_proto.h2
2 files changed, 22 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
index a3f2a2a..93be090 100644
--- a/arch/arm/cpu/armv7/mx6/soc.c
+++ b/arch/arm/cpu/armv7/mx6/soc.c
@@ -869,15 +869,35 @@ void prep_anatop_bypass(void)
#endif
}
-int set_anatop_bypass(void)
+int set_anatop_bypass(int wdog_reset_pin)
{
struct anatop_regs *anatop = (struct anatop_regs *)ANATOP_BASE_ADDR;
+ struct wdog_regs *wdog;
u32 reg = readl(&anatop->reg_core);
/* bypass VDDARM/VDDSOC */
reg = reg | (0x1F << 18) | 0x1F;
writel(reg, &anatop->reg_core);
+ if (wdog_reset_pin == 2)
+ wdog = (struct wdog_regs *) WDOG2_BASE_ADDR;
+ else if (wdog_reset_pin == 1)
+ wdog = (struct wdog_regs *) WDOG1_BASE_ADDR;
+ else
+ return arm_orig_podf;
+ /*
+ * use WDOG_B mode to reset external pmic because it's risky for the
+ * following watchdog reboot in case of cpu freq at lowest 400Mhz with
+ * ldo-bypass mode. Because boot frequency maybe higher 800Mhz i.e. So
+ * in ldo-bypass mode watchdog reset will only triger POR reset, not
+ * WDOG reset. But below code depends on hardware design, if HW didn't
+ * connect WDOG_B pin to external pmic such as i.mx6slevk, we can skip
+ * these code since it assumed boot from 400Mhz always.
+ */
+ reg = readw(&wdog->wcr);
+ reg |= 1 << 3;
+ writew(reg, &wdog->wcr);
+
return arm_orig_podf;
}
diff --git a/arch/arm/include/asm/arch-mx6/sys_proto.h b/arch/arm/include/asm/arch-mx6/sys_proto.h
index c8e5136..5b42ce9 100644
--- a/arch/arm/include/asm/arch-mx6/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx6/sys_proto.h
@@ -26,7 +26,7 @@ unsigned imx_ddr_size(void);
#ifdef CONFIG_LDO_BYPASS_CHECK
int check_ldo_bypass(void);
int check_1_2G(void);
-int set_anatop_bypass(void);
+int set_anatop_bypass(int wdog_reset_pin);
void ldo_mode_set(int ldo_bypass);
void prep_anatop_bypass(void);
void finish_anatop_bypass(void);