aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/watchdog
Commit message (Collapse)AuthorAge
* Merge master.kernel.org:/home/rmk/linux-2.6-drvmodelLinus Torvalds2005-11-11
|\
| * [DRIVER MODEL] Convert platform drivers to use struct platform_driverRussell King2005-11-09
| | | | | | | | | | | | | | | | | | This allows us to eliminate the casts in the drivers, and eventually remove the use of the device_driver function pointer methods for platform device drivers. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
* | [PATCH] PCI: removed unneeded .owner field from struct pci_driverGreg Kroah-Hartman2005-11-10
|/ | | | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* [WATCHDOG] adds device_driver .owner fieldWim Van Sebroeck2005-11-01
| | | | | | | | | Initialise the .owner field of the device driver with the module that owns it, for easier tracking of device driver ownership. (probably also better for sysfs...) Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* [WATCHDOG] pcwd_pci.c update commentsWim Van Sebroeck2005-11-01
| | | | | | update copyright + update bells and whistles driver for v2.6 Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* [WATCHDOG] w83627hf_wdt trivial typoPozsar Balazs2005-11-01
| | | | | | | | The most trivial typo fix in the world. Signed-off-by: Pozsar Balazs <pozsy@uhulinux.hu> Signed-off-by: Pádraig Brady <P@draigBrady.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* [WATCHDOG] s3c2410 wdt - add .owner fieldBen Dooks2005-11-01
| | | | | | | | | Initialise the .owner field of the device driver with the module that owns it, for easier tracking of device driver ownership. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* Merge master.kernel.org:/home/rmk/linux-2.6-drvmodelLinus Torvalds2005-10-31
|\ | | | | | | Manual #include fixups for clashes - there may be some unnecessary
| * Create platform_device.h to contain all the platform device details.Russell King2005-10-29
| | | | | | | | | | | | | | | | Convert everyone who uses platform_bus_type to include linux/platform_device.h. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
* | [PATCH] fix missing includesTim Schmielau2005-10-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I recently picked up my older work to remove unnecessary #includes of sched.h, starting from a patch by Dave Jones to not include sched.h from module.h. This reduces the number of indirect includes of sched.h by ~300. Another ~400 pointless direct includes can be removed after this disentangling (patch to follow later). However, quite a few indirect includes need to be fixed up for this. In order to feed the patches through -mm with as little disturbance as possible, I've split out the fixes I accumulated up to now (complete for i386 and x86_64, more archs to follow later) and post them before the real patch. This way this large part of the patch is kept simple with only adding #includes, and all hunks are independent of each other. So if any hunk rejects or gets in the way of other patches, just drop it. My scripts will pick it up again in the next round. Signed-off-by: Tim Schmielau <tim@physik3.uni-rostock.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] watchdog: update .owner field of struct pci_driverLaurent Riffard2005-10-30
|/ | | | | | | | | | | | This updates .owner field of struct pci_driver. This allows SYSFS to create the symlink from the driver to the module which provides it. Signed-off-by: Laurent Riffard <laurent.riffard@free.fr> Acked-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] DRIVER MODEL: Get rid of the obsolete tri-level suspend/resume callbacksRussell King2005-10-28
| | | | | | | | | | | | | | | | In PM v1, all devices were called at SUSPEND_DISABLE level. Then all devices were called at SUSPEND_SAVE_STATE level, and finally SUSPEND_POWER_DOWN level. However, with PM v2, to maintain compatibility for platform devices, I arranged for the PM v2 suspend/resume callbacks to call the old PM v1 suspend/resume callbacks three times with each level in order so that existing drivers continued to work. Since this is obsolete infrastructure which is no longer necessary, we can remove it. Here's an (untested) patch to do exactly that. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdogLinus Torvalds2005-10-08
|\
| * [WATCHDOG] pcwd_pci.c add debug module_paramWim Van Sebroeck2005-09-29
| | | | | | | | | | | | Add debugging code for the pcwd_pci driver. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * [WATCHDOG] pcwd_pci.c control status + boot-code clean-upWim Van Sebroeck2005-09-29
| | | | | | | | | | | | | | | | * Clean-up control status code (use control status defines + change pcipcwd_clear_status) * Clean-up boot-code (move card info to pcipcwd_show_card_info() ) Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* | [PATCH] mv64x60_wdt __user annotations and cleanupsAl Viro2005-09-29
|/ | | | | | | | | | | | | | - use nonseekable_open() instead of messing with if (*ppos != file->f_pos) return -EISPIPE in ->write() (->read is NULL). - trivial __user annotations Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [ARM SMP] Add timer/watchdog defines for MPCoreRussell King2005-09-14
| | | | | | | The timer/watchdog register definitions were missing from the mpcore watchdog patch. Add them. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog Linus Torvalds2005-09-13
|\
| * [WATCHDOG] pcwd_pci-include+WDIOC_SETOPTIONS-patchWim Van Sebroeck2005-09-12
| | | | | | | | | | | | | | Clean-up includes Check results for start + stop in the WDIOC_SETOPTIONS ioctl call Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * [WATCHDOG] sbc8360+w83977f_wdt-consolidate_CONFIG_WATCHDOG_NOWAYOUT_handlingWim Van Sebroeck2005-09-12
| | | | | | | | | | | | | | Attached patch removes #ifdef CONFIG_WATCHDOG_NOWAYOUT mess and replaces it with common define in linux/watchdog.h. Signed-Off-By: Wim Van Sebroeck <wim@iguana.be>
| * [WATCHDOG] w83977f-watchdog-driver.patchJose Miguel Goncalves2005-09-12
| | | | | | | | | | | | | | | | | | | | | | | | | | In a project for my company I've needed to use the watchdog device in a PCM-5335 SBC from AAEON. The watchdog timer is from a Winbond's SuperIO chip, the W83977F. I've made this driver based on two others already on the kernel tree, the w83877f_wdt and the wdt977. Signed-off-by: Jose Goncalves <jose.goncalves@inov.pt> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * [WATCHDOG] New SBC8360 watchdog driver (revised)Ian E. Morgan2005-09-11
| | | | | | | | | | | | | | | | New SBC8360 watchdog driver patch From: Ian E. Morgan <imorgan@webcon.ca> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
| * [WATCHDOG] driver-for-ibm-automatic-server-restart-watchdog-fix2.patchWim Van Sebroeck2005-09-11
| | | | | | | | | | | | | | | | | | | | The device/watchdog has a fixed timeout/heartbeat. So we don't support the WDIOC_SETTIMEOUT ioctl call and we also may not set the WDIOF_SETTIMEOUT flag. Cc: Andrey Panin <pazke@donpac.ru> Cc: Andrew Morton <akpm@osdl.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * [WATCHDOG] driver-for-ibm-automatic-server-restart-watchdog-fixAndrew Morton2005-09-11
| | | | | | | | | | | | | | | | Add fixed timeout comments Cc: Andrey Panin <pazke@donpac.ru> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
| * [WATCHDOG] driver-for-ibm-automatic-server-restart-watchdog.patchAndrey Panin2005-09-11
| | | | | | | | | | | | | | | | | | | | This patch adds driver for IBM Automatic Server Restart watchdog hardware found in some IBM eServer xSeries machines. This driver is based on the ugly driver provided by IBM. Driver was tested on IBM eServer 226. Signed-off-by: Andrey Panin <pazke@donpac.ru> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
| * [WATCHDOG] i6300.h-removal-patchDavid Hardeman2005-09-11
| | | | | | | | | | | | | | | | | | | | | | | | | | the attached patch moves the content of drivers/char/watchdog/i6300.h into drivers/char/watchdog/i6300.c, since it is the only file using the defines there is no real reason to have a separate header. Also cleaned up the comments a bit and added myself to the copyright holders. Signed-off-by: David Hardeman <david@2gen.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
| * [WATCHDOG] i6300esb.c-2-bugs-little-cleanup.patchJiri Slaby2005-09-11
| | | | | | | | | | | | | | | | | | | | In i6300esb.c watchdog card driver were 2 bugs (misused pc_match_device and pci_dev_put wasn't called in one error case) and one little cleanup was done (long line was converted to a shorter one with using built-in macro). Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
| * [WATCHDOG] i6300esb.c-pci_dev_put+nowayout-patchNaveen Gupta2005-09-11
| | | | | | | | | | | | | | | | | | | | | | One pci_dev_put was misused (there was one case without putting the device). Changed nowayout according to other drivers. Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> Signed-off-by: Naveen Gupta <ngupta@google.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
| * [WATCHDOG] i6300esb-set_correct_reload_register_bitNaveen Gupta2005-09-11
| | | | | | | | | | | | | | | | | | | | | | This patch writes into bit 8 of the reload register to perform the correct 'Reload Sequence' instead of writing into bit 4 of Watchdog for Intel 6300ESB chipset. Signed-off-by: Naveen Gupta <ngupta@google.com> Signed-off-by: David Hardeman <david@2gen.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
| * [WATCHDOG] i6300esb.c-WDT_ENABLE-bugNaveen Gupta2005-09-11
| | | | | | | | | | | | | | | | | | | | | | | | This patch sets the WDT_ENABLE bit of the Lock Register to enable the watchdog and WDT_LOCK bit only if nowayout is set. The old code always sets the WDT_LOCK bit of watchdog timer for Intel 6300ESB chipset. So, we end up locking the watchdog instead of enabling it. Signed-off-by: Naveen Gupta <ngupta@google.com> Signed-off-by: David Hardeman <david@2gen.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
| * [WATCHDOG] removes pci_find_device from i6300esb.cJiri Slaby2005-09-11
| | | | | | | | | | | | | | | | | | | | | | This patch changes pci_find_device to pci_get_device (encapsulated in for_each_pci_dev) in i6300esb watchdog card with appropriate adding pci_dev_put. Generated in 2.6.13-rc5-mm1 kernel version. Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * [WATCHDOG] i6300esb.patchDavid Hardeman2005-09-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I wrote earlier to the list[1] asking for a driver for the watchdog included in the 6300ESB chipset. I got a 2.4 driver via private email from Ross Biro which I've changed into what I hope resembles a 2.6 driver (which was done by looking a lot at the watchdog drivers already in the 2.6 tree). I've attached the result, and I'm hoping to get some feedback on the coding as a first step. I can't actually test it on the hardware right now as I won't have physical access until April. So my own tests have been limited to "compiles-without-warnings" and "can-be-insmodded-in-other-machine-without-oops". [1] http://marc.theaimsgroup.com/?l=linux-kernel&m=110711079825794&w=2 [2] http://marc.theaimsgroup.com/?l=linux-kernel&m=110711973917746&w=2 Signed-off-by: David Hardeman <david@2gen.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * [WATCHDOG] mv64x60_wdt.patchJames Chapman2005-09-10
| | | | | | | | | | | | | | Add mv64x60 (Marvell Discovery) watchdog support. Signed-off-by: James Chapman <jchapman@katalix.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * [WATCHDOG] Kconfig+Makefile-clean2Wim Van Sebroeck2005-09-10
| | | | | | | | | | | | | | Clean the Kconfig+Makefile according to a sorted list of the drivers of each architecture (and sub-architecture). Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * [WATCHDOG] s3c2410_wdt.c-state_warning.patchArnaud Patard (Rtp)2005-09-10
| | | | | | | | | | | | | | | | | | | | | | I've noticed that the patch from Ben Dooks (commit af4bb822bc65efb087cd36b83789f22161a6515b on your git tree) is introducing a warning. It's using 'u32 state' instead of 'pm_message_t state'. I've attached a one liner to fix it. Signed-Off-By: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* | [ARM SMP] Add MPCore watchdog driverRussell King2005-09-12
|/ | | | | | Add platform independent parts of the ARM MPCore watchdog driver. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [PATCH] timer initialization cleanup: DEFINE_TIMERIngo Molnar2005-09-09
| | | | | | | | | | Clean up timer initialization by introducing DEFINE_TIMER a'la DEFINE_SPINLOCK. Build and boot-tested on x86. A similar patch has been been in the -RT tree for some time. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge watchdog driver updatesLinus Torvalds2005-09-05
|\ | | | | | | | | | | | | | | | | Automated merge from master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog failed due to duplicate different changes to Kconfig file. Manually fixed up. Hopefully.
| * [WATCHDOG] softdog-timer-running-oops.patchChuck Ebbert2005-09-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The softdog watchdog timer has a bug that can create an oops: 1. Load the module without the nowayout option. 2. Open the driver and close it without writing 'V' before close. 3. Unload the module. The timer will continue to run... 4. Oops happens when timer fires. Reported Sun, 10 Oct 2004, by Michael Schierl <schierlm@gmx.de> Fix is easy: always take a reference on the module on open. Release it only when the device is closed and no timer is running. Tested on 2.6.13-rc6 using the soft_noboot option. While the timer is running and the device is closed, the module use count stays at 1. After the timer fires, it drops to 0. Repeatedly opening and closing the driver caused no problems. Please apply. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * [WATCHDOG] w83627hf_wdt.c-initialized_bios_bugP@Draig Brady2005-09-03
| | | | | | | | | | | | | | | | | | | | | | | | | | Attached is a small update to the w83627hf watchdog driver to initialise appropriately if it was already initialised in the BIOS. On tyan motherboards for e.g. you can init the watchdog to 4 mins, then when the driver is loaded it sets the watchdog to "seconds" mode, and then machine will reboot within 4 seconds. So this patch resets the timeout to the configured value if the watchdog is already running. Signed-off-by: P@draig Brady <P@draigBrady.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * [WATCHDOG] s3c2410 watchdog - replace reboot notifierBen Dooks2005-09-03
| | | | | | | | | | | | | | | | | | | | | | Patch from Dimitry Andric <dimitry.andric@tomtom.com> Change to using platfrom driver's .shutdown method instead of an reboot notifier Signed-off-by: Dimitry Andric <dimitry.andric@tomtom.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * [WATCHDOG] s3c2410 watchdog power managementBen Dooks2005-09-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Dimitry Andric <dimitry.andric@tomtom.com>, updated by Ben Dooks <ben-linux@fluff.org>. Patch is against 2.6.11-mm2 Add power management support to the s3c2410 watchdog, so that it is shut-down over suspend, and re-initialised on resume. Also add Dimitry to the list of authors. Signed-off-by: Dimitry Andric <dimitry.andric@tomtom.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * [WATCHDOG] correct sysfs name for watchdog devicesOlaf Hering2005-09-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | While looking for possible candidates for our udev.rules package, I found a few odd ->name properties. /dev/watchdog has minor 130 according to devices.txt. Since all watchdog drivers use the misc_register() call, they will end up in /sys/class/misc/$foo. udev may create the /dev/watchdog node if the driver is loaded. I dont have such a device, so I cant test it. The drivers below provide names with spaces and even with / in it. Not a big deal, but apps may expect /dev/watchdog. Signed-off-by: Olaf Hering <olh@suse.de> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * [WATCHDOG] Kconfig+Makefile-cleanWim Van Sebroeck2005-09-03
| | | | | | | | | | | | | | Clean the Kconfig+Makefile according to a sorted list of the drivers of each architecture (and sub-architecture). Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * [WATCHDOG] Makefile-probe_order-patchWim Van Sebroeck2005-09-03
| | | | | | | | | | | | Re-arrange Makefile according to what we want to probe first. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* | [PATCH] ppc32: Cleaned up global namespace of Book-E watchdog variablesKumar Gala2005-09-05
| | | | | | | | | | | | | | | | | | | | | | Renamed global variables used to convey if the watchdog is enabled and periodicity of the timer and moved the declarations into a header for these variables Signed-off-by: Matt McClintock <msm@freescale.com> Signed-off-by: Kumar Gala <kumar.gala@freescale.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] ppc32: Added support for the Book-E style Watchdog TimerKumar Gala2005-09-05
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | PowerPC 40x and Book-E processors support a watchdog timer at the processor core level. The timer has implementation dependent timeout frequencies that can be configured by software. One the first Watchdog timeout we get a critical exception. It is left to board specific code to determine what should happen at this point. If nothing is done and another timeout period expires the processor may attempt to reset the machine. Command line parameters: wdt=0 : disable watchdog (default) wdt=1 : enable watchdog wdt_period=N : N sets the value of the Watchdog Timer Period. The Watchdog Timer Period meaning is implementation specific. Check User Manual for the processor for more details. This patch is based off of work done by Takeharu Kato. Signed-off-by: Matt McClintock <msm@freescale.com> Signed-off-by: Kumar Gala <kumar.gala@freescale.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] i8xx_tco.c: arm watchdog only when startedWim Van Sebroeck2005-08-09
| | | | | | | | | i8xx_tco.c v0.08: only "arm" the watchdog when the watchdog has been started. (Kernel Bug 4251: system reset when battery is read and i8xx_tco driver loaded) Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] ARM: 2833/2: Remove support for WDIOF_MAGICCLOSE from sa1100-wdtIan Campbell2005-08-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Ian Campbell On PXA255 there is no way to disable the watchdog. Turning off OIER[E3] as suggested in the existing comment does not work. I posted a note to the ARM mailing list a little while ago asking for opinions from people using SA1100. There was one reponse from Nico who believes that the SA1100 is the same as the PXA255 in this respect. You also asked me to involve the watchdog maintainer which I tried to do but didn't hear anything back. There are only a couple of other drivers which can't stop the watchdog and there seems to be no consistancy regarding printing an error etc. I decided to print something since that matches the case for all the other drivers when NOWAYOUT is turned on. Also, I changed the device .name to "watchdog" like most of the other watchdogs. udev uses it as the device name (by default) and spaces etc. get in the way. Superceded 2833/1 because 2.6.13-rc4 caused rejects. Signed-off-by: Ian Campbell <icampbell@arcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [PATCH] consolidate CONFIG_WATCHDOG_NOWAYOUT handlingAndrey Panin2005-07-27
| | | | | | | | | | Attached patch removes #ifdef CONFIG_WATCHDOG_NOWAYOUT mess duplicated in almost every watchdog driver and replaces it with common define in linux/watchdog.h. Signed-off-by: Andrey Panin <pazke@donpac.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-18 20:39:52 -0500