Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3adfd4e2 authored by Deepak Saxena's avatar Deepak Saxena Committed by Linus Torvalds
Browse files

[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: default avatarDeepak Saxena <dsaxena@plexity.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4da5cc2c

drivers/char/watchdog/ixp4xx_wdt.c

+2 −2
Original line number Diff line number Diff line
@@ -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;