karo: merge with Ka-Ro specific tree for secure boot support

[karo-tx-uboot.git] / drivers / watchdog / imx_watchdog.c

diff --git a/drivers/watchdog/imx_watchdog.c b/drivers/watchdog/imx_watchdog.c
index d5993b4d26d6ba6018031cc5b31f7966d13a5ca8..3f6e5593ed0619aaa0dba7f812d8f7e85ac0ccdb 100644 (file)
--- a/drivers/watchdog/imx_watchdog.c
+++ b/drivers/watchdog/imx_watchdog.c
@@ -56,12 +56,7 @@ void reset_cpu(ulong addr)
 {
        struct watchdog_regs *wdog = (struct watchdog_regs *)WDOG1_BASE_ADDR;
 
-       writew(WCR_WDE, &wdog->wcr);
-       writew(0x5555, &wdog->wsr);
-       writew(0xaaaa, &wdog->wsr);     /* load minimum 1/2 second timeout */
        while (1) {
-               /*
-                * spin for .5 seconds before reset
-                */
+               writew(0, &wdog->wcr); /* clear SRS initiating SOFT reset */
        }
 }