X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cpu%2Fmpc86xx%2Fcpu.c;h=ecea5b0643896211960c4821ab9e11acae94f5c5;hb=ef50d6c06ece74fb17e8d7510e62cad9df8b810d;hp=4eaed058df662cd80054df7b648157c81e703931;hpb=a292d2265ef0463be4e7c4827a8a0dec556f0a88;p=oweals%2Fu-boot.git

diff --git a/cpu/mpc86xx/cpu.c b/cpu/mpc86xx/cpu.c
index 4eaed058df..ecea5b0643 100644
--- a/cpu/mpc86xx/cpu.c
+++ b/cpu/mpc86xx/cpu.c
@@ -214,6 +214,20 @@ get_tbclk(void)
 void
 watchdog_reset(void)
 {
+#if defined(CONFIG_MPC8610)
+	/*
+	 * This actually feed the hard enabled watchdog.
+	 */
+	volatile immap_t *immap = (immap_t *)CFG_IMMR;
+	volatile ccsr_wdt_t *wdt = &immap->im_wdt;
+	volatile ccsr_gur_t *gur = &immap->im_gur;
+	u32 tmp = gur->pordevsr;
+
+	if (tmp & 0x4000) {
+		wdt->swsrr = 0x556c;
+		wdt->swsrr = 0xaa39;
+	}
+#endif
 }
 #endif	/* CONFIG_WATCHDOG */
 
@@ -315,5 +329,4 @@ int cpu_eth_init(bd_t *bis)
 #endif
 	return 0;
 }
-#endif
-
+#endif /* CONFIG_TSEC_ENET */