Commit 4b0e976c 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: booke_wdt: clean up status messages
  watchdog: cleanup spaces before tabs
  watchdog: convert to DEFINE_PCI_DEVICE_TABLE
  watchdog: Xen watchdog driver
  watchdog: Intel SCU Watchdog Timer Driver for Moorestown and Medfield platforms.
  watchdog: jz4740_wdt - fix magic character checking
  watchdog: add JZ4740 watchdog driver
  watchdog: it87_wdt: Add support for IT8721F watchdog
  watchdog: hpwdt: build hpwdt as module by default with NMI_DECODING enabled
  watchdog: hpwdt: Fix a couple of typos
parents 19520fc1 112e7546

arch/mips/include/asm/mach-jz4740/platform.h

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ extern struct platform_device jz4740_i2s_device; 
extern struct platform_device jz4740_pcm_device;

extern struct platform_device jz4740_codec_device;

extern struct platform_device jz4740_adc_device;

extern struct platform_device jz4740_wdt_device;



void jz4740_serial_device_register(void);

arch/mips/jz4740/platform.c

+16 −0
Original line number Diff line number Diff line
@@ -289,3 +289,19 @@ void jz4740_serial_device_register(void) 


	platform_device_register(&jz4740_uart_device);

}



/* Watchdog */

static struct resource jz4740_wdt_resources[] = {

	{

		.start = JZ4740_WDT_BASE_ADDR,

		.end   = JZ4740_WDT_BASE_ADDR + 0x10 - 1,

		.flags = IORESOURCE_MEM,

	},

};



struct platform_device jz4740_wdt_device = {

	.name          = "jz4740-wdt",

	.id            = -1,

	.num_resources = ARRAY_SIZE(jz4740_wdt_resources),

	.resource      = jz4740_wdt_resources,

};

drivers/watchdog/Kconfig

+31 −3
Original line number Diff line number Diff line
@@ -533,6 +533,16 @@ config I6300ESB_WDT 
	  To compile this driver as a module, choose M here: the

	  module will be called i6300esb.



config INTEL_SCU_WATCHDOG

	bool "Intel SCU Watchdog for Mobile Platforms"

	depends on WATCHDOG

	depends on INTEL_SCU_IPC

	---help---

	  Hardware driver for the watchdog time built into the Intel SCU

	  for Intel Mobile Platforms.



	  To compile this driver as a module, choose M here.



config ITCO_WDT

	tristate "Intel TCO Timer/Watchdog"

	depends on (X86 || IA64) && PCI
@@ -580,7 +590,7 @@ config IT87_WDT 
	depends on X86 && EXPERIMENTAL

	---help---

	  This is the driver for the hardware watchdog on the ITE IT8702,

	  IT8712, IT8716, IT8718, IT8720, IT8726, IT8712 Super I/O chips.

	  IT8712, IT8716, IT8718, IT8720, IT8721, IT8726 Super I/O chips.

	  This watchdog simply watches your kernel to make sure it doesn't

	  freeze, and if it does, it reboots your computer after a certain

	  amount of time.
@@ -589,18 +599,20 @@ config IT87_WDT 
	  be called it87_wdt.



config HP_WATCHDOG

	tristate "HP Proliant iLO2+ Hardware Watchdog Timer"

	tristate "HP ProLiant iLO2+ Hardware Watchdog Timer"

	depends on X86

	default m

	help

	  A software monitoring watchdog and NMI sourcing driver. This driver

	  will detect lockups and provide a stack trace. This is a driver that

	  will only load on a HP ProLiant system with a minimum of iLO2 support.

	  will only load on an HP ProLiant system with a minimum of iLO2 support.

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

	  called hpwdt.



config HPWDT_NMI_DECODING

	bool "NMI decoding support for the HP ProLiant iLO2+ Hardware Watchdog Timer"

	depends on HP_WATCHDOG

	default y

	help

	  When an NMI occurs this feature will make the necessary BIOS calls to

	  log the cause of the NMI.
@@ -903,6 +915,12 @@ config INDYDOG 
	  timer expired and no process has written to /dev/watchdog during

	  that time.



config JZ4740_WDT

	tristate "Ingenic jz4740 SoC hardware watchdog"

	depends on MACH_JZ4740

	help

	  Hardware driver for the built-in watchdog timer on Ingenic jz4740 SoCs.



config WDT_MTX1

	tristate "MTX-1 Hardware Watchdog"

	depends on MIPS_MTX1
@@ -1111,6 +1129,16 @@ config WATCHDOG_RIO 


# XTENSA Architecture



# Xen Architecture



config XEN_WDT

	tristate "Xen Watchdog support"

	depends on XEN

	help

	  Say Y here to support the hypervisor watchdog capability provided

	  by Xen 4.0 and newer.  The watchdog timeout period is normally one

	  minute but can be changed with a boot-time parameter.



#

# ISA-based Watchdog Cards

#

drivers/watchdog/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ obj-$(CONFIG_W83877F_WDT) += w83877f_wdt.o 
obj-$(CONFIG_W83977F_WDT) += w83977f_wdt.o

obj-$(CONFIG_MACHZ_WDT) += machzwd.o

obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o

obj-$(CONFIG_INTEL_SCU_WATCHDOG) += intel_scu_watchdog.o



# M32R Architecture
@@ -114,6 +115,7 @@ obj-$(CONFIG_BCM47XX_WDT) += bcm47xx_wdt.o 
obj-$(CONFIG_BCM63XX_WDT) += bcm63xx_wdt.o

obj-$(CONFIG_RC32434_WDT) += rc32434_wdt.o

obj-$(CONFIG_INDYDOG) += indydog.o

obj-$(CONFIG_JZ4740_WDT) += jz4740_wdt.o

obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o

obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt.o

obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
@@ -148,6 +150,9 @@ obj-$(CONFIG_WATCHDOG_CP1XXX) += cpwd.o 


# XTENSA Architecture



# Xen

obj-$(CONFIG_XEN_WDT) += xen_wdt.o



# Architecture Independant

obj-$(CONFIG_WM831X_WATCHDOG) += wm831x_wdt.o

obj-$(CONFIG_WM8350_WATCHDOG) += wm8350_wdt.o

drivers/watchdog/alim1535_wdt.c

+5 −5
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ static int ali_notify_sys(struct notifier_block *this, 
 *	want to register another driver on the same PCI id.

 */



static struct pci_device_id ali_pci_tbl[] __used = {

static DEFINE_PCI_DEVICE_TABLE(ali_pci_tbl) __used = {

	{ PCI_VENDOR_ID_AL, 0x1533, PCI_ANY_ID, PCI_ANY_ID,},

	{ PCI_VENDOR_ID_AL, 0x1535, PCI_ANY_ID, PCI_ANY_ID,},

	{ 0, },

CRA Git | Maintained and supported by SUSTech CRA and CCSE