diff options
| author | Deepak Saxena <dsaxena@plexity.net> | 2006-01-03 12:50:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 16:47:42 -0800 |
| commit | 3adfd4e2b8804e926a5245062ba8ee12e88d30c3 (patch) | |
| tree | abcd17bd38ac7609566977bc5070573f16ed1be3 /drivers/char | |
| parent | 4da5cc2cec8caec1d357053e85a7a32f243f93a1 (diff) | |
| download | op-kernel-dev-3adfd4e2b8804e926a5245062ba8ee12e88d30c3.zip op-kernel-dev-3adfd4e2b8804e926a5245062ba8ee12e88d30c3.tar.gz | |
[PATCH] Fix IXP4xx watchdog errata workaround
The IXP4xx driver bails out on all A0 CPUs, but it should only do
so on IXP42x as IXP46x has functioning HW.
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/watchdog/ixp4xx_wdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/watchdog/ixp4xx_wdt.c b/drivers/char/watchdog/ixp4xx_wdt.c index b5be8b1..3800835 100644 --- a/drivers/char/watchdog/ixp4xx_wdt.c +++ b/drivers/char/watchdog/ixp4xx_wdt.c @@ -186,8 +186,8 @@ static int __init ixp4xx_wdt_init(void) unsigned long processor_id; asm("mrc p15, 0, %0, cr0, cr0, 0;" : "=r"(processor_id) :); - if (!(processor_id & 0xf)) { - printk("IXP4XXX Watchdog: Rev. A0 CPU detected - " + if (!(processor_id & 0xf) && !cpu_is_ixp46x()) { + printk("IXP4XXX Watchdog: Rev. A0 IXP42x CPU detected - " "watchdog disabled\n"); return -ENODEV; |
