Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[linux-2.6] / include / asm-arm / arch-s3c2410 / system.h

diff --git a/include/asm-arm/arch-s3c2410/system.h b/include/asm-arm/arch-s3c2410/system.h
index cb9cd9fb86110a666882bafe448e8f750f3f57a0..14de4e596f87b170661faad4cabe21deeb7019aa 100644 (file)
--- a/include/asm-arm/arch-s3c2410/system.h
+++ b/include/asm-arm/arch-s3c2410/system.h
@@ -82,18 +82,21 @@ arch_reset(char mode)
                printk(KERN_WARNING "%s: warning: cannot get watchdog clock\n", __func__);
 
        /* put initial values into count and data */
-       __raw_writel(0x100, S3C2410_WTCNT);
-       __raw_writel(0x100, S3C2410_WTDAT);
+       __raw_writel(0x80, S3C2410_WTCNT);
+       __raw_writel(0x80, S3C2410_WTDAT);
 
        /* set the watchdog to go and reset... */
        __raw_writel(S3C2410_WTCON_ENABLE|S3C2410_WTCON_DIV16|S3C2410_WTCON_RSTEN |
                     S3C2410_WTCON_PRESCALE(0x20), S3C2410_WTCON);
 
        /* wait for reset to assert... */
-       mdelay(5000);
+       mdelay(500);
 
        printk(KERN_ERR "Watchdog reset failed to assert reset\n");
 
+       /* delay to allow the serial port to show the message */
+       mdelay(50);
+
        /* we'll take a jump through zero as a poor second */
        cpu_reset(0);
 }