1 --- a/drivers/watchdog/bcm47xx_wdt.c
2 +++ b/drivers/watchdog/bcm47xx_wdt.c
5 #define WDT_DEFAULT_TIME 30 /* seconds */
6 #define WDT_MAX_TIME 255 /* seconds */
7 +#define WDT_SHIFT 15 /* 32.768 KHz on cores with slow WDT clock */
9 static int wdt_time = WDT_DEFAULT_TIME;
10 static bool nowayout = WATCHDOG_NOWAYOUT;
11 @@ -52,20 +53,20 @@ static unsigned long bcm47xx_wdt_busy;
12 static char expect_release;
13 static struct timer_list wdt_timer;
14 static atomic_t ticks;
15 +static int needs_sw_scale;
17 -static inline void bcm47xx_wdt_hw_start(void)
18 +static inline void bcm47xx_wdt_hw_start(u32 ticks)
20 - /* this is 2,5s on 100Mhz clock and 2s on 133 Mhz */
21 switch (bcm47xx_bus_type) {
22 #ifdef CONFIG_BCM47XX_SSB
23 case BCM47XX_BUS_TYPE_SSB:
24 - ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 0xfffffff);
25 + ssb_watchdog_timer_set(&bcm47xx_bus.ssb, ticks);
28 #ifdef CONFIG_BCM47XX_BCMA
29 case BCM47XX_BUS_TYPE_BCMA:
30 bcma_chipco_watchdog_timer_set(&bcm47xx_bus.bcma.bus.drv_cc,
36 @@ -90,33 +91,34 @@ static inline int bcm47xx_wdt_hw_stop(vo
37 static void bcm47xx_timer_tick(unsigned long unused)
39 if (!atomic_dec_and_test(&ticks)) {
40 - bcm47xx_wdt_hw_start();
41 + /* This is 2,5s on 100Mhz clock and 2s on 133 Mhz */
42 + bcm47xx_wdt_hw_start(0xfffffff);
43 mod_timer(&wdt_timer, jiffies + HZ);
45 pr_crit("Watchdog will fire soon!!!\n");
49 -static inline void bcm47xx_wdt_pet(void)
50 +static void bcm47xx_wdt_pet(void)
52 - atomic_set(&ticks, wdt_time);
54 + atomic_set(&ticks, wdt_time);
56 + bcm47xx_wdt_hw_start(wdt_time << WDT_SHIFT);
59 static void bcm47xx_wdt_start(void)
62 - bcm47xx_timer_tick(0);
65 -static void bcm47xx_wdt_pause(void)
67 - del_timer_sync(&wdt_timer);
68 - bcm47xx_wdt_hw_stop();
70 + bcm47xx_timer_tick(0);
73 static void bcm47xx_wdt_stop(void)
75 - bcm47xx_wdt_pause();
77 + del_timer_sync(&wdt_timer);
78 + bcm47xx_wdt_hw_stop();
81 static int bcm47xx_wdt_settimeout(int new_time)
82 @@ -267,7 +269,20 @@ static int __init bcm47xx_wdt_init(void)
83 if (bcm47xx_wdt_hw_stop() < 0)
86 - setup_timer(&wdt_timer, bcm47xx_timer_tick, 0L);
87 + /* FIXME Other cores */
88 +#ifdef BCM47XX_BUS_TYPE_BCMA
89 + if(bcm47xx_bus_type == BCM47XX_BUS_TYPE_BCMA &&
90 + bcm47xx_bus.ssb.chip_id == 0x5354) {
91 + /* Slow WDT clock, no pre-scaling */
95 + /* Fast WDT clock, needs software pre-scaling */
97 + setup_timer(&wdt_timer, bcm47xx_timer_tick, 0L);
98 +#ifdef BCM47XX_BUS_TYPE_BCMA
102 if (bcm47xx_wdt_settimeout(wdt_time)) {
103 bcm47xx_wdt_settimeout(WDT_DEFAULT_TIME);