ENGR00329631: imx6: fix kernel suspend reboot if keep watchdog alive

WDZST bit is write-once only bit. So we need take care the setting
in kernel ,otherwise, kernel setting will never be enabled.

Signed-off-by: Robin Gong <b38343@freescale.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
index 93be090..4787fb2 100644
--- a/arch/arm/cpu/armv7/mx6/soc.c
+++ b/arch/arm/cpu/armv7/mx6/soc.c
@@ -896,6 +896,11 @@ int set_anatop_bypass(int wdog_reset_pin)
 	 */
 	reg = readw(&wdog->wcr);
 	reg |= 1 << 3;
+	/*
+	 * WDZST bit is write-once only bit. Align this bit in kernel,
+	 * otherwise kernel code will have no chance to set this bit.
+	 */
+	reg |= 1 << 0;
 	writew(reg, &wdog->wcr);
 
 	return arm_orig_podf;