summaryrefslogtreecommitdiff
path: root/target/linux/brcm63xx
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-08-06 18:53:44 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-08-06 18:53:44 +0000
commitef9fbab1eb393195724cba4ce179e973d2558d4c (patch)
tree6ab65d3c888efb5760c402dc430e75750721dfc9 /target/linux/brcm63xx
parent1a7361a5290ff7fe4a4ecc0b99672699436f2332 (diff)
[brcm63xx] fix off-by-one maximum timeout in the wathchdog default counter for bcm6345, thanks AndyI
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17149 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx')
-rw-r--r--target/linux/brcm63xx/files/arch/mips/bcm63xx/dev-wdt.c4
-rw-r--r--target/linux/brcm63xx/files/drivers/watchdog/bcm63xx_wdt.c2
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);
}