diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-12-05 12:46:02 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-12-06 14:58:57 -0500 |
commit | a4855f39d4eb3f550ca5f4aac79bd999da42dc54 (patch) | |
tree | c334a19f43462a6def7abfca4c372385ce2bbdea /include/linux/bcma/bcma_driver_chipcommon.h | |
parent | a22a3114a820ca3eadee6af53d90736e5ca68fa1 (diff) |
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 'include/linux/bcma/bcma_driver_chipcommon.h')
-rw-r--r-- | include/linux/bcma/bcma_driver_chipcommon.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/bcma/bcma_driver_chipcommon.h b/include/linux/bcma/bcma_driver_chipcommon.h index 2f9b01493a90..e51359180b6f 100644 --- a/include/linux/bcma/bcma_driver_chipcommon.h +++ b/include/linux/bcma/bcma_driver_chipcommon.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef LINUX_BCMA_DRIVER_CC_H_ | 1 | #ifndef LINUX_BCMA_DRIVER_CC_H_ |
2 | #define LINUX_BCMA_DRIVER_CC_H_ | 2 | #define LINUX_BCMA_DRIVER_CC_H_ |
3 | 3 | ||
4 | #include <linux/platform_device.h> | ||
5 | |||
4 | /** ChipCommon core registers. **/ | 6 | /** ChipCommon core registers. **/ |
5 | #define BCMA_CC_ID 0x0000 | 7 | #define BCMA_CC_ID 0x0000 |
6 | #define BCMA_CC_ID_ID 0x0000FFFF | 8 | #define BCMA_CC_ID_ID 0x0000FFFF |
@@ -571,6 +573,7 @@ struct bcma_drv_cc { | |||
571 | struct bcma_serial_port serial_ports[4]; | 573 | struct bcma_serial_port serial_ports[4]; |
572 | #endif /* CONFIG_BCMA_DRIVER_MIPS */ | 574 | #endif /* CONFIG_BCMA_DRIVER_MIPS */ |
573 | u32 ticks_per_ms; | 575 | u32 ticks_per_ms; |
576 | struct platform_device *watchdog; | ||
574 | }; | 577 | }; |
575 | 578 | ||
576 | /* Register access */ | 579 | /* Register access */ |