1 --- a/drivers/ssb/driver_chipcommon.c
2 +++ b/drivers/ssb/driver_chipcommon.c
5 * Copyright 2005, Broadcom Corporation
6 * Copyright 2006, 2007, Michael Buesch <m@bues.ch>
7 + * Copyright 2012, Hauke Mehrtens <hauke@hauke-m.de>
9 * Licensed under the GNU/GPL. See COPYING for details.
12 #include <linux/ssb/ssb_regs.h>
13 #include <linux/export.h>
14 #include <linux/pci.h>
15 +#include <linux/bcm47xx_wdt.h>
17 #include "ssb_private.h"
19 @@ -306,6 +308,43 @@ static u32 ssb_chipco_watchdog_get_max_t
23 +u32 ssb_chipco_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt, u32 ticks)
25 + struct ssb_chipcommon *cc = bcm47xx_wdt_get_drvdata(wdt);
27 + if (cc->dev->bus->bustype != SSB_BUSTYPE_SSB)
30 + return ssb_chipco_watchdog_timer_set(cc, ticks);
33 +u32 ssb_chipco_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms)
35 + struct ssb_chipcommon *cc = bcm47xx_wdt_get_drvdata(wdt);
38 + if (cc->dev->bus->bustype != SSB_BUSTYPE_SSB)
41 + ticks = ssb_chipco_watchdog_timer_set(cc, cc->ticks_per_ms * ms);
42 + return ticks / cc->ticks_per_ms;
45 +static int ssb_chipco_watchdog_ticks_per_ms(struct ssb_chipcommon *cc)
47 + struct ssb_bus *bus = cc->dev->bus;
49 + if (cc->capabilities & SSB_CHIPCO_CAP_PMU) {
50 + /* based on 32KHz ILP clock */
53 + if (cc->dev->id.revision < 18)
54 + return ssb_clockspeed(bus) / 1000;
56 + return ssb_chipco_alp_clock(cc) / 1000;
60 void ssb_chipcommon_init(struct ssb_chipcommon *cc)
63 @@ -323,6 +362,11 @@ void ssb_chipcommon_init(struct ssb_chip
64 chipco_powercontrol_init(cc);
65 ssb_chipco_set_clockmode(cc, SSB_CLKMODE_FAST);
66 calc_fast_powerup_delay(cc);
68 + if (cc->dev->bus->bustype == SSB_BUSTYPE_SSB) {
69 + cc->ticks_per_ms = ssb_chipco_watchdog_ticks_per_ms(cc);
70 + cc->max_timer_ms = ssb_chipco_watchdog_get_max_timer(cc) / cc->ticks_per_ms;
74 void ssb_chipco_suspend(struct ssb_chipcommon *cc)
75 @@ -421,7 +465,7 @@ void ssb_chipco_timing_init(struct ssb_c
78 /* Set chip watchdog reset timer to fire in 'ticks' backplane cycles */
79 -void ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc, u32 ticks)
80 +u32 ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc, u32 ticks)
83 enum ssb_clkmode clkmode;
84 @@ -441,6 +485,7 @@ void ssb_chipco_watchdog_timer_set(struc
86 chipco_write32(cc, SSB_CHIPCO_WATCHDOG, ticks);
91 void ssb_chipco_irq_mask(struct ssb_chipcommon *cc, u32 mask, u32 value)
92 --- a/drivers/ssb/ssb_private.h
93 +++ b/drivers/ssb/ssb_private.h
96 #include <linux/ssb/ssb.h>
97 #include <linux/types.h>
98 +#include <linux/bcm47xx_wdt.h>
102 @@ -226,4 +227,8 @@ static inline int ssb_sflash_init(struct
104 extern struct platform_device ssb_pflash_dev;
106 +extern u32 ssb_chipco_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt,
108 +extern u32 ssb_chipco_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms);
110 #endif /* LINUX_SSB_PRIVATE_H_ */
111 --- a/include/linux/ssb/ssb_driver_chipcommon.h
112 +++ b/include/linux/ssb/ssb_driver_chipcommon.h
113 @@ -607,6 +607,8 @@ struct ssb_chipcommon {
114 #ifdef CONFIG_SSB_SFLASH
115 struct bcm47xx_sflash sflash;
121 static inline bool ssb_chipco_available(struct ssb_chipcommon *cc)
122 @@ -646,8 +648,7 @@ enum ssb_clkmode {
123 extern void ssb_chipco_set_clockmode(struct ssb_chipcommon *cc,
124 enum ssb_clkmode mode);
126 -extern void ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc,
128 +extern u32 ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc, u32 ticks);
130 void ssb_chipco_irq_mask(struct ssb_chipcommon *cc, u32 mask, u32 value);