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
  ...

diff --combined drivers/watchdog/Kconfig
index 55c4b5b,ce0658c..c68edc1
--- 1/drivers/watchdog/Kconfig
--- 2/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@@ -188,6 -188,15 +188,15 @@@ config AT91SAM9X_WATCHDO
          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 +567,17 @@@ config DIGICOLOR_WATCHDO
          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
@@@ -797,8 -817,7 +817,8 @@@ config ITCO_WD
        tristate "Intel TCO Timer/Watchdog"
        depends on (X86 || IA64) && PCI
        select WATCHDOG_CORE
 -      select LPC_ICH
 +      select LPC_ICH if !EXPERT
 +      select I2C_I801 if !EXPERT
        ---help---
          Hardware driver for the intel TCO timer based watchdog devices.
          These drivers are included in the Intel 82801 I/O Controller
@@@ -1334,7 -1353,7 +1354,7 @@@ config MPC5200_WD
  
  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

diff --combined drivers/watchdog/at91rm9200_wdt.c
index 9ba1153,464bf76..e12a797
--- 1/drivers/watchdog/at91rm9200_wdt.c
--- 2/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
@@@ -244,7 -244,7 +244,7 @@@ static int at91wdt_probe(struct platfor
        }
  
        regmap_st = syscon_node_to_regmap(parent->of_node);
-       if (!regmap_st)
+       if (IS_ERR(regmap_st))
                return -ENODEV;
  
        res = misc_register(&at91wdt_miscdev);
@@@ -269,8 -269,9 +269,8 @@@ static int at91wdt_remove(struct platfo
        if (res)
                dev_warn(dev, "failed to unregister restart handler\n");
  
 -      res = misc_deregister(&at91wdt_miscdev);
 -      if (!res)
 -              at91wdt_miscdev.parent = NULL;
 +      misc_deregister(&at91wdt_miscdev);
 +      at91wdt_miscdev.parent = NULL;
  
        return res;
  }