summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2006-10-13[WATCHDOG] Atmel AT91RM9200 rename.Andrew Victor9-8/+8
The new Atmel AT91SAM9261 and AT91SAM9260 processors use a different internal watchdog peripheral. This watchdog driver is therefore AT91RM9200-specific. This patch renames at91_wdt.c to at91rm9200_wdt.c, and changes the name of the configuration option. Signed-off-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-12[WATCHDOG] includes for sample watchdog program.Jean Delvare1-0/+2
Add missing includes to sample watchdog program. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-11[WATCHDOG] watchdog/iTCO_wdt: fix bug related to gcc uninit warningJeff Garzik1-2/+4
gcc emits the following warning: drivers/char/watchdog/iTCO_wdt.c: In function ‘iTCO_wdt_ioctl’: drivers/char/watchdog/iTCO_wdt.c:429: warning: ‘time_left’ may be used uninitialized in this function This indicates a condition near enough to a bug, to want to fix. iTCO_wdt_get_timeleft() stores a value in 'time_left' iff iTCO_version==(1 or 2). This driver only supports versions 1 or 2, so this is ok. However, since (a) the return value of iTCO_wdt_get_timeleft() is handled anyway, (b) it fixes the warning, and (c) it future-proofs the driver, we go ahead and add the obvious return value. Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
2006-10-08[WATCHDOG] add ich8 support to iTCO_wdt.c (patch 2)Wim Van Sebroeck1-2/+12
Add ICH8 support to the iTCO_wdt driver. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-08[WATCHDOG] add ich8 support to iTCO_wdt.cArnaud Patard (Rtp)1-0/+3
Add ICH8 support to the iTCO_wdt driver. Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-07[WATCHDOG] ioremap balanced with iounmap for drivers/char/watchdog/s3c2410_wdt.cAmol Lad1-0/+5
ioremap must be balanced by an iounmap and failing to do so can result in a memory leak. Signed-off-by: Amol Lad <amol@verismonetworks.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
2006-10-04[WATCHDOG] w83697hf/hg WDT driver - Kconfig patchSamuel Tardieu1-4/+6
Update Kconfig for the w83697hf/hg watchdog driver. Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-04[WATCHDOG] w83697hf/hg WDT driver - autodetect patchWim Van Sebroeck1-15/+17
Change the autodetect code so that it is more generic. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-04[WATCHDOG] w83697hf/hg WDT driver - patch 16Samuel Tardieu1-1/+2
This is patch 16 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - Add copyright notice for Samuel Tardieu also. This is the last patch in this series. The original description for Samuel's driver was: driver for the Winbond W83697HF/W83697HG watchdog timer The Winbond SuperIO W83697HF/HG includes a watchdog that can count from 1 to 255 seconds (or minutes). This drivers allows the seconds mode to be used. It exposes a standard /dev/watchdog interface. This chip is currently being used on some motherboards designed by VIA. By default, the module looks for a chip at I/O port 0x2e. The chip can be configured to be at 0x4e on some motherboards, the address can be chosen using the wdt_io module parameter. Using 0 will try to autodetect the address. Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-04[WATCHDOG] w83697hf/hg WDT driver - patch 15Samuel Tardieu1-10/+8
This is patch 15 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - Clean-up initialization code - part 2: * the line reading "set second mode & disable keyboard ..." is plain wrong, the register being manipulated (CRF4) is the counter itself, not the control byte (CRF3) -- looks like it has been copied from another driver. * I think garbage is being written in CRF3 (the control word) as the timeout value is being stored in this register (such as 60 for 60 seconds). * We only want to set pin 119 to WDTO# mode and leave the rest of CR29 like it is. * Set count mode to seconds and not minutes. Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-04[WATCHDOG] w83697hf/hg WDT driver - patch 14Samuel Tardieu1-21/+6
This is patch 14 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - Clean-up initialization code (part 1: remove w83697hf_select_wd_register() and w83697hf_unselect_wd_register() functions). - Make sure that the watchdog device is stopped as soon as we found it. Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-04[WATCHDOG] w83697hf/hg WDT driver - patch 13Samuel Tardieu1-9/+22
This is patch 13 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - Remove wdt_ctrl (it has been replaced with the w83697hf_write_timeout() function) and redo/clean-up the start/stop/ping code. - Make sure that the watchdog is enabled or disabled When starting or stoping the device (with a call to w83697hf_set_reg(0x30, ?); ). Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-04[WATCHDOG] w83697hf/hg WDT driver - patch 12Samuel Tardieu1-3/+9
This is patch 12 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - Add w83697hf_write_timeout() to set the watchdog's timeout value. Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-04[WATCHDOG] w83697hf/hg WDT driver - patch 11Samuel Tardieu1-2/+15
This is patch 11 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - Add w83697hf_select_wdt() and w83697hf_deselect_wdt() so that the start/stop/ping code can directly talk to the watchdog. Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-04[WATCHDOG] w83697hf/hg WDT driver - patch 10Samuel Tardieu1-10/+44
This is patch 10 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - check whether the device is really present (we *can* probe for the device now). Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-04[WATCHDOG] w83697hf/hg WDT driver - patch 9Samuel Tardieu1-15/+27
This is patch 9 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - add w83697hf_get_reg() and w83697hf_set_reg() functions. Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-04[WATCHDOG] w83697hf/hg WDT driver - patch 8Samuel Tardieu1-1/+7
This is patch 8 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - add w83697hf_lock function to leave the chipsets extended function mode. Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-04[WATCHDOG] w83697hf/hg WDT driver - patch 7Samuel Tardieu1-2/+8
This is patch 7 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - add w83697hf_unlock function to enter the chipsets extended function mode. Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-04[WATCHDOG] w83697hf/hg WDT driver - patch 6Samuel Tardieu1-5/+6
This is patch 6 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - The driver works for both the w83697hf and the w83697hg chipset's. Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-04[WATCHDOG] w83697hf/hg WDT driver - patch 5Samuel Tardieu1-21/+21
This is patch 5 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - Rename the Extended Function Registers to the names used in the data-sheet. Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-04[WATCHDOG] w83697hf/hg WDT driver - patch 4Samuel Tardieu1-3/+3
This is patch 4 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - limits the watchdog timeout to 1-63 while this device accepts 1-255. Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-04[WATCHDOG] w83697hf/hg WDT driver - patch 3Samuel Tardieu1-33/+33
This is patch 3 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - Fix identation. Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-04[WATCHDOG] w83697hf/hg WDT driver - patch 2Samuel Tardieu1-3/+3
This is patch 2 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - wdt_io is 2 bytes long. We should do a request_region for 2 bytes instead of 1. Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-04[WATCHDOG] w83697hf/hg WDT driver - patch 1Samuel Tardieu1-5/+3
This is patch 1 in the series of patches that converts Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's w83697hf/hg watchdog driver. This patch contains following changes: - the note concerning tyan motherboards has been copied from another driver, This doesn't apply here. - the comments concerning CRF6 are wrong as CRF3 is manipulated and CRF6 is never read nor written. - the comments concerning CRF5 are wrong as CRF4 is manipulated and CRF5 is never read nor written. Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-04[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()Wim Van Sebroeck1-1/+1
Return ENOTTY instead of ENOIOCTLCMD in user-visible ioctl() results The watchdog drivers used to return ENOIOCTLCMD for bad ioctl() commands. ENOIOCTLCMD should not be visible by the user, so use ENOTTY instead. Signed-off-by: Samuel Tardieu <sam@rfc1149.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Acked-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org>
2006-10-04[WATCHDOG] Kconfig clean upWim Van Sebroeck1-5/+4
fixed some more trailing spaces. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-04[WATCHDOG] w836?7hf_wdt spinlock fixes.Wim Van Sebroeck2-0/+16
Add io spinlocks to prevent possible race conditions between start and stop operations that are issued from different child processes where the master process opened /dev/watchdog. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-04[WATCHDOG] Kconfig clean-upWim Van Sebroeck1-13/+13
* fix typo's according to spellings checker * Fix some leading and trailing spaces Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-04[WATCHDOG] w83697hf WDT driverMarcus Junker3-0/+381
New watchdog driver for the Winbond W83697HF chipset. Signed-off-by: Marcus Junker <junker@anduras.de> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-04[WATCHDOG] Winbond SMsC37B787 watchdog fixesWim Van Sebroeck1-17/+30
* Added io spinlocking * Deleted WATCHDOG_MINOR (it's in the miscdevice include * Changed timer_enabled to use set_bit functions * WDIOC_GETSUPPORT should return -EFAULT or 0 * timeout should be correct before we initialize the watchdog * we should initialize the watchdog before we give access to userspace * Third parameter of module_param is not the default or initial value Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-04[WATCHDOG] Winbond SMsC37B787 - remove trailing whitespaceWim Van Sebroeck1-3/+3
Remove trailing whitespace. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-04[WATCHDOG] Winbond SMsC37B787 watchdog driverSven Anders3-0/+635
New watchdog driver for the Winbond SMsC37B787 chipset. Signed-off-by: Sven Anders <anders@anduras.de> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-10-04[S390] cio: improve unit check handling for internal operationsPeter Oberparleiter1-4/+4
Retry internal operation after unit check instead of aborting them. Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2006-10-04[S390] cio: add timeout handler for internal operations.Peter Oberparleiter1-0/+3
Add timeout handler for common-I/O-layer-internal I/O operations. Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2006-10-04[S390] Remove open-coded mem_map usage.Heiko Carstens5-19/+17
Use page_to_phys and pfn_to_page to avoid open-coded mem_map usage. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
2006-10-04[S390] Have s390 use add_active_range() and free_area_init_nodes.Heiko Carstens4-67/+27
Size zones and holes in an architecture independent manner for s390. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
2006-10-04[S390] Remove crept in whitespace from head*.S again.Heiko Carstens2-10/+10
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
2006-10-04[S390] incorrect placement of include.Martin Schwidefsky1-2/+2
The include of linux/smp.h needs to be done before the #if that checks for the compiler version. Seems like fallout from the inline assembly cleanup patch vs. the directed yield patch. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2006-10-04[S390] Wire up sys_getcpu system call.Heiko Carstens3-1/+12
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
2006-10-04[S390] zcrypt device registration/unregistration race.Ralph Wuerthner1-11/+12
Fix a race condition during AP device registration and unregistration. Signed-off-by: Ralph Wuerthner <rwuerthn@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2006-10-04[S390] Add timeouts during sense PGID, path verification and disband PGID.Cornelia Huck3-0/+13
While the machine owns us an interrupt in these cases (and we should get one), reality isn't always like that... Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2006-10-04[S390] user-copy optimization fallout.Martin Schwidefsky1-10/+7
Fix new restore_sigregs function. It copies the user space copy of the old psw without correcting the psw.mask and the psw.addr high order bit. While we are at it, simplify save_sigregs a bit. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2006-10-04[S390] update default configurationMartin Schwidefsky1-12/+44
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
2006-10-04Merge branch 'for-2.6.19' of git://brick.kernel.dk/data/git/linux-2.6-blockLinus Torvalds5-8/+36
* 'for-2.6.19' of git://brick.kernel.dk/data/git/linux-2.6-block: [PATCH] Document bi_sector and sector_t [PATCH] helper function for retrieving scsi_cmd given host based block layer tag
2006-10-04Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds7-19/+26
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Remove remaining reference to ite_gpio.h from Kbuild [MIPS] PNX8550 fixups
2006-10-04[PATCH] Document bi_sector and sector_tRoger Gammans2-2/+7
Signed-Off-By: Roger Gammans <rgammans@computer-surgery.co.uk> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
2006-10-04[PATCH] helper function for retrieving scsi_cmd given host based block layer tagDavid C Somayajulu3-6/+29
This was necessitated by the need for a function to get back to a scsi_cmnd, when an hba the posts its (corresponding) completion interrupt with a block layer tag as its reference. Signed-off-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: David Somayajulu <david.somayajulu@qlogic.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
2006-10-04Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvbLinus Torvalds13-77/+202
* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (4712): Fix warning when compiling on x86_i64 V4L/DVB (4711): Radio: No need to return void V4L/DVB (4708): Add tveeprom support for Philips FM1236/FM1216ME MK5 V4L/DVB (4707): 4linux: complete conversion to hotplug safe PCI API V4L/DVB (4706): Do not enable VIDEO_V4L2 unconditionally V4L/DVB (4704): SAA713x: fixed compile warning in SECAM fixup V4L/DVB (4703): Add support for the ASUS EUROPA2 OEM board V4L/DVB (4702): Fix: set antenna input for DVB-T for Asus P7131 Dual hybrid V4L/DVB (4701): Saa713x audio fixes V4L/DVB (4676a): Remove Kconfig item for DiB7000M support
2006-10-04[PATCH] atmel_serial: Fix roundoff error in atmel_console_get_optionsHaavard Skinnemoen1-1/+7
The atmel_console_get_options() function initializes the baud, parity and bits settings from the actual hardware setup, in case it has been initialized by a e.g. boot loader. The baud rate, however, is not necessarily exactly equal to one of the standard baud rates (115200, etc.) This means that the baud rate calculated by this function may be slightly higher or slightly lower than one of the standard baud rates. If the baud rate is slightly lower than the target, this causes problems when uart_set_option() tries to match the detected baud rate against the standard baud rate, as it will always select a baud rate that is lower or equal to the target rate. For example if the detected baud rate is slightly lower than 115200, usart_set_options() will select 57600. This patch fixes the problem by subtracting 1 from the value in BRGR when calculating the baud rate. The detected baud rate will thus always be higher than the nearest standard baud rate, and uart_set_options() will end up doing the right thing. Tested on ATSTK1000 and AT91RM9200-EK boards. Both are broken without this patch. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Acked-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-10-04[PATCH] AVR32: Allow renumbering of serial devicesHaavard Skinnemoen6-18/+26
Allow the board to remap actual USART peripheral devices to serial devices by calling at32_map_usart(hw_id, serial_line). This ensures that even though ATSTK1002 uses USART1 as the first serial port, it will still have a ttyS0 device. This also adds a board-specific early setup hook and moves the at32_setup_serial_console() call there from the platform code. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>