Commit 67b5ad9a 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: Add MCF548x watchdog driver.
  watchdog: add driver for the Atheros AR71XX/AR724X/AR913X SoCs
  watchdog: Add TCO support for nVidia chipsets
  watchdog: Add support for sp5100 chipset TCO
  watchdog: f71808e_wdt: add F71862FG, F71869 to Kconfig
  watchdog: iTCO_wdt: TCO Watchdog patch for Intel DH89xxCC PCH
  watchdog: iTCO_wdt: TCO Watchdog patch for Intel NM10 DeviceIDs
  watchdog: ks8695_wdt: include mach/hardware.h instead of mach/timex.h.
  watchdog: Propagate Book E WDT period changes to all cores
  watchdog: add CONFIG_WATCHDOG_NOWAYOUT support to PowerPC Book-E watchdog driver
  watchdog: alim7101_wdt: fix compiler warning on alim7101_pci_tbl
  watchdog: alim1535_wdt: fix compiler warning on ali_pci_tbl
  watchdog: Fix reboot on W83627ehf chipset.
  watchdog: Add watchdog support for W83627DHG chip
  watchdog: f71808e_wdt: Add Fintek F71869 watchdog
  watchdog: add f71862fg support
  watchdog: clean-up f71808e_wdt.c
parents 174a86df 88cce427

arch/m68k/include/asm/m548xgpt.h

+2 −0
Original line number Diff line number Diff line
@@ -59,11 +59,13 @@ 
#define MCF_GPT_GMS_GPIO_INPUT     (0x00000000)

#define MCF_GPT_GMS_GPIO_OUTLO     (0x00000020)

#define MCF_GPT_GMS_GPIO_OUTHI     (0x00000030)

#define MCF_GPT_GMS_GPIO_MASK      (0x00000030)

#define MCF_GPT_GMS_TMS_DISABLE    (0x00000000)

#define MCF_GPT_GMS_TMS_INCAPT     (0x00000001)

#define MCF_GPT_GMS_TMS_OUTCAPT    (0x00000002)

#define MCF_GPT_GMS_TMS_PWM        (0x00000003)

#define MCF_GPT_GMS_TMS_GPIO       (0x00000004)

#define MCF_GPT_GMS_TMS_MASK       (0x00000007)



/* Bit definitions and macros for MCF_GPT_GCIR */

#define MCF_GPT_GCIR_CNT(x)        (((x)&0x0000FFFF)<<0)

drivers/watchdog/Kconfig

+49 −7
Original line number Diff line number Diff line
@@ -409,15 +409,26 @@ config ALIM7101_WDT 
	  Most people will say N.



config F71808E_WDT

	tristate "Fintek F71808E, F71882FG and F71889FG Watchdog"

	tristate "Fintek F71808E, F71862FG, F71869, F71882FG and F71889FG Watchdog"

	depends on X86 && EXPERIMENTAL

	help

	  This is the driver for the hardware watchdog on the Fintek

	  F71808E, F71882FG and F71889FG Super I/O controllers.

	  F71808E, F71862FG, F71869, F71882FG and F71889FG Super I/O controllers.



	  You can compile this driver directly into the kernel, or use

	  it as a module.  The module will be called f71808e_wdt.



config SP5100_TCO

	tristate "AMD/ATI SP5100 TCO Timer/Watchdog"

	depends on X86 && PCI

	---help---

	  Hardware watchdog driver for the AMD/ATI SP5100 chipset. The TCO

	  (Total Cost of Ownership) timer is a watchdog timer that will reboot

	  the machine after its expiration. The expiration time can be

	  configured with the "heartbeat" parameter.



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

	  module will be called sp5100_tco.



config GEODE_WDT

	tristate "AMD Geode CS5535/CS5536 Watchdog"
@@ -631,6 +642,24 @@ config PC87413_WDT 


	  Most people will say N.



config NV_TCO

	tristate "nVidia TCO Timer/Watchdog"

	depends on X86 && PCI

	---help---

	  Hardware driver for the TCO timer built into the nVidia Hub family

	  (such as the MCP51).  The TCO (Total Cost of Ownership) timer is a

	  watchdog timer that will reboot the machine after its second

	  expiration. The expiration time can be configured with the

	  "heartbeat" parameter.



	  On some motherboards the driver may fail to reset the chipset's

	  NO_REBOOT flag which prevents the watchdog from rebooting the

	  machine. If this is the case you will get a kernel message like

	  "failed to reset NO_REBOOT flag, reboot disabled by hardware".



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

	  module will be called nv_tco.



config RDC321X_WDT

	tristate "RDC R-321x SoC watchdog"

	depends on X86_RDC321X
@@ -722,14 +751,15 @@ config SMSC37B787_WDT 
	  Most people will say N.



config W83627HF_WDT

	tristate "W83627HF Watchdog Timer"

	tristate "W83627HF/W83627DHG Watchdog Timer"

	depends on X86

	---help---

	  This is the driver for the hardware watchdog on the W83627HF chipset

	  as used in Advantech PC-9578 and Tyan S2721-533 motherboards

	  (and likely others).  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.

	  (and likely others). The driver also supports the W83627DHG chip.

	  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.



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

	  module will be called w83627hf_wdt.
@@ -832,10 +862,22 @@ config SBC_EPX_C3_WATCHDOG 


# M68K Architecture



# M68KNOMMU Architecture

config M548x_WATCHDOG

	tristate "MCF548x watchdog support"

	depends on M548x

	help

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

	  module will be called m548x_wdt.



# MIPS Architecture



config ATH79_WDT

	tristate "Atheros AR71XX/AR724X/AR913X hardware watchdog"

	depends on ATH79

	help

	  Hardware driver for the built-in watchdog timer on the Atheros

	  AR71XX/AR724X/AR913X SoCs.



config BCM47XX_WDT

	tristate "Broadcom BCM47xx Watchdog Timer"

	depends on BCM47XX

drivers/watchdog/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o 
obj-$(CONFIG_ALIM1535_WDT) += alim1535_wdt.o

obj-$(CONFIG_ALIM7101_WDT) += alim7101_wdt.o

obj-$(CONFIG_F71808E_WDT) += f71808e_wdt.o

obj-$(CONFIG_SP5100_TCO) += sp5100_tco.o

obj-$(CONFIG_GEODE_WDT) += geodewdt.o

obj-$(CONFIG_SC520_WDT) += sc520_wdt.o

obj-$(CONFIG_SBC_FITPC2_WATCHDOG) += sbc_fitpc2_wdt.o
@@ -86,6 +87,7 @@ obj-$(CONFIG_HP_WATCHDOG) += hpwdt.o 
obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o

obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o

obj-$(CONFIG_PC87413_WDT) += pc87413_wdt.o

obj-$(CONFIG_NV_TCO) += nv_tco.o

obj-$(CONFIG_RDC321X_WDT) += rdc321x_wdt.o

obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o

obj-$(CONFIG_SBC8360_WDT) += sbc8360.o
@@ -104,10 +106,10 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o 
# M32R Architecture



# M68K Architecture



# M68KNOMMU Architecture

obj-$(CONFIG_M548x_WATCHDOG) += m548x_wdt.o



# MIPS Architecture

obj-$(CONFIG_ATH79_WDT) += ath79_wdt.o

obj-$(CONFIG_BCM47XX_WDT) += bcm47xx_wdt.o

obj-$(CONFIG_BCM63XX_WDT) += bcm63xx_wdt.o

obj-$(CONFIG_RC32434_WDT) += rc32434_wdt.o

drivers/watchdog/alim1535_wdt.c

+1 −1
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[] = {

static struct pci_device_id 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, },

drivers/watchdog/alim7101_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ err_out: 
module_init(alim7101_wdt_init);

module_exit(alim7101_wdt_unload);



static struct pci_device_id alim7101_pci_tbl[] __devinitdata = {

static struct pci_device_id alim7101_pci_tbl[] __devinitdata __used = {

	{ PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101) },

	{ }

CRA Git | Maintained and supported by SUSTech CRA and CCSE