public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Fix IXP4xx watchdog errata workaround
@ 2006-01-03 20:50 Deepak Saxena
  0 siblings, 0 replies; only message in thread
From: Deepak Saxena @ 2006-01-03 20:50 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-kernel

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>

---


Index: linux-2.6-git/drivers/char/watchdog/ixp4xx_wdt.c
===================================================================
--- linux-2.6-git.orig/drivers/char/watchdog/ixp4xx_wdt.c
+++ linux-2.6-git/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;

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2006-01-03 20:50 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-01-03 20:50 [PATCH] Fix IXP4xx watchdog errata workaround Deepak Saxena

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox