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>

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>
Robin Gong
1 parent 21a2eb5ff0
Showing 1 changed file with 5 additions and 0 deletions Side-by-side Diff
arch/arm/cpu/armv7/mx6/soc.c
@@ -896,6 +896,11 @@
 	 */
 	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;
...	...	@@ -896,6 +896,11 @@
896	896	*/
897	897	reg = readw(&wdog->wcr);
898	898	reg \|= 1 << 3;
	899	+ /*
	900	+ * WDZST bit is write-once only bit. Align this bit in kernel,
	901	+ * otherwise kernel code will have no chance to set this bit.
	902	+ */
	903	+ reg \|= 1 << 0;
899	904	writew(reg, &wdog->wcr);
900	905
901	906	return arm_orig_podf;