From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 Jul 2019 17:47:59 +0000 (-0700)
Subject: Merge tag 'linux-watchdog-5.3-rc1' of git://www.linux-watchdog.org/linux-watchdog
X-Git-Tag: 5.3-smb3-fixes~9
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=d77e9e4e18ce9da3b4981a5c537979c42b06638c;p=sfrench%2Fcifs-2.6.git

Merge tag 'linux-watchdog-5.3-rc1' of git://linux-watchdog.org/linux-watchdog

Pull watchdog updates from Wim Van Sebroeck:

 - add Allwinner H6 watchdog

 - drop warning after registering device patches

 - hpwdt improvements

 - gpio: add support for nowayout option

 - introduce CONFIG_WATCHDOG_OPEN_TIMEOUT

 - convert remaining drivers to use SPDX license identifier

 - Fixes and improvements on several watchdog device drivers

* tag 'linux-watchdog-5.3-rc1' of git://www.linux-watchdog.org/linux-watchdog: (74 commits)
  watchdog: digicolor_wdt: Remove unused variable in dc_wdt_probe
  watchdog: ie6xx_wdt: Use spinlock_t instead of struct spinlock
  watchdog: atmel: atmel-sama5d4-wdt: Disable watchdog on system suspend
  watchdog: convert remaining drivers to use SPDX license identifier
  dt-bindings: watchdog: Rename bindings documentation file
  watchdog: mei_wdt: no need to check return value of debugfs_create functions
  watchdog: bcm_kona_wdt: no need to check return value of debugfs_create functions
  docs: watchdog: Fix build error.
  docs: watchdog: convert docs to ReST and rename to *.rst
  watchdog: make the device time out at open_deadline when open_timeout is used
  watchdog: introduce CONFIG_WATCHDOG_OPEN_TIMEOUT
  watchdog: introduce watchdog.open_timeout commandline parameter
  dt-bindings: watchdog: move i.MX system controller watchdog binding to SCU
  watchdog: imx_sc: Add pretimeout support
  watchdog: renesas_wdt: Add a few cycles delay
  watchdog: gpio: add support for nowayout option
  watchdog: renesas_wdt: Use 'dev' instead of dereferencing it repeatedly
  dt-bindings: watchdog: add Allwinner H6 watchdog
  watchdog: jz4740: Avoid starting watchdog in set_timeout
  watchdog: jz4740: Use register names from <linux/mfd/ingenic-tcu.h>
  ...
---

d77e9e4e18ce9da3b4981a5c537979c42b06638c
diff --cc Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
index f378922906f6,1b56557df521..a575e42f7fec
--- a/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
+++ b/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
@@@ -133,18 -133,16 +133,28 @@@ RTC bindings based on SCU Message Proto
  Required properties:
  - compatible: should be "fsl,imx8qxp-sc-rtc";
  
 +OCOTP bindings based on SCU Message Protocol
 +------------------------------------------------------------
 +Required properties:
 +- compatible:		Should be "fsl,imx8qxp-scu-ocotp"
 +- #address-cells:	Must be 1. Contains byte index
 +- #size-cells:		Must be 1. Contains byte length
 +
 +Optional Child nodes:
 +
 +- Data cells of ocotp:
 +  Detailed bindings are described in bindings/nvmem/nvmem.txt
 +
+ Watchdog bindings based on SCU Message Protocol
+ ------------------------------------------------------------
+ 
+ Required properties:
+ - compatible: should be:
+               "fsl,imx8qxp-sc-wdt"
+               followed by "fsl,imx-sc-wdt";
+ Optional properties:
+ - timeout-sec: contains the watchdog timeout in seconds.
+ 
  Example (imx8qxp):
  -------------
  aliases {