powerpc: mpc8xx: cleaning up watchdog

[oweals/u-boot.git] / arch / powerpc / cpu / mpc8xx / cpu.c

diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c
index 6a1bd8dce4b3cef8fed1fb98e410bac4f6d1320c..7608970e3b190ffbed559d2cd0a50d506e5f2343 100644 (file)
--- a/arch/powerpc/cpu/mpc8xx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu.c
@@ -272,24 +272,11 @@ unsigned long get_tbclk(void)
 
 /* ------------------------------------------------------------------------- */
 
-#if defined(CONFIG_WATCHDOG)
-void watchdog_reset(void)
+#if defined(CONFIG_HW_WATCHDOG)
+void hw_watchdog_reset(void)
 {
-       int re_enable = disable_interrupts();
+       immap_t __iomem *immr = (immap_t __iomem *)CONFIG_SYS_IMMR;
 
-       reset_8xx_watchdog((immap_t __iomem *)CONFIG_SYS_IMMR);
-       if (re_enable)
-               enable_interrupts();
-}
-#endif /* CONFIG_WATCHDOG */
-
-#if defined(CONFIG_WATCHDOG)
-
-void reset_8xx_watchdog(immap_t __iomem *immr)
-{
-       /*
-        * All other boards use the MPC8xx Internal Watchdog
-        */
        out_be16(&immr->im_siu_conf.sc_swsr, 0x556c);   /* write magic1 */
        out_be16(&immr->im_siu_conf.sc_swsr, 0xaa39);   /* write magic2 */
 }