Merge branch 'master' of git://www.denx.de/git/u-boot

[u-boot] / cpu / mcf532x / cpu.c

diff --git a/cpu/mcf532x/cpu.c b/cpu/mcf532x/cpu.c
index 89cc8ad93070f56349484eddb9ee91efcf0a734d..61541ab0f15fbbeaf2abdb22ba674c1ba6566341 100644 (file)
--- a/cpu/mcf532x/cpu.c
+++ b/cpu/mcf532x/cpu.c
@@ -64,6 +64,18 @@ int checkcpu(void)
        case 0x61:
                id = 5327;
                break;
+       case 0x65:
+               id = 5373;
+               break;
+       case 0x68:
+               id = 53721;
+               break;
+       case 0x69:
+               id = 5372;
+               break;
+       case 0x6B:
+               id = 5372;
+               break;
        }
 
        if (id) {
@@ -84,6 +96,7 @@ void watchdog_reset(void)
        volatile wdog_t *wdp = (wdog_t *) (MMAP_WDOG);
 
        wdp->sr = 0x5555;       /* Count register */
+       wdp->sr = 0xAAAA;       /* Count register */
 }
 
 int watchdog_disable(void)
@@ -104,8 +117,11 @@ int watchdog_init(void)
 
        /* set timeout and enable watchdog */
        wdog_module = ((CFG_CLK / 1000) * CONFIG_WATCHDOG_TIMEOUT);
-       wdog_module |= (wdog_module / 8192);
-       wdp->mr = wdog_module;
+#ifdef CONFIG_M5329
+       wdp->mr = (wdog_module / 8192);
+#else
+       wdp->mr = (wdog_module / 4096);
+#endif
 
        wdp->cr = WTM_WCR_EN;
        puts("WATCHDOG:enabled\n");