diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-12-05 21:46:02 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-12-06 23:58:57 +0400 |
| commit | a4855f39d4eb3f550ca5f4aac79bd999da42dc54 (patch) | |
| tree | c334a19f43462a6def7abfca4c372385ce2bbdea /drivers/bcma/driver_chipcommon.c | |
| parent | a22a3114a820ca3eadee6af53d90736e5ca68fa1 (diff) | |
| download | linux-a4855f39d4eb3f550ca5f4aac79bd999da42dc54.tar.xz | |
bcma: register watchdog driver
Register the watchdog driver to the system if this is a SoC. Using the
watchdog on a non SoC device, like a PCIe card, will make the PCIe
card die when the timeout expired, but starting it again is not
supported by bcma.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/bcma/driver_chipcommon.c')
| -rw-r--r-- | drivers/bcma/driver_chipcommon.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/drivers/bcma/driver_chipcommon.c b/drivers/bcma/driver_chipcommon.c index 117222697e1f..d017f2512275 100644 --- a/drivers/bcma/driver_chipcommon.c +++ b/drivers/bcma/driver_chipcommon.c @@ -12,6 +12,7 @@ #include "bcma_private.h" #include <linux/bcm47xx_wdt.h> #include <linux/export.h> +#include <linux/platform_device.h> #include <linux/bcma/bcma.h> static inline u32 bcma_cc_write32_masked(struct bcma_drv_cc *cc, u16 offset, @@ -87,6 +88,27 @@ static int bcma_chipco_watchdog_ticks_per_ms(struct bcma_drv_cc *cc) } } +int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc) +{ + struct bcm47xx_wdt wdt = {}; + struct platform_device *pdev; + + wdt.driver_data = cc; + wdt.timer_set = bcma_chipco_watchdog_timer_set_wdt; + wdt.timer_set_ms = bcma_chipco_watchdog_timer_set_ms_wdt; + wdt.max_timer_ms = bcma_chipco_watchdog_get_max_timer(cc) / cc->ticks_per_ms; + + pdev = platform_device_register_data(NULL, "bcm47xx-wdt", + cc->core->bus->num, &wdt, + sizeof(wdt)); + if (IS_ERR(pdev)) + return PTR_ERR(pdev); + + cc->watchdog = pdev; + + return 0; +} + void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc) { if (cc->early_setup_done) |