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 071c5030477cbcbb284d4a88907f8b210714fc5d..61541ab0f15fbbeaf2abdb22ba674c1ba6566341 100644 (file)
--- a/cpu/mcf532x/cpu.c
+++ b/cpu/mcf532x/cpu.c
@@ -29,19 +29,16 @@
 #include <watchdog.h>
 #include <command.h>
 
-#include <asm/immap_5329.h>
-#include <asm/m5329.h>
+#include <asm/immap.h>
+
+DECLARE_GLOBAL_DATA_PTR;
 
 int do_reset(cmd_tbl_t * cmdtp, bd_t * bd, int flag, int argc, char *argv[])
 {
-       volatile wdog_t *wdp = (wdog_t *) (MMAP_WDOG);
+       volatile rcm_t *rcm = (rcm_t *) (MMAP_RCM);
 
-       wdp->cr = 0;
        udelay(1000);
-
-       /* enable watchdog, set timeout to 0 and wait */
-       wdp->cr = WTM_WCR_EN;
-       while (1) ;
+       rcm->rcr |= RCM_RCR_SOFTRST;
 
        /* we don't return! */
        return 0;
@@ -49,8 +46,6 @@ int do_reset(cmd_tbl_t * cmdtp, bd_t * bd, int flag, int argc, char *argv[])
 
 int checkcpu(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        volatile ccm_t *ccm = (ccm_t *) MMAP_CCM;
        u16 msk;
        u16 id = 0;
@@ -69,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) {
@@ -89,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)
@@ -109,26 +117,15 @@ 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");
 
        return (0);
 }
-#endif                         /* #ifdef CONFIG_WATCHDOG */
-
-#ifdef CONFIG_MCFINTC
-int interrupt_init(void)
-{
-       volatile int0_t *intp = (int0_t *) (CFG_INTR_BASE);
-
-       /* Make sure all interrupts are disabled */
-       intp->imrh0 |= 0xFFFFFFFF;
-       intp->imrl0 |= 0xFFFFFFFF;
-
-       enable_interrupts();
-       return 0;
-}
-#endif                         /* CONFIG_MCFINTC */
+#endif                         /* CONFIG_WATCHDOG */