浏览代码

powerpc mpc85xx: Only clear TSR:WIS in watchdog_reset.

We should only write TSR_WIS to the SPRN_TSR register in
reset_85xx_watchdog.

The old code would cause the timer interrupt to be acknowledged when the
watchdog was reset, and we would then get no more timer interrupts.
This bug would affect all mpc85xx boards that have the watchdog enabled.

Signed-off-by: Mark Marshall <Mark.Marshall@omicron.at>
Signed-off-by: Andy Fleming <afleming@freescale.com>
Mark Marshall 12 年之前
父节点
当前提交
320d53da60
共有 1 个文件被更改,包括 1 次插入4 次删除
  1. 1 4
      arch/powerpc/cpu/mpc85xx/cpu.c

+ 1 - 4
arch/powerpc/cpu/mpc85xx/cpu.c

@@ -270,10 +270,7 @@ reset_85xx_watchdog(void)
 	/*
 	 * Clear TSR(WIS) bit by writing 1
 	 */
-	unsigned long val;
-	val = mfspr(SPRN_TSR);
-	val |= TSR_WIS;
-	mtspr(SPRN_TSR, val);
+	mtspr(SPRN_TSR, TSR_WIS);
 }
 #endif	/* CONFIG_WATCHDOG */