1 --- a/drivers/ssb/driver_mipscore.c 2007-12-06 08:07:00.000000000 +0100
2 +++ b/drivers/ssb/driver_mipscore.c 2007-12-06 10:27:43.000000000 +0100
4 ssb_write32(extif->dev, offset, value);
7 +/* Set chip watchdog reset timer to fire in 'ticks' backplane cycles */
9 +ssb_watchdog(struct ssb_bus *bus, uint ticks)
12 + if (bus->chipco.dev)
13 + ssb_write32(bus->chipco.dev, SSB_CHIPCO_WATCHDOG, ticks);
14 + else if (bus->extif.dev)
15 + ssb_write32(bus->extif.dev, SSB_EXTIF_WATCHDOG, ticks);
18 +EXPORT_SYMBOL(ssb_watchdog);
20 static const u32 ipsflag_irq_mask[] = {
23 --- a/include/linux/ssb/ssb_driver_mips.h 2007-12-06 08:07:00.000000000 +0100
24 +++ b/include/linux/ssb/ssb_driver_mips.h 2007-12-06 10:32:36.000000000 +0100
27 extern unsigned int ssb_mips_irq(struct ssb_device *dev);
29 +/* Set watchdog reset timer to fire in 'ticks' backplane cycles */
30 +extern int ssb_watchdog(struct ssb_bus *bus, uint ticks);
32 #else /* CONFIG_SSB_DRIVER_MIPS */
34 --- a/arch/mips/bcm947xx/setup.c 2007-12-06 08:07:00.000000000 +0100
35 +++ b/arch/mips/bcm947xx/setup.c 2007-12-06 10:33:39.000000000 +0100
39 /* Set the watchdog timer to reset immediately */
40 - ssb_chipco_watchdog_timer_set(&ssb.chipco, 1);
41 + ssb_watchdog(&ssb, 1);
47 /* Disable interrupts and watchdog and spin forever */
49 - ssb_chipco_watchdog_timer_set(&ssb.chipco, 0);
50 + ssb_watchdog(&ssb, 0);