From: Ben Dooks Date: Sun, 23 Dec 2007 02:09:32 +0000 (+0100) Subject: [ARM] 4722/1: S3C24XX: Improve output if watchdog reset fails X-Git-Tag: v2.6.25-rc1~1175^2~2^9~29 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ff44b49b55edee33b7ecea987be1a6413162581b;p=linux-2.6-omap-h63xx.git [ARM] 4722/1: S3C24XX: Improve output if watchdog reset fails If the watchdog reset fails and we decided to take the jump to zero approach, allow 50ms for the UARTS to drain the FIFOs before calling into a bootloader that may flush the output. Also reduece the waits and the timeout values as 5 seconds is rather long. Signed-off-by: Ben Dooks Signed-off-by: Russell King --- diff --git a/include/asm-arm/arch-s3c2410/system.h b/include/asm-arm/arch-s3c2410/system.h index cb9cd9fb861..14de4e596f8 100644 --- 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); }