diff options
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6/544-watchdog-bcm47xx_wdt.c-add-hard-timer.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.6/544-watchdog-bcm47xx_wdt.c-add-hard-timer.patch | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/544-watchdog-bcm47xx_wdt.c-add-hard-timer.patch b/target/linux/brcm47xx/patches-3.6/544-watchdog-bcm47xx_wdt.c-add-hard-timer.patch index 6970e10ea0..3c61cceea9 100644 --- a/target/linux/brcm47xx/patches-3.6/544-watchdog-bcm47xx_wdt.c-add-hard-timer.patch +++ b/target/linux/brcm47xx/patches-3.6/544-watchdog-bcm47xx_wdt.c-add-hard-timer.patch @@ -3,12 +3,12 @@ @@ -31,6 +31,7 @@ #define WDT_DEFAULT_TIME 30 /* seconds */ - #define WDT_SOFTTIMER_MAX 3600 /* seconds */ + #define WDT_SOFTTIMER_MAX 255 /* seconds */ +#define WDT_SOFTTIMER_THRESHOLD 60 /* seconds */ static int timeout = WDT_DEFAULT_TIME; static bool nowayout = WATCHDOG_NOWAYOUT; -@@ -50,6 +51,53 @@ static inline struct bcm47xx_wdt *bcm47x +@@ -49,6 +50,53 @@ static inline struct bcm47xx_wdt *bcm47x return container_of(wdd, struct bcm47xx_wdt, wdd); } @@ -62,7 +62,7 @@ static void bcm47xx_wdt_soft_timer_tick(unsigned long data) { struct bcm47xx_wdt *wdt = (struct bcm47xx_wdt *)data; -@@ -134,15 +182,22 @@ static struct watchdog_ops bcm47xx_wdt_s +@@ -133,15 +181,22 @@ static struct watchdog_ops bcm47xx_wdt_s static int __devinit bcm47xx_wdt_probe(struct platform_device *pdev) { int ret; @@ -88,7 +88,7 @@ wdt->wdd.info = &bcm47xx_wdt_info; wdt->wdd.timeout = WDT_DEFAULT_TIME; ret = wdt->wdd.ops->set_timeout(&wdt->wdd, timeout); -@@ -160,14 +215,16 @@ static int __devinit bcm47xx_wdt_probe(s +@@ -159,14 +214,16 @@ static int __devinit bcm47xx_wdt_probe(s if (ret) goto err_notifier; @@ -108,13 +108,3 @@ return ret; } ---- a/include/linux/bcm47xx_wdt.h -+++ b/include/linux/bcm47xx_wdt.h -@@ -10,6 +10,7 @@ - struct bcm47xx_wdt { - u32 (*timer_set)(struct bcm47xx_wdt *, u32); - u32 (*timer_set_ms)(struct bcm47xx_wdt *, u32); -+ u32 max_timer_ms; - - void *driver_data; - |