浏览代码

ARM: imx: improve mxc_restart() on the SRC bit writes

The current comment in the code does not make it clear why the double writes
on SRC bit is needed.  Let's quote the errata to get it clear.  Also, to
ensure there are at least 2 writes happen in the same one 32kHz period,
we actually need 3 writes.  Let's add the third one.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Shawn Guo 11 年之前
父节点
当前提交
2c11b57a8a
共有 1 个文件被更改,包括 8 次插入1 次删除
  1. 8 1
      arch/arm/mach-imx/system.c

+ 8 - 1
arch/arm/mach-imx/system.c

@@ -52,7 +52,14 @@ void mxc_restart(enum reboot_mode mode, const char *cmd)
 
 
 	/* Assert SRS signal */
 	/* Assert SRS signal */
 	__raw_writew(wcr_enable, wdog_base);
 	__raw_writew(wcr_enable, wdog_base);
-	/* write twice to ensure the request will not get ignored */
+	/*
+	 * Due to imx6q errata ERR004346 (WDOG: WDOG SRS bit requires to be
+	 * written twice), we add another two writes to ensure there must be at
+	 * least two writes happen in the same one 32kHz clock period.  We save
+	 * the target check here, since the writes shouldn't be a huge burden
+	 * for other platforms.
+	 */
+	__raw_writew(wcr_enable, wdog_base);
 	__raw_writew(wcr_enable, wdog_base);
 	__raw_writew(wcr_enable, wdog_base);
 
 
 	/* wait for reset to assert... */
 	/* wait for reset to assert... */