v2.6.34-rc patches
Subsystems (11)
Hi Linus,
Please pull from 'master' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
or if master.kernel.org hasn't synced up yet:
master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
This will update the following files:
arch/arm/mach-ep93xx/include/mach/ts72xx.h | 2 arch/arm/mach-ep93xx/ts72xx.c | 21 + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 2 drivers/watchdog/Kconfig | 20 + drivers/watchdog/Makefile | 2 drivers/watchdog/acquirewdt.c | 2 drivers/watchdog/advantechwdt.c | 2 drivers/watchdog/adx_wdt.c | 2 drivers/watchdog/alim1535_wdt.c | 2 drivers/watchdog/alim7101_wdt.c | 2 drivers/watchdog/ar7_wdt.c | 2 drivers/watchdog/at32ap700x_wdt.c | 2 drivers/watchdog/at91rm9200_wdt.c | 2 drivers/watchdog/bcm47xx_wdt.c | 2 drivers/watchdog/bfin_wdt.c | 56 --- drivers/watchdog/booke_wdt.c | 2 drivers/watchdog/coh901327_wdt.c | 2 drivers/watchdog/cpu5wdt.c | 2 drivers/watchdog/cpwd.c | 2 drivers/watchdog/davinci_wdt.c | 2 drivers/watchdog/ep93xx_wdt.c | 2 drivers/watchdog/eurotechwdt.c | 2 drivers/watchdog/gef_wdt.c | 16 drivers/watchdog/geodewdt.c | 2 drivers/watchdog/hpwdt.c | 2 drivers/watchdog/i6300esb.c | 101 ++--- drivers/watchdog/iTCO_wdt.c | 21 - drivers/watchdog/ib700wdt.c | 2 drivers/watchdog/indydog.c | 2 drivers/watchdog/it8712f_wdt.c | 2 drivers/watchdog/it87_wdt.c | 2 drivers/watchdog/ixp2000_wdt.c | 2 drivers/watchdog/ixp4xx_wdt.c | 2 drivers/watchdog/ks8695_wdt.c | 2 drivers/watchdog/machzwd.c | 2 drivers/watchdog/max63xx_wdt.c | 397 ++++++++++++++++++++++ drivers/watchdog/mixcomwd.c | 2 drivers/watchdog/mpc8xxx_wdt.c | 2 drivers/watchdog/mpcore_wdt.c | 2 drivers/watchdog/mv64x60_wdt.c | 2 drivers/watchdog/pc87413_wdt.c | 2 drivers/watchdog/pcwd.c | 2 drivers/watchdog/pcwd_pci.c | 2 drivers/watchdog/pcwd_usb.c | 2 drivers/watchdog/pika_wdt.c | 2 drivers/watchdog/pnx833x_wdt.c | 2 drivers/watchdog/rc32434_wdt.c | 2 drivers/watchdog/rdc321x_wdt.c | 2 drivers/watchdog/riowd.c | 2 drivers/watchdog/sbc_fitpc2_wdt.c | 2 drivers/watchdog/sch311x_wdt.c | 2 drivers/watchdog/stmp3xxx_wdt.c | 2 drivers/watchdog/ts72xx_wdt.c | 520 +++++++++++++++++++++++++++++ drivers/watchdog/txx9wdt.c | 25 - drivers/watchdog/w83627hf_wdt.c | 2 drivers/watchdog/w83977f_wdt.c | 2 drivers/watchdog/wdrtas.c | 2 drivers/watchdog/wdt.c | 2 drivers/watchdog/wdt_pci.c | 2 drivers/watchdog/wm831x_wdt.c | 2 drivers/watchdog/wm8350_wdt.c | 2 61 files changed, 1088 insertions(+), 193 deletions(-)
with these Changes:
Author: Wim Van Sebroeck <[email protected]> Date: Mon Mar 8 13:48:01 2010 +0000
[WATCHDOG] i6300esb.c: change platform_driver to pci_driver
Since the intel 6300esb platform uses a dedicated PCI ID for it's watchdog timer (00:1d.4), it's better and easier to have this as a pci_driver.
Author: Wim Van Sebroeck <[email protected]> Date: Mon Mar 8 11:02:38 2010 +0000
[WATCHDOG] i6300esb: fix unlock register with
Before you can read or write from the i6300esb memeory mapped registers, you need to unlock these. This is done by writing the magic numbers 0x80 and 0x86 to the reload register. The size of the reload register is 32bit though.
Also binary 11 is hex 0x03 and not 0x11.
Author: Andrew Morton <[email protected]> Date: Wed Mar 3 11:57:40 2010 -0800
[WATCHDOG] drivers/watchdog/wdt.c:wdt_ioctl(): make `ident' non-static
Making this instance static exposes the code to SMP races, etc.
Author: Wim Van Sebroeck <[email protected]> Date: Sat Dec 26 19:13:00 2009 +0000
[WATCHDOG] change reboot_notifier to platform-shutdown method.
Platform device drivers can use the .shutdown method to handle soft shutdown's instead of reboot_notifier's.
Author: Wim Van Sebroeck <[email protected]> Date: Sat Dec 26 18:55:22 2009 +0000
[WATCHDOG] watchdog_info constify
make the watchdog_info struct const where possible.
Author: Martyn Welch <[email protected]> Date: Mon Mar 1 17:06:20 2010 +0000
[WATCHDOG] gef_wdt: Author corrections following split of GE Fanuc joint venture
This patch corrects author and copyright notices following the split-up of the GE Fanuc joint venture.
Author: Naga Chumbalkar <[email protected]> Date: Tue Feb 9 00:42:02 2010 +0100
[WATCHDOG] iTCO_wdt: clean up probe(), modify err msg
It's possible that the platform is not allowing reboot via TCO timer expiration.
Also, differentiate between not finding a chipset that has TCO, and the case where TCO is present but the driver fails to initialize for some reason.
Author: Wim Van Sebroeck <[email protected]> Date: Wed Feb 10 19:34:05 2010 +0000
[WATCHDOG] ep93xx: watchdog timer driver for TS-72xx SBCs cleanup
Clean-up driver:
* make release the reverse of probe so that both are consistent
* add WDIOC_GETSTATUS & WDIOC_GETBOOTSTATUS ioctls.
Author: Marc Zyngier <[email protected]> Date: Thu Feb 4 20:08:56 2010 +0000
[WATCHDOG] support for max63xx watchdog timer chips
This driver adds support for the max63{69,70,71,72,73,74} family of watchdog timer chips.
It has been tested on an Arcom Zeus (max6369).
Author: Mika Westerberg <[email protected]> Date: Sun Nov 29 17:03:03 2009 +0200
[WATCHDOG] ep93xx: added platform side support for TS-72xx WDT driver
Author: Mika Westerberg <[email protected]> Date: Sun Nov 29 16:58:38 2009 +0200
[WATCHDOG] ep93xx: implemented watchdog timer driver for TS-72xx SBCs
Technologic Systems TS-72xx SBCs have external glue logic CPLD which includes watchdog timer. This driver implements kernel support for that.
The Changes can also be looked at on:
http://www.kernel.org/git/?p=linux/kernel/git/wim/linux-2.6-watchdog.git;a=summary
For completeness, I added the overal diff below.
Greetings,
Wim.
================================================================================
arch/arm/mach-ep93xx/include/mach/ts72xx.h +2 -0
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
drivers/watchdog/acquirewdt.c +1 -1
@@ -150,7 +150,7 @@ static long acq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)int options, retval = -EINVAL ;void __user *argp = (void __user *)arg;int __user *p = argp; -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_KEEPALIVEPING |WDIOF_MAGICCLOSE , .firmware_version =1 , .identity =WATCHDOG_NAME ,
drivers/watchdog/advantechwdt.c +1 -1
@@ -137,7 +137,7 @@ static long advwdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)int new_timeout;void __user *argp = (void __user *)arg;int __user *p = argp; -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_KEEPALIVEPING |WDIOF_SETTIMEOUT |WDIOF_MAGICCLOSE ,
drivers/watchdog/adx_wdt.c +1 -1
@@ -37,7 +37,7 @@ struct adx_wdt {spinlock_t lock; }; -static struct watchdog_info adx_wdt_info = { +static const struct watchdog_info adx_wdt_info = { .identity ="Avionic Design Xanthos Watchdog" , .options =WDIOF_SETTIMEOUT |WDIOF_KEEPALIVEPING , };
drivers/watchdog/alim1535_wdt.c +1 -1
@@ -180,7 +180,7 @@ static long ali_ioctl(struct file *file, unsigned int cmd, unsigned long arg) {void __user *argp = (void __user *)arg;int __user *p = argp; -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_KEEPALIVEPING |WDIOF_SETTIMEOUT |WDIOF_MAGICCLOSE ,
drivers/watchdog/alim7101_wdt.c +1 -1
@@ -238,7 +238,7 @@ static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg) {void __user *argp = (void __user *)arg;int __user *p = argp; -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_KEEPALIVEPING |WDIOF_SETTIMEOUT |WDIOF_MAGICCLOSE , .firmware_version =1 ,
drivers/watchdog/ar7_wdt.c +1 -1
@@ -219,7 +219,7 @@ static ssize_t ar7_wdt_write(struct file *file, const char *data, static long ar7_wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { - static struct watchdog_info ident = { + static const struct watchdog_info ident = { .identity = LONGNAME, .firmware_version = 1, .options = (WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING |
drivers/watchdog/at32ap700x_wdt.c +1 -1
@@ -202,7 +202,7 @@ static int at32_wdt_get_status(void)return status; } -static struct watchdog_info at32_wdt_info = { +static const struct watchdog_info at32_wdt_info = { .identity ="at32ap700x watchdog" , .options =WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING |
drivers/watchdog/at91rm9200_wdt.c +1 -1
@@ -121,7 +121,7 @@ static int at91_wdt_settimeout(int new_time)return 0 ; } -static struct watchdog_info at91_wdt_info = { +static const struct watchdog_info at91_wdt_info = { .identity ="at91 watchdog" , .options =WDIOF_SETTIMEOUT |WDIOF_KEEPALIVEPING , };
drivers/watchdog/bcm47xx_wdt.c +1 -1
@@ -149,7 +149,7 @@ static ssize_t bcm47xx_wdt_write(struct file *file, const char __user *data,return len; } -static struct watchdog_info bcm47xx_wdt_info = { +static const struct watchdog_info bcm47xx_wdt_info = { .identity =DRV_NAME , .options =WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING |
drivers/watchdog/bfin_wdt.c +17 -39
119 lines not on this page · raw message
drivers/watchdog/booke_wdt.c +1 -1
@@ -121,7 +121,7 @@ static ssize_t booke_wdt_write(struct file *file, const char __user *buf,return count; } -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_SETTIMEOUT |WDIOF_KEEPALIVEPING , .identity ="PowerPC Book-E Watchdog" , };
drivers/watchdog/coh901327_wdt.c +1 -1
@@ -257,7 +257,7 @@ static long coh901327_ioctl(struct file *file, unsigned int cmd,struct watchdog_info __user *ident;int __user *i; } uarg; -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_CARDRESET |WDIOF_SETTIMEOUT |WDIOF_KEEPALIVEPING ,
drivers/watchdog/cpu5wdt.c +1 -1
@@ -154,7 +154,7 @@ static long cpu5wdt_ioctl(struct file *file, unsigned int cmd,void __user *argp = (void __user *)arg;int __user *p = argp;unsigned int value; -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_CARDRESET , .identity ="CPU5 WDT" , };
drivers/watchdog/cpwd.c +1 -1
@@ -403,7 +403,7 @@ static int cpwd_release(struct inode *inode, struct file *file)static long cpwd_ioctl (struct file *file,unsigned int cmd,unsigned long arg) { -static struct watchdog_info info = { +static const struct watchdog_info info = { .options =WDIOF_SETTIMEOUT , .firmware_version =1 , .identity =DRIVER_NAME ,
drivers/watchdog/davinci_wdt.c +1 -1
@@ -142,7 +142,7 @@ davinci_wdt_write(struct file *file, const char *data, size_t len,return len; } -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_KEEPALIVEPING , .identity ="DaVinci Watchdog" , };
drivers/watchdog/ep93xx_wdt.c +1 -1
@@ -131,7 +131,7 @@ ep93xx_wdt_write(struct file *file, const char __user *data, size_t len,return len; } -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_CARDRESET |WDIOF_MAGICCLOSE , .identity ="EP93xx Watchdog" , };
drivers/watchdog/eurotechwdt.c +1 -1
@@ -238,7 +238,7 @@ static long eurwdt_ioctl(struct file *file, {void __user *argp = (void __user *)arg;int __user *p = argp; -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_KEEPALIVEPING |WDIOF_SETTIMEOUT |WDIOF_MAGICCLOSE , .firmware_version =1 ,
drivers/watchdog/gef_wdt.c +8 -8
@@ -1,9 +1,9 @@/* -* GE Fanuc watchdog userspace interface +* GE watchdog userspace interface * -* Author: Martyn Welch <[email protected]> +* Author: Martyn Welch <[email protected]> * -* Copyright 2008 GE Fanuc Intelligent Platforms Embedded Systems, Inc. +* Copyright 2008 GE Intelligent Platforms Embedded Systems, Inc. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the
@@ -161,11 +161,11 @@ static long gef_wdt_ioctl(struct file *file, unsigned int cmd,int timeout;int options;void __user *argp = (void __user *)arg; -static struct watchdog_info info = { +static const struct watchdog_info info = { .options =WDIOF_SETTIMEOUT |WDIOF_MAGICCLOSE |WDIOF_KEEPALIVEPING , .firmware_version =0 , - .identity ="GE Fanuc watchdog" , + .identity ="GE watchdog" , };switch (cmd) {
@@ -311,7 +311,7 @@ static struct of_platform_driver gef_wdt_driver = {static int __init gef_wdt_init (void ) { -printk (KERN_INFO "GE Fanuc watchdog driver\n" ); +printk (KERN_INFO "GE watchdog driver\n" );return of_register_platform_driver (&gef_wdt_driver); }
@@ -323,8 +323,8 @@ static void __exit gef_wdt_exit(void)module_init (gef_wdt_init);module_exit (gef_wdt_exit); -MODULE_AUTHOR ("Martyn Welch <[email protected]>" ); -MODULE_DESCRIPTION ("GE Fanuc watchdog driver" ); +MODULE_AUTHOR ("Martyn Welch <[email protected]>" ); +MODULE_DESCRIPTION ("GE watchdog driver" );MODULE_LICENSE ("GPL" );MODULE_ALIAS_MISCDEV (WATCHDOG_MINOR );MODULE_ALIAS ("platform: gef_wdt" );
drivers/watchdog/geodewdt.c +1 -1
@@ -142,7 +142,7 @@ static long geodewdt_ioctl(struct file *file, unsigned int cmd,int __user *p = argp;int interval; -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_SETTIMEOUT |WDIOF_KEEPALIVEPING |WDIOF_MAGICCLOSE , .firmware_version =1 ,
drivers/watchdog/hpwdt.c +1 -1
@@ -554,7 +554,7 @@ static ssize_t hpwdt_write(struct file *file, const char __user *data,return len; } -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_SETTIMEOUT |WDIOF_KEEPALIVEPING |WDIOF_MAGICCLOSE ,
drivers/watchdog/i6300esb.c +37 -64
211 lines not on this page · raw message
drivers/watchdog/iTCO_wdt.c +10 -11
@@ -584,7 +584,7 @@ static long iTCO_wdt_ioctl(struct file *file, unsigned int cmd,int new_heartbeat;void __user *argp = (void __user *)arg;int __user *p = argp; -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_SETTIMEOUT |WDIOF_KEEPALIVEPING |WDIOF_MAGICCLOSE ,
@@ -698,7 +698,7 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev,if (iTCO_wdt_private.iTCO_version ==2 ) {pci_read_config_dword (pdev,0xf0 , &base_address);if ((base_address &1 ) ==0 ) { - printk(KERN_ERR PFX "RCBA is disabled by harddware\n"); + printk(KERN_ERR PFX "RCBA is disabled by hardware\n"); ret = -ENODEV ; goto out; }
@@ -708,8 +708,8 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev,/* Check chipset's NO_REBOOT bit */ if (iTCO_wdt_unset_NO_REBOOT_bit () &&iTCO_vendor_check_noreboot_on ()) { - printk(KERN_ERR PFX "failed to reset NO_REBOOT flag, " - "reboot disabled by hardware\n"); + printk(KERN_INFO PFX "unable to reset NO_REBOOT flag, " + "platform may have disabled it\n"); ret = -ENODEV ;/* Cannot reset NO_REBOOT bit */ goto out_unmap; }
@@ -805,6 +805,7 @@ static void __devexit iTCO_wdt_cleanup(void)static int __devinit iTCO_wdt_probe (struct platform_device *dev) { +int ret = -ENODEV ;int found =0 ;struct pci_dev *pdev =NULL ;const struct pci_device_id *ent;
@@ -814,19 +815,17 @@ static int __devinit iTCO_wdt_probe(struct platform_device *dev)for_each_pci_dev (pdev) { ent =pci_match_id (iTCO_wdt_pci_tbl, pdev);if (ent) { -if (!(iTCO_wdt_init (pdev, ent, dev))) { - found++; + found++; + ret =iTCO_wdt_init (pdev, ent, dev); +if (!ret)break ; - } } } -if (!found) { +if (!found) printk(KERN_INFO PFX "No card detected\n"); -return -ENODEV ; - } -return 0 ; +return ret; } static int __devexit iTCO_wdt_remove(struct platform_device *dev)
drivers/watchdog/ib700wdt.c +1 -1
@@ -174,7 +174,7 @@ static long ibwdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)void __user *argp = (void __user *)arg;int __user *p = argp; -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_KEEPALIVEPING |WDIOF_SETTIMEOUT |WDIOF_MAGICCLOSE , .firmware_version =1 ,
drivers/watchdog/indydog.c +1 -1
@@ -111,7 +111,7 @@ static long indydog_ioctl(struct file *file, unsigned int cmd, unsigned long arg) {int options, retval = -EINVAL ; -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_KEEPALIVEPING , .firmware_version =0 , .identity ="Hardware Watchdog for SGI IP22" ,
drivers/watchdog/it8712f_wdt.c +1 -1
@@ -236,7 +236,7 @@ static long it8712f_wdt_ioctl(struct file *file, unsigned int cmd, { void __user *argp = (void __user *)arg; int __user *p = argp; - static struct watchdog_info ident = { + static const struct watchdog_info ident = { .identity = "IT8712F Watchdog", .firmware_version = 1, .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING |
drivers/watchdog/it87_wdt.c +1 -1
@@ -421,7 +421,7 @@ static ssize_t wdt_write(struct file *file, const char __user *buf,return count; } -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_SETTIMEOUT |WDIOF_MAGICCLOSE |WDIOF_KEEPALIVEPING , .firmware_version =1 , .identity =WATCHDOG_NAME ,
drivers/watchdog/ixp2000_wdt.c +1 -1
@@ -100,7 +100,7 @@ static ssize_t ixp2000_wdt_write(struct file *file, const char *data, } -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_MAGICCLOSE |WDIOF_SETTIMEOUT |WDIOF_KEEPALIVEPING , .identity ="IXP2000 Watchdog" ,
drivers/watchdog/ixp4xx_wdt.c +1 -1
@@ -89,7 +89,7 @@ ixp4xx_wdt_write(struct file *file, const char *data, size_t len, loff_t *ppos)return len; } -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_CARDRESET |WDIOF_MAGICCLOSE |WDIOF_SETTIMEOUT |WDIOF_KEEPALIVEPING , .identity ="IXP4xx Watchdog" ,
drivers/watchdog/ks8695_wdt.c +1 -1
@@ -145,7 +145,7 @@ static int ks8695_wdt_close(struct inode *inode, struct file *file)return 0 ; } -static struct watchdog_info ks8695_wdt_info = { +static const struct watchdog_info ks8695_wdt_info = { .identity ="ks8695 watchdog" , .options =WDIOF_SETTIMEOUT |WDIOF_KEEPALIVEPING , };
drivers/watchdog/machzwd.c +1 -1
@@ -101,7 +101,7 @@ MODULE_PARM_DESC(nowayout,#define PFX "machzwd" -static struct watchdog_info zf_info = { +static const struct watchdog_info zf_info = { .options =WDIOF_KEEPALIVEPING |WDIOF_MAGICCLOSE , .firmware_version =1 , .identity ="ZF-Logic watchdog" ,
drivers/watchdog/max63xx_wdt.c new file +397 -0
397 lines not on this page · raw message
drivers/watchdog/mixcomwd.c +1 -1
@@ -201,7 +201,7 @@ static long mixcomwd_ioctl(struct file *file,void __user *argp = (void __user *)arg;int __user *p = argp;int status; -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_KEEPALIVEPING |WDIOF_MAGICCLOSE , .firmware_version =1 , .identity ="MixCOM watchdog" ,
drivers/watchdog/mpc8xxx_wdt.c +1 -1
@@ -148,7 +148,7 @@ static long mpc8xxx_wdt_ioctl(struct file *file, unsigned int cmd, {void __user *argp = (void __user *)arg;int __user *p = argp; -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_KEEPALIVEPING , .firmware_version =1 , .identity ="MPC8xxx" ,
drivers/watchdog/mpcore_wdt.c +1 -1
@@ -213,7 +213,7 @@ static ssize_t mpcore_wdt_write(struct file *file, const char *data,return len; } -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_SETTIMEOUT |WDIOF_KEEPALIVEPING |WDIOF_MAGICCLOSE ,
drivers/watchdog/mv64x60_wdt.c +1 -1
@@ -179,7 +179,7 @@ static long mv64x60_wdt_ioctl(struct file *file,int timeout;int options;void __user *argp = (void __user *)arg; -static struct watchdog_info info = { +static const struct watchdog_info info = { .options =WDIOF_SETTIMEOUT |WDIOF_MAGICCLOSE |WDIOF_KEEPALIVEPING ,
drivers/watchdog/pc87413_wdt.c +1 -1
@@ -407,7 +407,7 @@ static long pc87413_ioctl(struct file *file, unsigned int cmd,int __user *i; } uarg; -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_KEEPALIVEPING |WDIOF_SETTIMEOUT |WDIOF_MAGICCLOSE ,
drivers/watchdog/pcwd.c +1 -1
@@ -606,7 +606,7 @@ static long pcwd_ioctl(struct file *file, unsigned int cmd, unsigned long arg)int temperature;int new_heartbeat;int __user *argp = (int __user *)arg; -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_OVERHEAT |WDIOF_CARDRESET | WDIOF_KEEPALIVEPING |
drivers/watchdog/pcwd_pci.c +1 -1
@@ -481,7 +481,7 @@ static long pcipcwd_ioctl(struct file *file, unsigned int cmd, { void __user *argp = (void __user *)arg; int __user *p = argp; - static struct watchdog_info ident = { + static const struct watchdog_info ident = { .options = WDIOF_OVERHEAT | WDIOF_CARDRESET | WDIOF_KEEPALIVEPING |
drivers/watchdog/pcwd_usb.c +1 -1
@@ -404,7 +404,7 @@ static long usb_pcwd_ioctl(struct file *file, unsigned int cmd, {void __user *argp = (void __user *)arg;int __user *p = argp; -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_KEEPALIVEPING |WDIOF_SETTIMEOUT |WDIOF_MAGICCLOSE ,
drivers/watchdog/pika_wdt.c +1 -1
@@ -52,7 +52,7 @@ static struct {struct timer_list timer;/* The timer that pings the watchdog */ } pikawdt_private; -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .identity =DRV_NAME , .options =WDIOF_CARDRESET | WDIOF_SETTIMEOUT |
drivers/watchdog/pnx833x_wdt.c +1 -1
@@ -141,7 +141,7 @@ static long pnx833x_wdt_ioctl(struct file *file, unsigned int cmd,int options, new_timeout =0 ;uint32_t timeout, timeout_left =0 ; -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_KEEPALIVEPING |WDIOF_SETTIMEOUT , .firmware_version =0 , .identity ="Hardware Watchdog for PNX833x" ,
drivers/watchdog/rc32434_wdt.c +1 -1
@@ -198,7 +198,7 @@ static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd,void __user *argp = (void __user *)arg;int new_timeout;unsigned int value; -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_SETTIMEOUT |WDIOF_KEEPALIVEPING |WDIOF_MAGICCLOSE ,
drivers/watchdog/rdc321x_wdt.c +1 -1
@@ -149,7 +149,7 @@ static long rdc321x_wdt_ioctl(struct file *file, unsigned int cmd, {void __user *argp = (void __user *)arg;unsigned int value; -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_CARDRESET , .identity ="RDC321x WDT" , };
drivers/watchdog/riowd.c +1 -1
@@ -85,7 +85,7 @@ static int riowd_release(struct inode *inode, struct file *filp)static long riowd_ioctl (struct file *filp,unsigned int cmd,unsigned long arg) { -static struct watchdog_info info = { +static const struct watchdog_info info = { .options =WDIOF_SETTIMEOUT , .firmware_version =1 , .identity =DRIVER_NAME ,
drivers/watchdog/sbc_fitpc2_wdt.c +1 -1
@@ -111,7 +111,7 @@ out: } -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_MAGICCLOSE |WDIOF_SETTIMEOUT |WDIOF_KEEPALIVEPING , .identity =WATCHDOG_NAME ,
drivers/watchdog/sch311x_wdt.c +1 -1
@@ -250,7 +250,7 @@ static long sch311x_wdt_ioctl(struct file *file, unsigned int cmd,int new_timeout;void __user *argp = (void __user *)arg;int __user *p = argp; -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_KEEPALIVEPING |WDIOF_SETTIMEOUT |WDIOF_MAGICCLOSE ,
drivers/watchdog/stmp3xxx_wdt.c +1 -1
@@ -94,7 +94,7 @@ static ssize_t stmp3xxx_wdt_write(struct file *file, const char __user *data,return len; } -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_CARDRESET |WDIOF_MAGICCLOSE | WDIOF_SETTIMEOUT |
drivers/watchdog/ts72xx_wdt.c new file +520 -0
520 lines not on this page · raw message
drivers/watchdog/txx9wdt.c +6 -19
@@ -13,7 +13,6 @@#include <linux/miscdevice.h> #include <linux/watchdog.h> #include <linux/fs.h> -#include <linux/reboot.h> #include <linux/init.h> #include <linux/uaccess.h> #include <linux/platform_device.h>
@@ -166,14 +165,6 @@ static long txx9wdt_ioctl(struct file *file, unsigned int cmd, } } -static int txx9wdt_notify_sys (struct notifier_block *this,unsigned long code, -void *unused) -{ -if (code ==SYS_DOWN || code ==SYS_HALT ) -txx9wdt_stop (); -return NOTIFY_DONE ; -} -static const struct file_operations txx9wdt_fops = { .owner =THIS_MODULE , .llseek = no_llseek,
@@ -189,10 +180,6 @@ static struct miscdevice txx9wdt_miscdev = { .fops = &txx9wdt_fops, }; -static struct notifier_block txx9wdt_notifier = { - .notifier_call = txx9wdt_notify_sys, -}; -static int __init txx9wdt_probe (struct platform_device *dev) {struct resource *res;
@@ -221,13 +208,8 @@ static int __init txx9wdt_probe(struct platform_device *dev)if (!txx9wdt_reg) goto exit_busy; - ret =register_reboot_notifier (&txx9wdt_notifier); -if (ret) - goto exit; - ret =misc_register (&txx9wdt_miscdev);if (ret) { -unregister_reboot_notifier (&txx9wdt_notifier); goto exit; }
@@ -249,14 +231,19 @@ exit: static int __exit txx9wdt_remove(struct platform_device *dev) {misc_deregister (&txx9wdt_miscdev); -unregister_reboot_notifier (&txx9wdt_notifier);clk_disable (txx9_imclk);clk_put (txx9_imclk);return 0 ; } +static void txx9wdt_shutdown (struct platform_device *dev) +{ +txx9wdt_stop (); +} +static struct platform_driver txx9wdt_driver = { .remove =__exit_p (txx9wdt_remove), + .shutdown = txx9wdt_shutdown, .driver = { .name ="txx9wdt" , .owner =THIS_MODULE ,
drivers/watchdog/w83627hf_wdt.c +1 -1
@@ -201,7 +201,7 @@ static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)void __user *argp = (void __user *)arg;int __user *p = argp;int new_timeout; -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_KEEPALIVEPING |WDIOF_SETTIMEOUT |WDIOF_MAGICCLOSE , .firmware_version =1 ,
drivers/watchdog/w83977f_wdt.c +1 -1
@@ -371,7 +371,7 @@ static ssize_t wdt_write(struct file *file, const char __user *buf,* according to their available features. */ -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_SETTIMEOUT |WDIOF_MAGICCLOSE |WDIOF_KEEPALIVEPING , .firmware_version =1 , .identity =WATCHDOG_NAME ,
drivers/watchdog/wdrtas.c +1 -1
@@ -312,7 +312,7 @@ static long wdrtas_ioctl(struct file *file, unsigned int cmd, {int __user *argp = (void __user *)arg;int i; -static struct watchdog_info wdinfo = { +static const struct watchdog_info wdinfo = { .options =WDRTAS_SUPPORTED_MASK , .firmware_version =0 , .identity ="wdrtas" ,
drivers/watchdog/wdt.c +1 -1
@@ -358,7 +358,7 @@ static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)int new_heartbeat;int status; -static struct watchdog_info ident = { +struct watchdog_info ident = { .options =WDIOF_SETTIMEOUT |WDIOF_MAGICCLOSE |WDIOF_KEEPALIVEPING ,
drivers/watchdog/wdt_pci.c +1 -1
@@ -412,7 +412,7 @@ static long wdtpci_ioctl(struct file *file, unsigned int cmd,int new_heartbeat;int status; -static struct watchdog_info ident = { +struct watchdog_info ident = { .options =WDIOF_SETTIMEOUT |WDIOF_MAGICCLOSE |WDIOF_KEEPALIVEPING ,
drivers/watchdog/wm831x_wdt.c +1 -1
@@ -213,7 +213,7 @@ static ssize_t wm831x_wdt_write(struct file *file,return count; } -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_SETTIMEOUT |WDIOF_KEEPALIVEPING |WDIOF_MAGICCLOSE , .identity ="WM831x Watchdog" , };
drivers/watchdog/wm8350_wdt.c +1 -1
@@ -177,7 +177,7 @@ static ssize_t wm8350_wdt_write(struct file *file,return count; } -static struct watchdog_info ident = { +static const struct watchdog_info ident = { .options =WDIOF_SETTIMEOUT |WDIOF_KEEPALIVEPING |WDIOF_MAGICCLOSE , .identity ="WM8350 Watchdog" , };