From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 25 May 2016 17:19:17 +0000 (-0700)
Subject: Merge git://www.linux-watchdog.org/linux-watchdog
X-Git-Tag: v4.7-rc1~55
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=1f93d2abf488c6a41bdd5e6caf80b559493eea8d;p=karo-tx-linux.git

Merge git://www.linux-watchdog.org/linux-watchdog

Pull watchdog updates from Wim Van Sebroeck:

 - add support for Fintek F81865 Super-IO chip

 - add support for watchdogs (RWDT and SWDT) found on RCar Gen3 based
   SoCs from Renesas

 - octeon: Handle the FROZEN hot plug notifier actions

 - f71808e_wdt fixes and cleanups

 - some small improvements in code and documentation

* git://www.linux-watchdog.org/linux-watchdog:
  MAINTAINERS: Add file patterns for watchdog device tree bindings
  Documentation: Add ebc-c384_wdt watchdog-parameters.txt entry
  watchdog: shwdt: Use setup_timer()
  watchdog: cpwd: Use setup_timer()
  arm64: defconfig: enable Renesas Watchdog Timer
  watchdog: renesas-wdt: add driver
  watchdog: remove error message when unable to allocate watchdog device
  watchdog: f71808e_wdt: Fix WDTMOUT_STS register read
  watchdog: f71808e_wdt: Fix typo
  watchdog: f71808e_wdt: Add F81865 support
  watchdog: sp5100_tco: properly check for new register layouts
  watchdog: core: Fix circular locking dependency
  watchdog: core: fix trivial typo in a comment
  watchdog: hpwdt: Adjust documentation to match latest kernel module parameters.
  watchdog: imx2_wdt: add external reset support via dt prop
  watchdog: octeon: Handle the FROZEN hot plug notifier actions.
  watchdog: qcom: Report reboot reason
---

1f93d2abf488c6a41bdd5e6caf80b559493eea8d
diff --cc arch/arm64/configs/defconfig
index 89171505e750,2578d55e336c..fd2d74d0491e
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -200,12 -171,12 +200,14 @@@ CONFIG_SENSORS_INA2XX=
  CONFIG_THERMAL=y
  CONFIG_THERMAL_EMULATION=y
  CONFIG_EXYNOS_THERMAL=y
+ CONFIG_WATCHDOG=y
+ CONFIG_RENESAS_WDT=y
  CONFIG_MFD_SPMI_PMIC=y
  CONFIG_MFD_SEC_CORE=y
 +CONFIG_MFD_HI655X_PMIC=y
  CONFIG_REGULATOR=y
  CONFIG_REGULATOR_FIXED_VOLTAGE=y
 +CONFIG_REGULATOR_HI655X=y
  CONFIG_REGULATOR_QCOM_SMD_RPM=y
  CONFIG_REGULATOR_QCOM_SPMI=y
  CONFIG_REGULATOR_S2MPS11=y