[brcm63xx] fix off-by-one maximum timeout in the wathchdog default counter for bcm634...

SVN-Revision: 17149

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 4aa2037dbd4894c203a8a99fc318be2469e150e2..6e184891dc6f4154d113663dccb25b74103a47d2 100644 (file)
--- 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 5e7689c6f3b4000140fa0fd8e5e65a4379575ad3..8d58ccd8b36053b1466c83dc44efa01b5c1f835b 100644 (file)
--- 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);
 }