Commit c8e6164f authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] watchdog updates

From: Wim Van Sebroeck <wim@iguana.be>

<wim@iguana.be> (04/02/29 1.1628)
   [WATCHDOG] v2.6.3 pcwd_usb-watchdog

   Add the Berkshire Products USB-PC Watchdog driver

<wim@iguana.be> (04/02/29 1.1629)
   [WATCHDOG] v2.6.3 MODULE_*-patch

   Add MODULE_* info

<wim@iguana.be> (04/02/29 1.1630)
   [WATCHDOG/SPARC64] v2.6.3 Kconfig-WATCHDOG_CP1XXX/WATCHDOG_RIO-patch

   Move WATCHDOG_CP1XXX and WATCHDOG_RIO for SPARC64 architecture
   from arch/sparc64/Kconfig to drivers/char/watchdog/Kconfig
   and made them dependant of WATCHDOG also
parent 2955399d
...@@ -450,28 +450,6 @@ config DISPLAY7SEG ...@@ -450,28 +450,6 @@ config DISPLAY7SEG
another UltraSPARC-IIi-cEngine boardset with a 7-segment display, another UltraSPARC-IIi-cEngine boardset with a 7-segment display,
you should say N to this option. you should say N to this option.
config WATCHDOG_CP1XXX
tristate "CP1XXX Hardware Watchdog support"
depends on PCI
---help---
This is the driver for the hardware watchdog timers present on
Sun Microsystems CompactPCI models CP1400 and CP1500.
To compile this driver as a module, choose M here: the
module will be called cpwatchdog.
If you do not have a CompactPCI model CP1400 or CP1500, or
another UltraSPARC-IIi-cEngine boardset with hardware watchdog,
you should say N to this option.
config WATCHDOG_RIO
tristate "RIO Hardware Watchdog support"
depends on PCI
help
Say Y here to support the hardware watchdog capability on Sun RIO
machines. The watchdog timeout period is normally one minute but
can be changed with a boot-time parameter.
config CMDLINE_BOOL config CMDLINE_BOOL
bool "Default bootloader kernel arguments" bool "Default bootloader kernel arguments"
......
...@@ -339,6 +339,30 @@ config SH_WDT ...@@ -339,6 +339,30 @@ config SH_WDT
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called shwdt. module will be called shwdt.
# SPARC64 Architecture
config WATCHDOG_CP1XXX
tristate "CP1XXX Hardware Watchdog support"
depends on WATCHDOG && SPARC64 && PCI
---help---
This is the driver for the hardware watchdog timers present on
Sun Microsystems CompactPCI models CP1400 and CP1500.
To compile this driver as a module, choose M here: the
module will be called cpwatchdog.
If you do not have a CompactPCI model CP1400 or CP1500, or
another UltraSPARC-IIi-cEngine boardset with hardware watchdog,
you should say N to this option.
config WATCHDOG_RIO
tristate "RIO Hardware Watchdog support"
depends on WATCHDOG && SPARC64 && PCI
help
Say Y here to support the hardware watchdog capability on Sun RIO
machines. The watchdog timeout period is normally one minute but
can be changed with a boot-time parameter.
# #
# ISA-based Watchdog Cards # ISA-based Watchdog Cards
# #
...@@ -455,4 +479,26 @@ config WDT_501_PCI ...@@ -455,4 +479,26 @@ config WDT_501_PCI
Fahrenheit. This works only if you have a WDT501P watchdog board Fahrenheit. This works only if you have a WDT501P watchdog board
installed. installed.
#
# USB-based Watchdog Cards
#
comment "USB-based Watchdog Cards"
depends on WATCHDOG && USB
config USBPCWATCHDOG
tristate "Berkshire Products USB-PC Watchdog"
depends on WATCHDOG && USB
---help---
This is the driver for the Berkshire Products USB-PC Watchdog card.
This card 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. The card can also monitor the internal temperature of the PC.
More info is available at <http://www.berkprod.com/usb_pc_watchdog.htm>.
To compile this driver as a module, choose M here: the
module will be called pcwd_usb.
Most people will say N.
endmenu endmenu
# #
# Makefile for the kernel character device drivers. # Makefile for the WatchDog device drivers.
# #
# Only one watchdog can succeed. We probe the hardware watchdog # Only one watchdog can succeed. We probe the hardware watchdog
...@@ -35,3 +35,4 @@ obj-$(CONFIG_CPU5_WDT) += cpu5wdt.o ...@@ -35,3 +35,4 @@ obj-$(CONFIG_CPU5_WDT) += cpu5wdt.o
obj-$(CONFIG_AMD7XX_TCO) += amd7xx_tco.o obj-$(CONFIG_AMD7XX_TCO) += amd7xx_tco.o
obj-$(CONFIG_INDYDOG) += indydog.o obj-$(CONFIG_INDYDOG) += indydog.o
obj-$(CONFIG_PCIPCWATCHDOG) += pcwd_pci.o obj-$(CONFIG_PCIPCWATCHDOG) += pcwd_pci.o
obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.o
...@@ -293,6 +293,7 @@ MODULE_AUTHOR("Heiko Ronsdorf <hero@ihg.uni-duisburg.de>"); ...@@ -293,6 +293,7 @@ MODULE_AUTHOR("Heiko Ronsdorf <hero@ihg.uni-duisburg.de>");
MODULE_DESCRIPTION("sma cpu5 watchdog driver"); MODULE_DESCRIPTION("sma cpu5 watchdog driver");
MODULE_SUPPORTED_DEVICE("sma cpu5 watchdog"); MODULE_SUPPORTED_DEVICE("sma cpu5 watchdog");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
MODULE_PARM(port, "i"); MODULE_PARM(port, "i");
MODULE_PARM_DESC(port, "base address of watchdog card, default is 0x91"); MODULE_PARM_DESC(port, "base address of watchdog card, default is 0x91");
......
...@@ -503,3 +503,4 @@ module_exit(eurwdt_exit); ...@@ -503,3 +503,4 @@ module_exit(eurwdt_exit);
MODULE_AUTHOR("Rodolfo Giometti"); MODULE_AUTHOR("Rodolfo Giometti");
MODULE_DESCRIPTION("Driver for Eurotech CPU-1220/1410 on board watchdog"); MODULE_DESCRIPTION("Driver for Eurotech CPU-1220/1410 on board watchdog");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
...@@ -350,5 +350,6 @@ module_exit(ibwdt_exit); ...@@ -350,5 +350,6 @@ module_exit(ibwdt_exit);
MODULE_AUTHOR("Charles Howes <chowes@vsol.net>"); MODULE_AUTHOR("Charles Howes <chowes@vsol.net>");
MODULE_DESCRIPTION("IB700 SBC watchdog driver"); MODULE_DESCRIPTION("IB700 SBC watchdog driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
/* end of ib700wdt.c */ /* end of ib700wdt.c */
...@@ -98,6 +98,7 @@ static unsigned short zf_readb(unsigned char port) ...@@ -98,6 +98,7 @@ static unsigned short zf_readb(unsigned char port)
MODULE_AUTHOR("Fernando Fuganti <fuganti@conectiva.com.br>"); MODULE_AUTHOR("Fernando Fuganti <fuganti@conectiva.com.br>");
MODULE_DESCRIPTION("MachZ ZF-Logic Watchdog driver"); MODULE_DESCRIPTION("MachZ ZF-Logic Watchdog driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
#ifdef CONFIG_WATCHDOG_NOWAYOUT #ifdef CONFIG_WATCHDOG_NOWAYOUT
static int nowayout = 1; static int nowayout = 1;
......
...@@ -302,4 +302,7 @@ static void __exit mixcomwd_exit(void) ...@@ -302,4 +302,7 @@ static void __exit mixcomwd_exit(void)
module_init(mixcomwd_init); module_init(mixcomwd_init);
module_exit(mixcomwd_exit); module_exit(mixcomwd_exit);
MODULE_AUTHOR("Gergely Madarasz <gorgo@itc.hu>");
MODULE_DESCRIPTION("MixCom Watchdog driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
...@@ -705,5 +705,8 @@ static void __exit pcwatchdog_exit(void) ...@@ -705,5 +705,8 @@ static void __exit pcwatchdog_exit(void)
module_init(pcwatchdog_init); module_init(pcwatchdog_init);
module_exit(pcwatchdog_exit); module_exit(pcwatchdog_exit);
MODULE_AUTHOR("Ken Hollis <kenji@bitgate.com>");
MODULE_DESCRIPTION("Berkshire ISA-PC Watchdog driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
MODULE_ALIAS_MISCDEV(TEMP_MINOR);
This diff is collapsed.
...@@ -218,3 +218,4 @@ module_param(nowayout, int, 0); ...@@ -218,3 +218,4 @@ module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
...@@ -486,3 +486,4 @@ module_exit(sc1200wdt_exit); ...@@ -486,3 +486,4 @@ module_exit(sc1200wdt_exit);
MODULE_AUTHOR("Zwane Mwaikambo <zwane@commfireservices.com>"); MODULE_AUTHOR("Zwane Mwaikambo <zwane@commfireservices.com>");
MODULE_DESCRIPTION("Driver for National Semiconductor PC87307/PC97307 watchdog component"); MODULE_DESCRIPTION("Driver for National Semiconductor PC87307/PC97307 watchdog component");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
...@@ -321,4 +321,4 @@ module_exit(wdt_exit); ...@@ -321,4 +321,4 @@ module_exit(wdt_exit);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Pdraig Brady <P@draigBrady.com>"); MODULE_AUTHOR("Pdraig Brady <P@draigBrady.com>");
MODULE_DESCRIPTION("w38627hf WDT driver"); MODULE_DESCRIPTION("w38627hf WDT driver");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
...@@ -427,3 +427,4 @@ module_exit(w83877f_wdt_unload); ...@@ -427,3 +427,4 @@ module_exit(w83877f_wdt_unload);
MODULE_AUTHOR("Scott and Bill Jennings"); MODULE_AUTHOR("Scott and Bill Jennings");
MODULE_DESCRIPTION("Driver for watchdog timer in w83877f chip"); MODULE_DESCRIPTION("Driver for watchdog timer in w83877f chip");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
...@@ -222,6 +222,7 @@ static void __exit footbridge_watchdog_exit(void) ...@@ -222,6 +222,7 @@ static void __exit footbridge_watchdog_exit(void)
MODULE_AUTHOR("Phil Blundell <pb@nexus.co.uk>"); MODULE_AUTHOR("Phil Blundell <pb@nexus.co.uk>");
MODULE_DESCRIPTION("Footbridge watchdog driver"); MODULE_DESCRIPTION("Footbridge watchdog driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
module_param(soft_margin, int, 0); module_param(soft_margin, int, 0);
MODULE_PARM_DESC(soft_margin,"Watchdog timeout in seconds"); MODULE_PARM_DESC(soft_margin,"Watchdog timeout in seconds");
......
...@@ -365,5 +365,7 @@ static void __exit nwwatchdog_exit(void) ...@@ -365,5 +365,7 @@ static void __exit nwwatchdog_exit(void)
module_init(nwwatchdog_init); module_init(nwwatchdog_init);
module_exit(nwwatchdog_exit); module_exit(nwwatchdog_exit);
MODULE_AUTHOR("Woody Suwalski <woody@netwinder.org>");
MODULE_DESCRIPTION("W83977AF Watchdog driver"); MODULE_DESCRIPTION("W83977AF Watchdog driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
...@@ -653,3 +653,5 @@ module_exit(wdtpci_cleanup); ...@@ -653,3 +653,5 @@ module_exit(wdtpci_cleanup);
MODULE_AUTHOR("JP Nollmann, Alan Cox"); MODULE_AUTHOR("JP Nollmann, Alan Cox");
MODULE_DESCRIPTION("Driver for the ICS PCI watchdog cards"); MODULE_DESCRIPTION("Driver for the ICS PCI watchdog cards");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
MODULE_ALIAS_MISCDEV(TEMP_MINOR);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment