The patch titled
SSB: watchdog support
has been added to the -mm tree. Its filename is
watchdog-support-3.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: SSB: watchdog support
From: Aurelien Jarno <aurelien@xxxxxxxxxxx>
Add a new function to control the watchdog. It originally comes from the
OpenWrt patches.
Cc: Felix Fietkau <nbd@xxxxxxxxxxx>
Signed-off-by: Aurelien Jarno <aurelien@xxxxxxxxxxx>
Signed-off-by: Michael Buesch <mb@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/ssb/driver_chipcommon.c | 7 +++++++
include/linux/ssb/ssb_driver_chipcommon.h | 3 +++
2 files changed, 10 insertions(+)
diff -puN drivers/ssb/driver_chipcommon.c~watchdog-support-3 drivers/ssb/driver_chipcommon.c
--- a/drivers/ssb/driver_chipcommon.c~watchdog-support-3
+++ a/drivers/ssb/driver_chipcommon.c
@@ -312,6 +312,13 @@ void ssb_chipco_timing_init(struct ssb_c
}
}
+/* Set chip watchdog reset timer to fire in 'ticks' backplane cycles */
+void
+ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc, u32 ticks)
+{
+ /* instant NMI */
+ chipco_write32(cc, SSB_CHIPCO_WATCHDOG, ticks);
+}
#ifdef CONFIG_SSB_SERIAL
int ssb_chipco_serial_init(struct ssb_chipcommon *cc,
diff -puN include/linux/ssb/ssb_driver_chipcommon.h~watchdog-support-3 include/linux/ssb/ssb_driver_chipcommon.h
--- a/include/linux/ssb/ssb_driver_chipcommon.h~watchdog-support-3
+++ a/include/linux/ssb/ssb_driver_chipcommon.h
@@ -377,6 +377,9 @@ enum ssb_clkmode {
extern void ssb_chipco_set_clockmode(struct ssb_chipcommon *cc,
enum ssb_clkmode mode);
+extern void ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc,
+ u32 ticks);
+
#ifdef CONFIG_SSB_SERIAL
extern int ssb_chipco_serial_init(struct ssb_chipcommon *cc,
struct ssb_serial_port *ports);
_
Patches currently in -mm which might be from aurelien@xxxxxxxxxxx are
origin.patch
git-kvm.patch
ssb-compile-fix.patch
watchdog-support-3.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
