Commit fd16230a authored by Tom Rini's avatar Tom Rini Committed by Linus Torvalds

[PATCH] ppc32: Fix mpc8xx watchdog

The CONFIG_8xx_WDT option got broken in the generic hardirq update as ppc32
had its own different request_irq that worked when other arches used
setup_irq.  This is the trivial fix for the problem.

From: Carsten Juttner <carjay@gmx.net>
Signed-off-by: default avatarTom Rini <trini@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f50b153b
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <asm/8xx_immap.h> #include <asm/8xx_immap.h>
...@@ -18,6 +19,12 @@ ...@@ -18,6 +19,12 @@
static int wdt_timeout; static int wdt_timeout;
static irqreturn_t m8xx_wdt_interrupt(int, void *, struct pt_regs *);
static struct irqaction m8xx_wdt_irqaction = {
.handler = m8xx_wdt_interrupt,
.name = "watchdog",
};
void m8xx_wdt_reset(void) void m8xx_wdt_reset(void)
{ {
volatile immap_t *imap = (volatile immap_t *)IMAP_ADDR; volatile immap_t *imap = (volatile immap_t *)IMAP_ADDR;
...@@ -84,8 +91,8 @@ void __init m8xx_wdt_handler_install(bd_t * binfo) ...@@ -84,8 +91,8 @@ void __init m8xx_wdt_handler_install(bd_t * binfo)
imap->im_sit.sit_piscr = imap->im_sit.sit_piscr =
(mk_int_int_mask(PIT_INTERRUPT) << 8) | PISCR_PIE | PISCR_PTE; (mk_int_int_mask(PIT_INTERRUPT) << 8) | PISCR_PIE | PISCR_PTE;
if (request_irq(PIT_INTERRUPT, m8xx_wdt_interrupt, 0, "watchdog", NULL)) if (setup_irq(PIT_INTERRUPT, &m8xx_wdt_irqaction))
panic("m8xx_wdt: could not allocate watchdog irq!"); panic("m8xx_wdt: error setting up the watchdog irq!");
printk(KERN_NOTICE printk(KERN_NOTICE
"m8xx_wdt: keep-alive trigger installed (PITC: 0x%04X)\n", pitc); "m8xx_wdt: keep-alive trigger installed (PITC: 0x%04X)\n", pitc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment