linux-stable.git/drivers/watchdog, branch v3.16.2

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

2014-06-21T16:47:01+00:00

Pull s390 patches from Martin Schwidefsky:
 "A couple of bug fixes, a debug change for qdio, an update for the
  default config, and one small extension.

  The watchdog module based on diagnose 0x288 is converted to the
  watchdog API and it now works under LPAR as well"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/ccwgroup: use ccwgroup_ungroup wrapper
  s390/ccwgroup: fix an uninitialized return code
  s390/ccwgroup: obtain extra reference for asynchronous processing
  qdio: Keep device-specific dbf entries
  s390/compat: correct ucontext layout for high gprs
  s390/cio: set device name as early as possible
  s390: update default configuration
  s390: avoid format strings leaking into names
  s390/airq: silence lockdep warning
  s390/watchdog: add support for LPAR operation (diag288)
  s390/watchdog: use watchdog API
  s390/sclp_vt220: Enable ASCII console per default
  s390/qdio: replace shift loop by ilog2
  s390/cio: silence lockdep warning
  s390/uaccess: always load the kernel ASCE after task switch
  s390/ap_bus: Make modules parameters visible in sysfs

watchdog: add Intel MID watchdog driver support

2014-06-10T19:48:16+00:00

Add initial Intel MID watchdog driver support.

This driver is an initial implementation of generic Intel MID watchdog
driver. Currently it supports Intel Merrifield platform.

Signed-off-by: Eric Ernst 
Signed-off-by: David Cohen 
Reviewed-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck

watchdog: sp805: Set watchdog_device->timeout from ->set_timeout()

2014-06-10T19:47:47+00:00

Implementation of ->set_timeout() is supposed to set 'timeout' field of 'struct
watchdog_device' passed to it. sp805 was rather setting this in a local
variable. Fix it.

Reported-by: Arun Ramamurthy 
Signed-off-by: Viresh Kumar 
Reviewed-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck 
Cc:  # 2.6.36+

booke/watchdog: refine and clean up the codes

2014-06-10T19:47:26+00:00

Basically, this patch does the following:
1. Move the codes of parsing boot parameters from setup-common.c
   to driver. In this way, code reader can know directly that
   there are boot parameters that can change the timeout.
2. Make boot parameter 'booke_wdt_period' effective.
   currently, when driver is loaded, default timeout is always
   being used in stead of booke_wdt_period.
3. Wrap up the watchdog timeout in device struct and clean up
   unnecessary codes.

Signed-off-by: Tang Yuantian 
Acked-by: Scott Wood 
Reviewed-by: Li Yang 
Reviewed-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck

watchdog: iop_wdt only builds for mach-iop13xx

2014-06-10T19:46:57+00:00

All three iop variants we support in Linux (iop32x, iop33x and
iop13xx) seem to have support for the watchdog hardware, but this
driver fails to build for the first two of these because it
uses the IOP13XX_WDTCR_IB_RESET macro that is only defined for
iop13xx.

This clarifies the dependency in Kconfig to avoid randconfig
build errors. It is unlikely that anyone will ever miss support
for this driver on the ancient iop3xx platforms, so we don't
need to bother trying to fix it properly.

Signed-off-by: Arnd Bergmann 
Reviewed-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck 
Cc: linux-watchdog@vger.kernel.org

watchdog: Remove drivers for W83697HF and W83697UG

2014-06-10T19:46:26+00:00

Since both chips are now supported by the w83627hf watchdog driver,
the chip specific drivers are no longer needed and can be removed.

Signed-off-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck

watchdog: w83627hf_wdt: Add early_disable module parameter

2014-06-10T19:46:07+00:00

Add early_disable module parameter to match functionality previously
available in the w83697hf_wdt driver.

Signed-off-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck

watchdog: orion: Add Armada 375/380 SoC support

2014-06-10T19:44:41+00:00

This commit adds support for the Armada 375 and Armada 380 SoCs.

This SoC variant has a second RSTOUT register, in addition to the already
existent, which is shared with the system-controller. To handle this RSTOUT,
we introduce a new MMIO register 'rstout_mask' to be required on
'armada-{375,380}-watchdog' new compatible string.

Signed-off-by: Ezequiel Garcia 
Reviewed-by: Guenter Roeck 
Acked-by: Jason Cooper 
Tested-by: Jason Gunthorpe 
Tested-by: Sebastian Hesselbarth 
Signed-off-by: Wim Van Sebroeck

watchdog: orion: Introduce per-SoC enabled() function

2014-06-10T19:44:31+00:00

In order to support other SoCs, it's needed to have a different enabled()
implementation for each SoC. This commit adds no functionality, and it
consists of preparation work.

Signed-off-by: Ezequiel Garcia 
Reviewed-by: Guenter Roeck 
Acked-by: Jason Cooper 
Tested-by: Jason Gunthorpe 
Tested-by: Sebastian Hesselbarth 
Signed-off-by: Wim Van Sebroeck

watchdog: orion: Introduce per-SoC stop() function

2014-06-10T19:44:24+00:00

In order to support other SoCs, it's needed to have a different stop()
implementation for each SoC. This commit adds no functionality, and it
consists of preparation work.

Signed-off-by: Ezequiel Garcia 
Reviewed-by: Guenter Roeck 
Acked-by: Jason Cooper 
Tested-by: Jason Gunthorpe 
Tested-by: Sebastian Hesselbarth 
Signed-off-by: Wim Van Sebroeck