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

Pull watchdog updates from Wim Van Sebroeck:
 - new driver for bcm281xx watchdog device
 - new driver for gpio based watchdog devices
 - remove DEFINE_PCI_DEVICE_TABLE macro for watchdog device drivers
 - conversion of davinci_wdt and mpc8xxx_wdt to watchdog core
 - improvements on davinci_wdt, at91/dt, at91sam9_wdt and s3c2410_wdt
 - Auto-detect IO address and expand supported chips on w836* super-I/O
   chipsets
 - core: Make dt "timeout-sec" property work on drivers w/out min/max
 - fix Kconfig dependencies
 - sirf: Remove redundant of_match_ptr helper
 - mach-moxart: add restart handler
 - hpwdt patch to display better panic information
 - imx2_wdt: disable watchdog timer during low power mode

* git://www.linux-watchdog.org/linux-watchdog: (31 commits)
  watchdog: w83627hf_wdt: Reset watchdog trigger during initialization
  watchdog: w83627hf: Add support for W83697HF and W83697UG
  watchdog: w83627hf: Auto-detect IO address and supported chips
  watchdog: at91sam9_wdt: increase security margin on watchdog counter reset
  watchdog: at91sam9_wdt: avoid spurious watchdog reset during init
  watchdog: at91sam9_wdt: fix secs_to_ticks
  ARM: at91/dt: add watchdog properties to kizbox board
  ARM: at91/dt: add sam9 watchdog default options to SoCs
  watchdog: at91sam9_wdt: update device tree doc
  watchdog: at91sam9_wdt: better watchdog support
  watchdog: sp805_wdt depends also on ARM64
  watchdog: mach-moxart: add restart handler
  watchdog: mpc8xxx_wdt convert to watchdog core
  watchdog: sirf: Remove redundant of_match_ptr helper
  watchdog: hpwdt patch to display informative string
  watchdog: dw_wdt: remove build dependencies
  watchdog: imx2_wdt: disable watchdog timer during low power mode
  watchdog: s3c2410_wdt: Report when the watchdog reset the system
  watchdog: s3c2410_wdt: use syscon regmap interface to configure pmu register
  watchdog: s3c2410_wdt: Handle rounding a little better for timeout
  ...

8 files changed, 39 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index 56ee8282a7a8..997901f7ed73 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -648,6 +648,11 @@
                         watchdog@fffffd40 {
                                 compatible = "atmel,at91sam9260-wdt";
                                 reg = <0xfffffd40 0x10>;
+                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+                                atmel,watchdog-type = "hardware";
+                                atmel,reset-type = "all";
+                                atmel,dbg-halt;
+                                atmel,idle-halt;
                                 status = "disabled";
                         };
                 };
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index c8fa9b9f07e3..0042f73068b0 100644
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -552,6 +552,11 @@
                         watchdog@fffffd40 {
                                 compatible = "atmel,at91sam9260-wdt";
                                 reg = <0xfffffd40 0x10>;
+                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+                                atmel,watchdog-type = "hardware";
+                                atmel,reset-type = "all";
+                                atmel,dbg-halt;
+                                atmel,idle-halt;
                                 status = "disabled";
                         };
 
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index ef0857cb171c..cbcc058b26b4 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -706,6 +706,11 @@
                         watchdog@fffffd40 {
                                 compatible = "atmel,at91sam9260-wdt";
                                 reg = <0xfffffd40 0x10>;
+                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+                                atmel,watchdog-type = "hardware";
+                                atmel,reset-type = "all";
+                                atmel,dbg-halt;
+                                atmel,idle-halt;
                                 status = "disabled";
                         };
 
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index 7248270a3ea6..394e6ce2afb7 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -541,6 +541,11 @@
                         watchdog@fffffe40 {
                                 compatible = "atmel,at91sam9260-wdt";
                                 reg = <0xfffffe40 0x10>;
+                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+                                atmel,watchdog-type = "hardware";
+                                atmel,reset-type = "all";
+                                atmel,dbg-halt;
+                                atmel,idle-halt;
                                 status = "disabled";
                         };
 
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 6e5e9cfc3c49..174219de92fa 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -754,6 +754,11 @@
                         watchdog@fffffe40 {
                                 compatible = "atmel,at91sam9260-wdt";
                                 reg = <0xfffffe40 0x10>;
+                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+                                atmel,watchdog-type = "hardware";
+                                atmel,reset-type = "all";
+                                atmel,dbg-halt;
+                                atmel,idle-halt;
                                 status = "disabled";
                         };
 
diff --git a/arch/arm/boot/dts/kizbox.dts b/arch/arm/boot/dts/kizbox.dts
index 02df1914a47c..928f6eef2d59 100644
--- a/arch/arm/boot/dts/kizbox.dts
+++ b/arch/arm/boot/dts/kizbox.dts
@@ -53,6 +53,12 @@
                                 status = "okay";
                         };
 
+                        watchdog@fffffd40 {
+                                timeout-sec = <15>;
+                                atmel,max-heartbeat-sec = <16>;
+                                atmel,min-heartbeat-sec = <0>;
+                                status = "okay";
+                        };
                 };
 
                 nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index 1105558d188b..52447c17537a 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -1092,6 +1092,11 @@
                         watchdog@fffffe40 {
                                 compatible = "atmel,at91sam9260-wdt";
                                 reg = <0xfffffe40 0x10>;
+                                interrupts = <4 IRQ_TYPE_LEVEL_HIGH 7>;
+                                atmel,watchdog-type = "hardware";
+                                atmel,reset-type = "all";
+                                atmel,dbg-halt;
+                                atmel,idle-halt;
                                 status = "disabled";
                         };
 
diff --git a/arch/arm/configs/bcm_defconfig b/arch/arm/configs/bcm_defconfig
index 2c38fdf1951d..2519d6de0640 100644
--- a/arch/arm/configs/bcm_defconfig
+++ b/arch/arm/configs/bcm_defconfig
@@ -126,3 +126,6 @@ CONFIG_CRC7=y
 CONFIG_XZ_DEC=y
 CONFIG_AVERAGE=y
 CONFIG_PINCTRL_CAPRI=y
+CONFIG_WATCHDOG=y
+CONFIG_BCM_KONA_WDT=y
+CONFIG_BCM_KONA_WDT_DEBUG=y