From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Apr 2018 22:43:50 +0000 (-0700)
Subject: Merge tag 'linux-watchdog-4.17-rc1' of git://www.linux-watchdog.org/linux-watchdog
X-Git-Tag: v5.15~9018
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=41531f58a6513b86f8f379117eca82502022b4a9;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull watchdog updates from Wim Van Sebroeck:

 - Add Nuvoton NPCM watchdog driver

 - renesas_wdt: Add R-Car Gen2 support

 - renesas_wdt: add suspend/resume and restart handler support

 - hpwdt: convert to watchdog core and improve NMI

 - improve timeout setting/handling in various drivers

 - coh901327: make license text and module licence match

 - fix error handling in asm9260_wdt, sprd_wdt and davinci_wdt

 - aspeed imrovements

 - dw improvements (for control register & suspend/resume)

 - add SPDX identifiers for watchdog subsystem

* tag 'linux-watchdog-4.17-rc1' of git://www.linux-watchdog.org/linux-watchdog: (35 commits)
  watchdog: davinci_wdt: fix error handling in davinci_wdt_probe()
  watchdog: add SPDX identifiers for watchdog subsystem
  watchdog: aspeed: Allow configuring for alternate boot
  watchdog: Add Nuvoton NPCM watchdog driver
  dt-bindings: watchdog: Add Nuvoton NPCM description
  watchdog: dw: save/restore control and timeout across suspend/resume
  watchdog: dw: RMW the control register
  watchdog: sprd_wdt: Fix error handling in sprd_wdt_enable()
  watchdog: aspeed: Fix translation of reset mode to ctrl register
  watchdog: renesas_wdt: Add restart handler
  watchdog: renesas_wdt: Add R-Car Gen2 support
  watchdog: renesas_wdt: Add suspend/resume support
  watchdog: f71808e_wdt: Fix WD_EN register read
  watchdog: hpwdt: Update driver version.
  watchdog: hpwdt: Add dynamic debug
  watchdog: hpwdt: Programable Pretimeout NMI
  watchdog: hpwdt: remove allow_kdump module parameter.
  watchdog: hpwdt: condition early return of NMI handler on iLO5
  watchdog: hpwdt: Modify to use watchdog core.
  watchdog: hpwdt: Update nmi_panic message.
  ...
---

41531f58a6513b86f8f379117eca82502022b4a9
diff --cc Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
index 04fc368,49900e7..ed11ce0
--- a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
@@@ -2,12 -2,13 +2,15 @@@ Allwinner SoCs Watchdog time
  
  Required properties:
  
 -- compatible : should be either "allwinner,sun4i-a10-wdt" or
 -               "allwinner,sun6i-a31-wdt"
 +- compatible : should be one of
 +	"allwinner,sun4i-a10-wdt"
 +	"allwinner,sun6i-a31-wdt"
 +	"allwinner,sun50i-a64-wdt","allwinner,sun6i-a31-wdt"
  - reg : Specifies base physical address and size of the registers.
  
+ Optional properties:
+ - timeout-sec : Contains the watchdog timeout in seconds
+ 
  Example:
  
  wdt: watchdog@1c20c90 {