diff options
| author | Florian Fainelli <florian@openwrt.org> | 2009-08-06 18:53:44 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2009-08-06 18:53:44 +0000 |
| commit | 48c1634d3e91ed380cca5bb3ae521f126c83780d (patch) | |
| tree | 3584cc4fea6d08242da9966ac4f33e3e38d97922 | |
| parent | dd78f746a56880a54e96da56df6431b7548c941a (diff) | |
| download | upstream-48c1634d3e91ed380cca5bb3ae521f126c83780d.tar.gz upstream-48c1634d3e91ed380cca5bb3ae521f126c83780d.tar.bz2 upstream-48c1634d3e91ed380cca5bb3ae521f126c83780d.zip | |
fix off-by-one maximum timeout in the wathchdog default counter for bcm6345, thanks AndyI
SVN-Revision: 17149
| -rw-r--r-- | target/linux/brcm63xx/files/arch/mips/bcm63xx/dev-wdt.c | 4 | ||||
| -rw-r--r-- | target/linux/brcm63xx/files/drivers/watchdog/bcm63xx_wdt.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/dev-wdt.c b/target/linux/brcm63xx/files/arch/mips/bcm63xx/dev-wdt.c index 4aa2037dbd..6e184891dc 100644 --- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/dev-wdt.c +++ b/target/linux/brcm63xx/files/arch/mips/bcm63xx/dev-wdt.c @@ -32,7 +32,5 @@ int __init bcm63xx_wdt_register(void) wdt_resources[0].end = wdt_resources[0].start; wdt_resources[0].end += RSET_WDT_SIZE - 1; - /* Disable watchdog for 6345 until we fix it */ - if (!BCMCPU_IS_6345()) - return platform_device_register(&bcm63xx_wdt_device); + return platform_device_register(&bcm63xx_wdt_device); } diff --git a/target/linux/brcm63xx/files/drivers/watchdog/bcm63xx_wdt.c b/target/linux/brcm63xx/files/drivers/watchdog/bcm63xx_wdt.c index 5e7689c6f3..8d58ccd8b3 100644 --- a/target/linux/brcm63xx/files/drivers/watchdog/bcm63xx_wdt.c +++ b/target/linux/brcm63xx/files/drivers/watchdog/bcm63xx_wdt.c @@ -57,7 +57,7 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" /* HW functions */ static void bcm63xx_wdt_hw_start(void) { - bcm_writel(0xffffffff, bcm63xx_wdt_device.regs + WDT_DEFVAL_REG); + bcm_writel(0xfffffffe, bcm63xx_wdt_device.regs + WDT_DEFVAL_REG); bcm_writel(WDT_START_1, bcm63xx_wdt_device.regs + WDT_CTL_REG); bcm_writel(WDT_START_2, bcm63xx_wdt_device.regs + WDT_CTL_REG); } |