aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/bcma
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-12-05 12:46:01 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-12-06 14:58:56 -0500
commita22a3114a820ca3eadee6af53d90736e5ca68fa1 (patch)
tree7ef75f05f651badbe8f7ef4ad7fd985f0dd214b0 /include/linux/bcma
parentf6354c8cf9a3be15de441fad593ce53e63e9bf2a (diff)
bcma: add methods for watchdog driver
The watchdog driver wants to set the watchdog timeout in ms and not in ticks, which is depending on the SoC type and the clock. Calculate the number of ticks per millisecond and provide two functions for the watchdog driver. Also return the ticks or millisecond the timer was set to in case the provided value was bigger than the max allowed value. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/linux/bcma')
-rw-r--r--include/linux/bcma/bcma_driver_chipcommon.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/bcma/bcma_driver_chipcommon.h b/include/linux/bcma/bcma_driver_chipcommon.h
index 145f3c56227f..2f9b01493a90 100644
--- a/include/linux/bcma/bcma_driver_chipcommon.h
+++ b/include/linux/bcma/bcma_driver_chipcommon.h
@@ -570,6 +570,7 @@ struct bcma_drv_cc {
570 int nr_serial_ports; 570 int nr_serial_ports;
571 struct bcma_serial_port serial_ports[4]; 571 struct bcma_serial_port serial_ports[4];
572#endif /* CONFIG_BCMA_DRIVER_MIPS */ 572#endif /* CONFIG_BCMA_DRIVER_MIPS */
573 u32 ticks_per_ms;
573}; 574};
574 575
575/* Register access */ 576/* Register access */
@@ -593,8 +594,7 @@ extern void bcma_chipco_resume(struct bcma_drv_cc *cc);
593 594
594void bcma_chipco_bcm4331_ext_pa_lines_ctl(struct bcma_drv_cc *cc, bool enable); 595void bcma_chipco_bcm4331_ext_pa_lines_ctl(struct bcma_drv_cc *cc, bool enable);
595 596
596extern void bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc, 597extern u32 bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc, u32 ticks);
597 u32 ticks);
598 598
599void bcma_chipco_irq_mask(struct bcma_drv_cc *cc, u32 mask, u32 value); 599void bcma_chipco_irq_mask(struct bcma_drv_cc *cc, u32 mask, u32 value);
600 600