Hi Linus,
I didn't get or see any objections to the below patches.
So can you please pull from 'master' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
or from master.kernel.org:
master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
Thanks in advance,
Wim.
> Hi Linus,
>
> If no-one objects, can you please pull from 'master' branch of
> git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
>
> This will update the following files:
>
> Documentation/watchdog/src/watchdog-simple.c | 2
> arch/arm/configs/at91rm9200dk_defconfig | 2
> arch/arm/configs/at91rm9200ek_defconfig | 2
> arch/arm/configs/csb337_defconfig | 2
> arch/arm/configs/csb637_defconfig | 2
> arch/arm/configs/kafa_defconfig | 2
> arch/arm/configs/onearm_defconfig | 2
> drivers/char/watchdog/Kconfig | 65 ++
> drivers/char/watchdog/Makefile | 4
> drivers/char/watchdog/at91_wdt.c | 287 ------------
> drivers/char/watchdog/at91rm9200_wdt.c | 287 ++++++++++++
> drivers/char/watchdog/iTCO_wdt.c | 21
> drivers/char/watchdog/s3c2410_wdt.c | 5
> drivers/char/watchdog/smsc37b787_wdt.c | 627 +++++++++++++++++++++++++++
> drivers/char/watchdog/w83627hf_wdt.c | 8
> drivers/char/watchdog/w83697hf_wdt.c | 450 +++++++++++++++++++
> 16 files changed, 1457 insertions(+), 311 deletions(-)
>
> with these Changes:
>
> Author: Wim Van Sebroeck <[email protected]>
> Date: Sat Oct 14 20:18:47 2006 +0200
>
> [WATCHDOG] remove experimental on iTCO_wdt.c
>
> The iTCO_wdt.c driver has been tested enough. So we can
> remove the experimental classification.
>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Andrew Victor <[email protected]>
> Date: Tue Sep 26 17:49:30 2006 +0200
>
> [WATCHDOG] Atmel AT91RM9200 rename.
>
> 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 <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Jean Delvare <[email protected]>
> Date: Thu Sep 28 09:35:27 2006 +0200
>
> [WATCHDOG] includes for sample watchdog program.
>
> Add missing includes to sample watchdog program.
>
> Signed-off-by: Jean Delvare <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Jeff Garzik <[email protected]>
> Date: Tue Oct 10 03:40:44 2006 -0400
>
> [WATCHDOG] watchdog/iTCO_wdt: fix bug related to gcc uninit warning
>
> 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 <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
> Signed-off-by: Andrew Morton <[email protected]>
>
> Author: Wim Van Sebroeck <[email protected]>
> Date: Sun Oct 8 21:05:21 2006 +0200
>
> [WATCHDOG] add ich8 support to iTCO_wdt.c (patch 2)
>
> Add ICH8 support to the iTCO_wdt driver.
>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Arnaud Patard (Rtp) <[email protected]>
> Date: Wed Oct 4 14:18:29 2006 +0200
>
> [WATCHDOG] add ich8 support to iTCO_wdt.c
>
> Add ICH8 support to the iTCO_wdt driver.
>
> Signed-off-by: Arnaud Patard <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Amol Lad <[email protected]>
> Date: Fri Oct 6 13:41:12 2006 -0700
>
> [WATCHDOG] ioremap balanced with iounmap for drivers/char/watchdog/s3c2410_wdt.c
>
> ioremap must be balanced by an iounmap and failing to do so can result
> in a memory leak.
>
> Signed-off-by: Amol Lad <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
> Signed-off-by: Andrew Morton <[email protected]>
>
> Author: Samuel Tardieu <[email protected]>
> Date: Thu Sep 7 11:57:00 2006 +0200
>
> [WATCHDOG] w83697hf/hg WDT driver - Kconfig patch
>
> Update Kconfig for the w83697hf/hg watchdog driver.
>
> Signed-off-by: Samuel Tardieu <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Wim Van Sebroeck <[email protected]>
> Date: Fri Sep 15 17:59:07 2006 +0200
>
> [WATCHDOG] w83697hf/hg WDT driver - autodetect patch
>
> Change the autodetect code so that it is more generic.
>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Samuel Tardieu <[email protected]>
> Date: Thu Sep 7 11:57:00 2006 +0200
>
> [WATCHDOG] w83697hf/hg WDT driver - patch 16
>
> 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 <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Samuel Tardieu <[email protected]>
> Date: Thu Sep 7 11:57:00 2006 +0200
>
> [WATCHDOG] w83697hf/hg WDT driver - patch 15
>
> 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 <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Samuel Tardieu <[email protected]>
> Date: Thu Sep 7 11:57:00 2006 +0200
>
> [WATCHDOG] w83697hf/hg WDT driver - patch 14
>
> 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 <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Samuel Tardieu <[email protected]>
> Date: Thu Sep 7 11:57:00 2006 +0200
>
> [WATCHDOG] w83697hf/hg WDT driver - patch 13
>
> 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 <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Samuel Tardieu <[email protected]>
> Date: Thu Sep 7 11:57:00 2006 +0200
>
> [WATCHDOG] w83697hf/hg WDT driver - patch 12
>
> 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 <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Samuel Tardieu <[email protected]>
> Date: Thu Sep 7 11:57:00 2006 +0200
>
> [WATCHDOG] w83697hf/hg WDT driver - patch 11
>
> 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 <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Samuel Tardieu <[email protected]>
> Date: Thu Sep 7 11:57:00 2006 +0200
>
> [WATCHDOG] w83697hf/hg WDT driver - patch 10
>
> 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 <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Samuel Tardieu <[email protected]>
> Date: Thu Sep 7 11:57:00 2006 +0200
>
> [WATCHDOG] w83697hf/hg WDT driver - patch 9
>
> 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 <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Samuel Tardieu <[email protected]>
> Date: Thu Sep 7 11:57:00 2006 +0200
>
> [WATCHDOG] w83697hf/hg WDT driver - patch 8
>
> 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 <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Samuel Tardieu <[email protected]>
> Date: Thu Sep 7 11:57:00 2006 +0200
>
> [WATCHDOG] w83697hf/hg WDT driver - patch 7
>
> 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 <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Samuel Tardieu <[email protected]>
> Date: Thu Sep 7 11:57:00 2006 +0200
>
> [WATCHDOG] w83697hf/hg WDT driver - patch 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 <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Samuel Tardieu <[email protected]>
> Date: Thu Sep 7 11:57:00 2006 +0200
>
> [WATCHDOG] w83697hf/hg WDT driver - patch 5
>
> 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 <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Samuel Tardieu <[email protected]>
> Date: Thu Sep 7 11:57:00 2006 +0200
>
> [WATCHDOG] w83697hf/hg WDT driver - patch 4
>
> 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 <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Samuel Tardieu <[email protected]>
> Date: Thu Sep 7 11:57:00 2006 +0200
>
> [WATCHDOG] w83697hf/hg WDT driver - patch 3
>
> 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 <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Samuel Tardieu <[email protected]>
> Date: Thu Sep 7 11:57:00 2006 +0200
>
> [WATCHDOG] w83697hf/hg WDT driver - patch 2
>
> 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 <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Samuel Tardieu <[email protected]>
> Date: Thu Sep 7 11:57:00 2006 +0200
>
> [WATCHDOG] w83697hf/hg WDT driver - patch 1
>
> 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 <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Wim Van Sebroeck <[email protected]>
> Date: Wed Sep 13 21:27:29 2006 +0200
>
> [WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()
>
> 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 <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
> Acked-by: Alan Cox <[email protected]>
> Signed-off-by: Andrew Morton <[email protected]>
>
> Author: Wim Van Sebroeck <[email protected]>
> Date: Sat Sep 2 19:04:02 2006 +0200
>
> [WATCHDOG] Kconfig clean up
>
> fixed some more trailing spaces.
>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Wim Van Sebroeck <[email protected]>
> Date: Sat Sep 2 18:50:20 2006 +0200
>
> [WATCHDOG] w836?7hf_wdt spinlock fixes.
>
> 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 <[email protected]>
>
> Author: Wim Van Sebroeck <[email protected]>
> Date: Sat Sep 2 17:59:54 2006 +0200
>
> [WATCHDOG] Kconfig clean-up
>
> * fix typo's according to spellings checker
> * Fix some leading and trailing spaces
>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Marcus Junker <[email protected]>
> Date: Thu Aug 24 17:11:50 2006 +0200
>
> [WATCHDOG] w83697hf WDT driver
>
> New watchdog driver for the Winbond W83697HF chipset.
>
> Signed-off-by: Marcus Junker <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Wim Van Sebroeck <[email protected]>
> Date: Sat Sep 2 20:53:19 2006 +0200
>
> [WATCHDOG] Winbond SMsC37B787 watchdog fixes
>
> * 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 <[email protected]>
>
> Author: Wim Van Sebroeck <[email protected]>
> Date: Sat Sep 2 19:32:26 2006 +0200
>
> [WATCHDOG] Winbond SMsC37B787 - remove trailing whitespace
>
> Remove trailing whitespace.
>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> Author: Sven Anders <[email protected]>
> Date: Thu Aug 24 17:11:50 2006 +0200
>
> [WATCHDOG] Winbond SMsC37B787 watchdog driver
>
> New watchdog driver for the Winbond SMsC37B787 chipset.
>
> Signed-off-by: Sven Anders <[email protected]>
> Signed-off-by: Wim Van Sebroeck <[email protected]>
>
> 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.
>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
