Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c1ec9c0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog 

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] max63xx driver depends on ioremap()
  [WATCHDOG] max63xx: be careful when disabling the watchdog
  [WATCHDOG] fixed book E watchdog period register mask.
  [WATCHDOG] omap4: Fix WDT Kconfig
parents 1f829825 aebaec97

drivers/watchdog/Kconfig

+4 −4
Original line number Original line Diff line number Diff line
@@ -194,10 +194,10 @@ config EP93XX_WATCHDOG 




config OMAP_WATCHDOG

config OMAP_WATCHDOG

	tristate "OMAP Watchdog"

	tristate "OMAP Watchdog"

	depends on ARCH_OMAP16XX || ARCH_OMAP2 || ARCH_OMAP3

	depends on ARCH_OMAP16XX || ARCH_OMAP2PLUS

	help

	help

	  Support for TI OMAP1610/OMAP1710/OMAP2420/OMAP3430 watchdog.  Say 'Y'

	  Support for TI OMAP1610/OMAP1710/OMAP2420/OMAP3430/OMAP4430 watchdog.  Say 'Y'

	  here to enable the OMAP1610/OMAP1710/OMAP2420/OMAP3430 watchdog timer.

	  here to enable the OMAP1610/OMAP1710/OMAP2420/OMAP3430/OMAP4430 watchdog timer.





config PNX4008_WATCHDOG

config PNX4008_WATCHDOG

	tristate "PNX4008 Watchdog"

	tristate "PNX4008 Watchdog"
@@ -302,7 +302,7 @@ config TS72XX_WATCHDOG 




config MAX63XX_WATCHDOG

config MAX63XX_WATCHDOG

	tristate "Max63xx watchdog"

	tristate "Max63xx watchdog"

	depends on ARM

	depends on ARM && HAS_IOMEM

	help

	help

	  Support for memory mapped max63{69,70,71,72,73,74} watchdog timer.

	  Support for memory mapped max63{69,70,71,72,73,74} watchdog timer.

drivers/watchdog/booke_wdt.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ u32 booke_wdt_period = WDT_PERIOD_DEFAULT; 




#ifdef	CONFIG_FSL_BOOKE

#ifdef	CONFIG_FSL_BOOKE

#define WDTP(x)		((((x)&0x3)<<30)|(((x)&0x3c)<<15))

#define WDTP(x)		((((x)&0x3)<<30)|(((x)&0x3c)<<15))

#define WDTP_MASK	(WDTP(0))

#define WDTP_MASK	(WDTP(0x3f))

#else

#else

#define WDTP(x)		(TCR_WP(x))

#define WDTP(x)		(TCR_WP(x))

#define WDTP_MASK	(TCR_WP_MASK)

#define WDTP_MASK	(TCR_WP_MASK)

drivers/watchdog/max63xx_wdt.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -154,9 +154,14 @@ static void max63xx_wdt_enable(struct max63xx_timeout *entry) 




static void max63xx_wdt_disable(void)

static void max63xx_wdt_disable(void)

{

{

	u8 val;



	spin_lock(&io_lock);

	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);

	spin_unlock(&io_lock);