Merge tag 'linux-watchdog-4.17-rc1' of git://www.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.
  ...

diff --combined Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
index 04fc368d828fb30d781d9cd6982d198525edf7f8,49900e72f6b131e781d5464998adfebfb41289b3..ed11ce0ac8362d687bdfcc9041194deb5f4ee265
--- 1/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
--- 2/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
@@@ -2,15 -2,17 +2,19 @@@ 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 {
        compatible = "allwinner,sun4i-a10-wdt";
        reg = <0x01c20c90 0x10>;
+       timeout-sec = <10>;
  };

diff --combined drivers/watchdog/Kconfig
index 66a7f5a2f474e1848b127c2c310979ef7a04c06f,db96b92dbe69d02f3970ef3c3623cc647bcf0315..9af07fd927636173ff933b59f21ec74ecd5645e3
--- 1/drivers/watchdog/Kconfig
--- 2/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@@ -514,6 -514,17 +514,17 @@@ config COH901327_WATCHDO
          This watchdog is used to reset the system and thus cannot be
          compiled as a module.
  
+ config NPCM7XX_WATCHDOG
+       bool "Nuvoton NPCM750 watchdog"
+       depends on ARCH_NPCM || COMPILE_TEST
+       default y if ARCH_NPCM750
+       select WATCHDOG_CORE
+       help
+         Say Y here to include Watchdog timer support for the
+         watchdog embedded into the NPCM7xx.
+         This watchdog is used to reset the system and thus cannot be
+         compiled as a module.
+ 
  config TWL4030_WATCHDOG
        tristate "TWL4030 Watchdog"
        depends on TWL4030_CORE
@@@ -815,6 -826,23 +826,6 @@@ config SPRD_WATCHDO
          Say Y here to include watchdog timer supported
          by Spreadtrum system.
  
 -# BLACKFIN Architecture
 -
 -config BFIN_WDT
 -      tristate "Blackfin On-Chip Watchdog Timer"
 -      depends on BLACKFIN
 -      ---help---
 -        If you say yes here you will get support for the Blackfin On-Chip
 -        Watchdog Timer. If you have one of these processors and wish to
 -        have watchdog support enabled, say Y, otherwise say N.
 -
 -        To compile this driver as a module, choose M here: the
 -        module will be called bfin_wdt.
 -
 -# CRIS Architecture
 -
 -# FRV Architecture
 -
  # X86 (i386 + ia64 + x86_64) Architecture
  
  config ACQUIRE_WDT
@@@ -866,8 -894,7 +877,8 @@@ config ALIM7101_WD
  
  config EBC_C384_WDT
        tristate "WinSystems EBC-C384 Watchdog Timer"
 -      depends on X86 && ISA_BUS_API
 +      depends on X86
 +      select ISA_BUS_API
        select WATCHDOG_CORE
        help
          Enables watchdog timer support for the watchdog timer on the
@@@ -1102,6 -1129,7 +1113,7 @@@ config IT87_WD
  
  config HP_WATCHDOG
        tristate "HP ProLiant iLO2+ Hardware Watchdog Timer"
+       select WATCHDOG_CORE
        depends on X86 && PCI
        help
          A software monitoring watchdog and NMI sourcing driver. This driver
@@@ -1415,6 -1443,8 +1427,6 @@@ config NIC7018_WD
          To compile this driver as a module, choose M here: the module will be
          called nic7018_wdt.
  
 -# M32R Architecture
 -
  # M68K Architecture
  
  config M54xx_WATCHDOG
@@@ -1587,7 -1617,7 +1599,7 @@@ config BCM7038_WD
  config IMGPDC_WDT
        tristate "Imagination Technologies PDC Watchdog Timer"
        depends on HAS_IOMEM
 -      depends on METAG || MIPS || COMPILE_TEST
 +      depends on MIPS || COMPILE_TEST
        select WATCHDOG_CORE
        help
          Driver for Imagination Technologies PowerDown Controller

diff --combined drivers/watchdog/Makefile
index e4dd91f5585a6d09925dacd7987470cdec0d0997,97a5afb5cad242c5b5100becc6503aae57fc7e50..1d3c6b094fe5c75269c079d313852d3a8be97f1f
--- 1/drivers/watchdog/Makefile
--- 2/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@@ -61,6 -61,7 +61,7 @@@ obj-$(CONFIG_ORION_WATCHDOG) += orion_w
  obj-$(CONFIG_SUNXI_WATCHDOG) += sunxi_wdt.o
  obj-$(CONFIG_RN5T618_WATCHDOG) += rn5t618_wdt.o
  obj-$(CONFIG_COH901327_WATCHDOG) += coh901327_wdt.o
+ obj-$(CONFIG_NPCM7XX_WATCHDOG) += npcm_wdt.o
  obj-$(CONFIG_STMP3XXX_RTC_WATCHDOG) += stmp3xxx_rtc_wdt.o
  obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o
  obj-$(CONFIG_TS4800_WATCHDOG) += ts4800_wdt.o
@@@ -91,6 -92,13 +92,6 @@@ obj-$(CONFIG_UNIPHIER_WATCHDOG) += unip
  obj-$(CONFIG_RTD119X_WATCHDOG) += rtd119x_wdt.o
  obj-$(CONFIG_SPRD_WATCHDOG) += sprd_wdt.o
  
 -# BLACKFIN Architecture
 -obj-$(CONFIG_BFIN_WDT) += bfin_wdt.o
 -
 -# CRIS Architecture
 -
 -# FRV Architecture
 -
  # X86 (i386 + ia64 + x86_64) Architecture
  obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
  obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o
@@@ -139,6 -147,8 +140,6 @@@ obj-$(CONFIG_INTEL_MEI_WDT) += mei_wdt.
  obj-$(CONFIG_NI903X_WDT) += ni903x_wdt.o
  obj-$(CONFIG_NIC7018_WDT) += nic7018_wdt.o
  
 -# M32R Architecture
 -
  # M68K Architecture
  obj-$(CONFIG_M54xx_WATCHDOG) += m54xx_wdt.o