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

Pull watchdog updates from Wim Van Sebroeck:
 - new driver for NXP LPC18xx Watchdog Timer
 - new driver for SAMA5D4 watchdog timer
 - add support for MCP79 to nv_tco driver
 - clean-up and improvement of the mpc8xxx watchdog driver
 - improvements to gpio-wdt
 - at91sam9_wdt clock improvements
 ... and other small fixes and improvements

* git://www.linux-watchdog.org/linux-watchdog: (25 commits)
  Watchdog: Fix parent of watchdog_devices
  watchdog: at91rm9200: Correct check for syscon_node_to_regmap() errors
  watchdog: at91sam9: get and use slow clock
  Documentation: dt: binding: atmel-sama5d4-wdt: for SAMA5D4 watchdog driver
  watchdog: add a driver to support SAMA5D4 watchdog timer
  watchdog: mpc8xxx: allow to compile for MPC512x
  watchdog: mpc8xxx: use better error code when watchdog cannot be enabled
  watchdog: mpc8xxx: use dynamic memory for device specific data
  watchdog: mpc8xxx: use devm_ioremap_resource to map memory
  watchdog: mpc8xxx: make use of of_device_get_match_data
  watchdog: mpc8xxx: simplify registration
  watchdog: mpc8xxx: remove dead code
  watchdog: lpc18xx_wdt_get_timeleft() can be static
  DT: watchdog: Add NXP LPC18xx Watchdog Timer binding documentation
  watchdog: NXP LPC18xx Watchdog Timer Driver
  watchdog: gpio-wdt: ping already at startup for always running devices
  watchdog: gpio-wdt: be more strict about hw_algo matching
  Documentation: watchdog: at91sam9_wdt: add clocks property
  watchdog: booke_wdt: Use infrastructure to check timeout limits
  watchdog: (nv_tco) add support for MCP79
  ...

1 files changed, 21 insertions, 1 deletions

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 55c4b5b0a317..c68edc16aa54 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -188,6 +188,15 @@ config AT91SAM9X_WATCHDOG
           Watchdog timer embedded into AT91SAM9X and AT91CAP9 chips. This will
           reboot your system when the timeout is reached.
 
+config SAMA5D4_WATCHDOG
+        tristate "Atmel SAMA5D4 Watchdog Timer"
+        depends on ARCH_AT91
+        select WATCHDOG_CORE
+        help
+          Atmel SAMA5D4 watchdog timer is embedded into SAMA5D4 chips.
+          Its Watchdog Timer Mode Register can be written more than once.
+          This will reboot your system when the timeout is reached.
+
 config CADENCE_WATCHDOG
         tristate "Cadence Watchdog Timer"
         depends on HAS_IOMEM
@@ -558,6 +567,17 @@ config DIGICOLOR_WATCHDOG
           To compile this driver as a module, choose M here: the
           module will be called digicolor_wdt.
 
+config LPC18XX_WATCHDOG
+        tristate "LPC18xx/43xx Watchdog"
+        depends on ARCH_LPC18XX || COMPILE_TEST
+        select WATCHDOG_CORE
+        help
+          Say Y here if to include support for the watchdog timer
+          in NXP LPC SoCs family, which includes LPC18xx/LPC43xx
+          processors.
+          To compile this driver as a module, choose M here: the
+          module will be called lpc18xx_wdt.
+
 # AVR32 Architecture
 
 config AT32AP700X_WDT
@@ -1334,7 +1354,7 @@ config MPC5200_WDT
 
 config 8xxx_WDT
         tristate "MPC8xxx Platform Watchdog Timer"
-        depends on PPC_8xx || PPC_83xx || PPC_86xx
+        depends on PPC_8xx || PPC_83xx || PPC_86xx || PPC_MPC512x
         select WATCHDOG_CORE
         help
           This driver is for a SoC level watchdog that exists on some