From: Kim Phillips <kim.phillips@freescale.com>
Date: Tue, 30 Jan 2007 22:15:31 +0000 (-0600)
Subject: mpc83xx: don't hang if watchdog configured on 8360, 832x
X-Git-Tag: v1.3.0-rc1~143^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=97c4b397dce236a7318b304667bf89e59d08b17c;p=kernel%2Fu-boot.git

mpc83xx: don't hang if watchdog configured on 8360, 832x

don't hang if watchdog configured on 8360, 832x

The watchdog programming model is the same across all 83xx devices;
make the code reflect that.
---

diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c
index f83981e..c24a20f 100644
--- a/cpu/mpc83xx/cpu.c
+++ b/cpu/mpc83xx/cpu.c
@@ -266,7 +266,6 @@ unsigned long get_tbclk(void)
 #if defined(CONFIG_WATCHDOG)
 void watchdog_reset (void)
 {
-#ifdef CONFIG_MPC834X
 	int re_enable = disable_interrupts();
 
 	/* Reset the 83xx watchdog */
@@ -276,9 +275,6 @@ void watchdog_reset (void)
 
 	if (re_enable)
 		enable_interrupts ();
-#else
-	hang();
-#endif
 }
 #endif