--- v1
+++ v3
@@ -1,51 +1,56 @@
-This patch series improves the watchdog driver used on the Broadcom
-bcm47xx SoCs.
-The watchdog driver does not access the functions directly any more,
-but it registers as a platform device driver and ssb and bcma are
-registering a device for this watchdog driver.
-This also adds support for SoCs with a power management unit (PMU),
-which have different clock rates.
+
+This patch series improves the functions for setting the watchdog
+driver in ssb amd bcma. It also makes ssb and bcma register a platform
+device which could be used by a watchdog driver to better set the times
+where the system should restart. The patches for the watchdog driver
+will be send later and were removed in v3.
This code is currently based on the wireless-testing/master tree by
-John Linville, because there are some changes in ssb and bcma in that
-tree queued for 3.8 which will conflict with these changes, if this
-would be based on an other tree. I have no problem with rebasing this
-onto any other tree.
+John Linville.
-Hauke Mehrtens (15):
- watchdog: bcm47xx_wdt.c: convert to watchdog core api
- watchdog: bcm47xx_wdt.c: use platform device
- watchdog: bcm47xx_wdt.c: rename ops methods
- watchdog: bcm47xx_wdt.c: rename wdt_timeout to timeout
- watchdog: bcm47xx_wdt.c: add hard timer
+v3:
+ * Remove changes done to the watchdog driver so John could pull this
+ into wireless-testing, this sill works with the old watchdog driver.
+ The patches changing the watchdog driver will be send later.
+ This was done to get this into 3.8 because Wim Van Sebroeck is
+ neither giving an Ack or a Nack on these patches and we want to do
+ more changes to bcma/ssb on top of these.
+
+v2:
+ * reword some commit messages
+ * rebase on current wireless-testing/master with
+ "ssb: extif: fix compile errors" applied on top of it.
+ * do not change value of WDT_SOFTTIMER_MAX
+ * moved some small changes in the bcm47xx_wdt.c patches
+
+Hauke Mehrtens (11):
+ ssb/bcma: add common header for watchdog
bcma: add bcma_chipco_alp_clock
bcma: set the pmu watchdog if available
bcma: add methods for watchdog driver
bcma: register watchdog driver
ssb: get alp clock from devices with PMU
- ssb: set the pmu watchdog if available
+ ssb: set the PMU watchdog if available
ssb: add methods for watchdog driver
- ssb: extif: add check for max value in watchdog
+ ssb: extif: add check for max value before setting watchdog register
ssb: extif: add methods for watchdog driver
ssb: register watchdog driver
drivers/bcma/bcma_private.h | 2 +
- drivers/bcma/driver_chipcommon.c | 114 ++++++++-
- drivers/bcma/main.c | 8 +
- drivers/ssb/driver_chipcommon.c | 99 +++++++-
- drivers/ssb/driver_chipcommon_pmu.c | 27 +++
- drivers/ssb/driver_extif.c | 24 +-
- drivers/ssb/embedded.c | 35 +++
- drivers/ssb/main.c | 8 +
- drivers/ssb/ssb_private.h | 31 +++
- drivers/watchdog/Kconfig | 1 +
- drivers/watchdog/bcm47xx_wdt.c | 339 ++++++++++++---------------
- include/linux/bcm47xx_wdt.h | 28 +++
+ drivers/bcma/driver_chipcommon.c | 114 +++++++++++++++++++++++++--
+ drivers/bcma/main.c | 8 ++
+ drivers/ssb/driver_chipcommon.c | 100 ++++++++++++++++++++---
+ drivers/ssb/driver_chipcommon_pmu.c | 27 +++++++
+ drivers/ssb/driver_extif.c | 24 +++++-
+ drivers/ssb/embedded.c | 35 ++++++++
+ drivers/ssb/main.c | 8 ++
+ drivers/ssb/ssb_private.h | 31 ++++++++
+ include/linux/bcm47xx_wdt.h | 19 +++++
include/linux/bcma/bcma_driver_chipcommon.h | 7 +-
include/linux/ssb/ssb.h | 2 +
include/linux/ssb/ssb_driver_chipcommon.h | 5 +-
- include/linux/ssb/ssb_driver_extif.h | 10 +-
- 16 files changed, 522 insertions(+), 218 deletions(-)
+ include/linux/ssb/ssb_driver_extif.h | 10 ++-
+ 14 files changed, 368 insertions(+), 24 deletions(-)
create mode 100644 include/linux/bcm47xx_wdt.h
--