Commit d4bab1b0 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] i6300esb.c: change platform_driver to pci_driver
  [WATCHDOG] i6300esb: fix unlock register with
  [WATCHDOG] drivers/watchdog/wdt.c:wdt_ioctl(): make `ident' non-static
  [WATCHDOG] change reboot_notifier to platform-shutdown method.
  [WATCHDOG] watchdog_info constify
  [WATCHDOG] gef_wdt: Author corrections following split of GE Fanuc joint venture
  [WATCHDOG] iTCO_wdt: clean up probe(), modify err msg
  [WATCHDOG] ep93xx: watchdog timer driver for TS-72xx SBCs cleanup
  [WATCHDOG] support for max63xx watchdog timer chips
  [WATCHDOG] ep93xx: added platform side support for TS-72xx WDT driver
  [WATCHDOG] ep93xx: implemented watchdog timer driver for TS-72xx SBCs
parents 56b78921 2786095a

arch/arm/mach-ep93xx/include/mach/ts72xx.h

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ 
#define TS72XX_RTC_DATA_PHYS_BASE	0x11700000

#define TS72XX_RTC_DATA_SIZE		0x00001000



#define TS72XX_WDT_CONTROL_PHYS_BASE	0x23800000

#define TS72XX_WDT_FEED_PHYS_BASE	0x23c00000



#ifndef __ASSEMBLY__

arch/arm/mach-ep93xx/ts72xx.c

+21 −0
Original line number Diff line number Diff line
@@ -166,6 +166,26 @@ static struct platform_device ts72xx_rtc_device = { 
	.num_resources	= 0,

};



static struct resource ts72xx_wdt_resources[] = {

	{

		.start	= TS72XX_WDT_CONTROL_PHYS_BASE,

		.end	= TS72XX_WDT_CONTROL_PHYS_BASE + SZ_4K - 1,

		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= TS72XX_WDT_FEED_PHYS_BASE,

		.end	= TS72XX_WDT_FEED_PHYS_BASE + SZ_4K - 1,

		.flags	= IORESOURCE_MEM,

	},

};



static struct platform_device ts72xx_wdt_device = {

	.name		= "ts72xx-wdt",

	.id		= -1,

	.num_resources 	= ARRAY_SIZE(ts72xx_wdt_resources),

	.resource	= ts72xx_wdt_resources,

};



static struct ep93xx_eth_data ts72xx_eth_data = {

	.phy_id		= 1,

};
@@ -175,6 +195,7 @@ static void __init ts72xx_init_machine(void) 
	ep93xx_init_devices();

	ts72xx_register_flash();

	platform_device_register(&ts72xx_rtc_device);

	platform_device_register(&ts72xx_wdt_device);



	ep93xx_register_eth(&ts72xx_eth_data, 1);

}

arch/powerpc/platforms/52xx/mpc52xx_gpt.c

+1 −1
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ static ssize_t mpc52xx_wdt_write(struct file *file, const char __user *data, 
	return 0;

}



static struct watchdog_info mpc5200_wdt_info = {

static const struct watchdog_info mpc5200_wdt_info = {

	.options	= WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,

	.identity	= WDT_IDENTITY,

};

drivers/watchdog/Kconfig

+18 −2
Original line number Diff line number Diff line
@@ -55,6 +55,11 @@ config SOFT_WATCHDOG 
	  To compile this driver as a module, choose M here: the

	  module will be called softdog.



config MAX63XX_WATCHDOG

       tristate "Max63xx watchdog"

       help

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



config WM831X_WATCHDOG

	tristate "WM831x watchdog"

	depends on MFD_WM831X
@@ -289,6 +294,17 @@ config ADX_WATCHDOG 
	  Say Y here if you want support for the watchdog timer on Avionic

	  Design Xanthos boards.



config TS72XX_WATCHDOG

	tristate "TS-72XX SBC Watchdog"

	depends on MACH_TS72XX

	help

	  Technologic Systems TS-7200, TS-7250 and TS-7260 boards have

	  watchdog timer implemented in a external CPLD chip. Say Y here

	  if you want to support for the watchdog timer on TS-72XX boards.



	  To compile this driver as a module, choose M here: the

	  module will be called ts72xx_wdt.



# AVR32 Architecture



config AT32AP700X_WDT
@@ -845,10 +861,10 @@ config TXX9_WDT 
# POWERPC Architecture



config GEF_WDT

	tristate "GE Fanuc Watchdog Timer"

	tristate "GE Watchdog Timer"

	depends on GEF_SBC610 || GEF_SBC310 || GEF_PPC9A

	---help---

	  Watchdog timer found in a number of GE Fanuc single board computers.

	  Watchdog timer found in a number of GE single board computers.



config MPC5200_WDT

	bool "MPC52xx Watchdog Timer"

drivers/watchdog/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ obj-$(CONFIG_COH901327_WATCHDOG) += coh901327_wdt.o 
obj-$(CONFIG_STMP3XXX_WATCHDOG) += stmp3xxx_wdt.o

obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o

obj-$(CONFIG_ADX_WATCHDOG) += adx_wdt.o

obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o



# AVR32 Architecture

obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
@@ -142,4 +143,5 @@ obj-$(CONFIG_WATCHDOG_CP1XXX) += cpwd.o 
# Architecture Independant

obj-$(CONFIG_WM831X_WATCHDOG) += wm831x_wdt.o

obj-$(CONFIG_WM8350_WATCHDOG) += wm8350_wdt.o

obj-$(CONFIG_MAX63XX_WATCHDOG) += max63xx_wdt.o

obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE