List of patches for this merge window (v3.3 -> v3.4-rc1)
Wim Van Sebroeck
Acked-by Wolfram Sang Acked-by Wolfram Sang Acked-by Linus Walleij Acked-by Wolfram Sang Reviewed-by Mika Westerberg Tested-by Mika Westerberg Tested-by Wouter de Geus Reviewed-by Mika Westerberg Acked-by Arnd Bergmann Acked-by Paul Cercueil Reviewed-by Wolfram Sang Acked-by Wolfram SangAll,
These are the patches that I will sent over for inclusion in Linus his tree tomorrow evening.
Kind regards,
Wim.
commit b92c803ec61de59e6e4ab9b2748d8e633cec3f08
Author: Wim Van Sebroeck <[email protected]> Date: Fri Mar 23 11:48:22 2012 +0100
watchdog: txx9wdt: fix timeout
timeout should be an unsigned int.
Set the timeout value properly in the watchdog_device struct so that we don't get an faulty values for the WDIOC_GETTIMEOUT ioctl call. Add check to see that timeout is a valid parameter after it is loaded as a module.
commit d6245842384c9289d4f778555fd8be729e0b0306
Author: Axel Lin <[email protected]> Date: Fri Mar 16 11:53:53 2012 +0800
watchdog: Convert txx9wdt driver to watchdog framework
This patch converts txx9wdt driver to watchdog framework. Also use devm_* APIs to save a few error handling code.
commit dddbc6a0513b25c80e73e14ee704186deedc0d00
Author: Wim Van Sebroeck <[email protected]> Date: Thu Mar 22 20:42:16 2012 +0100
watchdog: coh901327_wdt.c: fix timeout
Set the timeout value properly so that we don't get faulty values for the WDIOC_GETTIMEOUT iotcl. 'margin' should be an unsigned int. Also add a check to see if margin is a valid parameter after it is loaded as a module.
commit 15b25701b282bd761a82c6508529b2145744075f
Author: Linus Walleij <[email protected]> Date: Fri Mar 16 09:14:12 2012 +0100
watchdog: coh901327: convert to use watchdog core
This converts the COH901327 watchdog to use the watchdog core. I followed Wolframs document, looked at some other drivers and tested it on the U300.
commit fd7b673c92731fc6c0b1e999adfd87b6762ee797
Author: Viresh Kumar <[email protected]> Date: Fri Mar 16 09:14:00 2012 +0100
watchdog: Add support for WDIOC_GETTIMELEFT IOCTL in watchdog core
This patch adds support for WDIOC_GETTIMELEFT IOCTL in watchdog core. So, there is another function pointer added to struct watchdog_ops, which can be passed by drivers to support this IOCTL.
Related documentation is updated too.
commit 2ca1606359695cc7ce371c7829c4082d9095fc06
Author: Wim Van Sebroeck <[email protected]> Date: Thu Mar 22 09:37:10 2012 +0100
watchdog: ep93xx_wdt: timeout is an unsigned int value.
the timeout is a positive thus unsigned int value. Also re-add the comment about the actual heartbeat.
commit 59dcf1eb1a4b15610c68a4dbb7430d61a65f4af3
Author: Mika Westerberg <[email protected]> Date: Sun Mar 18 13:09:52 2012 +0200
watchdog: ep93xx_wdt: Fix timeout after conversion to watchdog core
After the conversion of this driver to the watchdog core, I noticed that we miss setting the initial timeout of the wdt device.
This results in a failure of the WDIOC_GETTIMEOUT ioctl call.
commit e12a679ddee4eb5ab2f99f7cf129355461e142c0
Author: H Hartley Sweeten <[email protected]> Date: Wed Mar 14 10:31:50 2012 -0700
watchdog: Convert ep93xx driver to watchdog core
Convert the ep93xx_wdt driver to the watchdog framework API.
Also, use the dev_<fmt> functions instead of pr_<fmt> for logging.
commit fb35a5ad5b4b2c3806b52b0159f4d5a0ad205c0f
Author: Viresh Kumar <[email protected]> Date: Mon Mar 12 09:52:15 2012 +0530
watchdog: sp805: Use devm routines
sp805 driver currently uses normal kzalloc, ioremap, etc routines. This patch replaces these routines with devm_kzalloc and devm_request_mem_region etc, so that we don't need to handle freeing of resources for error cases and module removal routine.
commit d2e8919bcfb63b662945d0e5cb9338f0f2229d10
Author: Viresh Kumar <[email protected]> Date: Mon Mar 12 09:52:14 2012 +0530
watchdog: sp805: replace readl/writel with lighter _relaxed variants
readl/writel versions for ARM contain memory barrier instruction for synchronizing DMA buffers. These are not required at least on this module. So use lighter _relaxed variants.
commit bfae14b679063d85f10579bbfd532db58b122e29
Author: Viresh Kumar <[email protected]> Date: Mon Mar 12 09:52:13 2012 +0530
watchdog: sp805: Fix documentation style comment
@ was missing before variables names, in their description. Also adev is mentioned as dev in comment. Fix both these issues.
commit 60a1aa50b2ca142a91455203ca2aa09502eddd20
Author: Viresh Kumar <[email protected]> Date: Mon Mar 12 09:52:00 2012 +0530
watchdog: mpcore_wdt: Allow platform_get_irq() to fail
irq is not necessary for mpcore wdt. Don't return error if it is not passed. But if it is passed, then request_irq must pass.
commit 75f5a536c0b605b9b8406325f51f62f67141973e
Author: Viresh Kumar <[email protected]> Date: Mon Mar 12 09:51:59 2012 +0530
watchdog: mpcore_wdt: Use devm routines
mpcore_wdt driver currently uses normal kzalloc, request_irq, ioremap, etc routines. This patch replaces these routines with devm_kzalloc and devm_request_mem_region etc, so that we don't need to handle freeing of resources for error cases and module removal routine.
Also, request_irq is moved before registering misc device, so that we are ready for irq as soon as device is registered.
commit aa065770f55f44ed24f0a9b76ec6e2135264d43b
Author: Viresh Kumar <[email protected]> Date: Mon Mar 12 09:51:58 2012 +0530
watchdog: mpcore_wdt: Rename dev to pdev for pointing to struct platform_device
Pointer to struct platform_device is named as dev, which makes it confusing when we write statements like dev->dev to access struct device within it.
This patch renames such names to pdev.
commit 38c484fa136f66224694af298f80e96bf4072700
Author: Jan Beulich <[email protected]> Date: Mon Mar 19 09:32:28 2012 +0000
watchdog: xen: don't clear is_active when xen_wdt_stop() failed
xen_wdt_release() shouldn't clear is_active even when the watchdog didn't get stopped (which by itself shouldn't happen, but let's return a proper error in this case rather than adding a BUG() upon hypercall failure).
commit 83448bf7867917d5fd104e65275d8e153f3293a8
Author: Jan Beulich <[email protected]> Date: Mon Mar 19 09:30:33 2012 +0000
watchdog: xen: don't unconditionally enable the watchdog during resume
This was found to be a problem particularly after guest migration.
commit ccd4144dd41c32a284a5b040f87aaefed0361a21
Author: Jaehoon Chung <[email protected]> Date: Fri Mar 16 15:27:21 2012 +0900
watchdog: fix compiler error for missing parenthesis
Joe's patch(watchdog: Use pr_<fmt> and pr_<level>) missed parenthesis in s3c2410_wdt.c.
commit 697b41e4d4b20b8d8564f5501927b0ed07153990
Author: Wim Van Sebroeck <[email protected]> Date: Tue Mar 13 09:06:12 2012 +0100
watchdog: ep93xx_wdt.c: fix platform probe
Fix the device/driver init so that the misc_register happens as last (since this opens userspace access to the device).
commit 3e0113a896803f792ffdf19b016578420824573f
Author: H Hartley Sweeten <[email protected]> Date: Tue Mar 13 09:48:16 2012 +1100
watchdog: ep93xx: Convert the watchdog driver into a platform device.
Convert the ep93xx watchdog driver into a platform device and remove it's dependency on <mach/hardware.h>.
commit 0197c1c49ef1ff386b2ebb6d3b0fc85a8e174b5c
Author: Wim Van Sebroeck <[email protected]> Date: Wed Feb 29 20:20:58 2012 +0100
watchdog: fix set_timeout operations
Since we changed the behaviour of the set_timeout operation in the watchdog API, we need to change the allready converted drivers so that they update the timeout field at the end of the set_timeout operation.
commit b10f7c12e051762b84457f6d38d4b71acbf76a02
Author: Hans de Goede <[email protected]> Date: Mon Sep 12 11:56:59 2011 +0200
watchdog: watchdog_dev: Let the driver update the timeout field on set_timeout success
When a set_timeout operation succeeds this does not necessarily mean that the exact timeout requested has been achieved, because the watchdog does not necessarily have a 1 second resolution. So rather then have the core set the timeout member of the watchdog_device struct to the exact requested value, instead the driver should set it to the actually achieved timeout value.
commit a5132cafc0a739107e51494b9054c0066802b8cd
Author: Alan Cox <[email protected]> Date: Tue Feb 28 22:48:11 2012 +0000
watchdog: softdog: convert to watchdog core
Convert softdog.c to the new watchdog API.
commit a0f3683365513c052d21991fe75eccd95aba9d34
Author: Axel Lin <[email protected]> Date: Wed Feb 8 14:24:10 2012 +0800
watchdog: Convert max63xx_wdt driver to watchdog framework
This patch converts max63xx_wdt driver to watchdog framework. Also use devm_* APIs to save a few error handling code.
commit 6b1e83869d13a6b5ce9ceb4b8f79a7538d467dee
Author: Wolfram Sang <[email protected]> Date: Thu Feb 2 18:48:11 2012 +0100
watchdog: pnx4008: convert driver to use the watchdog framework
Make this driver a user of the watchdog framework and remove parts now handled by the core. Tested on a custom lpc32xx-board.
commit 2e51d90f4db6c94bc75c6ff22e959237f3cc27ba
Author: Axel Lin <[email protected]> Date: Mon Jan 23 15:26:59 2012 +0800
watchdog: Convert wm8350_wdt driver to watchdog core
This patch converts wm8350_wdt driver to use watchdog core APIs.
commit 85f6df1492ff8b620cf601a1509520d2b89858dd
Author: Axel Lin <[email protected]> Date: Thu Jan 26 18:10:45 2012 +0800
watchdog: Convert jz4740_wdt driver to watchdog core
This patch converts jz4740_wdt driver to use watchdog core APIs. Also use devm_* APIs to save a few error handling code.
commit 86a1e1896c2710402e29a875d8d830244274244d
Author: Wim Van Sebroeck <[email protected]> Date: Mon Mar 5 16:51:11 2012 +0100
watchdog: nowayout is bool
nowayout is actually a boolean value.
So make it bool for all watchdog device drivers.
commit 27c766aaacb265d625dc634bf7903f7f9fd0c697
Author: Joe Perches <[email protected]> Date: Wed Feb 15 15:06:19 2012 -0800
watchdog: Use pr_<fmt> and pr_<level>
Use the current logging styles.
Make sure all output has a prefix.
Add missing newlines.
Remove now unnecessary PFX, NAME, and miscellaneous other #defines. Coalesce formats.
commit 7cbc353540c31ffaf65ad44d89b955be0f1d04dc
Author: Wolfram Sang <[email protected]> Date: Thu Feb 2 18:48:09 2012 +0100
watchdog: pnx4008: don't use __raw_-accessors
__raw_readl/__raw_writel are not meant for drivers [1].
[1] http://thread.gmane.org/gmane.linux.ports.arm.kernel/117626
commit 19f505f09c60d637c695a8e8c4768570e2309631
Author: Wolfram Sang <[email protected]> Date: Thu Feb 2 18:48:08 2012 +0100
watchdog: pnx4008: cleanup resource handling using managed devices
The resource handling in this driver was flaky: IO_ADDRESS instead of ioremap (and no unmapping), an unneeded static resource, no central exit path for error cases. Fix this by converting the driver to use managed resources. Also use dev_*-messages instead of pr_* while we are here.
commit 16ac4abe0d0ea0a8d42d6a2a7de2a4a00bbf5b40
Author: Viresh Kumar <[email protected]> Date: Fri Feb 24 15:12:37 2012 +0530
watchdog: sp805_wdt: add pm callbacks to support standby/S2R/hibernation
commit 474ef121008a2992bcc496930166ced89bda23d2
Author: Oskar Schirmer <[email protected]> Date: Thu Feb 16 12:17:45 2012 +0000
watchdog: make imx2_wdt report boot status correctly
Ioctl WDIOC_GETBOOTSTATUS is supposed to return some information on why the system did (re)boot recently, value WDIOF_CARDRESET being used to indicate watchdog induced reboot.
Up to now, imx2_wdt did not provide a value here, always returning zero to indicate normal boot.
Do evaluate the IMX Watchdog Reset Status Register and produce WDIOF_CARDRESET with WDIOC_GETBOOTSTATUS in case of a watchdog induced reset.
commit 5ba927e8ca3f73acb98f417d126652e26ab40a57
Author: Wolfram Sang <[email protected]> Date: Mon Jan 23 20:17:38 2012 +0100
watchdog: documentation: remove index-file
The 00-index file in the watchdog directory is, like many others, outdated (conversion-howto is missing) and doesn't contain worthwhile additional information. As it seems to be a maintenance burden without much gain, simply remove it.
Diffstat:
Documentation/watchdog/00-INDEX | 19 b/Documentation/watchdog/convert_drivers_to_kernel_api.txt | 4 b/Documentation/watchdog/watchdog-kernel-api.txt | 11 b/arch/arm/mach-ep93xx/core.c | 15 b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 1 b/drivers/char/ipmi/ipmi_watchdog.c | 4 b/drivers/hwmon/fschmd.c | 4 b/drivers/hwmon/w83793.c | 4 b/drivers/staging/mei/wd.c | 1 b/drivers/watchdog/Kconfig | 8 b/drivers/watchdog/acquirewdt.c | 28 - b/drivers/watchdog/advantechwdt.c | 34 - b/drivers/watchdog/alim1535_wdt.c | 25 - b/drivers/watchdog/alim7101_wdt.c | 55 -- b/drivers/watchdog/ar7_wdt.c | 38 - b/drivers/watchdog/at32ap700x_wdt.c | 4 b/drivers/watchdog/at91rm9200_wdt.c | 14 b/drivers/watchdog/at91sam9_wdt.c | 12 b/drivers/watchdog/ath79_wdt.c | 9 b/drivers/watchdog/bcm47xx_wdt.c | 18 b/drivers/watchdog/bcm63xx_wdt.c | 11 b/drivers/watchdog/bfin_wdt.c | 31 - b/drivers/watchdog/booke_wdt.c | 14 b/drivers/watchdog/coh901327_wdt.c | 206 +++------- b/drivers/watchdog/cpu5wdt.c | 19 b/drivers/watchdog/cpwd.c | 20 b/drivers/watchdog/dw_wdt.c | 7 b/drivers/watchdog/ep93xx_wdt.c | 251 ++++-------- b/drivers/watchdog/eurotechwdt.c | 32 - b/drivers/watchdog/f71808e_wdt.c | 40 - b/drivers/watchdog/gef_wdt.c | 15 b/drivers/watchdog/geodewdt.c | 9 b/drivers/watchdog/hpwdt.c | 31 - b/drivers/watchdog/i6300esb.c | 39 - b/drivers/watchdog/iTCO_vendor_support.c | 7 b/drivers/watchdog/iTCO_wdt.c | 59 +- b/drivers/watchdog/ib700wdt.c | 26 - b/drivers/watchdog/ibmasr.c | 18 b/drivers/watchdog/imx2_wdt.c | 14 b/drivers/watchdog/indydog.c | 24 - b/drivers/watchdog/intel_scu_watchdog.c | 71 +-- b/drivers/watchdog/intel_scu_watchdog.h | 1 b/drivers/watchdog/iop_wdt.c | 15 b/drivers/watchdog/it8712f_wdt.c | 39 - b/drivers/watchdog/it87_wdt.c | 46 -- b/drivers/watchdog/ixp2000_wdt.c | 11 b/drivers/watchdog/ixp4xx_wdt.c | 15 b/drivers/watchdog/jz4740_wdt.c | 265 ++++--------- b/drivers/watchdog/ks8695_wdt.c | 10 b/drivers/watchdog/lantiq_wdt.c | 8 b/drivers/watchdog/m54xx_wdt.c | 14 b/drivers/watchdog/machzwd.c | 37 - b/drivers/watchdog/max63xx_wdt.c | 194 +-------- b/drivers/watchdog/mixcomwd.c | 29 - b/drivers/watchdog/mpc8xxx_wdt.c | 17 b/drivers/watchdog/mpcore_wdt.c | 111 ++--- b/drivers/watchdog/mv64x60_wdt.c | 15 b/drivers/watchdog/nuc900_wdt.c | 4 b/drivers/watchdog/nv_tco.c | 46 +- b/drivers/watchdog/octeon-wdt-main.c | 16 b/drivers/watchdog/of_xilinx_wdt.c | 41 -- b/drivers/watchdog/omap_wdt.c | 4 b/drivers/watchdog/orion_wdt.c | 15 b/drivers/watchdog/pc87413_wdt.c | 57 +- b/drivers/watchdog/pcwd.c | 127 ++---- b/drivers/watchdog/pcwd_pci.c | 113 ++--- b/drivers/watchdog/pcwd_usb.c | 78 +-- b/drivers/watchdog/pika_wdt.c | 23 - b/drivers/watchdog/pnx4008_wdt.c | 263 +++--------- b/drivers/watchdog/pnx833x_wdt.c | 30 - b/drivers/watchdog/rc32434_wdt.c | 33 - b/drivers/watchdog/riowd.c | 10 b/drivers/watchdog/s3c2410_wdt.c | 31 - b/drivers/watchdog/sa1100_wdt.c | 10 b/drivers/watchdog/sb_wdog.c | 28 - b/drivers/watchdog/sbc60xxwdt.c | 41 -- b/drivers/watchdog/sbc7240_wdt.c | 44 -- b/drivers/watchdog/sbc8360.c | 24 - b/drivers/watchdog/sbc_epx_c3.c | 23 - b/drivers/watchdog/sbc_fitpc2_wdt.c | 13 b/drivers/watchdog/sc1200wdt.c | 34 - b/drivers/watchdog/sc520_wdt.c | 39 - b/drivers/watchdog/sch311x_wdt.c | 17 b/drivers/watchdog/scx200_wdt.c | 25 - b/drivers/watchdog/shwdt.c | 19 b/drivers/watchdog/smsc37b787_wdt.c | 42 -- b/drivers/watchdog/softdog.c | 211 ++-------- b/drivers/watchdog/sp5100_tco.c | 35 - b/drivers/watchdog/sp805_wdt.c | 111 +++-- b/drivers/watchdog/stmp3xxx_wdt.c | 8 b/drivers/watchdog/ts72xx_wdt.c | 4 b/drivers/watchdog/twl4030_wdt.c | 4 b/drivers/watchdog/txx9wdt.c | 184 ++------- b/drivers/watchdog/via_wdt.c | 13 b/drivers/watchdog/w83627hf_wdt.c | 38 - b/drivers/watchdog/w83697hf_wdt.c | 43 -- b/drivers/watchdog/w83697ug_wdt.c | 38 - b/drivers/watchdog/w83877f_wdt.c | 40 - b/drivers/watchdog/w83977f_wdt.c | 38 - b/drivers/watchdog/wafer5823wdt.c | 34 - b/drivers/watchdog/watchdog_core.c | 4 b/drivers/watchdog/watchdog_dev.c | 16 b/drivers/watchdog/wdrtas.c | 71 +-- b/drivers/watchdog/wdt.c | 55 +- b/drivers/watchdog/wdt285.c | 12 b/drivers/watchdog/wdt977.c | 40 - b/drivers/watchdog/wdt_pci.c | 70 +-- b/drivers/watchdog/wm831x_wdt.c | 6 b/drivers/watchdog/wm8350_wdt.c | 223 ++-------- b/drivers/watchdog/xen_wdt.c | 42 +- b/include/linux/watchdog.h | 4 111 files changed, 1829 insertions(+), 2844 deletions(-)
Quoted 3 lines · Wim Van Sebroeck
All,
These are the patches that I will sent over for inclusion in Linus his tree tomorrow evening.
I was looking for the 'Add multiple device support' patch series
(http://www.spinics.net/lists/linux-watchdog/msg01071.html)
to be included as our driver under drivers/staging/mei required them to work properly.
We expose additional interface
Thanks
Tomas
Quoted 566 lines
Kind regards,
Wim.commit
b92c803ec61de59e6e4ab9b2748d8e633cec3f08
Author: Wim Van Sebroeck <[email protected]>
Date: Fri Mar 23 11:48:22 2012 +0100watchdog: txx9wdt: fix timeout
timeout should be an unsigned int.
Set the timeout value properly in thewatchdog_devicestruct so that we don't get an faulty values for theWDIOC_GETTIMEOUTioctl call. Add check to see that timeout is a valid parameter after it is loaded as a module.Signed-off-by Wim Van Sebroeck <[email protected]>Acked-by Wolfram Sang <[email protected]>commit
d6245842384c9289d4f778555fd8be729e0b0306
Author: Axel Lin <[email protected]>
Date: Fri Mar 16 11:53:53 2012 +0800watchdog: Convert txx9wdt driver to watchdog framework
This patch converts txx9wdt driver to watchdog framework. Also use devm_* APIs to save a few error handling code.
Signed-off-by Axel Lin <[email protected]>Acked-by Wolfram Sang <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>commit
dddbc6a0513b25c80e73e14ee704186deedc0d00
Author: Wim Van Sebroeck <[email protected]>
Date: Thu Mar 22 20:42:16 2012 +0100watchdog:
coh901327_wdt.c: fix timeoutSet the timeout value properly so that we don't get faulty values for the
WDIOC_GETTIMEOUTiotcl. 'margin' should be an unsigned int. Also add a check to see if margin is a valid parameter after it is loaded as a module.Signed-off-by Wim Van Sebroeck <[email protected]>Acked-by Linus Walleij <[email protected]>Acked-by Wolfram Sang <[email protected]>commit
15b25701b282bd761a82c6508529b2145744075f
Author: Linus Walleij <[email protected]>
Date: Fri Mar 16 09:14:12 2012 +0100watchdog: coh901327: convert to use watchdog core
This converts the COH901327 watchdog to use the watchdog core. I followed Wolframs document, looked at some other drivers and tested it on the U300.
Signed-off-by Linus Walleij <[email protected]>Cc Wolfram Sang <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>commit
fd7b673c92731fc6c0b1e999adfd87b6762ee797
Author: Viresh Kumar <[email protected]>
Date: Fri Mar 16 09:14:00 2012 +0100watchdog: Add support for
WDIOC_GETTIMELEFTIOCTL in watchdog coreThis patch adds support for
WDIOC_GETTIMELEFTIOCTL in watchdog core. So, there is another function pointer added to structwatchdog_ops, which can be passed by drivers to support this IOCTL.Related documentation is updated too.
Signed-off-by Viresh Kumar <[email protected]>Signed-off-by Linus Walleij <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>commit
2ca1606359695cc7ce371c7829c4082d9095fc06
Author: Wim Van Sebroeck <[email protected]>
Date: Thu Mar 22 09:37:10 2012 +0100watchdog:
ep93xx_wdt: timeout is an unsigned int value.the timeout is a positive thus unsigned int value. Also re-add the comment about the actual heartbeat.
Signed-off-by Wim Van Sebroeck <[email protected]>commit
59dcf1eb1a4b15610c68a4dbb7430d61a65f4af3
Author: Mika Westerberg <[email protected]>
Date: Sun Mar 18 13:09:52 2012 +0200watchdog:
ep93xx_wdt: Fix timeout after conversion to watchdog coreAfter the conversion of this driver to the watchdog core, I noticed that we miss setting the initial timeout of the wdt device.
This results in a failure of theWDIOC_GETTIMEOUTioctl call.Reviewed-by Mika Westerberg <[email protected]>Tested-by Mika Westerberg <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>commit
e12a679ddee4eb5ab2f99f7cf129355461e142c0
Author: H Hartley Sweeten <[email protected]>
Date: Wed Mar 14 10:31:50 2012 -0700watchdog: Convert ep93xx driver to watchdog core
Convert the
ep93xx_wdtdriver to the watchdog framework API.Also, use the dev_<fmt> functions instead of pr_<fmt> for logging.
Signed-off-by H Hartley Sweeten <[email protected]>Cc Ryan Mallon <[email protected]>Cc Mika Westerberg <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>commit
fb35a5ad5b4b2c3806b52b0159f4d5a0ad205c0f
Author: Viresh Kumar <[email protected]>
Date: Mon Mar 12 09:52:15 2012 +0530watchdog: sp805: Use devm routines
sp805 driver currently uses normal kzalloc, ioremap, etc routines. This patch replaces these routines with
devm_kzallocanddevm_request_mem_regionetc, so that we don't need to handle freeing of resources for error cases and module removal routine.Signed-off-by Viresh Kumar <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>commit
d2e8919bcfb63b662945d0e5cb9338f0f2229d10
Author: Viresh Kumar <[email protected]>
Date: Mon Mar 12 09:52:14 2012 +0530watchdog: sp805: replace readl/writel with lighter
_relaxedvariantsreadl/writel versions for ARM contain memory barrier instruction for synchronizing DMA buffers. These are not required at least on this module. So use lighter
_relaxedvariants.Signed-off-by Viresh Kumar <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>commit
bfae14b679063d85f10579bbfd532db58b122e29
Author: Viresh Kumar <[email protected]>
Date: Mon Mar 12 09:52:13 2012 +0530watchdog: sp805: Fix documentation style comment
@ was missing before variables names, in their description. Also adev is mentioned as dev in comment. Fix both these issues.
Signed-off-by Viresh Kumar <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>commit
60a1aa50b2ca142a91455203ca2aa09502eddd20
Author: Viresh Kumar <[email protected]>
Date: Mon Mar 12 09:52:00 2012 +0530watchdog:
mpcore_wdt: Allowplatform_get_irq()to failirq is not necessary for mpcore wdt. Don't return error if it is not passed. But if it is passed, then
request_irqmust pass.Signed-off-by Viresh Kumar <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>commit
75f5a536c0b605b9b8406325f51f62f67141973e
Author: Viresh Kumar <[email protected]>
Date: Mon Mar 12 09:51:59 2012 +0530watchdog:
mpcore_wdt: Use devm routinesmpcore_wdt driver currently uses normal kzalloc,
request_irq, ioremap, etc routines. This patch replaces these routines withdevm_kzallocanddevm_request_mem_regionetc, so that we don't need to handle freeing of resources for error cases and module removal routine.Also,
request_irqis moved before registering misc device, so that we are ready for irq as soon as device is registered.Signed-off-by Viresh Kumar <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>commit
aa065770f55f44ed24f0a9b76ec6e2135264d43b
Author: Viresh Kumar <[email protected]>
Date: Mon Mar 12 09:51:58 2012 +0530watchdog:
mpcore_wdt: Rename dev to pdev for pointing to structplatform_devicePointer to struct
platform_deviceis named as dev, which makes it confusing when we write statements likedev->devto access struct device within it.This patch renames such names to pdev.
Signed-off-by Viresh Kumar <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>commit
38c484fa136f66224694af298f80e96bf4072700
Author: Jan Beulich <[email protected]>
Date: Mon Mar 19 09:32:28 2012 +0000watchdog: xen: don't clear
is_activewhenxen_wdt_stop()failedxen_wdt_release() shouldn't clear
is_activeeven when the watchdog didn't get stopped (which by itself shouldn't happen, but let's return a proper error in this case rather than adding aBUG()upon hypercall failure).Signed-off-by Jan Beulich <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>commit
83448bf7867917d5fd104e65275d8e153f3293a8
Author: Jan Beulich <[email protected]>
Date: Mon Mar 19 09:30:33 2012 +0000watchdog: xen: don't unconditionally enable the watchdog during resume
This was found to be a problem particularly after guest migration.
Signed-off-by Jan Beulich <[email protected]>Reported-by Wouter de Geus <[email protected]>Reported-by Ian Campbell <[email protected]>Tested-by Wouter de Geus <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>commit
ccd4144dd41c32a284a5b040f87aaefed0361a21
Author: Jaehoon Chung <[email protected]>
Date: Fri Mar 16 15:27:21 2012 +0900watchdog: fix compiler error for missing parenthesis
Joe's
patch(watchdog: Use pr_<fmt> and pr_<level>)missed parenthesis ins3c2410_wdt.c.Signed-off-by Jaehoon Chung <[email protected]>Signed-off-by Kyungmin Park <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>commit
697b41e4d4b20b8d8564f5501927b0ed07153990
Author: Wim Van Sebroeck <[email protected]>
Date: Tue Mar 13 09:06:12 2012 +0100watchdog:
ep93xx_wdt.c: fix platform probeFix the device/driver init so that the
misc_registerhappens as last (since this opens userspace access to the device).Signed-off-by Wim Van Sebroeck <[email protected]>commit
3e0113a896803f792ffdf19b016578420824573f
Author: H Hartley Sweeten <[email protected]>
Date: Tue Mar 13 09:48:16 2012 +1100watchdog: ep93xx: Convert the watchdog driver into a platform device.
Convert the ep93xx watchdog driver into a platform device and remove it's dependency on <
mach/hardware.h>.Signed-off-by H Hartley Sweeten <[email protected]>Signed-off-by Ryan Mallon <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>Reviewed-by Mika Westerberg <[email protected]>Acked-by Arnd Bergmann <[email protected]>commit
0197c1c49ef1ff386b2ebb6d3b0fc85a8e174b5c
Author: Wim Van Sebroeck <[email protected]>
Date: Wed Feb 29 20:20:58 2012 +0100watchdog: fix
set_timeoutoperationsSince we changed the behaviour of the
set_timeoutoperation in the watchdog API, we need to change the allready converted drivers so that they update the timeout field at the end of theset_timeoutoperation.Signed-off-by Wim Van Sebroeck <[email protected]>commit
b10f7c12e051762b84457f6d38d4b71acbf76a02
Author: Hans de Goede <[email protected]>
Date: Mon Sep 12 11:56:59 2011 +0200watchdog:
watchdog_dev: Let the driver update the timeout field onset_timeoutsuccessWhen a
set_timeoutoperation succeeds this does not necessarily mean that the exact timeout requested has been achieved, because the watchdog does not necessarily have a 1 second resolution. So rather then have the core set the timeout member of thewatchdog_devicestruct to the exact requested value, instead the driver should set it to the actually achieved timeout value.Signed-off-by Hans de Goede <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>commit
a5132cafc0a739107e51494b9054c0066802b8cd
Author: Alan Cox <[email protected]>
Date: Tue Feb 28 22:48:11 2012 +0000watchdog: softdog: convert to watchdog core
Convert
softdog.cto the new watchdog API.Signed-off-by Alan Cox <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>commit
a0f3683365513c052d21991fe75eccd95aba9d34
Author: Axel Lin <[email protected]>
Date: Wed Feb 8 14:24:10 2012 +0800watchdog: Convert
max63xx_wdtdriver to watchdog frameworkThis patch converts
max63xx_wdtdriver to watchdog framework. Also use devm_* APIs to save a few error handling code.Signed-off-by Axel Lin <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>commit
6b1e83869d13a6b5ce9ceb4b8f79a7538d467dee
Author: Wolfram Sang <[email protected]>
Date: Thu Feb 2 18:48:11 2012 +0100watchdog: pnx4008: convert driver to use the watchdog framework
Make this driver a user of the watchdog framework and remove parts now handled by the core. Tested on a custom lpc32xx-board.
[[email protected]: Added set_timeout operation]Signed-off-by Wolfram Sang <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>commit
2e51d90f4db6c94bc75c6ff22e959237f3cc27ba
Author: Axel Lin <[email protected]>
Date: Mon Jan 23 15:26:59 2012 +0800watchdog: Convert
wm8350_wdtdriver to watchdog coreThis patch converts
wm8350_wdtdriver to use watchdog core APIs.Signed-off-by Axel Lin <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>commit
85f6df1492ff8b620cf601a1509520d2b89858dd
Author: Axel Lin <[email protected]>
Date: Thu Jan 26 18:10:45 2012 +0800watchdog: Convert
jz4740_wdtdriver to watchdog coreThis patch converts
jz4740_wdtdriver to use watchdog core APIs. Also use devm_* APIs to save a few error handling code.Signed-off-by Axel Lin <[email protected]>Acked-by Paul Cercueil <[email protected]>Reviewed-by Wolfram Sang <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>commit
86a1e1896c2710402e29a875d8d830244274244d
Author: Wim Van Sebroeck <[email protected]>
Date: Mon Mar 5 16:51:11 2012 +0100watchdog: nowayout is bool
nowayout is actually a boolean value.
So make it bool for all watchdog device drivers.Signed-off-by Wim Van Sebroeck <[email protected]>commit
27c766aaacb265d625dc634bf7903f7f9fd0c697
Author: Joe Perches <[email protected]>
Date: Wed Feb 15 15:06:19 2012 -0800watchdog: Use pr_<fmt> and pr_<level>
Use the current logging styles.
Make sure all output has a prefix.
Add missing newlines.
Remove now unnecessary PFX, NAME, and miscellaneous other #defines. Coalesce formats.Signed-off-by Joe Perches <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>commit
7cbc353540c31ffaf65ad44d89b955be0f1d04dc
Author: Wolfram Sang <[email protected]>
Date: Thu Feb 2 18:48:09 2012 +0100watchdog: pnx4008: don't use __raw_-accessors
__raw_readl/__raw_writel are not meant for drivers [1].
[1] http://thread.gmane.org/gmane.linux.ports.arm.kernel/117626
Signed-off-by Wolfram Sang <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>commit
19f505f09c60d637c695a8e8c4768570e2309631
Author: Wolfram Sang <[email protected]>
Date: Thu Feb 2 18:48:08 2012 +0100watchdog: pnx4008: cleanup resource handling using managed devices
The resource handling in this driver was flaky:
IO_ADDRESSinstead of ioremap (and no unmapping), an unneeded static resource, no central exit path for error cases. Fix this by converting the driver to use managed resources. Also use dev_*-messages instead of pr_* while we are here.Signed-off-by Wolfram Sang <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>commit
16ac4abe0d0ea0a8d42d6a2a7de2a4a00bbf5b40
Author: Viresh Kumar <[email protected]>
Date: Fri Feb 24 15:12:37 2012 +0530watchdog:
sp805_wdt: add pm callbacks to support standby/S2R/hibernationSigned-off-by Viresh Kumar <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>commit
474ef121008a2992bcc496930166ced89bda23d2
Author: Oskar Schirmer <[email protected]>
Date: Thu Feb 16 12:17:45 2012 +0000watchdog: make
imx2_wdtreport boot status correctlyIoctl
WDIOC_GETBOOTSTATUSis supposed to return some information on why the system did (re)boot recently, valueWDIOF_CARDRESETbeing used to indicate watchdog induced reboot.Up to now,
imx2_wdtdid not provide a value here, always returning zero to indicate normal boot.Do evaluate the IMX Watchdog Reset Status Register and produce
WDIOF_CARDRESETwithWDIOC_GETBOOTSTATUSin case of a watchdog induced reset.Signed-off-by Oskar Schirmer <[email protected]>Acked-by Wolfram Sang <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>commit
5ba927e8ca3f73acb98f417d126652e26ab40a57
Author: Wolfram Sang <[email protected]>
Date: Mon Jan 23 20:17:38 2012 +0100watchdog: documentation: remove index-file
The 00-index file in the watchdog directory is, like many others, outdated (conversion-howto is missing) and doesn't contain worthwhile additional information. As it seems to be a maintenance burden without much gain, simply remove it.
Signed-off-by Wolfram Sang <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>Diffstat:
Documentation/watchdog/00-INDEX | 19b/Documentation/watchdog/convert_drivers_to_kernel_api.txt| 4b/Documentation/watchdog/watchdog-kernel-api.txt| 11b/arch/arm/mach-ep93xx/core.c| 15b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h| 1b/drivers/char/ipmi/ipmi_watchdog.c| 4b/drivers/hwmon/fschmd.c| 4b/drivers/hwmon/w83793.c| 4b/drivers/staging/mei/wd.c| 1 b/drivers/watchdog/Kconfig | 8b/drivers/watchdog/acquirewdt.c| 28 -b/drivers/watchdog/advantechwdt.c | 34 - b/drivers/watchdog/alim1535_wdt.c | 25 - b/drivers/watchdog/alim7101_wdt.c | 55 --b/drivers/watchdog/ar7_wdt.c | 38 -
b/drivers/watchdog/at32ap700x_wdt.c| 4b/drivers/watchdog/at91rm9200_wdt.c| 14b/drivers/watchdog/at91sam9_wdt.c| 12b/drivers/watchdog/ath79_wdt.c| 9b/drivers/watchdog/bcm47xx_wdt.c| 18b/drivers/watchdog/bcm63xx_wdt.c| 11b/drivers/watchdog/bfin_wdt.c| 31 -b/drivers/watchdog/booke_wdt.c| 14b/drivers/watchdog/coh901327_wdt.c| 206 +++-------b/drivers/watchdog/cpu5wdt.c| 19b/drivers/watchdog/cpwd.c| 20b/drivers/watchdog/dw_wdt.c| 7b/drivers/watchdog/ep93xx_wdt.c| 251 ++++--------b/drivers/watchdog/eurotechwdt.c| 32 -b/drivers/watchdog/f71808e_wdt.c| 40 -b/drivers/watchdog/gef_wdt.c| 15b/drivers/watchdog/geodewdt.c| 9b/drivers/watchdog/hpwdt.c| 31 -b/drivers/watchdog/i6300esb.c| 39 -b/drivers/watchdog/iTCO_vendor_support.c| 7b/drivers/watchdog/iTCO_wdt.c| 59 +-b/drivers/watchdog/ib700wdt.c| 26 -b/drivers/watchdog/ibmasr.c| 18b/drivers/watchdog/imx2_wdt.c| 14b/drivers/watchdog/indydog.c| 24 -b/drivers/watchdog/intel_scu_watchdog.c| 71 +--b/drivers/watchdog/intel_scu_watchdog.h| 1b/drivers/watchdog/iop_wdt.c| 15b/drivers/watchdog/it8712f_wdt.c| 39 -b/drivers/watchdog/it87_wdt.c| 46 --b/drivers/watchdog/ixp2000_wdt.c| 11b/drivers/watchdog/ixp4xx_wdt.c | 15 b/drivers/watchdog/jz4740_wdt.c | 265 ++++--------- b/drivers/watchdog/ks8695_wdt.c | 10 b/drivers/watchdog/lantiq_wdt.c | 8 b/drivers/watchdog/m54xx_wdt.c | 14b/drivers/watchdog/machzwd.c | 37 -
b/drivers/watchdog/max63xx_wdt.c| 194 +--------b/drivers/watchdog/mixcomwd.c| 29 -b/drivers/watchdog/mpc8xxx_wdt.c| 17b/drivers/watchdog/mpcore_wdt.c| 111 ++---b/drivers/watchdog/mv64x60_wdt.c| 15b/drivers/watchdog/nuc900_wdt.c| 4b/drivers/watchdog/nv_tco.c| 46 +-b/drivers/watchdog/octeon-wdt-main.c| 16b/drivers/watchdog/of_xilinx_wdt.c| 41 --b/drivers/watchdog/omap_wdt.c| 4b/drivers/watchdog/orion_wdt.c| 15b/drivers/watchdog/pc87413_wdt.c| 57 +-b/drivers/watchdog/pcwd.c| 127 ++----b/drivers/watchdog/pcwd_pci.c | 113 ++--- b/drivers/watchdog/pcwd_usb.c | 78 +-- b/drivers/watchdog/pika_wdt.c | 23 - b/drivers/watchdog/pnx4008_wdt.c | 263 +++--------- b/drivers/watchdog/pnx833x_wdt.c | 30 - b/drivers/watchdog/rc32434_wdt.c | 33 -b/drivers/watchdog/riowd.c | 10
b/drivers/watchdog/s3c2410_wdt.c| 31 -b/drivers/watchdog/sa1100_wdt.c| 10b/drivers/watchdog/sb_wdog.c| 28 -b/drivers/watchdog/sbc60xxwdt.c| 41 --b/drivers/watchdog/sbc7240_wdt.c| 44 --b/drivers/watchdog/sbc8360.c| 24 -b/drivers/watchdog/sbc_epx_c3.c| 23 -b/drivers/watchdog/sbc_fitpc2_wdt.c| 13b/drivers/watchdog/sc1200wdt.c| 34 -b/drivers/watchdog/sc520_wdt.c| 39 -b/drivers/watchdog/sch311x_wdt.c| 17b/drivers/watchdog/scx200_wdt.c| 25 -b/drivers/watchdog/shwdt.c| 19b/drivers/watchdog/smsc37b787_wdt.c| 42 --b/drivers/watchdog/softdog.c| 211 ++--------b/drivers/watchdog/sp5100_tco.c| 35 -b/drivers/watchdog/sp805_wdt.c| 111 +++--b/drivers/watchdog/stmp3xxx_wdt.c| 8b/drivers/watchdog/ts72xx_wdt.c| 4b/drivers/watchdog/twl4030_wdt.c| 4b/drivers/watchdog/txx9wdt.c| 184 ++-------b/drivers/watchdog/via_wdt.c| 13b/drivers/watchdog/w83627hf_wdt.c | 38 - b/drivers/watchdog/w83697hf_wdt.c | 43 -- b/drivers/watchdog/w83697ug_wdt.c | 38 - b/drivers/watchdog/w83877f_wdt.c | 40 - b/drivers/watchdog/w83977f_wdt.c | 38 - b/drivers/watchdog/wafer5823wdt.c | 34 -b/drivers/watchdog/watchdog_core.c | 4
b/drivers/watchdog/watchdog_dev.c| 16b/drivers/watchdog/wdrtas.c| 71 +--b/drivers/watchdog/wdt.c| 55 +-b/drivers/watchdog/wdt285.c| 12b/drivers/watchdog/wdt977.c| 40 -b/drivers/watchdog/wdt_pci.c| 70 +--b/drivers/watchdog/wm831x_wdt.c| 6b/drivers/watchdog/wm8350_wdt.c| 223 ++--------b/drivers/watchdog/xen_wdt.c| 42 +-b/include/linux/watchdog.h| 4
Quoted 6 lines
111 files changed, 1829 insertions(+), 2844 deletions(-)--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Tomas,
Quoted 4 lines
Quoted 3 lines
All,
These are the patches that I will sent over for inclusion in Linus his tree tomorrow evening.
Quoted 8 lines
I was looking for the 'Add multiple device support' patch series
(http://www.spinics.net/lists/linux-watchdog/msg01071.html)
to be included as our driver underdrivers/staging/meirequired them to work properly.
We expose additional interfaceThanks
Tomas
This will only be for the next merge window. Hans allready reviewed Alan's patch and Alan allready sent out an update, but this needs some more review though.
Kind regards,
Wim.
Quoted 15 lines
Hi Tomas,
Quoted 3 lines
Quoted 3 lines
All,
These are the patches that I will sent over for inclusion in Linus his tree
tomorrow evening.
Quoted 7 lines
I was looking for the 'Add multiple device support' patch series
(http://www.spinics.net/lists/linux-watchdog/msg01071.html)
to be included as our driver underdrivers/staging/meirequired them to work properly.
We expose additional interface
Quoted 6 lines
Quoted 2 lines
Thanks
TomasThis will only be for the next merge window. Hans allready reviewed Alan's patch and Alan allready sent out an update, but this needs some more review though.
I see, thanks for update.
Frankly I've tested only the first drop of the Alan's patches that went to LKML they worked pretty well.
I've subscribed to this list only yesterday so all this comments passed by w/o me noticing. I will review the discussion in the archive.
Thanks
Tomas
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html