Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 928fce2f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull watchdog updates from Wim Van Sebroeck:
 "This adds the following new drivers:

   - ImgTec PDC Watchdog Timer Driver,
   - Mediatek SoC integrated watchdog

  Add support for BCM5301X, IT8783, NCT6791 and NCT6792 WDT's

  Add bcm47xx_wdt and da9063 restart handlers and contains overall
  improvements and fixes"

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: bcm47xx_wdt.c: allow enabling on BCM5301X arch
  watchdog: jz4740: Add DT support
  dt: watchdog: Add DT binding documentation for jz4740 watchdog timer
  watchdog: dw_wdt: Try to get a 30 second watchdog by default
  watchdog: dw_wdt: pat the watchdog before enabling it
  watchdog: w83627hf_wdt: Add support for NCT6791 and NCT6792
  watchdog: bcm47xx_wdt.c: add restart handler support
  watchdog: gpio_wdt: Add "always_running" feature to GPIO watchdog
  watchdog: da9063: Add restart handler support
  ARM: mediatek: dts: Add bindings for watchdog
  watchdog: Add driver for Mediatek watchdog
  watchdog: Fix omap watchdogs to enable the magic close bit
  watchdog: rt2880_wdt: minor clean up
  watchdog: hpwdt: Fix initialization message in hpwdt.c
  watchdog: it87_wdt: add IT8783 ID
  watchdog: imx2: Constify struct regmap_config and watchdog_ops
  DT: watchdog: Add ImgTec PDC Watchdog Timer binding documentation
  watchdog: ImgTec PDC Watchdog Timer Driver
parents a5ac1fb1 94613431

Documentation/devicetree/bindings/watchdog/gpio-wdt.txt

+5 −0
Original line number Diff line number Diff line
@@ -13,6 +13,11 @@ Required Properties: 
    by the GPIO flags.

- hw_margin_ms: Maximum time to reset watchdog circuit (milliseconds).



Optional Properties:

- always-running: If the watchdog timer cannot be disabled, add this flag to

  have the driver keep toggling the signal without a client. It will only cease

  to toggle the signal when the device is open and the timeout elapsed.



Example:

	watchdog: watchdog {

		/* ADM706 */

Documentation/devicetree/bindings/watchdog/imgpdc-wdt.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
*ImgTec PowerDown Controller (PDC) Watchdog Timer (WDT)



Required properties:

- compatible : Should be "img,pdc-wdt"

- reg : Should contain WDT registers location and length

- clocks: Must contain an entry for each entry in clock-names.

- clock-names: Should contain "wdt" and "sys"; the watchdog counter

               clock and register interface clock respectively.

- interrupts : Should contain WDT interrupt



Examples:



watchdog@18102100 {

	compatible = "img,pdc-wdt";

	reg = <0x18102100 0x100>;

	clocks = <&pdc_wdt_clk>, <&sys_clk>;

	clock-names = "wdt", "sys";

	interrupts = <0 52 IRQ_TYPE_LEVEL_HIGH>;

};

Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
Ingenic Watchdog Timer (WDT) Controller for JZ4740



Required properties:

compatible: "ingenic,jz4740-watchdog"

reg: Register address and length for watchdog registers



Example:



watchdog: jz4740-watchdog@0x10002000 {

	compatible = "ingenic,jz4740-watchdog";

	reg = <0x10002000 0x100>;

};

Documentation/devicetree/bindings/watchdog/mtk-wdt.txt

0 → 100644
+13 −0
Original line number Diff line number Diff line 
Mediatek SoCs Watchdog timer



Required properties:



- compatible : should be "mediatek,mt6589-wdt"

- reg : Specifies base physical address and size of the registers.



Example:



wdt: watchdog@010000000 {

	compatible = "mediatek,mt6589-wdt";

	reg = <0x10000000 0x18>;

};

drivers/watchdog/Kconfig

+24 −1
Original line number Diff line number Diff line
@@ -505,6 +505,16 @@ config MESON_WATCHDOG 
	  To compile this driver as a module, choose M here: the

	  module will be called meson_wdt.



config MEDIATEK_WATCHDOG

	tristate "Mediatek SoCs watchdog support"

	depends on ARCH_MEDIATEK

	select WATCHDOG_CORE

	help

	  Say Y here to include support for the watchdog timer

	  in Mediatek SoCs.

	  To compile this driver as a module, choose M here: the

	  module will be called mtk_wdt.



# AVR32 Architecture



config AT32AP700X_WDT
@@ -1005,6 +1015,8 @@ config W83627HF_WDT 
		NCT6775

		NCT6776

		NCT6779

		NCT6791

		NCT6792



	  This watchdog simply watches your kernel to make sure it doesn't

	  freeze, and if it does, it reboots your computer after a certain
@@ -1101,7 +1113,7 @@ config ATH79_WDT 


config BCM47XX_WDT

	tristate "Broadcom BCM47xx Watchdog Timer"

	depends on BCM47XX

	depends on BCM47XX || ARCH_BCM_5301X

	select WATCHDOG_CORE

	help

	  Hardware driver for the Broadcom BCM47xx Watchdog Timer.
@@ -1235,6 +1247,17 @@ config BCM_KONA_WDT_DEBUG 


	  If in doubt, say 'N'.



config IMGPDC_WDT

	tristate "Imagination Technologies PDC Watchdog Timer"

	depends on HAS_IOMEM

	depends on METAG || MIPS || COMPILE_TEST

	help

	  Driver for Imagination Technologies PowerDown Controller

	  Watchdog Timer.



	  To compile this driver as a loadable module, choose M here.

	  The module will be called imgpdc_wdt.



config LANTIQ_WDT

	tristate "Lantiq SoC watchdog"

	depends on LANTIQ