mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
[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>
This commit is contained in:
parent
4da5cc2cec
commit
3adfd4e2b8
1 changed files with 2 additions and 2 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue