v2.6.34-rc4 watchdog fixes
Hi Linus,
Please pull from 'master' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
or if master.kernel.org hasn't synced up yet:
master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
This will update the following files:
drivers/watchdog/Kconfig | 8 ++++---- drivers/watchdog/booke_wdt.c | 2 +- drivers/watchdog/max63xx_wdt.c | 7 ++++++- 3 files changed, 11 insertions(+), 6 deletions(-)
with these Changes:
Author: Geert Uytterhoeven <[email protected]> Date: Wed Apr 7 19:57:02 2010 +0200
[WATCHDOG] max63xx driver depends on ioremap()
Correct fix for the "ioremap() causes build failure on S390" should have been a dependancy on HAS_IOMEM. So we add this dependancy also (and leave the driver in the ARM section for now).
Author: Marc Zyngier <[email protected]> Date: Fri Apr 9 17:43:33 2010 +0100
[WATCHDOG] max63xx: be careful when disabling the watchdog
When shutting down the watchdog timer, special care must be taken not to overwrite other bits in the register, as it may be shared with other peripherals.
For example, on the Arcom Vulcan, the register is shared between the watchdog and the PCI reset line...
Author: Luuk Paulussen <[email protected]> Date: Thu Apr 15 15:59:10 2010 +1200
[WATCHDOG] fixed book E watchdog period register mask.
A previous fix changed the WDTP function to use the period directly, rather than subtracting from 63. However the mask generation was not changed, so the mask was coming out as 0. This patch fixes it.
Author: Santosh Shilimkar <[email protected]> Date: Wed Apr 7 13:17:22 2010 +0530
[WATCHDOG] omap4: Fix WDT Kconfig
This patch allows Watchdog timer to be selected for OMAP4 by fixing Kconfig entry
The Changes can also be looked at on:
http://www.kernel.org/git/?p=linux/kernel/git/wim/linux-2.6-watchdog.git;a=summary
For completeness, I added the overal diff below.
Greetings,
Wim.
================================================================================
drivers/watchdog/Kconfig +4 -4
@@ -194,10 +194,10 @@ config EP93XX_WATCHDOG config OMAP_WATCHDOG tristate "OMAP Watchdog" - depends on ARCH_OMAP16XX || ARCH_OMAP2 || ARCH_OMAP3 + depends on ARCH_OMAP16XX || ARCH_OMAP2PLUS help - Support for TI OMAP1610/OMAP1710/OMAP2420/OMAP3430 watchdog. Say 'Y' - here to enable the OMAP1610/OMAP1710/OMAP2420/OMAP3430 watchdog timer. + Support for TI OMAP1610/OMAP1710/OMAP2420/OMAP3430/OMAP4430 watchdog. Say 'Y' + here to enable the OMAP1610/OMAP1710/OMAP2420/OMAP3430/OMAP4430 watchdog timer. config PNX4008_WATCHDOG tristate "PNX4008 Watchdog"
@@ -302,7 +302,7 @@ config TS72XX_WATCHDOG config MAX63XX_WATCHDOG tristate "Max63xx watchdog" - depends on ARM + depends on ARM && HAS_IOMEM help Support for memory mapped max63{69,70,71,72,73,74} watchdog timer.
drivers/watchdog/booke_wdt.c +1 -1
@@ -44,7 +44,7 @@ u32 booke_wdt_period = WDT_PERIOD_DEFAULT;#ifdef CONFIG_FSL_BOOKE #define WDTP (x) ((((x)&0x3)<<30)|(((x)&0x3c)<<15)) -#define WDTP_MASK (WDTP(0)) +#define WDTP_MASK (WDTP(0x3f))#else #define WDTP (x) (TCR_WP(x))#define WDTP_MASK (TCR_WP_MASK)
drivers/watchdog/max63xx_wdt.c +6 -1
@@ -154,9 +154,14 @@ static void max63xx_wdt_enable(struct max63xx_timeout *entry)static void max63xx_wdt_disable (void ) { +u8 val; +spin_lock (&io_lock); -__raw_writeb (3 , wdt_base); + val =__raw_readb (wdt_base); + val &= ~MAX6369_WDSET ; + val |=3 ; +__raw_writeb (val, wdt_base);spin_unlock (&io_lock);