fix off-by-one maximum timeout in the wathchdog default counter for bcm6345, thanks AndyI
SVN-Revision: 17149
This commit is contained in:
parent
dd78f746a5
commit
48c1634d3e
2 changed files with 2 additions and 4 deletions
|
@ -32,7 +32,5 @@ int __init bcm63xx_wdt_register(void)
|
||||||
wdt_resources[0].end = wdt_resources[0].start;
|
wdt_resources[0].end = wdt_resources[0].start;
|
||||||
wdt_resources[0].end += RSET_WDT_SIZE - 1;
|
wdt_resources[0].end += RSET_WDT_SIZE - 1;
|
||||||
|
|
||||||
/* Disable watchdog for 6345 until we fix it */
|
return platform_device_register(&bcm63xx_wdt_device);
|
||||||
if (!BCMCPU_IS_6345())
|
|
||||||
return platform_device_register(&bcm63xx_wdt_device);
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,7 +57,7 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
|
||||||
/* HW functions */
|
/* HW functions */
|
||||||
static void bcm63xx_wdt_hw_start(void)
|
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_1, bcm63xx_wdt_device.regs + WDT_CTL_REG);
|
||||||
bcm_writel(WDT_START_2, bcm63xx_wdt_device.regs + WDT_CTL_REG);
|
bcm_writel(WDT_START_2, bcm63xx_wdt_device.regs + WDT_CTL_REG);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue